@ptc-org/nestjs-query-typeorm 1.0.0-alpha.2 → 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.
Files changed (20) hide show
  1. package/package.json +3 -3
  2. package/src/module.js +1 -1
  3. package/src/providers.js +1 -1
  4. package/src/query/aggregate.builder.d.ts +7 -1
  5. package/src/query/aggregate.builder.js +23 -4
  6. package/src/query/aggregate.builder.js.map +1 -1
  7. package/src/query/filter-query.builder.d.ts +1 -1
  8. package/src/query/filter-query.builder.js +11 -9
  9. package/src/query/filter-query.builder.js.map +1 -1
  10. package/src/query/relation-query.builder.d.ts +11 -6
  11. package/src/query/relation-query.builder.js +90 -88
  12. package/src/query/relation-query.builder.js.map +1 -1
  13. package/src/query/sql-comparison.builder.js.map +1 -1
  14. package/src/query/where.builder.js.map +1 -1
  15. package/src/services/relation-query.service.d.ts +2 -2
  16. package/src/services/relation-query.service.js +14 -21
  17. package/src/services/relation-query.service.js.map +1 -1
  18. package/src/services/typeorm-query.service.d.ts +2 -0
  19. package/src/services/typeorm-query.service.js +6 -10
  20. package/src/services/typeorm-query.service.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.2",
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.1.0",
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.1",
33
+ "@ptc-org/nestjs-query-core": "1.0.0-alpha.4",
34
34
  "reflect-metadata": "^0.1.13"
35
35
  },
36
36
  "repository": {
package/src/module.js CHANGED
@@ -11,7 +11,7 @@ class NestjsQueryTypeOrmModule {
11
11
  imports: [typeOrmModule],
12
12
  module: NestjsQueryTypeOrmModule,
13
13
  providers: [...queryServiceProviders],
14
- exports: [...queryServiceProviders, typeOrmModule],
14
+ exports: [...queryServiceProviders, typeOrmModule]
15
15
  };
16
16
  }
17
17
  }
package/src/providers.js CHANGED
@@ -10,7 +10,7 @@ function createTypeOrmQueryServiceProvider(EntityClass, connection) {
10
10
  useFactory(repo) {
11
11
  return new services_1.TypeOrmQueryService(repo);
12
12
  },
13
- inject: [(0, typeorm_1.getRepositoryToken)(EntityClass, connection)],
13
+ inject: [(0, typeorm_1.getRepositoryToken)(EntityClass, connection)]
14
14
  };
15
15
  }
16
16
  const createTypeOrmQueryServiceProviders = (entities, connection) => entities.map((entity) => createTypeOrmQueryServiceProvider(entity, connection));
package/src/query/aggregate.builder.d.ts CHANGED
@@ -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
package/src/query/aggregate.builder.js CHANGED
@@ -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;
@@ -37,7 +40,7 @@ class AggregateBuilder {
37
40
  [AggregateFuncs.SUM, query.sum],
38
41
  [AggregateFuncs.AVG, query.avg],
39
42
  [AggregateFuncs.MAX, query.max],
40
- [AggregateFuncs.MIN, query.min],
43
+ [AggregateFuncs.MIN, query.min]
41
44
  ];
