@nmxjs/app 1.0.64 → 1.0.65
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
|
@@ -24,5 +24,5 @@ export declare class CrudService<E extends object, D extends object> {
|
|
|
24
24
|
delete: (idsOrOptions: string[] | FindOptionsWhere<E> | FindOptionsWhere<E>[]) => Promise<{
|
|
25
25
|
ok: boolean;
|
|
26
26
|
}>;
|
|
27
|
-
list(options
|
|
27
|
+
list({ filters, pagination, sorts, ...options }?: ICrudListOptions<E>): Promise<ListResponseDto<D>>;
|
|
28
28
|
}
|
package/dist/CrudService.js
CHANGED
|
@@ -1,9 +1,21 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __rest = (this && this.__rest) || function (s, e) {
|
|
3
|
+
var t = {};
|
|
4
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
|
5
|
+
t[p] = s[p];
|
|
6
|
+
if (s != null && typeof Object.getOwnPropertySymbols === "function")
|
|
7
|
+
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
|
|
8
|
+
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
|
|
9
|
+
t[p[i]] = s[p[i]];
|
|
10
|
+
}
|
|
11
|
+
return t;
|
|
12
|
+
};
|
|
2
13
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
14
|
exports.CrudService = void 0;
|
|
4
15
|
const utils_1 = require("@nmxjs/utils");
|
|
5
16
|
const types_1 = require("@nmxjs/types");
|
|
6
17
|
const typeorm_1 = require("typeorm");
|
|
18
|
+
const constants_1 = require("@nmxjs/constants");
|
|
7
19
|
class CrudService {
|
|
8
20
|
constructor(repository) {
|
|
9
21
|
this.repository = repository;
|
|
@@ -63,24 +75,12 @@ class CrudService {
|
|
|
63
75
|
ok,
|
|
64
76
|
};
|
|
65
77
|
}
|
|
66
|
-
async list(
|
|
67
|
-
var
|
|
68
|
-
|
|
69
|
-
const
|
|
70
|
-
const
|
|
71
|
-
const
|
|
72
|
-
if ((_c = options.pagination) === null || _c === void 0 ? void 0 : _c.limit) {
|
|
73
|
-
builder.limit(options.pagination.limit);
|
|
74
|
-
}
|
|
75
|
-
if (hasPagination) {
|
|
76
|
-
builder.offset((options.pagination.page - 1) * options.pagination.limit);
|
|
77
|
-
}
|
|
78
|
-
Object.keys(relations).forEach(key => {
|
|
79
|
-
if (!relations[key]) {
|
|
80
|
-
return;
|
|
81
|
-
}
|
|
82
|
-
builder.leftJoinAndSelect(`${this.repository.metadata.tableName}.${key}`, key);
|
|
83
|
-
});
|
|
78
|
+
async list(_a = {}) {
|
|
79
|
+
var _b;
|
|
80
|
+
var { filters = [], pagination, sorts } = _a, options = __rest(_a, ["filters", "pagination", "sorts"]);
|
|
81
|
+
const page = (pagination === null || pagination === void 0 ? void 0 : pagination.page) || 1;
|
|
82
|
+
const limit = (pagination === null || pagination === void 0 ? void 0 : pagination.limit) || constants_1.paginationLimit;
|
|
83
|
+
const findOptions = Object.assign(Object.assign({}, options), { order: options.order || {}, where: options.where || {}, take: limit, skip: Math.round((page - 1) * limit) });
|
|
84
84
|
let where = filters.reduce((res, v) => {
|
|
85
85
|
const field = (0, utils_1.camelToSnakeCase)(v.field);
|
|
86
86
|
if (v.operator === types_1.FilterOperatorEnum.EQ) {
|
|
@@ -109,30 +109,21 @@ class CrudService {
|
|
|
109
109
|
}
|
|
110
110
|
return res;
|
|
111
111
|
}, {});
|
|
112
|
-
(
|
|
113
|
-
|
|
114
|
-
builder.orderBy(v.field, v.type);
|
|
115
|
-
}
|
|
116
|
-
else {
|
|
117
|
-
builder.addOrderBy(v.field, v.type);
|
|
118
|
-
}
|
|
112
|
+
(_b = options.sorts) === null || _b === void 0 ? void 0 : _b.forEach(v => {
|
|
113
|
+
findOptions.order[v.field] = v.type;
|
|
119
114
|
});
|
|
120
|
-
if (Array.isArray(
|
|
121
|
-
where = [...(Object.keys(where).length ? [where] : []), ...
|
|
115
|
+
if (Array.isArray(findOptions.where)) {
|
|
116
|
+
findOptions.where = [...(Object.keys(where).length ? [where] : []), ...findOptions.where];
|
|
122
117
|
}
|
|
123
118
|
else if (options.where) {
|
|
124
|
-
where = Object.assign(Object.assign({}, where),
|
|
119
|
+
findOptions.where = Object.assign(Object.assign({}, where), findOptions.where);
|
|
125
120
|
}
|
|
126
121
|
const [totalCount, items] = await Promise.all([
|
|
127
|
-
this.repository.
|
|
128
|
-
|
|
129
|
-
.where(where)
|
|
130
|
-
.select('*')
|
|
131
|
-
.execute()
|
|
132
|
-
.then(res => res.map(v => this.repository.entityToDto(v))),
|
|
122
|
+
this.repository.count(findOptions),
|
|
123
|
+
this.repository.find(findOptions).then(res => res.map(v => this.repository.entityToDto(v))),
|
|
133
124
|
]);
|
|
134
|
-
const
|
|
135
|
-
const
|
|
125
|
+
const nextPage = page + 1;
|
|
126
|
+
const totalPages = Math.ceil(totalCount / limit);
|
|
136
127
|
return {
|
|
137
128
|
items,
|
|
138
129
|
cursor: Object.assign({ totalCount,
|
package/dist/CrudService.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CrudService.js","sourceRoot":"","sources":["../src/CrudService.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"CrudService.js","sourceRoot":"","sources":["../src/CrudService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
/// <reference types="types" />
|
|
2
2
|
import { ListRequestDto } from '@nmxjs/types';
|
|
3
|
-
import {
|
|
4
|
-
export interface ICrudListOptions<E extends object> extends ListRequestDto {
|
|
5
|
-
relations?: FindOptionsRelations<E>;
|
|
6
|
-
where?: FindOptionsWhere<E> | FindOptionsWhere<E>[];
|
|
3
|
+
import { FindManyOptions } from 'typeorm';
|
|
4
|
+
export interface ICrudListOptions<E extends object> extends ListRequestDto, FindManyOptions<E> {
|
|
7
5
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nmxjs/app",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.65",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -32,8 +32,9 @@
|
|
|
32
32
|
"@nestjs/microservices": "^10.3.0",
|
|
33
33
|
"@nestjs/testing": "^10.3.4",
|
|
34
34
|
"@nestjs/typeorm": "^10.0.0",
|
|
35
|
-
"@nmxjs/
|
|
35
|
+
"@nmxjs/constants": "^1.0.4",
|
|
36
36
|
"@nmxjs/errors": "^1.0.7",
|
|
37
|
+
"@nmxjs/utils": "^1.0.14",
|
|
37
38
|
"apollo-server-express": "^3.10.2",
|
|
38
39
|
"compression": "^1.7.4",
|
|
39
40
|
"graphql": "^16.6.0",
|
|
@@ -49,6 +50,6 @@
|
|
|
49
50
|
"@nmxjs/api": "^1.1.16",
|
|
50
51
|
"@nmxjs/config": "^1.0.8",
|
|
51
52
|
"@nmxjs/events": "^1.0.9",
|
|
52
|
-
"@nmxjs/types": "^1.0.
|
|
53
|
+
"@nmxjs/types": "^1.0.11"
|
|
53
54
|
}
|
|
54
55
|
}
|