@ptc-org/nestjs-query-typeorm 1.0.0-alpha.1 → 1.0.0-alpha.4

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 (19) hide show
  1. package/package.json +2 -2
  2. package/src/module.js +1 -1
  3. package/src/providers.js +1 -1
  4. package/src/query/aggregate.builder.js +3 -3
  5. package/src/query/aggregate.builder.js.map +1 -1
  6. package/src/query/filter-query.builder.js +1 -1
  7. package/src/query/filter-query.builder.js.map +1 -1
  8. package/src/query/relation-query.builder.d.ts +11 -6
  9. package/src/query/relation-query.builder.js +91 -95
  10. package/src/query/relation-query.builder.js.map +1 -1
  11. package/src/query/sql-comparison.builder.js.map +1 -1
  12. package/src/query/where.builder.js.map +1 -1
  13. package/src/services/relation-query.service.d.ts +2 -2
  14. package/src/services/relation-query.service.js +14 -21
  15. package/src/services/relation-query.service.js.map +1 -1
  16. package/src/services/typeorm-query.service.d.ts +2 -0
  17. package/src/services/typeorm-query.service.js +6 -10
  18. package/src/services/typeorm-query.service.js.map +1 -1
  19. package/CHANGELOG.md +0 -527
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ptc-org/nestjs-query-typeorm",
3
- "version": "1.0.0-alpha.1",
3
+ "version": "1.0.0-alpha.4",
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",
@@ -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.2",
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.js CHANGED
@@ -37,7 +37,7 @@ class AggregateBuilder {
37
37
  [AggregateFuncs.SUM, query.sum],
38
38
  [AggregateFuncs.AVG, query.avg],
39
39
  [AggregateFuncs.MAX, query.max],
40
- [AggregateFuncs.MIN, query.min],
40
+ [AggregateFuncs.MIN, query.min]
41
41
  ];
42
42
  return aggs.reduce((cols, [func, fields]) => {
43
43
  const aliases = (fields ?? []).map((f) => this.getAggregateAlias(func, f));
@@ -67,7 +67,7 @@ class AggregateBuilder {
67
67
  return {
68
68
  ...agg,
69
69
  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
70
- [aggFunc]: { ...aggResult, [fieldName]: response[resultField] },
70
+ [aggFunc]: { ...aggResult, [fieldName]: response[resultField] }
71
71
  };
72
72
  }, {});
73
73
  });
@@ -85,7 +85,7 @@ class AggregateBuilder {
85
85
  ...this.createAggSelect(AggregateFuncs.SUM, aggregate.sum, alias),
86
86
  ...this.createAggSelect(AggregateFuncs.AVG, aggregate.avg, alias),
87
87
  ...this.createAggSelect(AggregateFuncs.MAX, aggregate.max, alias),
88
- ...this.createAggSelect(AggregateFuncs.MIN, aggregate.min, alias),
88
+ ...this.createAggSelect(AggregateFuncs.MIN, aggregate.min, alias)
89
89
  ];
90
90
  if (!selects.length) {
91
91
  throw new common_1.BadRequestException('No aggregate fields found.');
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.js CHANGED
@@ -204,7 +204,7 @@ class FilterQueryBuilder {
204
204
  return prev;
205
205
  return {
206
206
  ...prev,
207
- [curr]: (0, lodash_merge_1.default)(prev[curr], this.getReferencedRelationsRecursive(referencedRelation.inverseEntityMetadata, currFilterValue)),
207
+ [curr]: (0, lodash_merge_1.default)(prev[curr], this.getReferencedRelationsRecursive(referencedRelation.inverseEntityMetadata, currFilterValue))
208
208
  };
209
209
  }, {});
210
210
  }
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":"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"}
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;
@@ -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,26 +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 andSelect = [];
158
- const whereCondition = primaryColumns.map((column) => {
159
- const paramName = this.getParamName(aliasName);
161
+ const whereCondition = relation.entityMetadata.primaryColumns
162
+ .map((column) => {
163
+ const paramName = this.getParamName(joinAlias);
160
164
  whereParams[paramName] = entities.map((entity) => column.getEntityValue(entity));
161
165
  // Also select the columns, so we can use them to map later
162
- andSelect.push(`${aliasName}.${column.propertyPath}`);
163
- return `${aliasName}.${column.propertyPath} IN (:...${paramName})`;
164
- }).join(' AND ');
165
- return qb.leftJoin(relation.entityMetadata.target, aliasName, joinCondition)
166
- .addSelect(andSelect)
167
- .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);
168
178
  },
