@ptc-org/nestjs-query-typeorm 10.0.2 → 11.0.0-alpha.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ptc-org/nestjs-query-typeorm",
3
- "version": "10.0.2",
3
+ "version": "11.0.0-alpha.0",
4
4
  "description": "Typeorm adapter for @ptc-org/nestjs-query-core",
5
5
  "homepage": "https://github.com/tripss/nestjs-query#readme",
6
6
  "bugs": {
@@ -28,9 +28,7 @@
28
28
  "lodash.merge": "^4.6.2",
29
29
  "lodash.omit": "^4.18.0",
30
30
  "tslib": "^2.8.1",
31
- "uuid": "^14.0.2",
32
- "@ptc-org/nestjs-query-core": "10.0.2",
33
- "reflect-metadata": "0.2.2"
31
+ "uuid": "^14.0.2"
34
32
  },
35
33
  "peerDependencies": {
36
34
  "@nestjs/common": "^10.0.0 || ^11.0.0",
@@ -41,12 +39,5 @@
41
39
  "publishConfig": {
42
40
  "access": "public"
43
41
  },
44
- "packageManager": "yarn@4.18.0",
45
- "resolutions": {
46
- "@apollo/gateway": "2.14.1",
47
- "@apollo/server": "^5.5.1",
48
- "@apollo/subgraph": "2.14.1",
49
- "better-sqlite3": "^13.0.3"
50
- },
51
42
  "type": "commonjs"
52
43
  }
@@ -125,7 +125,8 @@ class AggregateBuilder {
125
125
  query = `DATE(TO_CHAR(${col}, 'YYYY-mm-01'))`;
126
126
  }
127
127
  else if (aggregatedField.args.by === nestjs_query_core_1.GroupBy.WEEK) {
128
- // ISO 8601 week (Monday-based), matches the MySQL branch below (%X-%V).
128
+ // ISO 8601 week (Monday-based), matches the MySQL branch below, which subtracts
129
+ // WEEKDAY (0 = Monday) days to reach the same Monday.
129
130
  // Postgres `WW` is anchored to Jan 1 and produces Thursday-cutoff weeks in years
130
131
  // where Jan 1 is a Thursday, which is rarely what users want.
131
132
  query = `DATE(DATE_TRUNC('week', ${col}))`;
@@ -139,7 +140,7 @@ class AggregateBuilder {
139
140
  query = `DATE(DATE_FORMAT(${col}, '%Y-%m-01'))`;
140
141
  }
141
142
  else if (aggregatedField.args.by === nestjs_query_core_1.GroupBy.WEEK) {
142
- query = `STR_TO_DATE(DATE_FORMAT(${col}, '%X-%V-01'), '%X-%V-%w')`;
143
+ query = `DATE_SUB(DATE(${col}), INTERVAL WEEKDAY(${col}) DAY)`;
143
144
  }
144
145
  }
145
146
  return [query, groupByAlias];
