nicot 1.1.16 → 1.1.18
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/README.md +1 -0
- package/dist/src/bases/id-base.d.ts +1 -0
- package/dist/src/bases/id-base.js +4 -1
- package/dist/src/bases/id-base.js.map +1 -1
- package/dist/src/crud-base.js +2 -3
- package/dist/src/crud-base.js.map +1 -1
- package/dist/src/decorators/query.js +10 -1
- package/dist/src/decorators/query.js.map +1 -1
- package/dist/src/utility/cursor-pagination-utils.d.ts +2 -1
- package/dist/src/utility/cursor-pagination-utils.js +128 -33
- package/dist/src/utility/cursor-pagination-utils.js.map +1 -1
- package/dist/src/utility/filter-relations.d.ts +8 -1
- package/dist/src/utility/filter-relations.js +59 -11
- package/dist/src/utility/filter-relations.js.map +1 -1
- package/dist/src/utility/query-full-text-column-options.interface.d.ts +1 -0
- package/dist/src/utility/subject-registry.d.ts +3 -0
- package/dist/src/utility/subject-registry.js +19 -0
- package/dist/src/utility/subject-registry.js.map +1 -0
- package/dist/src/utility/unshift-order-by.d.ts +2 -0
- package/dist/src/utility/unshift-order-by.js +18 -0
- package/dist/src/utility/unshift-order-by.js.map +1 -0
- package/package.json +2 -2
package/README.md
CHANGED
|
@@ -230,6 +230,7 @@ NICOT 提供了一套查询装饰器，用于在 Entity 字段上声明支持的
|
|
|
230
230
|
@QueryFullText({
|
|
231
231
|
configuration: 'english', // 使用 postgres 搜索配置
|
|
232
232
|
tsQueryFunction: 'websearch_to_tsquery'// 使用的 tsquery 函数。默认为 websearch_to_tsquery
|
|
233
|
+
orderBySimilarity: true, // 使用相似度排序
|
|
233
234
|
})
|
|
234
235
|
englishContent: string;
|
|
235
236
|
|
|
@@ -12,7 +12,9 @@ function IdBase(idOptions = {}) {
|
|
|
12
12
|
const cl = class IdBase extends time_base_1.TimeBase {
|
|
13
13
|
applyQuery(qb, entityName) {
|
|
14
14
|
super.applyQuery(qb, entityName);
|
|
15
|
-
|
|
15
|
+
if (!idOptions.noOrderById) {
|
|
16
|
+
qb.orderBy(`${entityName}.id`, 'DESC');
|
|
17
|
+
}
|
|
16
18
|
(0, utility_1.applyQueryProperty)(this, qb, entityName, 'id');
|
|
17
19
|
}
|
|
18
20
|
};
|
|
@@ -33,6 +35,7 @@ function StringIdBase(idOptions) {
|
|
|
33
35
|
const cl = class StringIdBase extends time_base_1.TimeBase {
|
|
34
36
|
applyQuery(qb, entityName) {
|
|
35
37
|
super.applyQuery(qb, entityName);
|
|
38
|
+
console.log('idbase order by');
|
|
36
39
|
qb.orderBy(`${entityName}.id`, 'ASC');
|
|
37
40
|
(0, utility_1.applyQueryProperty)(this, qb, entityName, 'id');
|
|
38
41
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"id-base.js","sourceRoot":"","sources":["../../../src/bases/id-base.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"id-base.js","sourceRoot":"","sources":["../../../src/bases/id-base.ts"],"names":[],"mappings":";;AAiBA,wBAuBC;AAOD,oCA4BC;AA3ED,2CAAuC;AACvC,qCAAwD;AACxD,wCAAgD;AAChD,8CAKuB;AACvB,qDAAuD;AACvD,qCAAkD;AAOlD,SAAgB,MAAM,CAAC,YAAuB,EAAE;IAC9C,MAAM,EAAE,GAAG,MAAM,MAAO,SAAQ,oBAAQ;QAE7B,UAAU,CAAC,EAA8B,EAAE,UAAkB;YACpE,KAAK,CAAC,UAAU,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;YACjC,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;gBAC3B,EAAE,CAAC,OAAO,CAAC,GAAG,UAAU,KAAK,EAAE,MAAM,CAAC,CAAC;YACzC,CAAC;YACD,IAAA,4BAAkB,EAAC,IAAI,EAAE,EAAE,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;QACjD,CAAC;KACF,CAAC;IACF,MAAM,GAAG,GAAG,IAAA,iCAAuB,EAAC;QAClC,IAAA,wBAAW,GAAE;QACb,IAAA,sBAAS,EAAC,QAAQ,EAAE;YAClB,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,SAAS,CAAC,WAAW;YAClC,YAAY,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE;SACjD,CAAC;QACF,OAAO,CAAC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;QACvC,IAAA,mBAAS,EAAC,WAAW,CAAC;KACvB,CAAC,CAAC;IACH,GAAG,CAAC,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IACxB,OAAO,EAAE,CAAC;AACZ,CAAC;AAOD,SAAgB,YAAY,CAAC,SAA0B;IACrD,MAAM,EAAE,GAAG,MAAM,YAAa,SAAQ,oBAAQ;QAGnC,UAAU,CACjB,EAAoC,EACpC,UAAkB;YAElB,KAAK,CAAC,UAAU,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;YACjC,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;YAC/B,EAAE,CAAC,OAAO,CAAC,GAAG,UAAU,KAAK,EAAE,KAAK,CAAC,CAAC;YACtC,IAAA,4BAAkB,EAAC,IAAI,EAAE,EAAE,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;QACjD,CAAC;KACF,CAAC;IACF,MAAM,IAAI,GAAG;QACX,IAAA,yBAAY,EAAC,SAAS,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE;YAC5D,QAAQ,EAAE,CAAC,SAAS,CAAC,IAAI;YACzB,WAAW,EAAE,SAAS,CAAC,WAAW;YAClC,YAAY,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE;SACjD,CAAC;QACF,OAAO,CAAC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;QACvC,GAAG,CAAC,SAAS,CAAC,IAAI;YAChB,CAAC,CAAC,CAAC,IAAA,mBAAS,EAAC,MAAM,CAAC,EAAE,IAAA,wBAAW,GAAE,CAAC;YACpC,CAAC,CAAC,CAAC,IAAA,0BAAQ,GAAE,EAAE,IAAA,4BAAU,GAAE,EAAE,IAAA,0BAAa,GAAE,CAAC,CAAC;KACjD,CAAC;IACF,MAAM,GAAG,GAAG,IAAA,iCAAuB,EAAC,IAAI,CAAC,CAAC;IAC1C,GAAG,CAAC,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IACxB,OAAO,EAAE,CAAC;AACZ,CAAC"}
|
package/dist/src/crud-base.js
CHANGED
|
@@ -74,7 +74,7 @@ class CrudBase {
|
|
|
74
74
|
this.importReturnMessageDto = (0, nesties_1.ReturnMessageDto)([this.importEntryDto]);
|
|
75
75
|
this.entityPaginatedReturnMessageDto = (0, nesties_1.PaginatedReturnMessageDto)(this.entityClass);
|
|
76
76
|
this.entityCursorPaginatedReturnMessageDto = (0, cursor_pagination_1.CursorPaginationReturnMessageDto)(this.entityClass);
|
|
77
|
-
this.entityRelations = (0, filter_relations_1.filterRelations)(this.entityClass, this.crudOptions.relations);
|
|
77
|
+
this.entityRelations = (0, filter_relations_1.filterRelations)(this.entityClass, this.crudOptions.relations, (r) => !r.computed);
|
|
78
78
|
this.extraGetQuery = this.crudOptions.extraGetQuery || ((qb) => { });
|
|
79
79
|
this.log = new common_1.ConsoleLogger(`${this.entityClass.name}Service`);
|
|
80
80
|
this._typeormRelations = (0, get_typeorm_relations_1.getTypeormRelations)(this.entityClass);
|
|
@@ -279,7 +279,6 @@ class CrudBase {
|
|
|
279
279
|
condition(ent, qb, this.entityAliasName, field);
|
|
280
280
|
}
|
|
281
281
|
}
|
|
282
|
-
ent.applyQuery?.(qb, this.entityAliasName);
|
|
283
282
|
}
|
|
284
283
|
queryBuilder() {
|
|
285
284
|
return this.repo.createQueryBuilder(this.entityAliasName);
|
|
@@ -349,7 +348,7 @@ class CrudBase {
|
|
|
349
348
|
extraQuery = () => { }) {
|
|
350
349
|
const { query, pageSettings } = await this._preFindAll(ent, extraQuery);
|
|
351
350
|
try {
|
|
352
|
-
const { data, paginatedResult } = await (0, cursor_pagination_utils_1.getPaginatedResult)(query, this.entityAliasName, pageSettings.getRecordsPerPage(), ent.paginationCursor);
|
|
351
|
+
const { data, paginatedResult } = await (0, cursor_pagination_utils_1.getPaginatedResult)(query, this.entityClass, this.entityAliasName, pageSettings.getRecordsPerPage(), ent.paginationCursor);
|
|
353
352
|
await Promise.all(data.map((ent) => ent.afterGet?.()));
|
|
354
353
|
return new this.entityCursorPaginatedReturnMessageDto(200, 'success', this.cleanEntityNotInResultFields(data), paginatedResult);
|
|
355
354
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crud-base.js","sourceRoot":"","sources":["../../src/crud-base.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"crud-base.js","sourceRoot":"","sources":["../../src/crud-base.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,8 @@ exports.QueryFullText = exports.QueryNotEqual = exports.QueryLessEqual = exports
|
|
|
4
4
|
const metadata_1 = require("../utility/metadata");
|
|
5
5
|
const utility_1 = require("../utility");
|
|
6
6
|
const nesties_1 = require("nesties");
|
|
7
|
+
const unshift_order_by_1 = require("../utility/unshift-order-by");
|
|
8
|
+
const subject_registry_1 = require("../utility/subject-registry");
|
|
7
9
|
const QueryCondition = (cond) => metadata_1.Metadata.set('queryCondition', cond, 'queryConditionFields');
|
|
8
10
|
exports.QueryCondition = QueryCondition;
|
|
9
11
|
const QueryEqual = () => (0, exports.QueryCondition)(utility_1.applyQueryProperty);
|
|
@@ -44,9 +46,16 @@ const QueryFullText = (options = {}) => {
|
|
|
44
46
|
return;
|
|
45
47
|
const fieldName = key;
|
|
46
48
|
const typeormField = key;
|
|
47
|
-
|
|
49
|
+
const tsVectorStatement = `to_tsvector('${configurationName}', "${entityName}"."${fieldName}")`;
|
|
50
|
+
const tsQueryStatement = `${tsQueryFunction}('${configurationName}', :${typeormField})`;
|
|
51
|
+
qb.andWhere(`${tsVectorStatement} @@ ${tsQueryStatement}`, {
|
|
48
52
|
[typeormField]: obj[key],
|
|
49
53
|
});
|
|
54
|
+
if (options.orderBySimilarity) {
|
|
55
|
+
const rankVirtualField = `_fulltext_rank_${key}`;
|
|
56
|
+
(0, subject_registry_1.addSubject)(qb, `ts_rank(${tsVectorStatement}, ${tsQueryStatement})`, rankVirtualField);
|
|
57
|
+
(0, unshift_order_by_1.unshiftOrderBy)(qb, `"${rankVirtualField}"`, 'DESC');
|
|
58
|
+
}
|
|
50
59
|
}),
|
|
51
60
|
metadata_1.Metadata.set('queryFullTextColumn', {
|
|
52
61
|
...options,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../src/decorators/query.ts"],"names":[],"mappings":";;;AACA,kDAA+C;AAC/C,wCAMoB;AAEpB,qCAAkD;
|
|
1
|
+
{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../src/decorators/query.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { SelectQueryBuilder } from 'typeorm';
|
|
2
|
+
import { AnyClass } from 'nesties';
|
|
2
3
|
export type TypeormOrderByObject = {
|
|
3
4
|
order: 'ASC' | 'DESC';
|
|
4
5
|
nulls?: 'NULLS FIRST' | 'NULLS LAST';
|
|
@@ -6,7 +7,7 @@ export type TypeormOrderByObject = {
|
|
|
6
7
|
export type TypeormOrderByKey = 'ASC' | 'DESC';
|
|
7
8
|
export type TypeormOrderBy = ('ASC' | 'DESC') | TypeormOrderByObject;
|
|
8
9
|
export declare function extractValueFromOrderByKey(obj: any, key: string, entityAliasName?: string): any;
|
|
9
|
-
export declare function getPaginatedResult<T>(qb: SelectQueryBuilder<T>, entityAliasName: string, take: number, cursor?: string): Promise<{
|
|
10
|
+
export declare function getPaginatedResult<T>(qb: SelectQueryBuilder<T>, entityClass: AnyClass, entityAliasName: string, take: number, cursor?: string): Promise<{
|
|
10
11
|
data: T[];
|
|
11
12
|
paginatedResult: {
|
|
12
13
|
nextCursor: string;
|
|
@@ -8,13 +8,30 @@ exports.getPaginatedResult = getPaginatedResult;
|
|
|
8
8
|
const typeorm_1 = require("typeorm");
|
|
9
9
|
const lodash_1 = __importDefault(require("lodash"));
|
|
10
10
|
const superjson_1 = __importDefault(require("superjson"));
|
|
11
|
-
|
|
11
|
+
const filter_relations_1 = require("./filter-relations");
|
|
12
|
+
const subject_registry_1 = require("./subject-registry");
|
|
13
|
+
function getValueFromOrderBy(orderBy, reversed = false) {
|
|
14
|
+
if (reversed) {
|
|
15
|
+
const value = getValueFromOrderBy(orderBy, false);
|
|
16
|
+
return value === 'ASC' ? 'DESC' : 'ASC';
|
|
17
|
+
}
|
|
12
18
|
return typeof orderBy === 'string' ? orderBy : orderBy.order;
|
|
13
19
|
}
|
|
14
|
-
function
|
|
20
|
+
function getNullsFromOrderBy(orderBy, reversed = false) {
|
|
21
|
+
if (reversed) {
|
|
22
|
+
const value = getNullsFromOrderBy(orderBy, false);
|
|
23
|
+
return value === 'NULLS FIRST' ? 'NULLS LAST' : 'NULLS FIRST';
|
|
24
|
+
}
|
|
25
|
+
const nulls = typeof orderBy === 'string' ? undefined : orderBy.nulls;
|
|
26
|
+
if (!nulls) {
|
|
27
|
+
const value = getValueFromOrderBy(orderBy);
|
|
28
|
+
return value === 'ASC' ? 'NULLS FIRST' : 'NULLS LAST';
|
|
29
|
+
}
|
|
30
|
+
return nulls;
|
|
31
|
+
}
|
|
32
|
+
function getOperator(orderBy) {
|
|
15
33
|
const value = getValueFromOrderBy(orderBy);
|
|
16
|
-
|
|
17
|
-
return isBackwards ? '<' : '>';
|
|
34
|
+
return value === 'ASC' ? '>' : '<';
|
|
18
35
|
}
|
|
19
36
|
function getReversedTypeormOrderBy(orderBy) {
|
|
20
37
|
if (typeof orderBy === 'string') {
|
|
@@ -55,13 +72,16 @@ function getTypeormOrderBy(qb) {
|
|
|
55
72
|
function extractValueFromOrderByKey(obj, key, entityAliasName) {
|
|
56
73
|
const getField = (obj, key) => {
|
|
57
74
|
const value = obj[key];
|
|
58
|
-
if (
|
|
59
|
-
return
|
|
75
|
+
if (value == null)
|
|
76
|
+
return value;
|
|
60
77
|
if (Array.isArray(value)) {
|
|
78
|
+
/*
|
|
61
79
|
if (!value.length) {
|
|
62
|
-
|
|
80
|
+
return undefined;
|
|
63
81
|
}
|
|
64
82
|
return value[value.length - 1];
|
|
83
|
+
*/
|
|
84
|
+
return undefined;
|
|
65
85
|
}
|
|
66
86
|
return value;
|
|
67
87
|
};
|
|
@@ -72,13 +92,13 @@ function extractValueFromOrderByKey(obj, key, entityAliasName) {
|
|
|
72
92
|
const aliasParts = alias.split('_');
|
|
73
93
|
if (aliasParts.length === 1) {
|
|
74
94
|
const value = getField(obj, alias);
|
|
75
|
-
if (
|
|
76
|
-
return
|
|
95
|
+
if (value == null)
|
|
96
|
+
return value;
|
|
77
97
|
return getField(value, field);
|
|
78
98
|
}
|
|
79
99
|
const value = getField(obj, aliasParts[0]);
|
|
80
|
-
if (!value)
|
|
81
|
-
return
|
|
100
|
+
if (!value == null)
|
|
101
|
+
return value;
|
|
82
102
|
return extractValueFromOrderByKey(value, `${aliasParts.slice(1).join('_')}.${field}`);
|
|
83
103
|
}
|
|
84
104
|
function encodeBase64Url(str) {
|
|
@@ -94,7 +114,7 @@ function decodeBase64Url(str) {
|
|
|
94
114
|
str += '=';
|
|
95
115
|
return Buffer.from(str, 'base64').toString();
|
|
96
116
|
}
|
|
97
|
-
async function getPaginatedResult(qb, entityAliasName, take, cursor) {
|
|
117
|
+
async function getPaginatedResult(qb, entityClass, entityAliasName, take, cursor) {
|
|
98
118
|
const orderBys = getTypeormOrderBy(qb);
|
|
99
119
|
qb.take(take + 1);
|
|
100
120
|
let type = 'next';
|
|
@@ -105,30 +125,101 @@ async function getPaginatedResult(qb, entityAliasName, take, cursor) {
|
|
|
105
125
|
const keys = Object.keys(data.payload).filter((k) => qb.expressionMap.orderBys[k]);
|
|
106
126
|
if (keys.length) {
|
|
107
127
|
const staircasedKeys = keys.map((key, i) => lodash_1.default.range(i + 1).map((j) => keys[j]));
|
|
108
|
-
const cursorKey = (key) => `_cursor_${key.replace(/\./g, '__')}`;
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
128
|
+
const cursorKey = (key) => `_cursor_${key.replace(/\./g, '__').replace(/"/g, '')}`;
|
|
129
|
+
const expressionMatrix = staircasedKeys
|
|
130
|
+
.map((keys) => keys.map((key, j) => {
|
|
131
|
+
const paramKey = cursorKey(key);
|
|
132
|
+
const cursorValue = data.payload[key];
|
|
133
|
+
const orderBy = qb.expressionMap.orderBys[key];
|
|
134
|
+
const reversed = data.type === 'prev';
|
|
135
|
+
const order = getValueFromOrderBy(orderBy, reversed); // 'ASC' or 'DESC'
|
|
136
|
+
const nulls = getNullsFromOrderBy(orderBy, reversed); // 'NULLS FIRST' or 'NULLS LAST' or undefined
|
|
137
|
+
const isLast = j === keys.length - 1;
|
|
138
|
+
const subject = key.includes('"')
|
|
139
|
+
? (0, subject_registry_1.getSubject)(qb, key.replace(/"/g, ''))
|
|
140
|
+
: key;
|
|
141
|
+
const mayBeNullAtEnd = () => {
|
|
142
|
+
const res = (nulls === 'NULLS LAST' && order === 'ASC') ||
|
|
143
|
+
(nulls === 'NULLS FIRST' && order === 'DESC');
|
|
144
|
+
if (reversed) {
|
|
145
|
+
return !res;
|
|
146
|
+
}
|
|
147
|
+
return res;
|
|
148
|
+
};
|
|
149
|
+
if (cursorValue == null) {
|
|
150
|
+
if (isLast) {
|
|
151
|
+
if (mayBeNullAtEnd()) {
|
|
152
|
+
return '';
|
|
153
|
+
}
|
|
154
|
+
else {
|
|
155
|
+
return `${subject} IS NOT NULL`;
|
|
156
|
+
}
|
|
157
|
+
}
|
|
158
|
+
else {
|
|
159
|
+
// 中间字段，如果是null，就比较 IS NULL
|
|
160
|
+
return `${subject} IS NULL`;
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
else {
|
|
164
|
+
if (isLast) {
|
|
165
|
+
const expr = `${subject} ${getOperator(order)} :${paramKey}`;
|
|
166
|
+
if (mayBeNullAtEnd() &&
|
|
167
|
+
(0, filter_relations_1.queryColumnOptionsFromAlias)(qb, entityClass, entityAliasName, key)?.column?.isNullable) {
|
|
168
|
+
return `(${expr} OR ${subject} IS NULL)`;
|
|
169
|
+
}
|
|
170
|
+
return expr;
|
|
171
|
+
}
|
|
172
|
+
else {
|
|
173
|
+
return `${subject} = :${paramKey}`;
|
|
174
|
+
}
|
|
175
|
+
}
|
|
176
|
+
}))
|
|
177
|
+
.filter((s) => !s.some((ex) => !ex));
|
|
178
|
+
if (expressionMatrix.length) {
|
|
179
|
+
qb.andWhere(new typeorm_1.Brackets((sqb) => {
|
|
180
|
+
const levelToBrackets = (level) => new typeorm_1.Brackets((qb) => {
|
|
181
|
+
level.forEach((expr, i) => {
|
|
182
|
+
if (i === 0) {
|
|
183
|
+
qb.where(expr);
|
|
184
|
+
}
|
|
185
|
+
else {
|
|
186
|
+
qb.andWhere(expr);
|
|
187
|
+
}
|
|
188
|
+
});
|
|
117
189
|
});
|
|
118
|
-
const [
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
}))
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
})).setParameters(lodash_1.default.mapKeys(data.payload, (_, key) => cursorKey(key)));
|
|
190
|
+
const [first, ...rest] = expressionMatrix;
|
|
191
|
+
sqb.where(levelToBrackets(first));
|
|
192
|
+
rest.forEach((level) => sqb.orWhere(levelToBrackets(level)));
|
|
193
|
+
})).setParameters(Object.fromEntries(Object.entries(data.payload)
|
|
194
|
+
.filter(([k, v]) => qb.expressionMap.orderBys[k] && v != null)
|
|
195
|
+
.map(([k, v]) => [cursorKey(k), v])));
|
|
196
|
+
}
|
|
126
197
|
}
|
|
127
198
|
if (data.type === 'prev') {
|
|
128
199
|
reverseQueryOrderBy(qb);
|
|
129
200
|
}
|
|
130
201
|
}
|
|
131
|
-
const data = await qb.
|
|
202
|
+
const { raw, entities: data } = await qb.getRawAndEntities();
|
|
203
|
+
const rawMapById = new Map();
|
|
204
|
+
const getRawFromEntity = (entity) => {
|
|
205
|
+
const isNumberId = typeof entity.id === 'number';
|
|
206
|
+
const id = entity.id;
|
|
207
|
+
if (rawMapById.has(id)) {
|
|
208
|
+
return rawMapById.get(id);
|
|
209
|
+
}
|
|
210
|
+
return raw.find((r) => {
|
|
211
|
+
let id = r[`${entityAliasName}_id`];
|
|
212
|
+
if (isNumberId) {
|
|
213
|
+
id = Number(id);
|
|
214
|
+
if (isNaN(id))
|
|
215
|
+
return false;
|
|
216
|
+
}
|
|
217
|
+
if (id == null)
|
|
218
|
+
return false;
|
|
219
|
+
rawMapById[id] = r;
|
|
220
|
+
return id === entity.id;
|
|
221
|
+
});
|
|
222
|
+
};
|
|
132
223
|
const enough = data.length > take;
|
|
133
224
|
const hasNext = enough || type === 'prev';
|
|
134
225
|
const hasPrev = cursor && (enough || type === 'next');
|
|
@@ -140,10 +231,14 @@ async function getPaginatedResult(qb, entityAliasName, take, cursor) {
|
|
|
140
231
|
}
|
|
141
232
|
const generateCursor = (type, data) => {
|
|
142
233
|
const targetObject = type === 'prev' ? data[0] : data[data.length - 1];
|
|
143
|
-
const payload = Object.fromEntries(orderBys
|
|
144
|
-
|
|
234
|
+
const payload = Object.fromEntries(orderBys
|
|
235
|
+
.map(({ key }) => {
|
|
236
|
+
const value = !key.includes('.') || key.includes('"')
|
|
237
|
+
? getRawFromEntity(targetObject)?.[key.replace(/"/g, '')]
|
|
238
|
+
: extractValueFromOrderByKey(targetObject, key, entityAliasName);
|
|
145
239
|
return [key, value];
|
|
146
|
-
})
|
|
240
|
+
})
|
|
241
|
+
.filter((s) => s[1] !== undefined));
|
|
147
242
|
return encodeBase64Url(superjson_1.default.stringify({ type, payload }));
|
|
148
243
|
};
|
|
149
244
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cursor-pagination-utils.js","sourceRoot":"","sources":["../../../src/utility/cursor-pagination-utils.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"cursor-pagination-utils.js","sourceRoot":"","sources":["../../../src/utility/cursor-pagination-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,11 @@
|
|
|
1
1
|
import { AnyClass } from 'nesties';
|
|
2
2
|
import { RelationDef } from './relation-def';
|
|
3
|
+
import { TypeormRelation } from './get-typeorm-relations';
|
|
4
|
+
import { SelectQueryBuilder } from 'typeorm';
|
|
3
5
|
export declare const extractRelationName: (relation: string | RelationDef) => string;
|
|
4
|
-
export declare const filterRelations: <T extends string | RelationDef>(cl: AnyClass, relations?: T[]) => T[];
|
|
6
|
+
export declare const filterRelations: <T extends string | RelationDef>(cl: AnyClass, relations?: T[], cond?: (r: TypeormRelation) => boolean) => T[];
|
|
7
|
+
export declare const filterAliases: (cl: AnyClass, rootAlias: string, aliases?: string[], cond?: (r: TypeormRelation | undefined, field: string, key: string | undefined) => boolean) => string[];
|
|
8
|
+
export declare const queryColumnOptionsFromAlias: (qb: SelectQueryBuilder<any>, cl: AnyClass, rootAlias: string, alias: string) => {
|
|
9
|
+
relations: TypeormRelation[];
|
|
10
|
+
column: import("typeorm/metadata/ColumnMetadata").ColumnMetadata;
|
|
11
|
+
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.filterRelations = exports.extractRelationName = void 0;
|
|
3
|
+
exports.queryColumnOptionsFromAlias = exports.filterAliases = exports.filterRelations = exports.extractRelationName = void 0;
|
|
4
4
|
const get_typeorm_relations_1 = require("./get-typeorm-relations");
|
|
5
5
|
const extractRelationName = (relation) => {
|
|
6
6
|
if (typeof relation === 'string') {
|
|
@@ -12,16 +12,16 @@ const extractRelationName = (relation) => {
|
|
|
12
12
|
};
|
|
13
13
|
exports.extractRelationName = extractRelationName;
|
|
14
14
|
const typeormRelationsCache = new Map();
|
|
15
|
-
const
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
15
|
+
const fetchTypeormRelations = (cl) => {
|
|
16
|
+
if (typeormRelationsCache.has(cl)) {
|
|
17
|
+
return typeormRelationsCache.get(cl);
|
|
18
|
+
}
|
|
19
|
+
const relations = (0, get_typeorm_relations_1.getTypeormRelations)(cl);
|
|
20
|
+
const map = Object.fromEntries(relations.map((r) => [r.propertyName, r]));
|
|
21
|
+
typeormRelationsCache.set(cl, map);
|
|
22
|
+
return map;
|
|
23
|
+
};
|
|
24
|
+
const filterRelations = (cl, relations, cond = () => true) => {
|
|
25
25
|
return (relations?.filter((r) => {
|
|
26
26
|
const relationName = (0, exports.extractRelationName)(r);
|
|
27
27
|
const checkLevel = (entityClass, name) => {
|
|
@@ -40,4 +40,52 @@ const filterRelations = (cl, relations) => {
|
|
|
40
40
|
}) || []);
|
|
41
41
|
};
|
|
42
42
|
exports.filterRelations = filterRelations;
|
|
43
|
+
const filterAliases = (cl, rootAlias, aliases, cond = () => true) => {
|
|
44
|
+
return (aliases?.filter((alias) => {
|
|
45
|
+
const [field, key] = alias.split('.');
|
|
46
|
+
if (!key || field === rootAlias) {
|
|
47
|
+
return cond(undefined, field, key);
|
|
48
|
+
}
|
|
49
|
+
const relationLevels = [...field.split('_'), key];
|
|
50
|
+
let currentClass = cl;
|
|
51
|
+
for (let i = 0; i < relationLevels.length; i++) {
|
|
52
|
+
const f = relationLevels[i];
|
|
53
|
+
const k = relationLevels[i + 1];
|
|
54
|
+
const relation = fetchTypeormRelations(currentClass)?.[f];
|
|
55
|
+
if (!cond(relation, f, k))
|
|
56
|
+
return false;
|
|
57
|
+
currentClass = relation.propertyClass;
|
|
58
|
+
}
|
|
59
|
+
return true;
|
|
60
|
+
}) || []);
|
|
61
|
+
};
|
|
62
|
+
exports.filterAliases = filterAliases;
|
|
63
|
+
const queryColumnOptionsFromAlias = (qb, cl, rootAlias, alias) => {
|
|
64
|
+
const [field, key] = alias.split('.');
|
|
65
|
+
if (field === rootAlias) {
|
|
66
|
+
return {
|
|
67
|
+
relations: [],
|
|
68
|
+
column: qb.connection.getMetadata(cl)?.findColumnWithPropertyName(key),
|
|
69
|
+
};
|
|
70
|
+
}
|
|
71
|
+
const relationLevels = field.split('_');
|
|
72
|
+
let currentClass = cl;
|
|
73
|
+
const relations = [];
|
|
74
|
+
while (relationLevels.length) {
|
|
75
|
+
const f = relationLevels.shift();
|
|
76
|
+
const relation = fetchTypeormRelations(currentClass)?.[f];
|
|
77
|
+
if (!relation || relation.computed) {
|
|
78
|
+
return;
|
|
79
|
+
}
|
|
80
|
+
relations.push(relation);
|
|
81
|
+
currentClass = relation.propertyClass;
|
|
82
|
+
}
|
|
83
|
+
return {
|
|
84
|
+
relations,
|
|
85
|
+
column: qb.connection
|
|
86
|
+
.getMetadata(currentClass)
|
|
87
|
+
?.findColumnWithPropertyName(key),
|
|
88
|
+
};
|
|
89
|
+
};
|
|
90
|
+
exports.queryColumnOptionsFromAlias = queryColumnOptionsFromAlias;
|
|
43
91
|
//# sourceMappingURL=filter-relations.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter-relations.js","sourceRoot":"","sources":["../../../src/utility/filter-relations.ts"],"names":[],"mappings":";;;AAEA,mEAA+E;
|
|
1
|
+
{"version":3,"file":"filter-relations.js","sourceRoot":"","sources":["../../../src/utility/filter-relations.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getSubject = exports.addSubject = void 0;
|
|
4
|
+
const subjectRegistry = new WeakMap();
|
|
5
|
+
const addSubject = (qb, select, alias) => {
|
|
6
|
+
let subjects = subjectRegistry.get(qb);
|
|
7
|
+
if (!subjects) {
|
|
8
|
+
subjects = {};
|
|
9
|
+
subjectRegistry.set(qb, subjects);
|
|
10
|
+
}
|
|
11
|
+
subjects[alias] = select;
|
|
12
|
+
return qb.addSelect(select, alias);
|
|
13
|
+
};
|
|
14
|
+
exports.addSubject = addSubject;
|
|
15
|
+
const getSubject = (qb, alias) => {
|
|
16
|
+
return subjectRegistry.get(qb)?.[alias];
|
|
17
|
+
};
|
|
18
|
+
exports.getSubject = getSubject;
|
|
19
|
+
//# sourceMappingURL=subject-registry.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"subject-registry.js","sourceRoot":"","sources":["../../../src/utility/subject-registry.ts"],"names":[],"mappings":";;;AAEA,MAAM,eAAe,GAAG,IAAI,OAAO,EAGhC,CAAC;AAEG,MAAM,UAAU,GAAG,CACxB,EAAyB,EACzB,MAAc,EACd,KAAa,EACb,EAAE;IACF,IAAI,QAAQ,GAAG,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACvC,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,QAAQ,GAAG,EAAE,CAAC;QACd,eAAe,CAAC,GAAG,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;IACpC,CAAC;IACD,QAAQ,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC;IACzB,OAAO,EAAE,CAAC,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AACrC,CAAC,CAAC;AAZW,QAAA,UAAU,cAYrB;AAEK,MAAM,UAAU,GAAG,CACxB,EAAyB,EACzB,KAAa,EACO,EAAE;IACtB,OAAO,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;AAC1C,CAAC,CAAC;AALW,QAAA,UAAU,cAKrB"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.unshiftOrderBy = void 0;
|
|
4
|
+
const unshiftOrderBy = (qb, sort, order, nulls) => {
|
|
5
|
+
const currentOrderBys = Object.entries(qb.expressionMap.allOrderBys);
|
|
6
|
+
qb.orderBy(sort, order, nulls);
|
|
7
|
+
currentOrderBys.forEach(([key, value]) => {
|
|
8
|
+
if (typeof value === 'string') {
|
|
9
|
+
qb.addOrderBy(key, value);
|
|
10
|
+
}
|
|
11
|
+
else {
|
|
12
|
+
qb.addOrderBy(key, value.order, value.nulls);
|
|
13
|
+
}
|
|
14
|
+
});
|
|
15
|
+
return qb;
|
|
16
|
+
};
|
|
17
|
+
exports.unshiftOrderBy = unshiftOrderBy;
|
|
18
|
+
//# sourceMappingURL=unshift-order-by.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"unshift-order-by.js","sourceRoot":"","sources":["../../../src/utility/unshift-order-by.ts"],"names":[],"mappings":";;;AAEO,MAAM,cAAc,GAAG,CAC5B,EAAyB,EACzB,IAAY,EACZ,KAAsB,EACtB,KAAoC,EACpC,EAAE;IACF,MAAM,eAAe,GAAG,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IACrE,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;IAC/B,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QACvC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC9B,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAC5B,CAAC;aAAM,CAAC;YACN,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC,CAAC,CAAC;IACH,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC;AAhBW,QAAA,cAAc,kBAgBzB"}
|
package/package.json
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "nicot",
|
|
3
3
|
"description": "Nest.js interacting with class-validator + OpenAPI + TypeORM for Nest.js Restful API development.",
|
|
4
|
-
"version": "1.1.
|
|
4
|
+
"version": "1.1.18",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
7
7
|
"scripts": {
|
|
8
8
|
"lint": "eslint --fix .",
|
|
9
9
|
"build": "rimraf dist && tsc",
|
|
10
|
-
"test": "jest --passWithNoTests",
|
|
10
|
+
"test": "jest --passWithNoTests --runInBand",
|
|
11
11
|
"start": "node dist/index.js"
|
|
12
12
|
},
|
|
13
13
|
"repository": {
|