169
179
  whereCondition: (entity) => {
170
180
  const params = {};
171
- const sql = primaryColumns
181
+ const sql = relation.entityMetadata.primaryColumns
172
182
  .map((column) => {
173
183
  const paramName = this.getParamName(aliasName);
174
184
  params[paramName] = column.getEntityValue(entity);
@@ -194,28 +204,32 @@ class RelationQueryBuilder {
194
204
  fromPrimaryKeys,
195
205
  joins: [],
196
206
  mapRelations: (entity, relations) => {
197
- const filter = columns.reduce((columns, column) => ({
198
- ...columns,
207
+ const filter = columns.reduce((columnsFilter, column) => ({
208
+ ...columnsFilter,
199
209
  [column.propertyName]: column.referencedColumn.getEntityValue(entity)
200
210
  }), {});
201
211
  return (0, lodash_filter_1.default)(relations, filter);
202
212
  },
203
213
  batchSelect: (qb, entities) => {
204
214
  const params = {};
205
- const sql = columns.map((column) => {
215
+ const where = columns
216
+ .map((column) => {
206
217
  const paramName = this.getParamName(aliasName);
207
218
  params[paramName] = entities.map((entity) => column.referencedColumn.getEntityValue(entity));
208
219
  return `${aliasName}.${column.propertyPath} IN (:...${paramName})`;
209
- }).join(' AND ');
210
- return qb.andWhere(sql, params);
220
+ })
221
+ .join(' AND ');
222
+ return qb.andWhere(where, params);
211
223
  },
212
224
  whereCondition: (entity) => {
213
225
  const params = {};
214
- const sql = columns.map((col) => {
226
+ const sql = columns
227
+ .map((col) => {
215
228
  const paramName = this.getParamName(aliasName);
216
229
  params[paramName] = col.referencedColumn.getEntityValue(entity);
217
230
  return `${aliasName}.${col.propertyPath} = :${paramName}`;
218
- }).join(' AND ');
231
+ })
232
+ .join(' AND ');
219
233
  return { sql, params };
220
234
  }
221
235
  };
@@ -244,38 +258,11 @@ class RelationQueryBuilder {
244
258
  fromAlias: mainAlias,
245
259
  fromPrimaryKeys,
246
260
  joins,
247
- mapRelations(entity, relations, rawRelations) {
248
- const rawFilter = relation.joinColumns.reduce((columns, column) => ({
249
- ...columns,
250
- [`${joinAlias}_${column.propertyName}`]: column.referencedColumn.getEntityValue(entity)
251
- }), {});
252
- // First filter the raw relations with the PK of the entity, then filter the relations
253
- // with the PK of the raw relation
254
- return (0, lodash_filter_1.default)(rawRelations, rawFilter).reduce((entityRelations, rawRelation) => {
255
- const filter = relation.inverseJoinColumns.reduce((columns, column) => ({
256
- ...columns,
257
- [column.referencedColumn.propertyName]: rawRelation[`${joinAlias}_${column.propertyName}`]
258
- }), {});
259
- return entityRelations.concat((0, lodash_filter_1.default)(relations, filter));
260
- }, []);
261
+ mapRelations: (entity, relations, rawRelations) => {
262
+ return this.batchMapRelationsManyToMany(joinAlias, relation.joinColumns, entity, relations, rawRelations);
261
263
  },
262
264
  batchSelect: (qb, entities) => {
263
- const params = {};
264
- const andSelect = [];
265
- const sql = relation.joinColumns.map((column) => {
266
- const paramName = this.getParamName(column.propertyName);
267
- params[paramName] = entities.map((entity) => column.referencedColumn.getEntityValue(entity));
268
- // We also want to select the field, so we can map them back in the mapper
269
- andSelect.push(`${joinAlias}.${column.propertyName}`);
270
- return `${joinAlias}.${column.propertyName} IN (:...${paramName})`;
271
- }).join(' AND ');
272
- // Add the needed joins
273
- return joins.reduce((qb, join) => {
274
- const conditions = join.conditions.map(({ leftHand, rightHand }) => `${leftHand} = ${rightHand}`);
275
- return qb.innerJoin(join.target, join.alias, conditions.join(' AND '));
276
- }, qb)
277
- .addSelect(andSelect)
278
- .andWhere(sql, params);
265
+ return this.batchSelectManyToMany(qb, entities, joinAlias, relation.joinColumns);
279
266
  },
280
267
  whereCondition: (entity) => {
281
268
  const params = {};
@@ -314,50 +301,59 @@ class RelationQueryBuilder {
314
301
  fromAlias: mainAlias,
315
302
  fromPrimaryKeys,
316
303
  joins,
317
- mapRelations(entity, relations, rawRelations) {
318
- const rawFilter = relation.inverseRelation.inverseJoinColumns.reduce((columns, column) => ({
319
- ...columns,
320
- [`${joinAlias}_${column.propertyName}`]: column.referencedColumn.getEntityValue(entity)
321
- }), {});
322
- // First filter the raw relations with the PK of the entity, then filter the relations
323
- // with the PK of the raw relation
324
- return (0, lodash_filter_1.default)(rawRelations, rawFilter).reduce((entityRelations, rawRelation) => {
325
- const filter = relation.inverseRelation.joinColumns.reduce((columns, column) => ({
326
- ...columns,
327
- [column.referencedColumn.propertyName]: rawRelation[`${joinAlias}_${column.propertyName}`]
328
- }), {});
329
- return entityRelations.concat((0, lodash_filter_1.default)(relations, filter));
330
- }, []);
304
+ mapRelations: (entity, relations, rawRelations) => {
305
+ return this.batchMapRelationsManyToMany(joinAlias, relation.inverseRelation.inverseJoinColumns, entity, relations, rawRelations);
331
306
  },
332
307
  batchSelect: (qb, entities) => {
333
- const params = {};
334
- const andSelect = [];
335
- const sql = relation.inverseRelation.inverseJoinColumns.map((column) => {
336
- const paramName = this.getParamName(column.propertyName);
337
- params[paramName] = entities.map((entity) => column.referencedColumn.getEntityValue(entity));
338
- // We also want to select the field, so we can map them back in the mapper
339
- andSelect.push(`${joinAlias}.${column.propertyName}`);
340
- return `${joinAlias}.${column.propertyName} IN (:...${paramName})`;
341
- }).join(' AND ');
342
- // Add the needed joins
343
- return joins.reduce((qb, join) => {
344
- const conditions = join.conditions.map(({ leftHand, rightHand }) => `${leftHand} = ${rightHand}`);
345
- return qb.innerJoin(join.target, join.alias, conditions.join(' AND '));
346
- }, qb)
347
- .addSelect(andSelect)
348
- .andWhere(sql, params);
308
+ return this.batchSelectManyToMany(qb, entities, joinAlias, relation.inverseRelation.inverseJoinColumns);
349
309
  },
350
310
  whereCondition: (entity) => {
351
311
  const params = {};
352
- const sql = relation.inverseRelation.inverseJoinColumns.map((inverseJoinColumn) => {
312
+ const sql = relation.inverseRelation.inverseJoinColumns
313
+ .map((inverseJoinColumn) => {
353
314
  const paramName = this.getParamName(inverseJoinColumn.propertyName);
354
315
  params[paramName] = inverseJoinColumn.referencedColumn.getEntityValue(entity);
355
316
  return `${joinAlias}.${inverseJoinColumn.propertyName} = :${paramName}`;
356
- }).join(' AND ');
317
+ })
318
+ .join(' AND ');
357
319
  return { sql, params };
358
320
  }
359
321
  };
360
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
+ }
361
357
  getParamName(prefix) {
362
358
  this.paramCount += 1;
363
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":";;;;AAEA,qCAAkF;AAElF,4DAAyD;AACzD,iEAA4D;AAC5D,2DAAuD;AACvD,+EAAyC;AAqDzC;;;;GAIG;AACH,MAAa,oBAAoB;IAS/B,YAAqB,IAAwB,EAAW,QAAgB;QAAnD,SAAI,GAAJ,IAAI,CAAoB;QAAW,aAAQ,GAAR,QAAQ,CAAQ;QACtE,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAW,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QACtF,IAAI,CAAC,kBAAkB,GAAG,IAAI,yCAAkB,CAAW,IAAI,CAAC,YAAY,CAAC,CAAC;QAC9E,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;IACtB,CAAC;IAEM,MAAM,CAAC,MAAc,EAAE,KAAsB;QAClD,MAAM,YAAY,GAAG,IAAI,CAAC,kBAAkB,CAAC,kBAAkB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAE9E,IAAI,eAAe,GAAG,IAAI,CAAC,0BAA0B,CAAC,MAAM,CAAC,CAAC;QAC9D,eAAe,GAAG,YAAY;YAC5B,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,2BAA2B,CAAC,eAAe,EAAE,IAAI,CAAC,kBAAkB,CAAC,+BAA+B,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;YACzK,CAAC,CAAC,eAAe,CAAC;QAEpB,eAAe,GAAG,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,eAAe,EAAE,KAAK,CAAC,MAAM,EAAE,eAAe,CAAC,KAAK,CAAC,CAAC;QAC5G,eAAe,GAAG,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,eAAe,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;QAErF,OAAO,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,eAAe,EAAE,KAAK,CAAC,OAAO,EAAE,eAAe,CAAC,KAAK,CAAC,CAAC;IACrG,CAAC;IAEM,WAAW,CAAC,QAAkB,EAAE,KAAsB;QAC3D,MAAM,YAAY,GAAG,IAAI,CAAC,kBAAkB,CAAC,kBAAkB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC9E,IAAI,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QAC3E,EAAE,GAAG,YAAY;YACf,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,2BAA2B,CAAC,EAAE,EAAE,IAAI,CAAC,kBAAkB,CAAC,+BAA+B,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;YAC5J,CAAC,CAAC,EAAE,CAAC;QACP,EAAE,GAAG,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,EAAE,EAAE,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;QACrE,EAAE,GAAG,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,EAAE,EAAE,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;QACvE,EAAE,GAAG,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,EAAE,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;QAE3D,OAAO,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;IACrD,CAAC;IAEM,cAAc,CACnB,QAAkB,EAClB,KAAsB,EACtB,cAAwC;QAExC,MAAM,OAAO,GAAG,CAAC,GAAG,oCAAgB,CAAC,mBAAmB,CAAC,cAAc,CAAC,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAC3G,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CACnB,CAAC;QAEF,MAAM,aAAa,GAAG,IAAI,CAAC,4BAA4B,CAAC,QAAQ,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC;QAEzF,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,UAAU;aACxC,kBAAkB,EAAE;aACpB,MAAM,CAAC,OAAO,CAAC;aACf,IAAI,CAA+C,IAAI,aAAa,CAAC,GAAG,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC;aAC7F,aAAa,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IACzC,CAAC;IAEM,SAAS,CAAC,MAAc,EAAE,KAAsB,EAAE,cAAwC;QAC/F,IAAI,eAAe,GAAG,IAAI,CAAC,0BAA0B,CAAC,MAAM,CAAC,CAAC;QAC9D,eAAe,GAAG,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,eAAe,EAAE,cAAc,EAAE,eAAe,CAAC,KAAK,CAAC,CAAC;QACjH,eAAe,GAAG,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,eAAe,EAAE,KAAK,CAAC,MAAM,EAAE,eAAe,CAAC,KAAK,CAAC,CAAC;QAC5G,eAAe,GAAG,IAAI,CAAC,kBAAkB,CAAC,qBAAqB,CAC7D,eAAe,EACf,cAAc,CAAC,OAAO,EACtB,eAAe,CAAC,KAAK,CACtB,CAAC;QACF,eAAe,GAAG,IAAI,CAAC,kBAAkB,CAAC,YAAY,CACpD,eAAe,EACf,cAAc,CAAC,OAAO,EACtB,eAAe,CAAC,KAAK,CACtB,CAAC;QACF,OAAO,eAAe,CAAC;IACzB,CAAC;IAED,IAAW,YAAY;QACrB,IAAI,IAAI,CAAC,gBAAgB,EAAE;YACzB,OAAO,IAAI,CAAC,gBAAgB,CAAC;SAC9B;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,IAAI,CAAC,QAAQ,CAAC,CAAC;QAE5F,IAAI,CAAC,QAAQ,EAAE;YACb,MAAM,IAAI,KAAK,CAAC,uCAAuC,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC;SAE1E;aAAM,IAAI,QAAQ,CAAC,WAAW,IAAI,QAAQ,CAAC,eAAe,EAAE;YAC3D,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,+BAA+B,CAAC,QAAQ,CAAC,CAAC;SAExE;aAAM,IAAI,QAAQ,CAAC,WAAW,IAAI,QAAQ,CAAC,kBAAkB,EAAE;YAC9D,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,kCAAkC,CAAC,QAAQ,CAAC,CAAC;SAE3E;aAAM,IAAI,QAAQ,CAAC,iBAAiB,EAAE;YACrC,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC;SAE/D;aAAM;YACL,yBAAyB;YACzB,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,6BAA6B,CAAC,QAAQ,CAAC,CAAC;SACtE;QACD,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;IAEO,4BAA4B,CAClC,QAAkB,EAClB,KAAsB,EACtB,cAAwC;QAExC,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC;QACxC,MAAM,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;YAC3C,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC;YAC1D,OAAO,QAAQ,CAAC,SAAS,CAAC,GAAG,KAAK,EAAE,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACjE,CAAC,CAAC,CAAC;QACH,MAAM,SAAS,GAAG,UAAU,CAAC,MAAM,CACjC,CAAC,EAAE,MAAM,EAAE,UAAU,EAAgB,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;YAC7C,MAAM,EAAE,CAAC,GAAG,MAAM,EAAE,EAAE,CAAC,QAAQ,EAAE,CAAC;YAClC,UAAU,EAAE,EAAE,GAAG,UAAU,EAAE,GAAG,EAAE,CAAC,aAAa,EAAE,EAAE;SACrD,CAAC,EACF,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,CAC/B,CAAC;QAEF,MAAM,QAAQ,GAAG,SAAS,CAAC,MAAM;aAC9B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;2BACS,CAAC,QAAQ,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;aAC1D,IAAI,CAAC,aAAa,CAAC,CAAC;QACvB,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,UAAU,EAAE,CAAC;IACzD,CAAC;IAEO,0BAA0B,CAAC,MAAc;QAC/C,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC;QAC/B,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAE1E,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE;YACnD,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,GAAG,QAAQ,MAAM,SAAS,EAAE,CAAC,CAAC;YAClG,OAAO,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,EAAE,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;QACzE,CAAC,EAAE,YAAY,CAAC,CAAC;QAEjB,OAAO,aAAa,CAAC,KAAK,CAAC,IAAI,kBAAQ,CAAC,CAAC,GAAG,EAAE,EAAE;YAC9C,MAAM,KAAK,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YAE1C,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC,CAAC;IACN,CAAC;IAEO,+BAA+B,CAAC,QAA0B;QAChE,MAAM,SAAS,GAAG,QAAQ,CAAC,cAAc,CAAC,IAAI,CAAC;QAC/C,MAAM,EAAE,cAAc,EAAE,GAAG,QAAQ,CAAC,cAAc,CAAC;QACnD,MAAM,EAAE,WAAW,EAAE,GAAG,QAAQ,CAAC;QACjC,MAAM,KAAK,GAAiB;YAC1B;gBACE,MAAM,EAAE,QAAQ,CAAC,cAAc,CAAC,MAAwB;gBACxD,KAAK,EAAE,SAAS;gBAChB,UAAU,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;oBAC3C,QAAQ,EAAE,GAAG,SAAS,IAAI,UAAU,CAAC,YAAY,EAAE;oBACnD,SAAS,EAAE,GAAG,QAAQ,CAAC,YAAY,IAAI,UAAU,CAAC,gBAAiB,CAAC,YAAY,EAAE;iBACnF,CAAC,CAAC;aACJ;SACF,CAAC;QACF,MAAM,eAAe,GAAG,QAAQ,CAAC,qBAAqB,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YACjF,UAAU,EAAE,GAAG,QAAQ,CAAC,YAAY,IAAI,EAAE,CAAC,YAAY,EAAE;YACzD,YAAY,EAAE,EAAE,CAAC,YAAY;YAC7B,YAAY,EAAE,EAAE,CAAC,YAAY;SAC9B,CAAC,CAAC,CAAC;QAEJ,OAAO;YACL,QAAQ;YACR,IAAI,EAAE,QAAQ,CAAC,IAAuB;YACtC,SAAS,EAAE,QAAQ,CAAC,YAAY;YAChC,eAAe;YACf,KAAK;YAEL,YAAY,EAAE,CAAC,MAAc,EAAE,SAAqB,EAAE,YAAmB,EAAc,EAAE;gBACvF,MAAM,SAAS,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;oBAC5D,GAAG,OAAO;oBAEV,CAAC,yBAAW,CAAC,UAAU,CACrB,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,EAC3C,SAAS,EACT,MAAM,CAAC,YAAY,CACpB,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC;iBAClC,CAAC,EAAE,EAAqB,CAAC,CAAC;gBAE3B,sFAAsF;gBACtF,kCAAkC;gBAClC,OAAO,IAAA,uBAAY,EAAC,YAAY,EAAE,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,eAAe,EAAE,WAAW,EAAE,EAAE;oBACnF,MAAM,MAAM,GAAG,IAAI,CAAC,gDAAgD,EAAE,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;wBAClG,GAAG,OAAO;wBAEV,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC;qBACtD,CAAC,EAAE,EAAqB,CAAC,CAAC;oBAE3B,OAAO,eAAe,CAAC,MAAM,CAAC,IAAA,uBAAY,EAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;gBACjE,CAAC,EAAE,EAAgB,CAAC,CAAC;YACvB,CAAC;YAED,WAAW,EAAE,CAAC,EAAE,EAAE,QAAQ,EAAE,EAAE;gBAC5B,MAAM,aAAa,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;oBAC/C,OAAO,GAAG,SAAS,IAAI,MAAM,CAAC,YAAY,MAAM,QAAQ,CAAC,YAAY,IAAI,MAAM,CAAC,gBAAiB,CAAC,YAAY,EAAE,CAAC;gBACnH,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAEjB,MAAM,WAAW,GAAG,EAAE,CAAC;gBACvB,MAAM,SAAS,GAAG,EAAE,CAAC;gBACrB,MAAM,cAAc,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;oBACnD,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;oBAE/C,WAAW,CAAC,SAAS,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC;oBAEjF,2DAA2D;oBAC3D,SAAS,CAAC,IAAI,CAAC,GAAG,SAAS,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;oBACtD,OAAO,GAAG,SAAS,IAAI,MAAM,CAAC,YAAY,YAAY,SAAS,GAAG,CAAC;gBACrE,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAEjB,OAAO,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,cAAc,CAAC,MAAwB,EAAE,SAAS,EAAE,aAAa,CAAC;qBAC3F,SAAS,CAAC,SAAS,CAAC;qBACpB,QAAQ,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;YAC3C,CAAC;YAED,cAAc,EAAE,CAAC,MAAc,EAAe,EAAE;gBAC9C,MAAM,MAAM,GAAkB,EAAE,CAAC;gBAEjC,MAAM,GAAG,GAAG,cAAc;qBACvB,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;oBACd,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;oBAE/C,MAAM,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;oBAClD,OAAO,GAAG,SAAS,IAAI,MAAM,CAAC,YAAY,OAAO,SAAS,EAAE,CAAC;gBAC/D,CAAC,CAAC;qBACD,IAAI,CAAC,OAAO,CAAC,CAAC;gBAEjB,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;YACzB,CAAC;SACF,CAAC;IACJ,CAAC;IAEO,kCAAkC,CAAC,QAA0B;QACnE,MAAM,SAAS,GAAG,QAAQ,CAAC,YAAY,CAAC;QACxC,MAAM,OAAO,GAAG,QAAQ,CAAC,eAAgB,CAAC,WAAW,CAAC;QACtD,MAAM,eAAe,GAAiB,QAAQ,CAAC,qBAAqB,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YAC/F,UAAU,EAAE,GAAG,SAAS,IAAI,EAAE,CAAC,YAAY,EAAE;YAC7C,YAAY,EAAE,EAAE,CAAC,YAAY;YAC7B,YAAY,EAAE,EAAE,CAAC,YAAY;SAC9B,CAAC,CAAC,CAAC;QACJ,OAAO;YACL,QAAQ;YACR,IAAI,EAAE,QAAQ,CAAC,eAAgB,CAAC,cAAc,CAAC,MAAyB;YACxE,SAAS,EAAE,SAAS;YACpB,eAAe;YACf,KAAK,EAAE,EAAE;YACT,YAAY,EAAE,CAAC,MAAc,EAAE,SAAqB,EAAc,EAAE;gBAClE,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;oBAClD,GAAG,OAAO;oBACV,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC,gBAAiB,CAAC,cAAc,CAAC,MAAM,CAAC;iBACvE,CAAC,EAAE,EAAqB,CAAC,CAAC;gBAE3B,OAAO,IAAA,uBAAY,EAAC,SAAS,EAAE,MAAM,CAAe,CAAC;YACvD,CAAC;YACD,WAAW,EAAE,CAAC,EAAE,EAAE,QAAkB,EAAE,EAAE;gBACtC,MAAM,MAAM,GAAG,EAAE,CAAC;gBAElB,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;oBACjC,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;oBAC/C,MAAM,CAAC,SAAS,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,gBAAiB,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC;oBAE9F,OAAO,GAAG,SAAS,IAAI,MAAM,CAAC,YAAY,YAAY,SAAS,GAAG,CAAC;gBACrE,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAEjB,OAAO,EAAE,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YAClC,CAAC;YACD,cAAc,EAAE,CAAC,MAAc,EAAe,EAAE;gBAC9C,MAAM,MAAM,GAAkB,EAAE,CAAC;gBAEjC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;oBAC9B,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;oBAE/C,MAAM,CAAC,SAAS,CAAC,GAAG,GAAG,CAAC,gBAAiB,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;oBACjE,OAAO,GAAG,SAAS,IAAI,GAAG,CAAC,YAAY,OAAO,SAAS,EAAE,CAAC;gBAC5D,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAEjB,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;YACzB,CAAC;SACF,CAAC;IACJ,CAAC;IAEO,sBAAsB,CAAC,QAA0B;QACvD,MAAM,SAAS,GAAG,QAAQ,CAAC,YAAY,CAAC;QACxC,MAAM,SAAS,GAAG,QAAQ,CAAC,sBAAuB,CAAC,SAAS,CAAC;QAC7D,MAAM,KAAK,GAAiB;YAC1B;gBACE,MAAM,EAAE,SAAS;gBACjB,KAAK,EAAE,SAAS;gBAChB,UAAU,EAAE,QAAQ,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,iBAAiB,EAAE,EAAE,CAAC,CAAC;oBAClE,QAAQ,EAAE,GAAG,SAAS,IAAI,iBAAiB,CAAC,YAAY,EAAE;oBAC1D,SAAS,EAAE,GAAG,SAAS,IAAI,iBAAiB,CAAC,gBAAiB,CAAC,YAAY,EAAE;iBAC9E,CAAC,CAAC;aACJ;SACF,CAAC;QAEF,MAAM,eAAe,GAAG,QAAQ,CAAC,qBAAqB,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YACjF,UAAU,EAAE,GAAG,SAAS,IAAI,EAAE,CAAC,YAAY,EAAE;YAC7C,YAAY,EAAE,EAAE,CAAC,YAAY;YAC7B,YAAY,EAAE,EAAE,CAAC,YAAY;SAC9B,CAAC,CAAC,CAAC;QAEJ,OAAO;YACL,QAAQ;YACR,IAAI,EAAE,QAAQ,CAAC,IAAuB;YACtC,SAAS,EAAE,SAAS;YACpB,eAAe;YACf,KAAK;YAEL,YAAY,CAAc,MAAc,EAAE,SAAqB,EAAE,YAA2B;gBAC1F,MAAM,SAAS,GAAG,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;oBAClE,GAAG,OAAO;oBAEV,CAAC,GAAG,SAAS,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC,EAAE,MAAM,CAAC,gBAAgB,CAAC,cAAc,CAAC,MAAM,CAAC;iBACxF,CAAC,EAAE,EAAqB,CAAC,CAAC;gBAE3B,sFAAsF;gBACtF,kCAAkC;gBAClC,OAAO,IAAA,uBAAY,EAAC,YAAY,EAAE,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,eAAe,EAAE,WAAW,EAAE,EAAE;oBACnF,MAAM,MAAM,GAAG,QAAQ,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;wBACtE,GAAG,OAAO;wBAEV,CAAC,MAAM,CAAC,gBAAgB,CAAC,YAAY,CAAC,EAAE,WAAW,CAAC,GAAG,SAAS,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;qBAC3F,CAAC,EAAE,EAAqB,CAAC,CAAC;oBAE3B,OAAO,eAAe,CAAC,MAAM,CAAC,IAAA,uBAAY,EAAC,SAAS,EAAE,MAAM,CAAQ,CAAC,CAAC;gBACxE,CAAC,EAAE,EAAgB,CAAC,CAAC;YACvB,CAAC;YAED,WAAW,EAAE,CAAC,EAAE,EAAE,QAAkB,EAAE,EAAE;gBACtC,MAAM,MAAM,GAAG,EAAE,CAAC;gBAClB,MAAM,SAAS,GAAG,EAAE,CAAC;gBAErB,MAAM,GAAG,GAAG,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;oBAC9C,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;oBACzD,MAAM,CAAC,SAAS,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,gBAAiB,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC;oBAE9F,0EAA0E;oBAC1E,SAAS,CAAC,IAAI,CAAC,GAAG,SAAS,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;oBACtD,OAAO,GAAG,SAAS,IAAI,MAAM,CAAC,YAAY,YAAY,SAAS,GAAG,CAAC;gBACrE,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAEjB,uBAAuB;gBACvB,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE;oBAC/B,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,GAAG,QAAQ,MAAM,SAAS,EAAE,CAAC,CAAC;oBAElG,OAAO,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,EAAE,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;gBACzE,CAAC,EAAE,EAAE,CAAC;qBACH,SAAS,CAAC,SAAS,CAAC;qBACpB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YAC3B,CAAC;YAED,cAAc,EAAE,CAAC,MAAc,EAAe,EAAE;gBAC9C,MAAM,MAAM,GAAkB,EAAE,CAAC;gBAEjC,MAAM,GAAG,GAAG,QAAQ,CAAC,WAAW;qBAC7B,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;oBAClB,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;oBAE7D,MAAM,CAAC,SAAS,CAAC,GAAG,UAAU,CAAC,gBAAiB,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;oBACxE,OAAO,GAAG,SAAS,IAAI,UAAU,CAAC,YAAY,OAAO,SAAS,EAAE,CAAC;gBACnE,CAAC,CAAC;qBACD,IAAI,CAAC,OAAO,CAAC,CAAC;gBAEjB,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;YACzB,CAAC;SACF,CAAC;IACJ,CAAC;IAEO,6BAA6B,CAAC,QAA0B;QAC9D,MAAM,SAAS,GAAG,QAAQ,CAAC,YAAY,CAAC;QACxC,MAAM,SAAS,GAAG,QAAQ,CAAC,sBAAuB,CAAC,SAAS,CAAC;QAC7D,MAAM,KAAK,GAAG;YACZ;gBACE,MAAM,EAAE,SAAS;gBACjB,KAAK,EAAE,SAAS;gBAChB,UAAU,EAAE,QAAQ,CAAC,eAAgB,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;oBACrE,QAAQ,EAAE,GAAG,SAAS,IAAI,UAAU,CAAC,YAAY,EAAE;oBACnD,SAAS,EAAE,GAAG,SAAS,IAAI,UAAU,CAAC,gBAAiB,CAAC,YAAY,EAAE;iBACvE,CAAC,CAAC;aACJ;SACF,CAAC;QAEF,MAAM,eAAe,GAAG,QAAQ,CAAC,qBAAqB,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YACjF,UAAU,EAAE,GAAG,SAAS,IAAI,EAAE,CAAC,YAAY,EAAE;YAC7C,YAAY,EAAE,EAAE,CAAC,YAAY;YAC7B,YAAY,EAAE,EAAE,CAAC,YAAY;SAC9B,CAAC,CAAC,CAAC;QAEJ,OAAO;YACL,QAAQ;YACR,IAAI,EAAE,QAAQ,CAAC,IAAuB;YACtC,SAAS,EAAE,SAAS;YACpB,eAAe;YACf,KAAK;YAEL,YAAY,CAAc,MAAc,EAAE,SAAqB,EAAE,YAA2B;gBAC1F,MAAM,SAAS,GAAG,QAAQ,CAAC,eAAgB,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;oBAC1F,GAAG,OAAO;oBAEV,CAAC,GAAG,SAAS,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC,EAAE,MAAM,CAAC,gBAAgB,CAAC,cAAc,CAAC,MAAM,CAAC;iBACxF,CAAC,EAAE,EAAqB,CAAC,CAAC;gBAE3B,sFAAsF;gBACtF,kCAAkC;gBAClC,OAAO,IAAA,uBAAY,EAAC,YAAY,EAAE,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,eAAe,EAAE,WAAW,EAAE,EAAE;oBACnF,MAAM,MAAM,GAAG,QAAQ,CAAC,eAAe,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;wBAC/E,GAAG,OAAO;wBAEV,CAAC,MAAM,CAAC,gBAAgB,CAAC,YAAY,CAAC,EAAE,WAAW,CAAC,GAAG,SAAS,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;qBAC3F,CAAC,EAAE,EAAqB,CAAC,CAAC;oBAE3B,OAAO,eAAe,CAAC,MAAM,CAAC,IAAA,uBAAY,EAAC,SAAS,EAAE,MAAM,CAAQ,CAAC,CAAC;gBACxE,CAAC,EAAE,EAAgB,CAAC,CAAC;YACvB,CAAC;YAED,WAAW,EAAE,CAAC,EAAE,EAAE,QAAkB,EAAE,EAAE;gBACtC,MAAM,MAAM,GAAG,EAAE,CAAC;gBAClB,MAAM,SAAS,GAAG,EAAE,CAAC;gBAErB,MAAM,GAAG,GAAG,QAAQ,CAAC,eAAgB,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;oBACtE,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;oBACzD,MAAM,CAAC,SAAS,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,gBAAiB,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC;oBAE9F,0EAA0E;oBAC1E,SAAS,CAAC,IAAI,CAAC,GAAG,SAAS,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;oBACtD,OAAO,GAAG,SAAS,IAAI,MAAM,CAAC,YAAY,YAAY,SAAS,GAAG,CAAC;gBACrE,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAEjB,uBAAuB;gBACvB,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE;oBAC/B,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,GAAG,QAAQ,MAAM,SAAS,EAAE,CAAC,CAAC;oBAElG,OAAO,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,EAAE,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;gBACzE,CAAC,EAAE,EAAE,CAAC;qBACH,SAAS,CAAC,SAAS,CAAC;qBACpB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YAC3B,CAAC;YAED,cAAc,EAAE,CAAC,MAAc,EAAe,EAAE;gBAC9C,MAAM,MAAM,GAAkB,EAAE,CAAC;gBAEjC,MAAM,GAAG,GAAG,QAAQ,CAAC,eAAgB,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,iBAAiB,EAAE,EAAE;oBACjF,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;oBAEpE,MAAM,CAAC,SAAS,CAAC,GAAG,iBAAiB,CAAC,gBAAiB,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;oBAE/E,OAAO,GAAG,SAAS,IAAI,iBAAiB,CAAC,YAAY,OAAO,SAAS,EAAE,CAAC;gBAC1E,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAEjB,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;YACzB,CAAC;SACF,CAAC;IACJ,CAAC;IAEO,YAAY,CAAC,MAAc;QACjC,IAAI,CAAC,UAAU,IAAI,CAAC,CAAC;QACrB,OAAO,GAAG,MAAM,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;IACxC,CAAC;IAED,IAAI,kBAAkB;QACpB,OAAO,8BAA8B,CAAC;IACxC,CAAC;IAED,IAAY,yBAAyB;QACnC,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IAClD,CAAC;IAED,IAAY,UAAU;QACpB,OAAO,SAAS,CAAC;IACnB,CAAC;IAEO,UAAU,CAAC,GAAW;QAC5B,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACjE,CAAC;IAEM,gDAAgD;QACrD,OAAO,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YACpD,YAAY,EAAE,EAAE,CAAC,YAAY;YAC7B,UAAU,EAAE,yBAAW,CAAC,UAAU,CAChC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,EAC3C,IAAI,CAAC,YAAY,CAAC,SAAS,EAC3B,EAAE,CAAC,YAAY,CAChB;SACF,CAAC,CAAC,CAAC;IACN,CAAC;CACF;AAveD,oDAueC"}
1
+ {"version":3,"file":"relation-query.builder.js","sourceRoot":"","sources":["../../../../../packages/query-typeorm/src/query/relation-query.builder.ts"],"names":[],"mappings":";;;;AAEA,qCAAkF;AAElF,4DAAyD;AAGzD,iEAA4D;AAC5D,2DAAuD;AACvD,+EAAyC;AAqDzC;;;;GAIG;AACH,MAAa,oBAAoB;IAgB/B,YAAqB,IAAwB,EAAW,QAAgB;QAAnD,SAAI,GAAJ,IAAI,CAAoB;QAAW,aAAQ,GAAR,QAAQ,CAAQ;QACtE,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAW,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QACtF,IAAI,CAAC,kBAAkB,GAAG,IAAI,yCAAkB,CAAW,IAAI,CAAC,YAAY,CAAC,CAAC;QAC9E,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;IACtB,CAAC;IAEM,MAAM,CAAC,MAAc,EAAE,KAAsB;QAClD,MAAM,YAAY,GAAG,IAAI,CAAC,kBAAkB,CAAC,kBAAkB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAE9E,IAAI,eAAe,GAAG,IAAI,CAAC,0BAA0B,CAAC,MAAM,CAAC,CAAC;QAC9D,eAAe,GAAG,YAAY;YAC5B,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,2BAA2B,CACjD,eAAe,EACf,IAAI,CAAC,kBAAkB,CAAC,+BAA+B,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,CAClG;YACH,CAAC,CAAC,eAAe,CAAC;QAEpB,eAAe,GAAG,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,eAAe,EAAE,KAAK,CAAC,MAAM,EAAE,eAAe,CAAC,KAAK,CAAC,CAAC;QAC5G,eAAe,GAAG,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,eAAe,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;QAErF,OAAO,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,eAAe,EAAE,KAAK,CAAC,OAAO,EAAE,eAAe,CAAC,KAAK,CAAC,CAAC;IACrG,CAAC;IAEM,WAAW,CAAC,QAAkB,EAAE,KAAsB,EAAE,WAAqB;QAClF,MAAM,YAAY,GAAG,IAAI,CAAC,kBAAkB,CAAC,kBAAkB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC9E,IAAI,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QAE3E,IAAI,WAAW,EAAE;YACf,EAAE,CAAC,WAAW,EAAE,CAAC;SAClB;QAED,EAAE,GAAG,YAAY;YACf,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,2BAA2B,CACjD,EAAE,EACF,IAAI,CAAC,kBAAkB,CAAC,+BAA+B,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,CAClG;YACH,CAAC,CAAC,EAAE,CAAC;QACP,EAAE,GAAG,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,EAAE,EAAE,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;QACrE,EAAE,GAAG,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,EAAE,EAAE,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;QACvE,EAAE,GAAG,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,EAAE,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;QAE3D,OAAO,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;IACrD,CAAC;IAEM,cAAc,CACnB,QAAkB,EAClB,KAAsB,EACtB,cAAwC;QAExC,MAAM,OAAO,GAAG,CAAC,GAAG,oCAAgB,CAAC,mBAAmB,CAAC,cAAc,CAAC,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAC3G,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CACnB,CAAC;QAEF,MAAM,aAAa,GAAG,IAAI,CAAC,4BAA4B,CAAC,QAAQ,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC;QAEzF,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,UAAU;aACxC,kBAAkB,EAAE;aACpB,MAAM,CAAC,OAAO,CAAC;aACf,IAAI,CAA+C,IAAI,aAAa,CAAC,GAAG,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC;aAC7F,aAAa,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IACzC,CAAC;IAEM,SAAS,CACd,MAAc,EACd,KAAsB,EACtB,cAAwC;QAExC,IAAI,eAAe,GAAG,IAAI,CAAC,0BAA0B,CAAC,MAAM,CAAC,CAAC;QAC9D,eAAe,GAAG,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,eAAe,EAAE,cAAc,EAAE,eAAe,CAAC,KAAK,CAAC,CAAC;QACjH,eAAe,GAAG,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,eAAe,EAAE,KAAK,CAAC,MAAM,EAAE,eAAe,CAAC,KAAK,CAAC,CAAC;QAC5G,eAAe,GAAG,IAAI,CAAC,kBAAkB,CAAC,qBAAqB,CAC7D,eAAe,EACf,cAAc,CAAC,OAAO,EACtB,eAAe,CAAC,KAAK,CACtB,CAAC;QACF,eAAe,GAAG,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,eAAe,EAAE,cAAc,CAAC,OAAO,EAAE,eAAe,CAAC,KAAK,CAAC,CAAC;QACvH,OAAO,eAAe,CAAC;IACzB,CAAC;IAED,IAAW,YAAY;QACrB,IAAI,IAAI,CAAC,gBAAgB,EAAE;YACzB,OAAO,IAAI,CAAC,gBAAgB,CAAC;SAC9B;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,IAAI,CAAC,QAAQ,CAAC,CAAC;QAE5F,IAAI,CAAC,QAAQ,EAAE;YACb,MAAM,IAAI,KAAK,CAAC,uCAAuC,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC;SAC1E;aAAM,IAAI,QAAQ,CAAC,WAAW,IAAI,QAAQ,CAAC,eAAe,EAAE;YAC3D,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,+BAA+B,CAAC,QAAQ,CAAC,CAAC;SACxE;aAAM,IAAI,QAAQ,CAAC,WAAW,IAAI,QAAQ,CAAC,kBAAkB,EAAE;YAC9D,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,kCAAkC,CAAC,QAAQ,CAAC,CAAC;SAC3E;aAAM,IAAI,QAAQ,CAAC,iBAAiB,EAAE;YACrC,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC;SAC/D;aAAM;YACL,yBAAyB;YACzB,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,6BAA6B,CAAC,QAAQ,CAAC,CAAC;SACtE;QAED,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;IAEO,4BAA4B,CAClC,QAAkB,EAClB,KAAsB,EACtB,cAAwC;QAExC,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC;QACxC,MAAM,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;YAC3C,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC;YAC1D,OAAO,QAAQ,CAAC,SAAS,CAAC,GAAG,KAAK,EAAE,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACjE,CAAC,CAAC,CAAC;QACH,MAAM,SAAS,GAAG,UAAU,CAAC,MAAM,CACjC,CAAC,EAAE,MAAM,EAAE,UAAU,EAAgB,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;YAC7C,MAAM,EAAE,CAAC,GAAG,MAAM,EAAE,EAAE,CAAC,QAAQ,EAAE,CAAC;YAClC,UAAU,EAAE,EAAE,GAAG,UAAU,EAAE,GAAG,EAAE,CAAC,aAAa,EAAE,EAAE;SACrD,CAAC,EACF,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,CAC/B,CAAC;QAEF,MAAM,QAAQ,GAAG,SAAS,CAAC,MAAM;aAC9B,GAAG,CACF,CAAC,CAAC,EAAE,EAAE,CAAC;wBACS,CAAC,QAAQ,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CACtD;aACA,IAAI,CAAC,aAAa,CAAC,CAAC;QACvB,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC,UAAU,EAAE,CAAC;IACzD,CAAC;IAEO,0BAA0B,CAAC,MAAc;QAC/C,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QAEvF,MAAM,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE;YAChE,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,GAAG,QAAQ,MAAM,SAAS,EAAE,CAAC,CAAC;YAElG,OAAO,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,EAAE,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;QACzE,CAAC,EAAE,YAAY,CAAC,CAAC;QAEjB,OAAO,aAAa,CAAC,KAAK,CACxB,IAAI,kBAAQ,CAAC,CAAC,GAAG,EAAE,EAAE;YACnB,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YAEvD,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;QACxC,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAEO,+BAA+B,CAAC,QAA0B;QAChE,MAAM,SAAS,GAAG,QAAQ,CAAC,cAAc,CAAC,SAAS,CAAC;QAEpD,MAAM,KAAK,GAAiB;YAC1B;gBACE,MAAM,EAAE,QAAQ,CAAC,cAAc,CAAC,MAAwB;gBACxD,KAAK,EAAE,SAAS;gBAChB,UAAU,EAAE,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;oBACpD,QAAQ,EAAE,GAAG,SAAS,IAAI,UAAU,CAAC,YAAY,EAAE;oBACnD,SAAS,EAAE,GAAG,QAAQ,CAAC,YAAY,IAAI,UAAU,CAAC,gBAAgB,CAAC,YAAY,EAAE;iBAClF,CAAC,CAAC;aACJ;SACF,CAAC;QAEF,MAAM,eAAe,GAAG,QAAQ,CAAC,qBAAqB,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YACjF,UAAU,EAAE,GAAG,QAAQ,CAAC,YAAY,IAAI,EAAE,CAAC,YAAY,EAAE;YACzD,YAAY,EAAE,EAAE,CAAC,YAAY;YAC7B,YAAY,EAAE,EAAE,CAAC,YAAY;SAC9B,CAAC,CAAC,CAAC;QAEJ,OAAO;YACL,QAAQ;YACR,IAAI,EAAE,QAAQ,CAAC,IAAuB;YACtC,SAAS,EAAE,QAAQ,CAAC,YAAY;YAChC,eAAe;YACf,KAAK;YAEL,YAAY,EAAE,CAAC,MAAc,EAAE,SAAqB,EAAE,YAAmB,EAAc,EAAE;gBACvF,oCAAoC;gBACpC,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,EAAE,IAAI,IAAI,SAAS,CAAC;gBAExD,MAAM,SAAS,GAAG,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAC,MAAM,CAC7D,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;oBACpB,GAAG,OAAO;oBAEV,CAAC,GAAG,SAAS,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC;iBACvE,CAAC,EACF,EAAqB,CACtB,CAAC;gBAEF,sFAAsF;gBACtF,kCAAkC;gBAClC,OAAO,IAAA,uBAAY,EAAC,YAAY,EAAE,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,eAA2B,EAAE,WAAqB,EAAE,EAAE;oBACzG,MAAM,MAAM,GAAG,IAAI,CAAC,gDAAgD,EAAE,CAAC,MAAM,CAC3E,CAAC,OAAwB,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;wBACrC,GAAG,OAAO;wBAEV,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC;qBACtD,CAAC,EACF,EAAqB,CACtB,CAAC;oBAEF,OAAO,eAAe,CAAC,MAAM,CAAC,IAAA,uBAAY,EAAC,SAAS,EAAE,MAAM,CAAe,CAAC,CAAC;gBAC/E,CAAC,EAAE,EAAgB,CAAe,CAAC;YACrC,CAAC;YAED,WAAW,EAAE,CAAC,YAAY,EAAE,QAAQ,EAAE,EAAE;gBACtC,IAAI,CAAC,aAAa,GAAG,YAAY,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;oBACrE,OAAO,KAAK,CAAC,IAAI,KAAK,MAAM,IAAI,KAAK,CAAC,MAAM,KAAK,QAAQ,CAAC,cAAc,CAAC,MAAM,CAAC;gBAClF,CAAC,CAAC,CAAC;gBAEH,oCAAoC;gBACpC,MAAM,SAAS,GAAG,IAAI,CAAC,aAAa,EAAE,IAAI,IAAI,SAAS,CAAC;gBAExD,MAAM,WAAW,GAA+B,EAAE,CAAC;gBACnD,MAAM,cAAc,GAAG,QAAQ,CAAC,cAAc,CAAC,cAAc;qBAC1D,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;oBACd,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;oBAE/C,WAAW,CAAC,SAAS,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAY,CAAC,CAAC;oBAE5F,2DAA2D;oBAC3D,YAAY,CAAC,SAAS,CAAC,GAAG,SAAS,IAAI,MAAM,CAAC,YAAY,EAAE,EAAE,GAAG,SAAS,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;oBAErG,OAAO,GAAG,SAAS,IAAI,MAAM,CAAC,YAAY,YAAY,SAAS,GAAG,CAAC;gBACrE,CAAC,CAAC;qBACD,IAAI,CAAC,OAAO,CAAC,CAAC;gBAEjB,4EAA4E;gBAC5E,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;oBACvB,YAAY,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE;wBACvC,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,GAAG,QAAQ,MAAM,SAAS,EAAE,CAAC,CAAC;wBAElG,OAAO,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,EAAE,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;oBACzE,CAAC,EAAE,YAAY,CAAC,CAAC;iBAClB;gBAED,OAAO,YAAY,CAAC,QAAQ,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;YAC5D,CAAC;YAED,cAAc,EAAE,CAAC,MAAc,EAAe,EAAE;gBAC9C,MAAM,MAAM,GAAkB,EAAE,CAAC;gBAEjC,MAAM,GAAG,GAAG,QAAQ,CAAC,cAAc,CAAC,cAAc;qBAC/C,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;oBACd,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;oBAE/C,MAAM,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;oBAClD,OAAO,GAAG,SAAS,IAAI,MAAM,CAAC,YAAY,OAAO,SAAS,EAAE,CAAC;gBAC/D,CAAC,CAAC;qBACD,IAAI,CAAC,OAAO,CAAC,CAAC;gBAEjB,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;YACzB,CAAC;SACF,CAAC;IACJ,CAAC;IAEO,kCAAkC,CAAC,QAA0B;QACnE,MAAM,SAAS,GAAG,QAAQ,CAAC,YAAY,CAAC;QACxC,MAAM,OAAO,GAAG,QAAQ,CAAC,eAAe,CAAC,WAAW,CAAC;QACrD,MAAM,eAAe,GAAiB,QAAQ,CAAC,qBAAqB,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YAC/F,UAAU,EAAE,GAAG,SAAS,IAAI,EAAE,CAAC,YAAY,EAAE;YAC7C,YAAY,EAAE,EAAE,CAAC,YAAY;YAC7B,YAAY,EAAE,EAAE,CAAC,YAAY;SAC9B,CAAC,CAAC,CAAC;QAEJ,OAAO;YACL,QAAQ;YACR,IAAI,EAAE,QAAQ,CAAC,eAAe,CAAC,cAAc,CAAC,MAAyB;YACvE,SAAS,EAAE,SAAS;YACpB,eAAe;YACf,KAAK,EAAE,EAAE;YACT,YAAY,EAAE,CAAC,MAAc,EAAE,SAAqB,EAAc,EAAE;gBAClE,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAC3B,CAAC,aAAa,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;oBAC1B,GAAG,aAAa;oBAChB,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC,gBAAgB,CAAC,cAAc,CAAC,MAAM,CAAC;iBACtE,CAAC,EACF,EAAqB,CACtB,CAAC;gBAEF,OAAO,IAAA,uBAAY,EAAC,SAAS,EAAE,MAAM,CAAe,CAAC;YACvD,CAAC;YACD,WAAW,EAAE,CAAC,EAAgC,EAAE,QAAkB,EAAE,EAAE;gBACpE,MAAM,MAAM,GAAG,EAAE,CAAC;gBAElB,MAAM,KAAK,GAAG,OAAO;qBAClB,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;oBACd,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;oBAC/C,MAAM,CAAC,SAAS,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,cAAc,CAAC,MAAM,CAAY,CAAC,CAAC;oBAExG,OAAO,GAAG,SAAS,IAAI,MAAM,CAAC,YAAY,YAAY,SAAS,GAAG,CAAC;gBACrE,CAAC,CAAC;qBACD,IAAI,CAAC,OAAO,CAAC,CAAC;gBAEjB,OAAO,EAAE,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YACpC,CAAC;YACD,cAAc,EAAE,CAAC,MAAc,EAAe,EAAE;gBAC9C,MAAM,MAAM,GAAkB,EAAE,CAAC;gBAEjC,MAAM,GAAG,GAAG,OAAO;qBAChB,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;oBACX,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;oBAE/C,MAAM,CAAC,SAAS,CAAC,GAAG,GAAG,CAAC,gBAAgB,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;oBAChE,OAAO,GAAG,SAAS,IAAI,GAAG,CAAC,YAAY,OAAO,SAAS,EAAE,CAAC;gBAC5D,CAAC,CAAC;qBACD,IAAI,CAAC,OAAO,CAAC,CAAC;gBAEjB,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;YACzB,CAAC;SACF,CAAC;IACJ,CAAC;IAEO,sBAAsB,CAAC,QAA0B;QACvD,MAAM,SAAS,GAAG,QAAQ,CAAC,YAAY,CAAC;QACxC,MAAM,SAAS,GAAG,QAAQ,CAAC,sBAAsB,CAAC,SAAS,CAAC;QAC5D,MAAM,KAAK,GAAiB;YAC1B;gBACE,MAAM,EAAE,SAAS;gBACjB,KAAK,EAAE,SAAS;gBAChB,UAAU,EAAE,QAAQ,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,iBAAiB,EAAE,EAAE,CAAC,CAAC;oBAClE,QAAQ,EAAE,GAAG,SAAS,IAAI,iBAAiB,CAAC,YAAY,EAAE;oBAC1D,SAAS,EAAE,GAAG,SAAS,IAAI,iBAAiB,CAAC,gBAAgB,CAAC,YAAY,EAAE;iBAC7E,CAAC,CAAC;aACJ;SACF,CAAC;QAEF,MAAM,eAAe,GAAG,QAAQ,CAAC,qBAAqB,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YACjF,UAAU,EAAE,GAAG,SAAS,IAAI,EAAE,CAAC,YAAY,EAAE;YAC7C,YAAY,EAAE,EAAE,CAAC,YAAY;YAC7B,YAAY,EAAE,EAAE,CAAC,YAAY;SAC9B,CAAC,CAAC,CAAC;QAEJ,OAAO;YACL,QAAQ;YACR,IAAI,EAAE,QAAQ,CAAC,IAAuB;YACtC,SAAS,EAAE,SAAS;YACpB,eAAe;YACf,KAAK;YAEL,YAAY,EAAE,CAAc,MAAc,EAAE,SAAqB,EAAE,YAA2B,EAAc,EAAE;gBAC5G,OAAO,IAAI,CAAC,2BAA2B,CAAc,SAAS,EAAE,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC;YACzH,CAAC;YAED,WAAW,EAAE,CAAC,EAAE,EAAE,QAAkB,EAAE,EAAE;gBACtC,OAAO,IAAI,CAAC,qBAAqB,CAAC,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAC;YACnF,CAAC;YAED,cAAc,EAAE,CAAC,MAAc,EAAe,EAAE;gBAC9C,MAAM,MAAM,GAAkB,EAAE,CAAC;gBAEjC,MAAM,GAAG,GAAG,QAAQ,CAAC,WAAW;qBAC7B,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;oBAClB,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;oBAE7D,MAAM,CAAC,SAAS,CAAC,GAAG,UAAU,CAAC,gBAAgB,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;oBACvE,OAAO,GAAG,SAAS,IAAI,UAAU,CAAC,YAAY,OAAO,SAAS,EAAE,CAAC;gBACnE,CAAC,CAAC;qBACD,IAAI,CAAC,OAAO,CAAC,CAAC;gBAEjB,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;YACzB,CAAC;SACF,CAAC;IACJ,CAAC;IAEO,6BAA6B,CAAC,QAA0B;QAC9D,MAAM,SAAS,GAAG,QAAQ,CAAC,YAAY,CAAC;QACxC,MAAM,SAAS,GAAG,QAAQ,CAAC,sBAAsB,CAAC,SAAS,CAAC;QAC5D,MAAM,KAAK,GAAG;YACZ;gBACE,MAAM,EAAE,SAAS;gBACjB,KAAK,EAAE,SAAS;gBAChB,UAAU,EAAE,QAAQ,CAAC,eAAe,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;oBACpE,QAAQ,EAAE,GAAG,SAAS,IAAI,UAAU,CAAC,YAAY,EAAE;oBACnD,SAAS,EAAE,GAAG,SAAS,IAAI,UAAU,CAAC,gBAAgB,CAAC,YAAY,EAAE;iBACtE,CAAC,CAAC;aACJ;SACF,CAAC;QAEF,MAAM,eAAe,GAAG,QAAQ,CAAC,qBAAqB,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YACjF,UAAU,EAAE,GAAG,SAAS,IAAI,EAAE,CAAC,YAAY,EAAE;YAC7C,YAAY,EAAE,EAAE,CAAC,YAAY;YAC7B,YAAY,EAAE,EAAE,CAAC,YAAY;SAC9B,CAAC,CAAC,CAAC;QAEJ,OAAO;YACL,QAAQ;YACR,IAAI,EAAE,QAAQ,CAAC,IAAuB;YACtC,SAAS,EAAE,SAAS;YACpB,eAAe;YACf,KAAK;YAEL,YAAY,EAAE,CAAc,MAAc,EAAE,SAAqB,EAAE,YAA2B,EAAc,EAAE;gBAC5G,OAAO,IAAI,CAAC,2BAA2B,CACrC,SAAS,EACT,QAAQ,CAAC,eAAe,CAAC,kBAAkB,EAC3C,MAAM,EACN,SAAS,EACT,YAAY,CACb,CAAC;YACJ,CAAC;YAED,WAAW,EAAE,CAAC,EAAgC,EAAE,QAAkB,EAAgC,EAAE;gBAClG,OAAO,IAAI,CAAC,qBAAqB,CAAC,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC;YAC1G,CAAC;YAED,cAAc,EAAE,CAAC,MAAc,EAAe,EAAE;gBAC9C,MAAM,MAAM,GAAkB,EAAE,CAAC;gBAEjC,MAAM,GAAG,GAAG,QAAQ,CAAC,eAAe,CAAC,kBAAkB;qBACpD,GAAG,CAAC,CAAC,iBAAiB,EAAE,EAAE;oBACzB,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;oBAEpE,MAAM,CAAC,SAAS,CAAC,GAAG,iBAAiB,CAAC,gBAAgB,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;oBAE9E,OAAO,GAAG,SAAS,IAAI,iBAAiB,CAAC,YAAY,OAAO,SAAS,EAAE,CAAC;gBAC1E,CAAC,CAAC;qBACD,IAAI,CAAC,OAAO,CAAC,CAAC;gBAEjB,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;YACzB,CAAC;SACF,CAAC;IACJ,CAAC;IAEO,qBAAqB,CAC3B,YAA0C,EAC1C,QAAkB,EAClB,SAAiB,EACjB,OAAyB;QAEzB,MAAM,MAAM,GAAG,EAAE,CAAC;QAElB,MAAM,GAAG,GAAG,OAAO;aAChB,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YACd,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;YACzD,MAAM,CAAC,SAAS,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,cAAc,CAAC,MAAM,CAAY,CAAC,CAAC;YAExG,0EAA0E;YAC1E,YAAY,CAAC,SAAS,CAAC,GAAG,SAAS,IAAI,MAAM,CAAC,YAAY,EAAE,EAAE,GAAG,SAAS,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;YAErG,OAAO,GAAG,SAAS,IAAI,MAAM,CAAC,YAAY,YAAY,SAAS,GAAG,CAAC;QACrE,CAAC,CAAC;aACD,IAAI,CAAC,OAAO,CAAC,CAAC;QAEjB,uBAAuB;QACvB,OAAO,IAAI,CAAC,YAAY,CAAC,KAAK;aAC3B,MAAM,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE;YACnB,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,GAAG,QAAQ,MAAM,SAAS,EAAE,CAAC,CAAC;YAElG,OAAO,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,EAAE,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;QACzE,CAAC,EAAE,YAAY,CAAC;aACf,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAC3B,CAAC;IAEO,2BAA2B,CACjC,SAAiB,EACjB,OAAyB,EACzB,MAAc,EACd,SAAqB,EACrB,YAA2B;QAE3B,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,CAC9B,CAAC,aAAa,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;YAC1B,GAAG,aAAa;YAEhB,CAAC,GAAG,SAAS,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC,EAAE,MAAM,CAAC,gBAAgB,CAAC,cAAc,CAAC,MAAM,CAAC;SACxF,CAAC,EACF,EAAqB,CACtB,CAAC;QAEF,sFAAsF;QACtF,kCAAkC;QAClC,OAAO,IAAA,uBAAY,EAAC,YAAY,EAAE,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,eAAe,EAAE,WAAW,EAAE,EAAE;YACnF,MAAM,MAAM,GAAG,IAAI,CAAC,gDAAgD,EAAE,CAAC,MAAM,CAC3E,CAAC,aAAa,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;gBAC1B,GAAG,aAAa;gBAChB,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC;aACtD,CAAC,EACF,EAAqB,CACtB,CAAC;YAEF,OAAO,eAAe,CAAC,MAAM,CAAC,IAAA,uBAAY,EAAC,SAAS,EAAE,MAAM,CAAe,CAAC,CAAC;QAC/E,CAAC,EAAE,EAAgB,CAAC,CAAC;IACvB,CAAC;IAEO,YAAY,CAAC,MAAc;QACjC,IAAI,CAAC,UAAU,IAAI,CAAC,CAAC;QAErB,OAAO,GAAG,MAAM,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;IACxC,CAAC;IAED,IAAI,kBAAkB;QACpB,OAAO,8BAA8B,CAAC;IACxC,CAAC;IAED,IAAY,yBAAyB;QACnC,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IAClD,CAAC;IAED,IAAY,UAAU;QACpB,OAAO,SAAS,CAAC;IACnB,CAAC;IAEO,UAAU,CAAC,GAAW;QAC5B,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IACjE,CAAC;IAEO,gDAAgD;QACtD,OAAO,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YACpD,YAAY,EAAE,EAAE,CAAC,YAAY;YAC7B,UAAU,EAAE,yBAAW,CAAC,UAAU,CAChC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,EAC3C,IAAI,CAAC,YAAY,CAAC,SAAS,EAC3B,EAAE,CAAC,YAAY,CAChB;SACF,CAAC,CAAC,CAAC;IACN,CAAC;CACF;AAnhBD,oDAmhBC"}
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
  }