@wisemen/nestjs-typeorm 0.0.29 → 0.0.30
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.
|
@@ -1,13 +1,11 @@
|
|
|
1
1
|
import { type EntityManager, type EntityTarget, FindOneOptions, FindOptionsWhere, ObjectLiteral, Repository } from 'typeorm';
|
|
2
2
|
export declare class TypeOrmRepository<T extends ObjectLiteral> extends Repository<T> {
|
|
3
3
|
constructor(entity: EntityTarget<T>, manager: EntityManager);
|
|
4
|
-
findNextBatch(options: FindOneOptions<T>, batchSize: number, lastEntity: Partial<T> | undefined): Promise<T[]>;
|
|
5
4
|
findInBatches(options: FindOneOptions<T>, batchSize: number): AsyncGenerator<T[], void, void>;
|
|
6
5
|
findByInBatches(where: FindOptionsWhere<T> | FindOptionsWhere<T>[], batchSize: number): AsyncGenerator<T[], void, void>;
|
|
7
6
|
private addBatchingToOrder;
|
|
8
7
|
private addBatchingToSelect;
|
|
9
8
|
private addBatchingToWhere;
|
|
10
9
|
private addBatchConditionToWhereClause;
|
|
11
|
-
private getLastEntityEntriesForOrder;
|
|
12
10
|
private getKeyCondition;
|
|
13
11
|
}
|
|
@@ -4,24 +4,21 @@ export class TypeOrmRepository extends Repository {
|
|
|
4
4
|
constructor(entity, manager) {
|
|
5
5
|
super(entity, createTransactionManagerProxy(manager));
|
|
6
6
|
}
|
|
7
|
-
async findNextBatch(options, batchSize, lastEntity) {
|
|
8
|
-
const primaryKeys = this.metadata.primaryColumns.map(column => column.propertyName);
|
|
9
|
-
const order = this.addBatchingToOrder(options.order, primaryKeys);
|
|
10
|
-
const select = this.addBatchingToSelect(options.select, order);
|
|
11
|
-
const where = this.addBatchingToWhere(options.where, order, lastEntity);
|
|
12
|
-
return await this.find({
|
|
13
|
-
...options,
|
|
14
|
-
select,
|
|
15
|
-
where,
|
|
16
|
-
order,
|
|
17
|
-
take: batchSize
|
|
18
|
-
});
|
|
19
|
-
}
|
|
20
7
|
async *findInBatches(options, batchSize) {
|
|
8
|
+
const primaryKeys = this.metadata.primaryColumns.map(column => column.propertyName);
|
|
21
9
|
let entities = [];
|
|
22
10
|
let lastEntity = undefined;
|
|
23
11
|
do {
|
|
24
|
-
|
|
12
|
+
const order = this.addBatchingToOrder(options.order, primaryKeys);
|
|
13
|
+
const select = this.addBatchingToSelect(options.select, order);
|
|
14
|
+
const where = this.addBatchingToWhere(options.where, order, lastEntity);
|
|
15
|
+
entities = await this.find({
|
|
16
|
+
...options,
|
|
17
|
+
select,
|
|
18
|
+
where,
|
|
19
|
+
order,
|
|
20
|
+
take: batchSize
|
|
21
|
+
});
|
|
25
22
|
if (entities.length === 0)
|
|
26
23
|
return;
|
|
27
24
|
yield entities;
|
|
@@ -61,35 +58,26 @@ export class TypeOrmRepository extends Repository {
|
|
|
61
58
|
return this.addBatchConditionToWhereClause(where, order, lastEntity);
|
|
62
59
|
}
|
|
63
60
|
addBatchConditionToWhereClause(where, order, lastEntity) {
|
|
64
|
-
const [keys, keysLastEntityValues] = this.getLastEntityEntriesForOrder(order, lastEntity);
|
|
65
61
|
const clauses = [];
|
|
62
|
+
const keys = Object.keys(order);
|
|
66
63
|
for (let i = keys.length - 1; i >= 0; i--) {
|
|
67
64
|
const key = keys[i];
|
|
68
|
-
const
|
|
65
|
+
const keyLastValue = lastEntity[key];
|
|
69
66
|
const preceedingKeys = keys.slice(0, i);
|
|
70
|
-
const
|
|
71
|
-
const preceedingKeysWhere = Object.fromEntries(preceedingKeys.map((k, i) => [k,
|
|
67
|
+
const preceedingKeysLastValues = preceedingKeys.map(k => lastEntity[k]);
|
|
68
|
+
const preceedingKeysWhere = Object.fromEntries(preceedingKeys.map((k, i) => [k, preceedingKeysLastValues[i]]));
|
|
72
69
|
const clause = {
|
|
73
70
|
...where,
|
|
74
71
|
...preceedingKeysWhere,
|
|
75
|
-
[key]: this.getKeyCondition(where, order, key,
|
|
72
|
+
[key]: this.getKeyCondition(where, order, key, keyLastValue)
|
|
76
73
|
};
|
|
77
74
|
clauses.push(clause);
|
|
78
75
|
}
|
|
79
76
|
return clauses;
|
|
80
77
|
}
|
|
81
|
-
|
|
82
|
-
const keys = Object.keys(order);
|
|
83
|
-
const entityKeys = Object.keys(lastEntity);
|
|
84
|
-
if (!keys.every(key => entityKeys.includes(key))) {
|
|
85
|
-
throw new Error(`entity must include at least following properties: ${keys.join(', ')}`);
|
|
86
|
-
}
|
|
87
|
-
const keysValues = keys.map(key => lastEntity[key]);
|
|
88
|
-
return [keys, keysValues];
|
|
89
|
-
}
|
|
90
|
-
getKeyCondition(where, order, key, keyLastEntityValue) {
|
|
78
|
+
getKeyCondition(where, order, key, lastKeyValue) {
|
|
91
79
|
const existingCondition = where?.[key];
|
|
92
|
-
const batchCondition = order?.[key] === 'ASC' ? MoreThan(
|
|
80
|
+
const batchCondition = order?.[key] === 'ASC' ? MoreThan(lastKeyValue) : LessThan(lastKeyValue);
|
|
93
81
|
if (existingCondition === undefined) {
|
|
94
82
|
return batchCondition;
|
|
95
83
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repository.js","sourceRoot":"","sources":["../../lib/extensions/repository.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAyC,KAAK,EAAkB,YAAY,EAAoF,QAAQ,EAAE,QAAQ,EAAiB,UAAU,EAAE,MAAM,SAAS,CAAA;AAC1O,OAAO,EAAE,6BAA6B,EAAE,MAAM,kBAAkB,CAAA;AAEhE,MAAM,OAAO,iBAA2C,SAAQ,UAAc;IAC5E,YAAa,MAAuB,EAAE,OAAsB;QAC1D,KAAK,CAAC,MAAM,EAAE,6BAA6B,CAAC,OAAO,CAAC,CAAC,CAAA;IACvD,CAAC;IAED,KAAK,
|
|
1
|
+
{"version":3,"file":"repository.js","sourceRoot":"","sources":["../../lib/extensions/repository.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@wisemen/nestjs-typeorm",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.30",
|
|
4
4
|
"main": "./dist/index.js",
|
|
5
5
|
"types": "./dist/index.d.ts",
|
|
6
6
|
"type": "module",
|
|
@@ -18,9 +18,9 @@
|
|
|
18
18
|
"release": "pnpx release-it"
|
|
19
19
|
},
|
|
20
20
|
"devDependencies": {
|
|
21
|
-
"@types/node": "^24.
|
|
22
|
-
"eslint": "^9.
|
|
23
|
-
"expect": "^30.
|
|
21
|
+
"@types/node": "^24.5.2",
|
|
22
|
+
"eslint": "^9.36.0",
|
|
23
|
+
"expect": "^30.1.2",
|
|
24
24
|
"typescript": "^5.9.2"
|
|
25
25
|
},
|
|
26
26
|
"author": "Joren Vandeweyer",
|
|
@@ -33,10 +33,10 @@
|
|
|
33
33
|
"@nestjs/common": "^11.1.6",
|
|
34
34
|
"@nestjs/config": "^4.0.2",
|
|
35
35
|
"@nestjs/typeorm": "^11.0.0",
|
|
36
|
-
"@wisemen/coordinates": "^0.0.
|
|
37
|
-
"@wisemen/time": "^0.0.
|
|
36
|
+
"@wisemen/coordinates": "^0.0.10",
|
|
37
|
+
"@wisemen/time": "^0.0.26",
|
|
38
38
|
"change-case": "^5.4.4",
|
|
39
39
|
"class-validator": "^0.14.2",
|
|
40
|
-
"typeorm": "^0.3.
|
|
40
|
+
"typeorm": "^0.3.27"
|
|
41
41
|
}
|
|
42
42
|
}
|