42
45
  return aggs.reduce((cols, [func, fields]) => {
43
46
  const aliases = (fields ?? []).map((f) => this.getAggregateAlias(func, f));
@@ -67,11 +70,22 @@ class AggregateBuilder {
67
70
  return {
68
71
  ...agg,
69
72
  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
70
- [aggFunc]: { ...aggResult, [fieldName]: response[resultField] },
73
+ [aggFunc]: { ...aggResult, [fieldName]: response[resultField] }
71
74
  };
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
@@ -85,7 +99,7 @@ class AggregateBuilder {
85
99
  ...this.createAggSelect(AggregateFuncs.SUM, aggregate.sum, alias),
86
100
  ...this.createAggSelect(AggregateFuncs.AVG, aggregate.avg, alias),
87
101
  ...this.createAggSelect(AggregateFuncs.MAX, aggregate.max, alias),
88
- ...this.createAggSelect(AggregateFuncs.MIN, aggregate.min, alias),
102
+ ...this.createAggSelect(AggregateFuncs.MIN, aggregate.min, alias)
89
103
  ];
90
104
  if (!selects.length) {
91
105
  throw new common_1.BadRequestException('No aggregate fields found.');
@@ -108,7 +122,12 @@ class AggregateBuilder {
108
122
  }
109
123
  return fields.map((field) => {
110
124
  const col = alias ? `${alias}.${field}` : field;
111
- return [`${col}`, AggregateBuilder.getGroupByAlias(field)];
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
  }
package/src/query/aggregate.builder.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"aggregate.builder.js","sourceRoot":"","sources":["../../../../../packages/query-typeorm/src/query/aggregate.builder.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"aggregate.builder.js","sourceRoot":"","sources":["../../../../../packages/query-typeorm/src/query/aggregate.builder.ts"],"names":[],"mappings":"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"}
package/src/query/filter-query.builder.d.ts CHANGED
@@ -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
- applyGroupBy<T extends Groupable<Entity>>(qb: T, groupBy?: (keyof Entity)[], alias?: string): T;
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
package/src/query/filter-query.builder.js CHANGED
@@ -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.applyGroupBy(qb, aggregate.groupBy, qb.alias);
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
- applyGroupBy(qb, groupBy, alias) {
138
+ applyAggregateGroupBy(qb, groupBy, alias) {
135
139
  if (!groupBy) {
136
140
  return qb;
137
141
  }
138
- return groupBy.reduce((prevQb, group) => {
139
- const col = alias ? `${alias}.${group}` : `${group}`;
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
- const col = alias ? `${alias}.${field}` : `${field}`;
149
- return prevQb.addOrderBy(col, 'ASC');
151
+ return prevQb.addOrderBy(this.aggregateBuilder.getCorrectedField(alias, field), 'ASC');
150
152
  }, qb);
151
153
  }
152
154
  /**
@@ -204,7 +206,7 @@ class FilterQueryBuilder {
204
206
  return prev;
205
207
  return {
206
208
  ...prev,
207
- [curr]: (0, lodash_merge_1.default)(prev[curr], this.getReferencedRelationsRecursive(referencedRelation.inverseEntityMetadata, currFilterValue)),
209
+ [curr]: (0, lodash_merge_1.default)(prev[curr], this.getReferencedRelationsRecursive(referencedRelation.inverseEntityMetadata, currFilterValue))
208
210
  };
209
211
  }, {});
210
212
  }
package/src/query/filter-query.builder.js.map CHANGED
@@ -1 +1 @@
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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"}
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;AAuCjC;;;;GAIG;AACH,MAAa,kBAAkB;IAC7B,YACW,IAAwB,EACxB,eAAqC,IAAI,4BAAY,EAAU,EAC/D,mBAA6C,IAAI,oCAAgB,CAAS,IAAI,CAAC;QAF/E,SAAI,GAAJ,IAAI,CAAoB;QACxB,iBAAY,GAAZ,YAAY,CAAmD;QAC/D,qBAAgB,GAAhB,gBAAgB,CAA+D;IACvF,CAAC;IAEJ;;;;OAIG;IACI,MAAM,CAAC,KAAoB;QAChC,MAAM,YAAY,GAAG,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC3D,IAAI,EAAE,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACnC,EAAE,GAAG,YAAY;YACf,CAAC,CAAC,IAAI,CAAC,2BAA2B,CAAC,EAAE,EAAE,IAAI,CAAC,+BAA+B,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;YAC9G,CAAC,CAAC,EAAE,CAAC;QACP,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;QAClD,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,EAAE,EAAE,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;QACpD,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,KAAK,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;QACtD,OAAO,EAAE,CAAC;IACZ,CAAC;IAEM,UAAU,CAAC,EAAyC,EAAE,KAAoB;QAC/E,MAAM,YAAY,GAAG,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC3D,IAAI,EAAE,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACnC,EAAE,GAAG,YAAY;YACf,CAAC,CAAC,IAAI,CAAC,2BAA2B,CAAC,EAAE,EAAE,IAAI,CAAC,+BAA+B,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;YAC9G,CAAC,CAAC,EAAE,CAAC;QACP,EAAE,GAAG,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;QAC1B,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;QAClD,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,EAAE,EAAE,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;QACpD,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,KAAK,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;QACtD,OAAO,EAAE,CAAC;IACZ,CAAC;IAEM,SAAS,CAAC,KAAoB,EAAE,SAAiC;QACtE,MAAM,YAAY,GAAG,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC3D,IAAI,EAAE,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACnC,EAAE,GAAG,YAAY;YACf,CAAC,CAAC,IAAI,CAAC,2BAA2B,CAAC,EAAE,EAAE,IAAI,CAAC,+BAA+B,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;YAC9G,CAAC,CAAC,EAAE,CAAC;QACP,EAAE,GAAG,IAAI,CAAC,cAAc,CAAC,EAAE,EAAE,SAAS,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;QAClD,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;QAClD,EAAE,GAAG,IAAI,CAAC,qBAAqB,CAAC,EAAE,EAAE,SAAS,CAAC,OAAO,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;QACjE,EAAE,GAAG,IAAI,CAAC,qBAAqB,CAAC,EAAE,EAAE,SAAS,CAAC,OAAO,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;QACjE,OAAO,EAAE,CAAC;IACZ,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,KAAoB;QAChC,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC,MAAM,EAAE,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACjF,CAAC;IAED;;;;OAIG;IACI,UAAU,CAAC,KAAoB;QACpC,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC,UAAU,EAAoC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACvH,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,KAAoB;QAChC,MAAM,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC,MAAM,EAAE,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;QACnF,OAAO,IAAI,CAAC,YAAY,CAAC,EAAE,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IAC9C,CAAC;IAED;;;;;OAKG;IACI,WAAW,CAA6B,EAAK,EAAE,MAAe,EAAE,WAAqB;QAC1F,IAAI,CAAC,MAAM,EAAE;YACX,OAAO,EAAE,CAAC;SACX;QAED,IAAI,WAAW,EAAE;YACf,OAAO,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;SAClD;QAED,OAAO,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACtD,CAAC;IAED;;;;;;OAMG;IACI,cAAc,CAAwC,EAAM,EAAE,SAAiC,EAAE,KAAc;QACpH,OAAO,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;IAC3D,CAAC;IAED;;;;;;OAMG;IACI,WAAW,CAAgC,EAAS,EAAE,MAAuB,EAAE,KAAc;QAClG,IAAI,CAAC,MAAM,EAAE;YACX,OAAO,EAAE,CAAC;SACX;QACD,OAAO,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,+BAA+B,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,KAAK,CAAC,CAAC;IACtH,CAAC;IAED;;;;;OAKG;IACI,YAAY,CAA6B,EAAK,EAAE,KAA2B,EAAE,KAAc;QAChG,IAAI,CAAC,KAAK,EAAE;YACV,OAAO,EAAE,CAAC;SACX;QACD,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,EAAE;YAC1D,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,IAAI,KAAe,EAAE,CAAC,CAAC,CAAC,GAAG,KAAe,EAAE,CAAC;YACzE,OAAO,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;QAClD,CAAC,EAAE,EAAE,CAAC,CAAC;IACT,CAAC;IAEM,qBAAqB,CAA8B,EAAK,EAAE,OAA0B,EAAE,KAAc;QACzG,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO,EAAE,CAAC;SACX;QACD,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;YACtC,OAAO,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,KAAK,EAAE,KAAe,CAAC,CAAC,CAAC;QAC5F,CAAC,EAAE,EAAE,CAAC,CAAC;IACT,CAAC;IAEM,qBAAqB,CAA6B,EAAK,EAAE,OAA0B,EAAE,KAAc;QACxG,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO,EAAE,CAAC;SACX;QACD,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;YACtC,OAAO,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,KAAK,EAAE,KAAe,CAAC,EAAE,KAAK,CAAC,CAAC;QACnG,CAAC,EAAE,EAAE,CAAC,CAAC;IACT,CAAC;IAED;;;OAGG;IACK,kBAAkB;QACxB,OAAO,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;IACxC,CAAC;IAED;;;;;;OAMG;IACI,2BAA2B,CAChC,EAA8B,EAC9B,YAA2B,EAC3B,KAAc;QAEd,IAAI,CAAC,YAAY,EAAE;YACjB,OAAO,EAAE,CAAC;SACX;QACD,MAAM,mBAAmB,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACtD,OAAO,mBAAmB,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE;YAClD,OAAO,IAAI,CAAC,2BAA2B,CACrC,GAAG,CAAC,QAAQ,CAAC,GAAG,KAAK,IAAI,GAAG,CAAC,KAAK,IAAI,QAAQ,EAAE,EAAE,QAAQ,CAAC,EAC3D,YAAY,CAAC,QAAQ,CAAC,EACtB,QAAQ,CACT,CAAC;QACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IACT,CAAC;IAED;;;;;;OAMG;IACI,kBAAkB,CAAC,MAAuB;QAC/C,IAAI,CAAC,MAAM,EAAE;YACX,OAAO,KAAK,CAAC;SACd;QACD,OAAO,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;IACxD,CAAC;IAEO,sBAAsB,CAAC,MAAsB;QACnD,MAAM,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC;QAC/B,MAAM,gBAAgB,GAAG,IAAA,mCAAe,EAAC,MAAM,CAAC,CAAC;QACjD,OAAO,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IACnE,CAAC;IAED,+BAA+B,CAAC,QAAwB,EAAE,SAA0B,EAAE;QACpF,MAAM,gBAAgB,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAA8B,CAAC,CAAC,CAAC;QAC/F,OAAO,gBAAgB,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;YAC5C,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;YACrC,IAAI,CAAC,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,IAAI,CAAC,IAAI,eAAe,EAAE;gBACxD,KAAK,MAAM,SAAS,IAAI,eAAe,EAAE;oBACvC,IAAI,GAAG,IAAA,sBAAK,EAAC,IAAI,EAAE,IAAI,CAAC,+BAA+B,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC;iBAC/E;aACF;YACD,MAAM,kBAAkB,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,IAAI,CAAC,CAAC;YACnF,IAAI,CAAC,kBAAkB;gBAAE,OAAO,IAAI,CAAC;YACrC,OAAO;gBACL,GAAG,IAAI;gBACP,CAAC,IAAI,CAAC,EAAE,IAAA,sBAAK,EACV,IAAqB,CAAC,IAAI,CAAC,EAC5B,IAAI,CAAC,+BAA+B,CAAC,kBAAkB,CAAC,qBAAqB,EAAE,eAAe,CAAC,CAChG;aACF,CAAC;QACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IACT,CAAC;IAED,IAAY,aAAa;QACvB,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;IACjE,CAAC;CACF;AAxOD,gDAwOC"}
package/src/query/relation-query.builder.d.ts CHANGED
@@ -41,13 +41,19 @@ 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
- batchSelect(entities: Entity[], query: Query<Relation>): SelectQueryBuilder<Relation>;
56
+ batchSelect(entities: Entity[], query: Query<Relation>, withDeleted?: boolean): SelectQueryBuilder<Relation>;
51
57
  batchAggregate(entities: Entity[], query: Query<Relation>, aggregateQuery: AggregateQuery<Relation>): SelectQueryBuilder<EntityIndexRelation<Record<string, unknown>>>;
52
58
  aggregate(entity: Entity, query: Query<Relation>, aggregateQuery: AggregateQuery<Relation>): SelectQueryBuilder<Relation>;
53
59
  get relationMeta(): RelationQuery<Relation, Entity>;
@@ -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
@@ -30,9 +30,12 @@ class RelationQueryBuilder {
30
30
  relationBuilder = this.filterQueryBuilder.applyPaging(relationBuilder, query.paging);
31
31
  return this.filterQueryBuilder.applySorting(relationBuilder, query.sorting, relationBuilder.alias);
32
32
  }
33
- batchSelect(entities, query) {
33
+ batchSelect(entities, query, withDeleted) {
34
34
  const hasRelations = this.filterQueryBuilder.filterHasRelations(query.filter);
35
35
  let qb = this.relationRepo.createQueryBuilder(this.relationMeta.fromAlias);
36
+ if (withDeleted) {
37
+ qb.withDeleted();
38
+ }
36
39
  qb = hasRelations
37
40
  ? this.filterQueryBuilder.applyRelationJoinsRecursive(qb, this.filterQueryBuilder.getReferencedRelationsRecursive(this.relationRepo.metadata, query.filter))
38
41
  : qb;
@@ -55,7 +58,7 @@ class RelationQueryBuilder {
55
58
  relationBuilder = this.filterQueryBuilder.applyAggregate(relationBuilder, aggregateQuery, relationBuilder.alias);
56
59
  relationBuilder = this.filterQueryBuilder.applyFilter(relationBuilder, query.filter, relationBuilder.alias);
57
60
  relationBuilder = this.filterQueryBuilder.applyAggregateSorting(relationBuilder, aggregateQuery.groupBy, relationBuilder.alias);
58
- relationBuilder = this.filterQueryBuilder.applyGroupBy(relationBuilder, aggregateQuery.groupBy, relationBuilder.alias);
61
+ relationBuilder = this.filterQueryBuilder.applyAggregateGroupBy(relationBuilder, aggregateQuery.groupBy, relationBuilder.alias);
59
62
  return relationBuilder;
60
63
  }
61
64
  get relationMeta() {
@@ -93,31 +96,28 @@ class RelationQueryBuilder {
93
96
  }), { unions: [], parameters: {} });
94
97
  const unionSql = unionSqls.unions
95
98
  .map((u) => `SELECT *
96
- FROM (${u}) AS ${this.escapeName(fromAlias)}`)
99
+ FROM (${u}) AS ${this.escapeName(fromAlias)}`)
97
100
  .join(' UNION ALL ');
98
101
  return { sql: unionSql, params: unionSqls.parameters };
99
102
  }
100
103
  createRelationQueryBuilder(entity) {
101
- const meta = this.relationMeta;
102
- const queryBuilder = this.relationRepo.createQueryBuilder(meta.fromAlias);
103
- const joinedBuilder = meta.joins.reduce((qb, join) => {
104
+ const queryBuilder = this.relationRepo.createQueryBuilder(this.relationMeta.fromAlias);
105
+ const joinedBuilder = this.relationMeta.joins.reduce((qb, join) => {
104
106
  const conditions = join.conditions.map(({ leftHand, rightHand }) => `${leftHand} = ${rightHand}`);
105
107
  return qb.innerJoin(join.target, join.alias, conditions.join(' AND '));
106
108
  }, queryBuilder);
107
109
  return joinedBuilder.where(new typeorm_1.Brackets((bqb) => {
108
- const where = meta.whereCondition(entity);
110
+ const where = this.relationMeta.whereCondition(entity);
109
111
  bqb.andWhere(where.sql, where.params);
110
112
  }));
111
113
  }
112
114
  getManyToOneOrOneToOneOwnerMeta(relation) {
113
- const aliasName = relation.entityMetadata.name;
114
- const { primaryColumns } = relation.entityMetadata;
115
- const { joinColumns } = relation;
115
+ const aliasName = relation.entityMetadata.tableName;
116
116
  const joins = [
117
117
  {
118
118
  target: relation.entityMetadata.target,
119
119
  alias: aliasName,
120
- conditions: joinColumns.map((joinColumn) => ({
120
+ conditions: relation.joinColumns.map((joinColumn) => ({
121
121
  leftHand: `${aliasName}.${joinColumn.propertyName}`,
122
122
  rightHand: `${relation.propertyName}.${joinColumn.referencedColumn.propertyName}`
123
123
  }))
@@ -135,9 +135,11 @@ class RelationQueryBuilder {
135
135
  fromPrimaryKeys,
136
136
  joins,
137
137
  mapRelations: (entity, relations, rawRelations) => {
138
- const rawFilter = primaryColumns.reduce((columns, column) => ({
138
+ // Set the alias to use for the join
139
+ const joinAlias = this.existingAlias?.name || aliasName;
140
+ const rawFilter = relation.entityMetadata.primaryColumns.reduce((columns, column) => ({
139
141
  ...columns,
140
- [DriverUtils_1.DriverUtils.buildAlias(this.relationRepo.manager.connection.driver, aliasName, column.databasePath)]: column.getEntityValue(entity)
142
+ [`${joinAlias}_${column.propertyPath}`]: column.getEntityValue(entity)
141
143
  }), {});
142
144
  // First filter the raw relations with the PK of the entity, then filter the relations
143
145
  // with the PK of the raw relation
@@ -149,24 +151,34 @@ class RelationQueryBuilder {
149
151
  return entityRelations.concat((0, lodash_filter_1.default)(relations, filter));
150
152
  }, []);
151
153
  },
152
- batchSelect: (qb, entities) => {
153
- const joinCondition = joinColumns.map((column) => {
154
- return `${aliasName}.${column.propertyName} = ${relation.propertyName}.${column.referencedColumn.propertyName}`;
155
- }).join(' AND ');
154
+ batchSelect: (queryBuilder, entities) => {
155
+ this.existingAlias = queryBuilder.expressionMap.aliases.find((alias) => {
156
+ return alias.type === 'join' && alias.target === relation.entityMetadata.target;
157
+ });
158
+ // Set the alias to use for the join
159
+ const joinAlias = this.existingAlias?.name || aliasName;
156
160
  const whereParams = {};
157
- const whereCondition = primaryColumns.map((column) => {
158
- const paramName = this.getParamName(aliasName);
161
+ const whereCondition = relation.entityMetadata.primaryColumns
162
+ .map((column) => {
163
+ const paramName = this.getParamName(joinAlias);
159
164
  whereParams[paramName] = entities.map((entity) => column.getEntityValue(entity));
160
165
  // 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})`;
163
- }).join(' AND ');
164
- return qb.leftJoin(relation.entityMetadata.target, aliasName, joinCondition)
165
- .andWhere(whereCondition, whereParams);
166
+ queryBuilder.addSelect(`${joinAlias}.${column.propertyPath}`, `${joinAlias}_${column.propertyPath}`);
167
+ return `${joinAlias}.${column.propertyPath} IN (:...${paramName})`;
168
+ })
169
+ .join(' AND ');
170
+ // Only add the joins if there was not an existing one yet for this relation
171
+ if (!this.existingAlias) {
172
+ queryBuilder = joins.reduce((qb, join) => {
173
+ const conditions = join.conditions.map(({ leftHand, rightHand }) => `${leftHand} = ${rightHand}`);
174
+ return qb.innerJoin(join.target, join.alias, conditions.join(' AND '));
175
+ }, queryBuilder);
176
+ }
177
+ return queryBuilder.andWhere(whereCondition, whereParams);
166
178
  },
167
179
  whereCondition: (entity) => {
168
180
  const params = {};
169
- const sql = primaryColumns
181
+ const sql = relation.entityMetadata.primaryColumns
170
182
  .map((column) => {
171
183
  const paramName = this.getParamName(aliasName);
172
184
  params[paramName] = column.getEntityValue(entity);
@@ -192,28 +204,32 @@ class RelationQueryBuilder {
192
204
  fromPrimaryKeys,
193
205
  joins: [],
194
206
  mapRelations: (entity, relations) => {
195
- const filter = columns.reduce((columns, column) => ({
196
- ...columns,
207
+ const filter = columns.reduce((columnsFilter, column) => ({
208
+ ...columnsFilter,
197
209
  [column.propertyName]: column.referencedColumn.getEntityValue(entity)
198
210
  }), {});
199
211
  return (0, lodash_filter_1.default)(relations, filter);
200
212
  },
201
213
  batchSelect: (qb, entities) => {
202
214
  const params = {};
203
- const sql = columns.map((column) => {
215
+ const where = columns
216
+ .map((column) => {
204
217
  const paramName = this.getParamName(aliasName);
205
218
  params[paramName] = entities.map((entity) => column.referencedColumn.getEntityValue(entity));
206
219
  return `${aliasName}.${column.propertyPath} IN (:...${paramName})`;
207
- }).join(' AND ');
208
- return qb.andWhere(sql, params);
220
+ })
221
+ .join(' AND ');
222
+ return qb.andWhere(where, params);
209
223
  },
210
224
  whereCondition: (entity) => {
211
225
  const params = {};
212
- const sql = columns.map((col) => {
226
+ const sql = columns
227
+ .map((col) => {
213
228
  const paramName = this.getParamName(aliasName);
214
229
  params[paramName] = col.referencedColumn.getEntityValue(entity);
215
230
  return `${aliasName}.${col.propertyPath} = :${paramName}`;
216
- }).join(' AND ');
231
+ })
232
+ .join(' AND ');
217
233
  return { sql, params };
218
234
  }
219
235
  };
@@ -243,35 +259,10 @@ class RelationQueryBuilder {
243
259
  fromPrimaryKeys,
244
260
  joins,
245
261
  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
- }, []);
262
+ return this.batchMapRelationsManyToMany(joinAlias, relation.joinColumns, entity, relations, rawRelations);
259
263
  },
260
264
  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);
265
+ return this.batchSelectManyToMany(qb, entities, joinAlias, relation.joinColumns);
275
266
  },
276
267
  whereCondition: (entity) => {
277
268
  const params = {};
@@ -311,47 +302,58 @@ class RelationQueryBuilder {
311
302
  fromPrimaryKeys,
312
303
  joins,
313
304
  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
- }, []);
305
+ return this.batchMapRelationsManyToMany(joinAlias, relation.inverseRelation.inverseJoinColumns, entity, relations, rawRelations);
327
306
  },
328
307
  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);
308
+ return this.batchSelectManyToMany(qb, entities, joinAlias, relation.inverseRelation.inverseJoinColumns);
343
309
  },
344
310
  whereCondition: (entity) => {
345
311
  const params = {};
346
- const sql = relation.inverseRelation.inverseJoinColumns.map((inverseJoinColumn) => {
312
+ const sql = relation.inverseRelation.inverseJoinColumns
313
+ .map((inverseJoinColumn) => {
347
314
  const paramName = this.getParamName(inverseJoinColumn.propertyName);
348
315
  params[paramName] = inverseJoinColumn.referencedColumn.getEntityValue(entity);
349
316
  return `${joinAlias}.${inverseJoinColumn.propertyName} = :${paramName}`;
350
- }).join(' AND ');
317
+ })
318
+ .join(' AND ');
351
319
  return { sql, params };
352
320
  }
353
321
  };
354
322
  }
323
+ batchSelectManyToMany(queryBuilder, entities, joinAlias, columns) {
324
+ const params = {};
325
+ const sql = columns
326
+ .map((column) => {
327
+ const paramName = this.getParamName(column.propertyName);
328
+ params[paramName] = entities.map((entity) => column.referencedColumn.getEntityValue(entity));
329
+ // We also want to select the field, so we can map them back in the mapper
330
+ queryBuilder.addSelect(`${joinAlias}.${column.propertyName}`, `${joinAlias}_${column.propertyName}`);
331
+ return `${joinAlias}.${column.propertyName} IN (:...${paramName})`;
332
+ })
333
+ .join(' AND ');
334
+ // Add the needed joins
335
+ return this.relationMeta.joins
336
+ .reduce((qb, join) => {
337
+ const conditions = join.conditions.map(({ leftHand, rightHand }) => `${leftHand} = ${rightHand}`);
338
+ return qb.innerJoin(join.target, join.alias, conditions.join(' AND '));
339
+ }, queryBuilder)
340
+ .andWhere(sql, params);
341
+ }
342
+ batchMapRelationsManyToMany(joinAlias, columns, entity, relations, rawRelations) {
343
+ const rawFilter = columns.reduce((columnsFilter, column) => ({
344
+ ...columnsFilter,
345
+ [`${joinAlias}_${column.propertyName}`]: column.referencedColumn.getEntityValue(entity)
346
+ }), {});
347
+ // First filter the raw relations with the PK of the entity, then filter the relations
348
+ // with the PK of the raw relation
349
+ return (0, lodash_filter_1.default)(rawRelations, rawFilter).reduce((entityRelations, rawRelation) => {
350
+ const filter = this.getRelationPrimaryKeysPropertyNameAndColumnsName().reduce((columnsFilter, column) => ({
351
+ ...columnsFilter,
352
+ [column.propertyName]: rawRelation[column.columnName]
353
+ }), {});
354
+ return entityRelations.concat((0, lodash_filter_1.default)(relations, filter));
355
+ }, []);
356
+ }
355
357
  getParamName(prefix) {
356
358
  this.paramCount += 1;
357
359
  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/query/sql-comparison.builder.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"sql-comparison.builder.js","sourceRoot":"","sources":["../../../../../packages/query-typeorm/src/query/sql-comparison.builder.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sql-comparison.builder.js","sourceRoot":"","sources":["../../../../../packages/query-typeorm/src/query/sql-comparison.builder.ts"],"names":[],"mappings":"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"}
package/src/query/where.builder.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"where.builder.js","sourceRoot":"","sources":["../../../../../packages/query-typeorm/src/query/where.builder.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"where.builder.js","sourceRoot":"","sources":["../../../../../packages/query-typeorm/src/query/where.builder.ts"],"names":[],"mappings":"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"}
package/src/services/relation-query.service.d.ts CHANGED
@@ -11,7 +11,8 @@ export declare abstract class RelationQueryService<Entity> {
11
11
  abstract repo: Repository<Entity>;
12
12
  abstract getById(id: string | number, opts?: GetByIdOptions<Entity>): Promise<Entity>;
13
13
  /**
14
- * Query for relations for an array of Entities. This method will return a map with the Entity as the key and the relations as the value.
14
+ * Query for relations for an array of Entities. This method will return a map with
15
+ * the Entity as the key and the relations as the value.
15
16
  * @param RelationClass - The class of the relation.
16
17
  * @param relationName - The name of the relation to load.
17
18
  * @param entities - the dtos to find relations for.
@@ -127,7 +128,6 @@ export declare abstract class RelationQueryService<Entity> {
127
128
  private createTypeormRelationQueryBuilder;
128
129
  private getRelationMeta;
129
130
  private getRelationEntity;
130
- private getRelationsFromPrimaryKeys;
131
131
  private getRelations;
132
132
  private foundAllRelations;
133
133
  }
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
  /**
@@ -43,12 +42,15 @@ class RelationQueryService {
43
42
  return this.batchFindRelations(RelationClass, relationName, dto, opts);
44
43
  }
45
44
  const assembler = nestjs_query_core_1.AssemblerFactory.getAssembler(RelationClass, this.getRelationEntity(relationName));
46
- const relationEntity = await this.getRelationQueryBuilder(relationName)
47
- .select(dto, { filter: opts?.filter, paging: { limit: 1 } })
48
- .getOne();
49
- return relationEntity
50
- ? assembler.convertToDTO(relationEntity)
51
- : undefined;
45
+ const relationQueryBuilder = this.getRelationQueryBuilder(relationName).select(dto, {
46
+ filter: opts?.filter,
47
+ paging: { limit: 1 }
48
+ });
49
+ if (opts?.withDeleted) {
50
+ relationQueryBuilder.withDeleted();
51
+ }
52
+ const relationEntity = await relationQueryBuilder.getOne();
53
+ return relationEntity ? assembler.convertToDTO(relationEntity) : undefined;
52
54
  }
53
55
  /**
54
56
  * Add a single relation.
@@ -153,11 +155,11 @@ class RelationQueryService {
153
155
  * @param relationName - The name of relation to query for.
154
156
  * @param query - A query to filter, page or sort relations.
155
157
  */
156
- async batchQueryRelations(RelationClass, relationName, entities, query) {
158
+ async batchQueryRelations(RelationClass, relationName, entities, query, withDeleted) {
157
159
  const assembler = nestjs_query_core_1.AssemblerFactory.getAssembler(RelationClass, this.getRelationEntity(relationName));
158
- const relationQueryBuilder = this.getRelationQueryBuilder(relationName);
159
160
  const convertedQuery = assembler.convertQuery(query);
160
- const entityRelations = await relationQueryBuilder.batchSelect(entities, convertedQuery).getRawAndEntities();
161
+ const relationQueryBuilder = this.getRelationQueryBuilder(relationName);
162
+ const entityRelations = await relationQueryBuilder.batchSelect(entities, convertedQuery, withDeleted).getRawAndEntities();
161
163
  return entities.reduce((results, entity) => {
162
164
  const relations = relationQueryBuilder.relationMeta.mapRelations(entity, entityRelations.entities, entityRelations.raw);
163
165
  return results.set(entity, assembler.convertToDTOs(relations));
@@ -185,9 +187,7 @@ class RelationQueryService {
185
187
  const resultingAgg = results.get(e) ?? [];
186
188
  results.set(e, [
187
189
  ...resultingAgg,
188
- ...query_1.AggregateBuilder.convertToAggregateResponse([
189
- (0, lodash_omit_1.default)(relationAgg, relationQueryBuilder.entityIndexColName)
190
- ])
190
+ ...query_1.AggregateBuilder.convertToAggregateResponse([(0, lodash_omit_1.default)(relationAgg, relationQueryBuilder.entityIndexColName)])
191
191
  ]);
192
192
  return results;
193
193
  }, new Map());
@@ -221,7 +221,7 @@ class RelationQueryService {
221
221
  const batchResults = await this.batchQueryRelations(RelationClass, relationName, dtos, {
222
222
  paging: { limit: dtos.length },
223
223
  filter: opts?.filter
224
- });
224
+ }, opts?.withDeleted);
225
225
  const results = new Map();
226
226
  batchResults.forEach((relation, dto) => {
227
227
  // get just the first one.
@@ -246,13 +246,6 @@ class RelationQueryService {
246
246
  }
247
247
  return relationMeta.type;
248
248
  }
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
249
  getRelations(relationName, ids, filter) {
257
250
  const relationQueryBuilder = this.getRelationQueryBuilder(relationName).filterQueryBuilder;
258
251
  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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"}
package/src/services/typeorm-query.service.d.ts CHANGED
@@ -52,6 +52,7 @@ export declare class TypeOrmQueryService<Entity> extends RelationQueryService<En
52
52
  * const todoItem = await this.service.findById(1);
53
53
  * ```
54
54
  * @param id - The id of the record to find.
55
+ * @param opts
55
56
  */
56
57
  findById(id: string | number, opts?: FindByIdOptions<Entity>): Promise<Entity | undefined>;
57
58
  /**
@@ -66,6 +67,7 @@ export declare class TypeOrmQueryService<Entity> extends RelationQueryService<En
66
67
  * }
67
68
  * ```
68
69
  * @param id - The id of the record to find.
70
+ * @param opts
69
71
  */
70
72
  getById(id: string | number, opts?: GetByIdOptions<Entity>): Promise<Entity>;
71
73
  /**
package/src/services/typeorm-query.service.js CHANGED
@@ -61,6 +61,7 @@ class TypeOrmQueryService extends relation_query_service_1.RelationQueryService
61
61
  * const todoItem = await this.service.findById(1);
62
62
  * ```
63
63
  * @param id - The id of the record to find.
64
+ * @param opts
64
65
  */
65
66
  async findById(id, opts) {
66
67
  const qb = this.filterQueryBuilder.selectById(id, opts ?? {});
@@ -81,6 +82,7 @@ class TypeOrmQueryService extends relation_query_service_1.RelationQueryService
81
82
  * }
82
83
  * ```
83
84
  * @param id - The id of the record to find.
85
+ * @param opts
84
86
  */
85
87
  async getById(id, opts) {
86
88
  const entity = await this.findById(id, opts);
@@ -158,11 +160,8 @@ class TypeOrmQueryService extends relation_query_service_1.RelationQueryService
158
160
  let updateResult;
159
161
  // If the update has relations then fetch all the id's and then do an update on the ids returned
160
162
  if (this.filterQueryBuilder.filterHasRelations(filter)) {
161
- const builder = this.filterQueryBuilder.select({ filter })
162
- .distinct(true);
163
- const distinctRecords = await builder
164
- .addSelect(`${builder.alias}.id`)
165
- .getRawMany();
163
+ const builder = this.filterQueryBuilder.select({ filter }).distinct(true);
164
+ const distinctRecords = await builder.addSelect(`${builder.alias}.id`).getRawMany();
166
165
  const ids = distinctRecords.map(({ id }) => id);
167
166
  const idsFilter = { id: { in: ids } };
168
167
  updateResult = await this.filterQueryBuilder
@@ -217,11 +216,8 @@ class TypeOrmQueryService extends relation_query_service_1.RelationQueryService
217
216
  async deleteMany(filter, opts) {
218
217
  let deleteResult = {};
219
218
  if (this.filterQueryBuilder.filterHasRelations(filter)) {
220
- const builder = this.filterQueryBuilder.select({ filter })
221
- .distinct(true);
222
- const distinctRecords = await builder
223
- .addSelect(`${builder.alias}.id`)
224
- .getRawMany();
219
+ const builder = this.filterQueryBuilder.select({ filter }).distinct(true);
220
+ const distinctRecords = await builder.addSelect(`${builder.alias}.id`).getRawMany();
225
221
  const ids = distinctRecords.map(({ id }) => id);
226
222
  const idsFilter = { id: { in: ids } };
227
223
  if (ids.length > 0) {
package/src/services/typeorm-query.service.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"typeorm-query.service.js","sourceRoot":"","sources":["../../../../../packages/query-typeorm/src/services/typeorm-query.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"typeorm-query.service.js","sourceRoot":"","sources":["../../../../../packages/query-typeorm/src/services/typeorm-query.service.ts"],"names":[],"mappings":"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"}