@hugo.ye/common 1.0.63 → 1.0.64
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,6 +1,6 @@
|
|
|
1
1
|
import { Logger } from "@nestjs/common";
|
|
2
2
|
import { AbstractEntity } from "../index.js";
|
|
3
|
-
import { EntityManager, Repository, type DeepPartial, type FindOptionsRelations, type FindOptionsWhere } from "typeorm";
|
|
3
|
+
import { EntityManager, Repository, type DeepPartial, type FindOptionsOrder, type FindOptionsRelations, type FindOptionsWhere } from "typeorm";
|
|
4
4
|
import type { QueryDeepPartialEntity } from "typeorm/query-builder/QueryPartialEntity.js";
|
|
5
5
|
export declare abstract class AbstractRepository<T extends AbstractEntity<T>> {
|
|
6
6
|
private readonly entityManager;
|
|
@@ -10,7 +10,7 @@ export declare abstract class AbstractRepository<T extends AbstractEntity<T>> {
|
|
|
10
10
|
create(entity: T): Promise<T>;
|
|
11
11
|
findOne(where: FindOptionsWhere<T> | FindOptionsWhere<T>[], relations?: FindOptionsRelations<T>): Promise<T>;
|
|
12
12
|
findOneAndUpdate(where: FindOptionsWhere<T>, partialEntity: QueryDeepPartialEntity<T>): Promise<T>;
|
|
13
|
-
find(where: FindOptionsWhere<T> | FindOptionsWhere<T>[], relations?: FindOptionsRelations<T>): Promise<T[]>;
|
|
13
|
+
find(where: FindOptionsWhere<T> | FindOptionsWhere<T>[], relations?: FindOptionsRelations<T>, order?: FindOptionsOrder<T>): Promise<T[]>;
|
|
14
14
|
findOneAndDelete(where: FindOptionsWhere<T>): Promise<import("typeorm").DeleteResult>;
|
|
15
15
|
save(entity: DeepPartial<T>): Promise<DeepPartial<T> & T>;
|
|
16
16
|
getRepository(): Repository<T>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abstract.repository.d.ts","sourceRoot":"","sources":["../../src/database/abstract.repository.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAqB,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAG,UAAU,EAAE,KAAK,WAAW,EAAE,KAAK,oBAAoB,EAAE,KAAK,gBAAgB,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"abstract.repository.d.ts","sourceRoot":"","sources":["../../src/database/abstract.repository.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAqB,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAG,UAAU,EAAE,KAAK,WAAW,EAAE,KAAK,gBAAgB,EAAE,KAAK,oBAAoB,EAAE,KAAK,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAChJ,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6CAA6C,CAAC;AAE1F,8BAAsB,kBAAkB,CAAC,CAAC,SAAS,cAAc,CAAC,CAAC,CAAC;IAI5D,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IAJrC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;gBAGb,aAAa,EAAE,aAAa,EAC5B,gBAAgB,EAAE,UAAU,CAAC,CAAC,CAAC;IAG9C,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAI7B,OAAO,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,EAAE,EAAE,SAAS,CAAC,EAAE,oBAAoB,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAS5G,gBAAgB,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,sBAAsB,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IASlG,IAAI,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,EAAE,EAAE,SAAS,CAAC,EAAE,oBAAoB,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAC,gBAAgB,CAAC,CAAC,CAAC;IASxH,gBAAgB,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC;IAI3C,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;IAIjC,aAAa;CAIhB"}
|
|
@@ -27,8 +27,14 @@ export class AbstractRepository {
|
|
|
27
27
|
}
|
|
28
28
|
return this.findOne(where);
|
|
29
29
|
}
|
|
30
|
-
async find(where, relations) {
|
|
31
|
-
|
|
30
|
+
async find(where, relations, order) {
|
|
31
|
+
const condition = { where: { ...where } };
|
|
32
|
+
if (relations)
|
|
33
|
+
Object.assign(condition, { relations: { ...relations } });
|
|
34
|
+
if (order)
|
|
35
|
+
Object.assign(condition, { order: { ...order } });
|
|
36
|
+
return await this.entityRepository.find(condition);
|
|
37
|
+
// return relations ? await this.entityRepository.find({ where, relations }) : await this.entityRepository.find({ where });
|
|
32
38
|
}
|
|
33
39
|
async findOneAndDelete(where) {
|
|
34
40
|
return await this.entityRepository.delete(where);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abstract.repository.js","sourceRoot":"","sources":["../../src/database/abstract.repository.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAG,UAAU,
|
|
1
|
+
{"version":3,"file":"abstract.repository.js","sourceRoot":"","sources":["../../src/database/abstract.repository.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAG,UAAU,EAA6F,MAAM,SAAS,CAAC;AAGhJ,MAAM,OAAgB,kBAAkB;IAIf;IACA;IAFrB,YACqB,aAA4B,EAC5B,gBAA+B;QAD/B,kBAAa,GAAb,aAAa,CAAe;QAC5B,qBAAgB,GAAhB,gBAAgB,CAAe;IAChD,CAAC;IAEL,KAAK,CAAC,MAAM,CAAC,MAAS;QAClB,OAAO,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACjD,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,KAAkD,EAAE,SAAmC;QACjG,MAAM,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QACtI,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mCAAmC,EAAE,KAAK,CAAC,CAAA;YAC5D,MAAM,IAAI,iBAAiB,CAAC,sBAAsB,CAAC,CAAC;QACxD,CAAC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,KAA0B,EAAE,aAAwC;QACvF,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;QAC9E,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC;YACzB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mCAAmC,EAAE,KAAK,CAAC,CAAA;YAC5D,MAAM,IAAI,iBAAiB,CAAC,sBAAsB,CAAC,CAAC;QACxD,CAAC;QACD,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,KAAkD,EAAE,SAAmC,EAAE,KAA0B;QAC1H,MAAM,SAAS,GAAG,EAAC,KAAK,EAAC,EAAC,GAAG,KAAK,EAAC,EAAC,CAAC;QACrC,IAAI,SAAS;YAAE,MAAM,CAAC,MAAM,CAAC,SAAS,EAAC,EAAC,SAAS,EAAC,EAAC,GAAG,SAAS,EAAC,EAAC,CAAC,CAAC;QACnE,IAAI,KAAK;YAAE,MAAM,CAAC,MAAM,CAAC,SAAS,EAAC,EAAC,KAAK,EAAC,EAAC,GAAG,KAAK,EAAC,EAAC,CAAC,CAAC;QACvD,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACnD,2HAA2H;IAC/H,CAAC;IAGD,KAAK,CAAC,gBAAgB,CAAC,KAA0B;QAC7C,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,MAAsB;QAC7B,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACpD,CAAC;IAED,aAAa;QACT,OAAO,IAAI,CAAC,gBAAgB,CAAC;IACjC,CAAC;CAEJ"}
|