@wisemen/nestjs-typeorm 1.0.1 → 1.1.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.
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { DeepPartial, 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
|
-
createAndInsert(entityLike: DeepPartial<T>): Promise<T>;
|
|
4
|
+
createAndInsert(entityLike: DeepPartial<T> | T): Promise<T>;
|
|
5
|
+
createAndInsert(entityLike: Array<DeepPartial<T> | T>): Promise<T[]>;
|
|
5
6
|
findNextBatch(options: FindOneOptions<T>, batchSize: number, lastEntity: Partial<T> | undefined): Promise<T[]>;
|
|
6
7
|
findInBatches(options: FindOneOptions<T>, batchSize: number): AsyncGenerator<T[], void, void>;
|
|
7
8
|
findByInBatches(where: FindOptionsWhere<T> | FindOptionsWhere<T>[], batchSize: number): AsyncGenerator<T[], void, void>;
|
|
@@ -7,9 +7,23 @@ export class TypeOrmRepository extends Repository {
|
|
|
7
7
|
super(entity, proxy);
|
|
8
8
|
}
|
|
9
9
|
async createAndInsert(entityLike) {
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
10
|
+
if (Array.isArray(entityLike)) {
|
|
11
|
+
const EntityClass = this.target;
|
|
12
|
+
const entities = entityLike.map(item => item instanceof EntityClass ? item : this.create(item));
|
|
13
|
+
await this.insert(entities);
|
|
14
|
+
return entities;
|
|
15
|
+
}
|
|
16
|
+
const EntityClass = this.target;
|
|
17
|
+
const isEntity = entityLike instanceof EntityClass;
|
|
18
|
+
if (isEntity) {
|
|
19
|
+
await this.insert(entityLike);
|
|
20
|
+
return entityLike;
|
|
21
|
+
}
|
|
22
|
+
else {
|
|
23
|
+
const entity = this.create(entityLike);
|
|
24
|
+
await this.insert(entity);
|
|
25
|
+
return entity;
|
|
26
|
+
}
|
|
13
27
|
}
|
|
14
28
|
async findNextBatch(options, batchSize, lastEntity) {
|
|
15
29
|
const primaryKeys = this.metadata.primaryColumns.map(column => column.propertyName);
|
|
@@ -73,12 +87,12 @@ export class TypeOrmRepository extends Repository {
|
|
|
73
87
|
for (let i = keys.length - 1; i >= 0; i--) {
|
|
74
88
|
const key = keys[i];
|
|
75
89
|
const keyLastEntityValue = keysLastEntityValues[i];
|
|
76
|
-
const
|
|
77
|
-
const
|
|
78
|
-
const
|
|
90
|
+
const precedingKeys = keys.slice(0, i);
|
|
91
|
+
const precedingKeysLastEntityValues = keysLastEntityValues.slice(0, i);
|
|
92
|
+
const precedingKeysWhere = Object.fromEntries(precedingKeys.map((k, i) => [k, precedingKeysLastEntityValues[i]]));
|
|
79
93
|
const clause = {
|
|
80
94
|
...where,
|
|
81
|
-
...
|
|
95
|
+
...precedingKeysWhere,
|
|
82
96
|
[key]: this.getKeyCondition(where, order, key, keyLastEntityValue)
|
|
83
97
|
};
|
|
84
98
|
clauses.push(clause);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repository.js","sourceRoot":"","sources":["../../lib/extensions/repository.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAsD,KAAK,EAAkB,YAAY,EAAyD,QAAQ,EAAE,QAAQ,
|
|
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": "1.0
|
|
3
|
+
"version": "1.1.0",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -25,6 +25,8 @@
|
|
|
25
25
|
"devDependencies": {
|
|
26
26
|
"@types/node": "25.3.0",
|
|
27
27
|
"eslint": "10.2.1",
|
|
28
|
+
"oxlint": "1.59.0",
|
|
29
|
+
"oxlint-tsgolint": "0.20.0",
|
|
28
30
|
"expect": "30.2.0",
|
|
29
31
|
"typescript": ">=4.8.4 <=5.9.3",
|
|
30
32
|
"@wisemen/eslint-config-nestjs": "1.1.1"
|