@nmxjs/app 1.0.59 → 1.0.61
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/dist/CrudService.d.ts
CHANGED
|
@@ -12,7 +12,7 @@ export declare class CrudService<E extends object, D extends object> {
|
|
|
12
12
|
createMany: (payload: Partial<E>[]) => Promise<{
|
|
13
13
|
ids: string[];
|
|
14
14
|
}>;
|
|
15
|
-
update(idOrOptions: string | FindOptionsWhere<E
|
|
15
|
+
update(idOrOptions: string | FindOptionsWhere<E> | FindOptionsWhere<E>[], payload: Partial<E>): Promise<{
|
|
16
16
|
ok: boolean;
|
|
17
17
|
}>;
|
|
18
18
|
get: (options?: FindManyOptions<E>) => Promise<{
|
|
@@ -21,7 +21,7 @@ export declare class CrudService<E extends object, D extends object> {
|
|
|
21
21
|
getOne: (idOrOptions: string | FindOneOptions<E>) => Promise<{
|
|
22
22
|
item: D;
|
|
23
23
|
}>;
|
|
24
|
-
delete: (idsOrOptions: string[] | FindOptionsWhere<E>) => Promise<{
|
|
24
|
+
delete: (idsOrOptions: string[] | FindOptionsWhere<E> | FindOptionsWhere<E>[]) => Promise<{
|
|
25
25
|
ok: boolean;
|
|
26
26
|
}>;
|
|
27
27
|
list(options: ICrudListOptions<E>): Promise<ListResponseDto<D>>;
|
package/dist/CrudService.js
CHANGED
|
@@ -35,7 +35,7 @@ class CrudService {
|
|
|
35
35
|
}));
|
|
36
36
|
this.delete = (idsOrOptions) => this.repository
|
|
37
37
|
.createQueryBuilder()
|
|
38
|
-
.where(Array.isArray(idsOrOptions) ? { id: (0, typeorm_1.In)(idsOrOptions) } : idsOrOptions)
|
|
38
|
+
.where(Array.isArray(idsOrOptions) && typeof idsOrOptions[0] === 'string' ? { id: (0, typeorm_1.In)(idsOrOptions) } : idsOrOptions)
|
|
39
39
|
.execute()
|
|
40
40
|
.then(res => ({
|
|
41
41
|
ok: res.affected > 0,
|
|
@@ -77,7 +77,7 @@ class CrudService {
|
|
|
77
77
|
relations.forEach(v => {
|
|
78
78
|
builder.leftJoinAndSelect(`${this.repository.metadata.tableName}.${v}`, v);
|
|
79
79
|
});
|
|
80
|
-
|
|
80
|
+
let where = filters.reduce((res, v) => {
|
|
81
81
|
const field = (0, utils_1.camelToSnakeCase)(v.field);
|
|
82
82
|
if (v.operator === types_1.FilterOperatorEnum.EQ) {
|
|
83
83
|
res[field] = v.values[0];
|
|
@@ -104,7 +104,7 @@ class CrudService {
|
|
|
104
104
|
res[field] = (0, typeorm_1.Not)(res[v.field]);
|
|
105
105
|
}
|
|
106
106
|
return res;
|
|
107
|
-
}, {})
|
|
107
|
+
}, {});
|
|
108
108
|
(_d = options.sorts) === null || _d === void 0 ? void 0 : _d.forEach((v, i) => {
|
|
109
109
|
if (i === 0) {
|
|
110
110
|
builder.orderBy(v.field, v.type);
|
|
@@ -113,6 +113,12 @@ class CrudService {
|
|
|
113
113
|
builder.addOrderBy(v.field, v.type);
|
|
114
114
|
}
|
|
115
115
|
});
|
|
116
|
+
if (Array.isArray(options.where)) {
|
|
117
|
+
where = [where, ...options.where];
|
|
118
|
+
}
|
|
119
|
+
else if (options.where) {
|
|
120
|
+
where = Object.assign(Object.assign({}, where), options.where);
|
|
121
|
+
}
|
|
116
122
|
const [totalCount, items] = await Promise.all([
|
|
117
123
|
this.repository.createQueryBuilder().where(where).getCount(),
|
|
118
124
|
builder
|
package/dist/CrudService.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CrudService.js","sourceRoot":"","sources":["../src/CrudService.ts"],"names":[],"mappings":";;;AAAA,wCAAgE;AAChE,wCAAmE;AACnE,qCAAiJ;AAIjJ,MAAa,WAAW;IACtB,YAA+B,UAAiC;QAAjC,eAAU,GAAV,UAAU,CAAuB;QAEzD,WAAM,GAAG,CAAC,OAAmB,EAAE,EAAE,CACtC,IAAI,CAAC,UAAU;aACZ,kBAAkB,EAAE;aACpB,MAAM,EAAE;aACR,MAAM,CAAM,IAAA,sBAAc,EAAC,OAAO,CAAC,CAAC;aACpC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC;aACjB,OAAO,EAAE;aACT,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACZ,EAAE,EAAU,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE;SAC1B,CAAC,CAAC,CAAC;QAED,eAAU,GAAG,CAAC,OAAqB,EAAE,EAAE,CAC5C,IAAI,CAAC,UAAU;aACZ,kBAAkB,EAAE;aACpB,MAAM,EAAE;aACR,MAAM,CAAM,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,sBAAc,EAAC,CAAC,CAAC,CAAC,CAAC;aAChD,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC;aACjB,OAAO,EAAE;aACT,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACZ,GAAG,EAAY,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACtC,CAAC,CAAC,CAAC;QA4BD,QAAG,GAAG,CAAC,OAA4B,EAAE,EAAE,CAC5C,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACzC,KAAK,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAK,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;SACzD,CAAC,CAAC,CAAC;QAEC,WAAM,GAAG,CAAC,WAAuC,EAAE,EAAE,CAC1D,CAAC,WAAW;YACV,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,EAAK,IAAI,EAAE,CAAC;YACpC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAiB,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACnI,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC;aACvC,CAAC,CAAC,CAAC;QAEH,WAAM,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"CrudService.js","sourceRoot":"","sources":["../src/CrudService.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,5 +3,5 @@ import { ListRequestDto } from '@nmxjs/types';
|
|
|
3
3
|
import { FindOptionsWhere } from 'typeorm';
|
|
4
4
|
export interface ICrudListOptions<E extends object> extends ListRequestDto {
|
|
5
5
|
relations?: Array<keyof E>;
|
|
6
|
-
where
|
|
6
|
+
where?: FindOptionsWhere<E> | FindOptionsWhere<E>[];
|
|
7
7
|
}
|