@@ -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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"}
@@ -41,6 +41,7 @@ export interface NestedRecord<E = unknown> {
41
41
  export interface NestedRelationsAliased {
42
42
  [keys: string]: {
43
43
  alias: string;
44
+ metadata: EntityMetadata;
44
45
  relations: NestedRelationsAliased;
45
46
  };
46
47
  }
@@ -223,10 +223,14 @@ class FilterQueryBuilder {
223
223
  }
224
224
  getReferencedRelationsWithAliasRecursive(metadata, filter = {}, selectRelations = []) {
225
225
  const referencedRelations = this.getReferencedRelationsRecursive(metadata, filter, selectRelations);
226
- return this.injectRelationsAliasRecursive(referencedRelations);
226
+ return this.injectRelationsAliasRecursive(metadata, referencedRelations);
227
227
  }
228
- injectRelationsAliasRecursive(relations, counter = new Map()) {
228
+ injectRelationsAliasRecursive(metadata, relations, counter = new Map()) {
229
229
  return Object.entries(relations).reduce((prev, [name, children]) => {
230
+ const relationMetadata = metadata.relations.find(({ propertyName }) => propertyName === name)?.inverseEntityMetadata;
231
+ if (!relationMetadata) {
232
+ return prev;
233
+ }
230
234
  const count = (counter.get(name) ?? -1) + 1;
231
235
  const alias = count === 0 ? name : `${name}_${count}`;
232
236
  counter.set(name, count);
@@ -234,7 +238,8 @@ class FilterQueryBuilder {
234
238
  ...prev,
235
239
  [name]: {
236
240
  alias,
237
- relations: this.injectRelationsAliasRecursive(children, counter)
241
+ metadata: relationMetadata,
242
+ relations: this.injectRelationsAliasRecursive(relationMetadata, children, counter)
238
243
  }
239
244
  };
240
245
  }, {});
@@ -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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"}
@@ -1,5 +1,5 @@
1
1
  import { CommonFieldComparisonBetweenType, FilterComparisonOperators } from '@ptc-org/nestjs-query-core';
2
- import { ObjectLiteral, Repository } from 'typeorm';
2
+ import { EntityMetadata, ObjectLiteral, Repository } from 'typeorm';
3
3
  /**
4
4
  * @internal
5
5
  */
@@ -18,8 +18,23 @@ export type EntityComparisonField<Entity, F extends keyof Entity> = Entity[F] |
18
18
  export declare class SQLComparisonBuilder<Entity> {
19
19
  readonly comparisonMap: Record<string, string>;
20
20
  readonly repo?: Repository<Entity>;
21
+ readonly entityMetadata: EntityMetadata | undefined;
21
22
  static DEFAULT_COMPARISON_MAP: Record<string, string>;
22
- constructor(comparisonMap?: Record<string, string>, repo?: Repository<Entity>);
23
+ /**
24
+ * @param comparisonMap - the comparison operators this builder understands.
25
+ * @param repo - repository of the entity this builder builds comparisons for.
26
+ * @param entityMetadata - metadata of the entity this builder builds comparisons for, used to
27
+ * expand virtual columns into their queries. Defaults to the metadata of `repo`, and can be
28
+ * supplied on its own when there is no repository for the entity, as is the case for a relation.
29
+ */
30
+ constructor(comparisonMap?: Record<string, string>, repo?: Repository<Entity>, entityMetadata?: EntityMetadata | undefined);
31
+ /**
32
+ * Creates a builder for an entity that has no repository to hand, such as a relation reached
33
+ * through a filter.
34
+ *
35
+ * @param entityMetadata - metadata of the entity the builder builds comparisons for.
36
+ */
37
+ static forEntityMetadata<Entity>(entityMetadata: EntityMetadata): SQLComparisonBuilder<Entity>;
23
38
  private get paramName();
24
39
  /**
25
40
  * Creates a valid SQL fragment with parameters.
@@ -7,9 +7,26 @@ const common_1 = require("../common");
7
7
  * Builder to create SQL Comparisons. (=, !=, \>, etc...)
8
8
  */
9
9
  class SQLComparisonBuilder {
10
- constructor(comparisonMap = SQLComparisonBuilder.DEFAULT_COMPARISON_MAP, repo) {
10
+ /**
11
+ * @param comparisonMap - the comparison operators this builder understands.
12
+ * @param repo - repository of the entity this builder builds comparisons for.
13
+ * @param entityMetadata - metadata of the entity this builder builds comparisons for, used to
14
+ * expand virtual columns into their queries. Defaults to the metadata of `repo`, and can be
15
+ * supplied on its own when there is no repository for the entity, as is the case for a relation.
16
+ */
17
+ constructor(comparisonMap = SQLComparisonBuilder.DEFAULT_COMPARISON_MAP, repo, entityMetadata = repo?.metadata) {
11
18
  this.comparisonMap = comparisonMap;
12
19
  this.repo = repo;
20
+ this.entityMetadata = entityMetadata;
21
+ }
22
+ /**
23
+ * Creates a builder for an entity that has no repository to hand, such as a relation reached
24
+ * through a filter.
25
+ *
26
+ * @param entityMetadata - metadata of the entity the builder builds comparisons for.
27
+ */
28
+ static forEntityMetadata(entityMetadata) {
29
+ return new SQLComparisonBuilder(SQLComparisonBuilder.DEFAULT_COMPARISON_MAP, undefined, entityMetadata);
13
30
  }
14
31
  get paramName() {
15
32
  return `param${(0, common_1.randomString)()}`;
@@ -140,11 +157,9 @@ class SQLComparisonBuilder {
140
157
  return val !== null && typeof val === 'object' && 'lower' in val && 'upper' in val;
141
158
  }
142
159
  getCol(field, alias) {
143
- if (this.repo) {
144
- const column = this.repo.metadata.columns.find(({ databasePath }) => databasePath === field);
145
- if (column && column.isVirtualProperty) {
146
- return `(${column.query(alias)})`;
147
- }
160
+ const column = this.entityMetadata?.columns.find(({ databasePath }) => databasePath === field);
161
+ if (column && column.isVirtualProperty) {
162
+ return `(${column.query(alias)})`;
148
163
  }
149
164
  return alias ? `${alias}.${field}` : `${field}`;
150
165
  }
@@ -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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"}
@@ -93,8 +93,8 @@ class WhereBuilder {
93
93
  }
94
94
  withRelationFilter(where, field, cmp, relationNames) {
95
95
  return where.andWhere(new typeorm_1.Brackets((qb) => {
96
- const relationWhere = new WhereBuilder();
97
96
  const nestedRelationAliased = relationNames[field];
97
+ const relationWhere = new WhereBuilder(sql_comparison_builder_1.SQLComparisonBuilder.forEntityMetadata(nestedRelationAliased.metadata));
98
98
  const nestedRelationAliasedAlias = nestedRelationAliased.alias;
99
99
  const nestedRelationAliasedRelationNames = nestedRelationAliased.relations;
100
100
  return relationWhere.build(qb, cmp, nestedRelationAliasedRelationNames, nestedRelationAliasedAlias);
@@ -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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"}
@@ -1,4 +1,4 @@
1
- import { AggregateOptions, AggregateQuery, AggregateResponse, Class, CountOptions, DeepPartial, DeleteManyOptions, DeleteManyResponse, DeleteOneOptions, Filter, Filterable, FindByIdOptions, GetByIdOptions, Query, QueryOptions, QueryService, UpdateManyResponse, UpdateOneOptions } from '@ptc-org/nestjs-query-core';
1
+ import { AggregateOptions, AggregateQuery, AggregateResponse, Class, CountOptions, CreateManyOptions, CreateOneOptions, DeepPartial, DeleteManyOptions, DeleteManyResponse, DeleteOneOptions, Filter, Filterable, FindByIdOptions, GetByIdOptions, Query, QueryOptions, QueryService, UpdateManyResponse, UpdateOneOptions } from '@ptc-org/nestjs-query-core';
2
2
  import { Repository } from 'typeorm';
3
3
  import { FilterQueryBuilder } from '../query';
4
4
  import { RelationQueryService } from './relation-query.service';
@@ -79,8 +79,9 @@ export declare class TypeOrmQueryService<Entity> extends RelationQueryService<En
79
79
  * const todoItem = await this.service.createOne({title: 'Todo Item', completed: false });
80
80
  * ```
81
81
  * @param record - The entity to create.
82
+ * @param opts - Additional options.
82
83
  */
83
- createOne(record: DeepPartial<Entity>): Promise<Entity>;
84
+ createOne(record: DeepPartial<Entity>, opts?: CreateOneOptions<Entity>): Promise<Entity>;
84
85
  /**
85
86
  * Create multiple entities.
86
87
  *
@@ -92,8 +93,9 @@ export declare class TypeOrmQueryService<Entity> extends RelationQueryService<En
92
93
  * ]);
93
94
  * ```
94
95
  * @param records - The entities to create.
96
+ * @param opts - Additional options.
95
97
  */
96
- createMany(records: DeepPartial<Entity>[]): Promise<Entity[]>;
98
+ createMany(records: DeepPartial<Entity>[], opts?: CreateManyOptions<Entity>): Promise<Entity[]>;
97
99
  /**
98
100
  * Update an entity.
99
101
  *
@@ -2,6 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.TypeOrmQueryService = void 0;
4
4
  const common_1 = require("@nestjs/common");
5
+ const nestjs_query_core_1 = require("@ptc-org/nestjs-query-core");
5
6
  const query_1 = require("../query");
6
7
  const relation_query_service_1 = require("./relation-query.service");
7
8
  /**
@@ -133,11 +134,11 @@ class TypeOrmQueryService extends relation_query_service_1.RelationQueryService
133
134
  * const todoItem = await this.service.createOne({title: 'Todo Item', completed: false });
134
135
  * ```
135
136
  * @param record - The entity to create.
137
+ * @param opts - Additional options.
136
138
  */
137
- async createOne(record) {
139
+ async createOne(record, opts) {
140
+ (0, nestjs_query_core_1.ensureMatchesCreationFilter)(record, opts?.filter);
138
141
  const entity = await this.ensureIsEntityAndDoesNotExist(record);
139
- // eslint-disable-next-line @typescript-eslint/ban-ts-comment
140
- // @ts-ignore
141
142
  return this.repo.save(entity);
142
143
  }
143
144
  /**
@@ -151,11 +152,11 @@ class TypeOrmQueryService extends relation_query_service_1.RelationQueryService
151
152
  * ]);
152
153
  * ```
153
154
  * @param records - The entities to create.
155
+ * @param opts - Additional options.
154
156
  */
155
- async createMany(records) {
156
- const entities = await Promise.all(records.map((r) => this.ensureIsEntityAndDoesNotExist(r)));
157
- // eslint-disable-next-line @typescript-eslint/ban-ts-comment
158
- // @ts-ignore
157
+ async createMany(records, opts) {
158
+ const creatableRecords = (0, nestjs_query_core_1.filterCreatableRecords)(records, opts?.filter);
159
+ const entities = await Promise.all(creatableRecords.map((creatableRecord) => this.ensureIsEntityAndDoesNotExist(creatableRecord)));
159
160
  return this.repo.save(entities);
160
161
  }
161
162
  /**
@@ -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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"}