@spinajs/orm-http 2.0.389 → 2.0.390
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/lib/cjs/builders.js +171 -69
- package/lib/cjs/builders.js.map +1 -1
- package/lib/cjs/decorators.d.ts.map +1 -1
- package/lib/cjs/decorators.js.map +1 -1
- package/lib/cjs/dto.js.map +1 -1
- package/lib/cjs/extension.d.ts +5 -4
- package/lib/cjs/extension.d.ts.map +1 -1
- package/lib/cjs/index.d.ts.map +1 -1
- package/lib/cjs/index.js +5 -6
- package/lib/cjs/index.js.map +1 -1
- package/lib/cjs/interfaces.d.ts +9 -1
- package/lib/cjs/interfaces.d.ts.map +1 -1
- package/lib/cjs/interfaces.js +6 -1
- package/lib/cjs/interfaces.js.map +1 -1
- package/lib/cjs/model.d.ts +26 -17
- package/lib/cjs/model.d.ts.map +1 -1
- package/lib/cjs/model.js +25 -15
- package/lib/cjs/model.js.map +1 -1
- package/lib/cjs/route-arg.d.ts.map +1 -1
- package/lib/cjs/route-arg.js +23 -13
- package/lib/cjs/route-arg.js.map +1 -1
- package/lib/mjs/builders.js +171 -69
- package/lib/mjs/builders.js.map +1 -1
- package/lib/mjs/decorators.d.ts.map +1 -1
- package/lib/mjs/decorators.js.map +1 -1
- package/lib/mjs/dto.js.map +1 -1
- package/lib/mjs/extension.d.ts +5 -4
- package/lib/mjs/extension.d.ts.map +1 -1
- package/lib/mjs/index.d.ts.map +1 -1
- package/lib/mjs/index.js +5 -6
- package/lib/mjs/index.js.map +1 -1
- package/lib/mjs/interfaces.d.ts +9 -1
- package/lib/mjs/interfaces.d.ts.map +1 -1
- package/lib/mjs/interfaces.js +5 -0
- package/lib/mjs/interfaces.js.map +1 -1
- package/lib/mjs/model.d.ts +26 -17
- package/lib/mjs/model.d.ts.map +1 -1
- package/lib/mjs/model.js +25 -15
- package/lib/mjs/model.js.map +1 -1
- package/lib/mjs/route-arg.d.ts.map +1 -1
- package/lib/mjs/route-arg.js +23 -13
- package/lib/mjs/route-arg.js.map +1 -1
- package/lib/tsconfig.cjs.tsbuildinfo +1 -1
- package/lib/tsconfig.mjs.tsbuildinfo +1 -1
- package/package.json +11 -10
package/lib/cjs/builders.js
CHANGED
|
@@ -1,83 +1,185 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const orm_1 = require("@spinajs/orm");
|
|
4
|
+
const interfaces_js_1 = require("./interfaces.js");
|
|
5
|
+
const util_1 = require("@spinajs/util");
|
|
6
|
+
const exceptions_1 = require("@spinajs/exceptions");
|
|
4
7
|
/**
|
|
5
|
-
*
|
|
8
|
+
* Validation helper functions for different value types using @spinajs/util
|
|
6
9
|
*/
|
|
7
|
-
|
|
10
|
+
const ValidationHelpers = {
|
|
11
|
+
requireArray: (filter) => {
|
|
12
|
+
(0, util_1._check_arg)((0, util_1._is_array)(), (0, util_1._min_length)(1, new exceptions_1.InvalidArgument(`Operator '${filter.Operator}' for column '${filter.Column}' requires an array with at least 1 value, got: ${filter.Value.length}`, filter.Column, 'LENGTH_TOO_SHORT')))(filter.Value, filter.Column);
|
|
13
|
+
},
|
|
14
|
+
requireTwoValueArray: (filter) => {
|
|
15
|
+
(0, util_1._check_arg)((0, util_1._is_array)(), (0, util_1._min_length)(2, new exceptions_1.InvalidArgument(`Operator '${filter.Operator}' for column '${filter.Column}' requires an array with exactly 2 values, got: ${filter.Value.length}`, filter.Column, 'LENGTH_TOO_SHORT')))(filter.Value, filter.Column);
|
|
16
|
+
},
|
|
17
|
+
requireString: (filter) => {
|
|
18
|
+
if (filter.Value !== null && filter.Value !== undefined) {
|
|
19
|
+
(0, util_1._check_arg)((0, util_1._is_string)(), (0, util_1._trim)(), (0, util_1._non_empty)(new exceptions_1.InvalidArgument(`Operator '${filter.Operator}' for column '${filter.Column}' requires a non-empty string, got: ${filter.Value}`, filter.Column, 'INVALID_STRING')))(filter.Value, filter.Column);
|
|
20
|
+
}
|
|
21
|
+
},
|
|
22
|
+
requireValue: (filter) => {
|
|
23
|
+
(0, util_1._check_arg)((0, util_1._non_undefined)(new exceptions_1.InvalidArgument(`Operator '${filter.Operator}' for column '${filter.Column}' requires a value, got: ${filter.Value}`, filter.Column, 'VALUE_REQUIRED')))(filter.Value, filter.Column);
|
|
24
|
+
},
|
|
25
|
+
noValidation: () => {
|
|
26
|
+
// No validation needed for operators that don't use the Value field
|
|
27
|
+
}
|
|
28
|
+
};
|
|
29
|
+
/**
|
|
30
|
+
* Operator mapping with validation, AND and OR application functions
|
|
31
|
+
*/
|
|
32
|
+
const OPERATOR_MAP = {
|
|
33
|
+
'eq': {
|
|
34
|
+
validate: ValidationHelpers.requireValue,
|
|
35
|
+
applyAnd: (qb, filter) => qb.andWhere(filter.Column, orm_1.SqlOperator.EQ, filter.Value),
|
|
36
|
+
applyOr: (qb, filter) => qb.orWhere(filter.Column, orm_1.SqlOperator.EQ, filter.Value)
|
|
37
|
+
},
|
|
38
|
+
'neq': {
|
|
39
|
+
validate: ValidationHelpers.requireValue,
|
|
40
|
+
applyAnd: (qb, filter) => qb.andWhere(filter.Column, orm_1.SqlOperator.NOT, filter.Value),
|
|
41
|
+
applyOr: (qb, filter) => qb.orWhere(filter.Column, orm_1.SqlOperator.NOT, filter.Value)
|
|
42
|
+
},
|
|
43
|
+
'gt': {
|
|
44
|
+
validate: ValidationHelpers.requireValue,
|
|
45
|
+
applyAnd: (qb, filter) => qb.andWhere(filter.Column, orm_1.SqlOperator.GT, filter.Value),
|
|
46
|
+
applyOr: (qb, filter) => qb.orWhere(filter.Column, orm_1.SqlOperator.GT, filter.Value)
|
|
47
|
+
},
|
|
48
|
+
'gte': {
|
|
49
|
+
validate: ValidationHelpers.requireValue,
|
|
50
|
+
applyAnd: (qb, filter) => qb.andWhere(filter.Column, orm_1.SqlOperator.GTE, filter.Value),
|
|
51
|
+
applyOr: (qb, filter) => qb.orWhere(filter.Column, orm_1.SqlOperator.GTE, filter.Value)
|
|
52
|
+
},
|
|
53
|
+
'lt': {
|
|
54
|
+
validate: ValidationHelpers.requireValue,
|
|
55
|
+
applyAnd: (qb, filter) => qb.andWhere(filter.Column, orm_1.SqlOperator.LT, filter.Value),
|
|
56
|
+
applyOr: (qb, filter) => qb.orWhere(filter.Column, orm_1.SqlOperator.LT, filter.Value)
|
|
57
|
+
},
|
|
58
|
+
'lte': {
|
|
59
|
+
validate: ValidationHelpers.requireValue,
|
|
60
|
+
applyAnd: (qb, filter) => qb.andWhere(filter.Column, orm_1.SqlOperator.LTE, filter.Value),
|
|
61
|
+
applyOr: (qb, filter) => qb.orWhere(filter.Column, orm_1.SqlOperator.LTE, filter.Value)
|
|
62
|
+
},
|
|
63
|
+
'like': {
|
|
64
|
+
validate: ValidationHelpers.requireString,
|
|
65
|
+
applyAnd: (qb, filter) => qb.andWhere(filter.Column, orm_1.SqlOperator.LIKE, `%${filter.Value}%`),
|
|
66
|
+
applyOr: (qb, filter) => qb.orWhere(filter.Column, orm_1.SqlOperator.LIKE, `%${filter.Value}%`)
|
|
67
|
+
},
|
|
68
|
+
'b-like': {
|
|
69
|
+
validate: ValidationHelpers.requireString,
|
|
70
|
+
applyAnd: (qb, filter) => qb.andWhere(filter.Column, orm_1.SqlOperator.LIKE, `%${filter.Value}`),
|
|
71
|
+
applyOr: (qb, filter) => qb.orWhere(filter.Column, orm_1.SqlOperator.LIKE, `%${filter.Value}`)
|
|
72
|
+
},
|
|
73
|
+
'e-like': {
|
|
74
|
+
validate: ValidationHelpers.requireString,
|
|
75
|
+
applyAnd: (qb, filter) => qb.andWhere(filter.Column, orm_1.SqlOperator.LIKE, `${filter.Value}%`),
|
|
76
|
+
applyOr: (qb, filter) => qb.orWhere(filter.Column, orm_1.SqlOperator.LIKE, `${filter.Value}%`)
|
|
77
|
+
},
|
|
78
|
+
'between': {
|
|
79
|
+
validate: ValidationHelpers.requireTwoValueArray,
|
|
80
|
+
applyAnd: (qb, filter) => qb.andWhere(filter.Column, orm_1.SqlOperator.BETWEEN, filter.Value),
|
|
81
|
+
applyOr: (qb, filter) => qb.orWhere(filter.Column, orm_1.SqlOperator.BETWEEN, filter.Value)
|
|
82
|
+
},
|
|
83
|
+
'notbetween': {
|
|
84
|
+
validate: ValidationHelpers.requireTwoValueArray,
|
|
85
|
+
applyAnd: (qb, filter) => qb.andWhere(filter.Column, orm_1.SqlOperator.NOT_BETWEEN, filter.Value),
|
|
86
|
+
applyOr: (qb, filter) => qb.orWhere(filter.Column, orm_1.SqlOperator.NOT_BETWEEN, filter.Value)
|
|
87
|
+
},
|
|
88
|
+
'isnull': {
|
|
89
|
+
validate: ValidationHelpers.noValidation,
|
|
90
|
+
applyAnd: (qb, filter) => qb.andWhere(filter.Column, orm_1.SqlOperator.NULL),
|
|
91
|
+
applyOr: (qb, filter) => qb.orWhere(filter.Column, orm_1.SqlOperator.NULL)
|
|
92
|
+
},
|
|
93
|
+
'notnull': {
|
|
94
|
+
validate: ValidationHelpers.noValidation,
|
|
95
|
+
applyAnd: (qb, filter) => qb.andWhere(filter.Column, orm_1.SqlOperator.NOT_NULL),
|
|
96
|
+
applyOr: (qb, filter) => qb.orWhere(filter.Column, orm_1.SqlOperator.NOT_NULL)
|
|
97
|
+
},
|
|
98
|
+
'in': {
|
|
99
|
+
validate: ValidationHelpers.requireArray,
|
|
100
|
+
applyAnd: (qb, filter) => qb.whereIn(filter.Column, filter.Value),
|
|
101
|
+
applyOr: (qb, filter) => qb.orWhere((query) => query.whereIn(filter.Column, filter.Value))
|
|
102
|
+
},
|
|
103
|
+
'nin': {
|
|
104
|
+
validate: ValidationHelpers.requireArray,
|
|
105
|
+
applyAnd: (qb, filter) => qb.whereNotIn(filter.Column, filter.Value),
|
|
106
|
+
applyOr: (qb, filter) => qb.orWhere((query) => query.whereNotIn(filter.Column, filter.Value))
|
|
107
|
+
},
|
|
108
|
+
'exists': {
|
|
109
|
+
validate: ValidationHelpers.noValidation,
|
|
110
|
+
applyAnd: (qb, filter) => qb.whereExist(filter.Column),
|
|
111
|
+
applyOr: (qb, filter) => qb.orWhere((query) => query.whereExist(filter.Column))
|
|
112
|
+
},
|
|
113
|
+
'n-exists': {
|
|
114
|
+
validate: ValidationHelpers.noValidation,
|
|
115
|
+
applyAnd: (qb, filter) => qb.whereNotExists(filter.Column),
|
|
116
|
+
applyOr: (qb, filter) => qb.orWhere((query) => query.whereNotExists(filter.Column))
|
|
117
|
+
},
|
|
118
|
+
'regexp': {
|
|
119
|
+
validate: ValidationHelpers.requireString,
|
|
120
|
+
applyAnd: (qb, filter) => qb.andWhere(filter.Column, orm_1.SqlOperator.REGEXP, filter.Value),
|
|
121
|
+
applyOr: (qb, filter) => qb.orWhere(filter.Column, orm_1.SqlOperator.REGEXP, filter.Value)
|
|
122
|
+
}
|
|
123
|
+
};
|
|
124
|
+
/**
|
|
125
|
+
* Extend where builder with filter func old style ( by prototype )
|
|
126
|
+
*/
|
|
127
|
+
orm_1.SelectQueryBuilder.prototype.filter = function (filters, logicalOperator, filterColumns) {
|
|
8
128
|
if (!filters || filters.length === 0) {
|
|
9
129
|
return this;
|
|
10
130
|
}
|
|
131
|
+
// Performance optimization: limit the number of filters to prevent abuse
|
|
132
|
+
const MAX_FILTERS = 100;
|
|
133
|
+
if (filters.length > MAX_FILTERS) {
|
|
134
|
+
throw new Error(`Too many filters provided: ${filters.length}. Maximum allowed: ${MAX_FILTERS}`);
|
|
135
|
+
}
|
|
11
136
|
const columns = filterColumns ?? this._model.filterColumns();
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
throw new Error('Operator is required');
|
|
18
|
-
}
|
|
19
|
-
const column = columns.find((c) => c.column === filter.Column);
|
|
20
|
-
if (!column) {
|
|
21
|
-
throw new Error(`Column ${filter.Column} is not filterable`);
|
|
22
|
-
}
|
|
23
|
-
if (column.query) {
|
|
24
|
-
column.query(filter.Operator, filter.Value).call(this);
|
|
25
|
-
return this;
|
|
26
|
-
}
|
|
27
|
-
// TODO: in futere add full expression tree support ( OR, AND, maybe nesting queries for relations, EXISTS maybe ?)
|
|
28
|
-
switch (filter.Operator) {
|
|
29
|
-
case 'eq':
|
|
30
|
-
this.andWhere(filter.Column, orm_1.SqlOperator.EQ, filter.Value);
|
|
31
|
-
break;
|
|
32
|
-
case 'neq':
|
|
33
|
-
this.andWhere(filter.Column, orm_1.SqlOperator.NOT, filter.Value);
|
|
34
|
-
break;
|
|
35
|
-
case 'gt':
|
|
36
|
-
this.andWhere(filter.Column, orm_1.SqlOperator.GT, filter.Value);
|
|
37
|
-
break;
|
|
38
|
-
case 'gte':
|
|
39
|
-
this.andWhere(filter.Column, orm_1.SqlOperator.GTE, filter.Value);
|
|
40
|
-
break;
|
|
41
|
-
case 'lt':
|
|
42
|
-
this.andWhere(filter.Column, orm_1.SqlOperator.LT, filter.Value);
|
|
43
|
-
break;
|
|
44
|
-
case 'lte':
|
|
45
|
-
this.andWhere(filter.Column, orm_1.SqlOperator.LTE, filter.Value);
|
|
46
|
-
break;
|
|
47
|
-
case 'like':
|
|
48
|
-
this.andWhere(filter.Column, orm_1.SqlOperator.LIKE, `%${filter.Value}%`);
|
|
49
|
-
break;
|
|
50
|
-
case 'b-like':
|
|
51
|
-
this.andWhere(filter.Column, orm_1.SqlOperator.LIKE, `%${filter.Value}`);
|
|
52
|
-
break;
|
|
53
|
-
case 'e-like':
|
|
54
|
-
this.andWhere(filter.Column, orm_1.SqlOperator.LIKE, `${filter.Value}%`);
|
|
55
|
-
case 'in':
|
|
56
|
-
this.whereIn(filter.Column, filter.Value);
|
|
57
|
-
break;
|
|
58
|
-
case 'nin':
|
|
59
|
-
this.whereNotIn(filter.Column, filter.Value);
|
|
60
|
-
break;
|
|
61
|
-
case 'between':
|
|
62
|
-
this.andWhere(filter.Column, orm_1.SqlOperator.BETWEEN, filter.Value);
|
|
63
|
-
break;
|
|
64
|
-
case 'isnull':
|
|
65
|
-
this.andWhere(filter.Column, orm_1.SqlOperator.NULL);
|
|
66
|
-
break;
|
|
67
|
-
case 'notnull':
|
|
68
|
-
this.andWhere(filter.Column, orm_1.SqlOperator.NOT_NULL);
|
|
69
|
-
break;
|
|
70
|
-
case 'notbetween':
|
|
71
|
-
this.andWhere(filter.Column, orm_1.SqlOperator.NOT_BETWEEN, filter.Value);
|
|
72
|
-
break;
|
|
73
|
-
case "exists":
|
|
74
|
-
this.whereExist(filter.Column);
|
|
75
|
-
break;
|
|
76
|
-
case "n-exists":
|
|
77
|
-
this.whereNotExists(filter.Column);
|
|
78
|
-
break;
|
|
137
|
+
const useOrOperator = logicalOperator === interfaces_js_1.FilterableLogicalOperators.Or;
|
|
138
|
+
// Pre-validate all filters before applying any
|
|
139
|
+
filters.forEach((filter, index) => {
|
|
140
|
+
if (!filter || typeof filter !== 'object') {
|
|
141
|
+
throw new Error(`Invalid filter at index ${index}: must be an object`);
|
|
79
142
|
}
|
|
80
143
|
});
|
|
144
|
+
this.andWhere(function () {
|
|
145
|
+
filters.forEach((filter, index) => {
|
|
146
|
+
if (!filter.Column) {
|
|
147
|
+
throw new Error(`Column is required for filter at index ${index}`);
|
|
148
|
+
}
|
|
149
|
+
if (!filter.Operator) {
|
|
150
|
+
throw new Error(`Operator is required for filter at index ${index}`);
|
|
151
|
+
}
|
|
152
|
+
// Validate that the operator is supported
|
|
153
|
+
if (!Object.keys(OPERATOR_MAP).includes(filter.Operator)) {
|
|
154
|
+
throw new Error(`Unsupported operator '${filter.Operator}' at index ${index}. Supported operators: ${Object.keys(OPERATOR_MAP).join(', ')}`);
|
|
155
|
+
}
|
|
156
|
+
const column = columns.find((c) => c.column === filter.Column);
|
|
157
|
+
if (!column) {
|
|
158
|
+
throw new Error(`Column '${filter.Column}' is not filterable at index ${index}`);
|
|
159
|
+
}
|
|
160
|
+
// Validate that the operator is allowed for this column
|
|
161
|
+
if (column.operators && !column.operators.includes(filter.Operator)) {
|
|
162
|
+
throw new Error(`Operator '${filter.Operator}' is not allowed for column '${filter.Column}' at index ${index}. Allowed operators: ${column.operators.join(', ')}`);
|
|
163
|
+
}
|
|
164
|
+
if (column.query) {
|
|
165
|
+
column.query(filter.Operator, filter.Value).call(this);
|
|
166
|
+
return;
|
|
167
|
+
}
|
|
168
|
+
// Apply the operator using the operator map
|
|
169
|
+
const operatorConfig = OPERATOR_MAP[filter.Operator];
|
|
170
|
+
if (!operatorConfig) {
|
|
171
|
+
throw new Error(`Unsupported operator: ${filter.Operator}`);
|
|
172
|
+
}
|
|
173
|
+
// Validate filter value using operator-specific validation
|
|
174
|
+
operatorConfig.validate(filter);
|
|
175
|
+
if (useOrOperator) {
|
|
176
|
+
operatorConfig.applyOr(this, filter);
|
|
177
|
+
}
|
|
178
|
+
else {
|
|
179
|
+
operatorConfig.applyAnd(this, filter);
|
|
180
|
+
}
|
|
181
|
+
});
|
|
182
|
+
});
|
|
81
183
|
return this;
|
|
82
184
|
};
|
|
83
185
|
//# sourceMappingURL=builders.js.map
|
package/lib/cjs/builders.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builders.js","sourceRoot":"","sources":["../../src/builders.ts"],"names":[],"mappings":";;AAAA,sCAA+D;
|
|
1
|
+
{"version":3,"file":"builders.js","sourceRoot":"","sources":["../../src/builders.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decorators.d.ts","sourceRoot":"","sources":["../../src/decorators.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,SAAS,EAAE,aAAa,EAAkF,MAAM,cAAc,CAAC;AAC1J,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACrE,OAAO,EAAE,WAAW,EAAiB,MAAM,aAAa,CAAC;AAGzD,wBAAgB,UAAU,CAAC,gBAAgB,EAAE,mBAAmB,EAAE,GAAG,WAAW,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,EAAE,CAAC,QAAQ,EAAE,mBAAmB,EAAE,KAAK,EAAE,GAAG,KAAK,aAAa,CAAC,OAAO,CAAC,EAAE,WAAW,CAAC,EAAE,OAAO,
|
|
1
|
+
{"version":3,"file":"decorators.d.ts","sourceRoot":"","sources":["../../src/decorators.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,SAAS,EAAE,aAAa,EAAkF,MAAM,cAAc,CAAC;AAC1J,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACrE,OAAO,EAAE,WAAW,EAAiB,MAAM,aAAa,CAAC;AAGzD,wBAAgB,UAAU,CAAC,gBAAgB,EAAE,mBAAmB,EAAE,GAAG,WAAW,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,EAAE,CAAC,QAAQ,EAAE,mBAAmB,EAAE,KAAK,EAAE,GAAG,KAAK,aAAa,CAAC,OAAO,CAAC,EAAE,WAAW,CAAC,EAAE,OAAO,OAoCpM;AAED,wBAAgB,MAAM,CAAC,KAAK,EAAE,WAAW,CAAC,SAAS,CAAC,GAAG,aAAa,CAAC,OAAO,CAAC,EAAE,yGAE9E"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../../src/decorators.ts"],"names":[],"mappings":";;;AAAA,sCAA0J;AAE1J,oCAAyD;AACzD,wCAAiD;AAEjD,SAAgB,UAAU,CAAC,gBAAgE,EAAE,SAAiF,EAAE,WAAqB;IACnM,OAAO,IAAA,wCAAkC,EAAC,CAAC,KAAuB,EAAE,OAAY,EAAE,WAAmB,EAAE,EAAE;QACvG,IAAI,KAAK,CAAC,iBAAiB,KAAK,SAAS,EAAE,CAAC;YAC1C,KAAK,CAAC,iBAAiB,GAAG,IAAI,GAAG,EAAkC,CAAC;QACtE,CAAC;QAED,IAAI,IAAA,kBAAa,EAAC,gBAAgB,CAAC,EAAE,CAAC;YACpC,kFAAkF;YAClF,yBAAyB;YACzB,MAAM,UAAU,GAAG,IAAA,4BAAsB,EAAC,gBAAgB,CAAC,CAAC;YAC5D,IAAI,UAAU,CAAC,iBAAiB,EAAE,CAAC;gBACjC,MAAM,IAAI,GAAG,CAAC,GAAG,UAAU,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC,CAAC;gBACtD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;oBACzB,OAAO,CAAC,GAAG,WAAW,IAAI,CAAC,EAAE,EAAE,UAAU,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;gBACtE,CAAC,CAAC,CAAC;gBAEH,KAAK,CAAC,iBAAiB,GAAG,IAAI,GAAG,CAAiC,CAAC,GAAG,KAAK,CAAC,iBAAiB,CAAC,OAAO,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../../src/decorators.ts"],"names":[],"mappings":";;;AAAA,sCAA0J;AAE1J,oCAAyD;AACzD,wCAAiD;AAEjD,SAAgB,UAAU,CAAC,gBAAgE,EAAE,SAAiF,EAAE,WAAqB;IACnM,OAAO,IAAA,wCAAkC,EAAC,CAAC,KAAuB,EAAE,OAAY,EAAE,WAAmB,EAAE,EAAE;QACvG,IAAI,KAAK,CAAC,iBAAiB,KAAK,SAAS,EAAE,CAAC;YAC1C,KAAK,CAAC,iBAAiB,GAAG,IAAI,GAAG,EAAkC,CAAC;QACtE,CAAC;QAED,IAAI,IAAA,kBAAa,EAAC,gBAAgB,CAAC,EAAE,CAAC;YACpC,kFAAkF;YAClF,yBAAyB;YACzB,MAAM,UAAU,GAAG,IAAA,4BAAsB,EAAC,gBAAgB,CAAC,CAAC;YAC5D,IAAI,UAAU,CAAC,iBAAiB,EAAE,CAAC;gBACjC,MAAM,IAAI,GAAG,CAAC,GAAG,UAAU,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC,CAAC;gBACtD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;oBACzB,OAAO,CAAC,GAAG,WAAW,IAAI,CAAC,EAAE,EAAE,UAAU,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;gBACtE,CAAC,CAAC,CAAC;gBAEH,KAAK,CAAC,iBAAiB,GAAG,IAAI,GAAG,CAAiC,CAAC,GAAG,KAAK,CAAC,iBAAiB,CAAC,OAAO,EAAE,EAAE,GAAI,GAAW,CAAC,CAAC,CAAC;YAC7H,CAAC;QACH,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBACtB,MAAM,IAAI,KAAK,CAAC,2BAA2B,KAAK,CAAC,IAAI,oBAAoB,WAAW,8BAA8B,CAAC,CAAC;YACtH,CAAC;YACD,KAAK,CAAC,iBAAiB,CAAC,GAAG,CAAC,WAAW,EAAE;gBACvC,SAAS,EAAE,gBAAgB;gBAC3B,KAAK,EAAE,SAAS;aACS,CAAC,CAAC;QAC/B,CAAC;QAED,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC;QACrE,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,mFAAmF;YACnF,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAA,wBAAkB,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW,IAAI,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAChH,CAAC;aAAM,CAAC;YACN,UAAU,CAAC,SAAS,GAAG,WAAW,IAAI,KAAK,CAAC;QAC9C,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AApCD,gCAoCC;AAED,SAAgB,MAAM,CAAC,KAAwD;IAC7E,OAAO,IAAA,YAAK,EAAC,IAAA,gBAAS,EAAC,qBAAqB,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;AAC9D,CAAC;AAFD,wBAEC"}
|
package/lib/cjs/dto.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dto.js","sourceRoot":"","sources":["../../src/dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,oDAA6C;AAWtC,IAAM,aAAa,GAAnB,MAAM,aAAa;IAIxB,YAAY,IAA4B;QACtC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC5B,CAAC;CACF,CAAA;AAPY,sCAAa;wBAAb,aAAa;IATzB,IAAA,mBAAM,EAAC;QACN,IAAI,EAAE,QAAQ;QACd,GAAG,EAAE,4BAA4B;QACjC,UAAU,EAAE;YACV,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,EAAE;YACrC,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,EAAE;YACtC,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,EAAE;SACrC;KACF,CAAC;;GACW,aAAa,CAOzB;AAUM,IAAM,QAAQ,GAAd,MAAM,QAAQ;IAInB,YAAY,IAAuB;QACjC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC5B,CAAC;CACF,CAAA;AAPY,4BAAQ;mBAAR,QAAQ;IARpB,IAAA,mBAAM,EAAC;QACN,IAAI,EAAE,QAAQ;QACd,GAAG,EAAE,uBAAuB;QAC5B,UAAU,EAAE;YACV,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,KAAK,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"dto.js","sourceRoot":"","sources":["../../src/dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,oDAA6C;AAWtC,IAAM,aAAa,GAAnB,MAAM,aAAa;IAIxB,YAAY,IAA4B;QACtC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC5B,CAAC;CACF,CAAA;AAPY,sCAAa;wBAAb,aAAa;IATzB,IAAA,mBAAM,EAAC;QACN,IAAI,EAAE,QAAQ;QACd,GAAG,EAAE,4BAA4B;QACjC,UAAU,EAAE;YACV,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,EAAE;YACrC,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,EAAE;YACtC,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,EAAE;SACrC;KACF,CAAC;;GACW,aAAa,CAOzB;AAUM,IAAM,QAAQ,GAAd,MAAM,QAAQ;IAInB,YAAY,IAAuB;QACjC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC5B,CAAC;CACF,CAAA;AAPY,4BAAQ;mBAAR,QAAQ;IARpB,IAAA,mBAAM,EAAC;QACN,IAAI,EAAE,QAAQ;QACd,GAAG,EAAE,uBAAuB;QAC5B,UAAU,EAAE;YACV,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,EAAE;YAC/D,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;SAC3B;KACF,CAAC;;GACW,QAAQ,CAOpB"}
|
package/lib/cjs/extension.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { IColumnFilter, IFilter } from './interfaces.js';
|
|
1
|
+
import { IColumnFilter, IFilter, IFilterRequest, FilterableLogicalOperators } from './interfaces.js';
|
|
2
2
|
declare module '@spinajs/orm' {
|
|
3
3
|
interface IModelDescriptor {
|
|
4
4
|
/**
|
|
@@ -12,8 +12,9 @@ declare module '@spinajs/orm' {
|
|
|
12
12
|
* Add filter to query
|
|
13
13
|
*
|
|
14
14
|
* @param filter
|
|
15
|
+
* @param logicalOperator
|
|
15
16
|
*/
|
|
16
|
-
filter(filter: IFilter[], filters?: IColumnFilter<unknown>[]): this;
|
|
17
|
+
filter(filter: IFilter[], logicalOperator?: FilterableLogicalOperators, filters?: IColumnFilter<unknown>[]): this;
|
|
17
18
|
}
|
|
18
19
|
namespace ModelBase {
|
|
19
20
|
/**
|
|
@@ -27,9 +28,9 @@ declare module '@spinajs/orm' {
|
|
|
27
28
|
* NOTE 2: explicit type for generic T is not possible due to typescript limitations
|
|
28
29
|
* we cannot infer type of T from function arguments couse this is augumentation
|
|
29
30
|
*
|
|
30
|
-
* @param
|
|
31
|
+
* @param filterRequest
|
|
31
32
|
*/
|
|
32
|
-
function filter<T extends ModelBase<unknown>>(
|
|
33
|
+
function filter<T extends ModelBase<unknown>>(filterRequest: IFilterRequest): Promise<Array<T>>;
|
|
33
34
|
}
|
|
34
35
|
}
|
|
35
36
|
//# sourceMappingURL=extension.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extension.d.ts","sourceRoot":"","sources":["../../src/extension.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"extension.d.ts","sourceRoot":"","sources":["../../src/extension.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,cAAc,EAAE,0BAA0B,EAAE,MAAM,iBAAiB,CAAC;AAErG,OAAO,QAAQ,cAAc,CAAC;IAC5B,UAAiB,gBAAgB;QAC/B;;WAEG;QACH,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC;KACzD;IAED,UAAiB,mBAAmB;QAClC;;;;;;WAMG;QACH,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,eAAe,CAAC,EAAE,0BAA0B,EAAE,OAAO,CAAC,EAAE,aAAa,CAAC,OAAO,CAAC,EAAE,GAAG,IAAI,CAAC;KACnH;IAED,UAAU,SAAS,CAAC;QAElB;;WAEG;QACH,SAAgB,YAAY,IAAI,GAAG,CAAC;QAEpC,SAAgB,aAAa,IAAI,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC;QAE1D;;;;;;;WAOG;QACH,SAAgB,MAAM,CAAC,CAAC,SAAS,SAAS,CAAC,OAAO,CAAC,EAAE,aAAa,EAAE,cAAc,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;KACxG;CACF"}
|
package/lib/cjs/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,SAAS,EAAgG,MAAM,cAAc,CAAC;AAC5I,OAAO,EAAE,eAAe,EAAE,UAAU,EAAoB,aAAa,EAAE,WAAW,EAAE,OAAO,IAAI,QAAQ,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1I,OAAO,EAAE,UAAU,EAAqC,YAAY,EAAM,MAAM,aAAa,CAAC;AAE9F,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAGnD,cAAc,iBAAiB,CAAC;AAChC,cAAc,YAAY,CAAC;AAC3B,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,UAAU,CAAC;AACzB,cAAc,mCAAmC,CAAC;AAElD,qBACa,SAAU,SAAQ,SAAS;IACtC,IAAW,aAAa,IAAI,MAAM,CAEjC;IAEY,OAAO,CAAC,QAAQ,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,eAAe,EAAE,GAAG,EAAE,QAAQ;;;;CAgBnG;AAED,qBACa,WAAY,SAAQ,SAAS;IAExC,SAAS,CAAC,SAAS,EAAE,UAAU,CAAC;IAGhC,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC;IAEb,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAE9B,IAAW,aAAa,IAAI,MAAM,CAEjC;IAEY,OAAO,CAAC,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,eAAe,EAAE,GAAG,EAAE,QAAQ;;;;IAWjG,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,eAAe,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,EAAE,QAAQ;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,SAAS,EAAgG,MAAM,cAAc,CAAC;AAC5I,OAAO,EAAE,eAAe,EAAE,UAAU,EAAoB,aAAa,EAAE,WAAW,EAAE,OAAO,IAAI,QAAQ,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1I,OAAO,EAAE,UAAU,EAAqC,YAAY,EAAM,MAAM,aAAa,CAAC;AAE9F,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAGnD,cAAc,iBAAiB,CAAC;AAChC,cAAc,YAAY,CAAC;AAC3B,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,UAAU,CAAC;AACzB,cAAc,mCAAmC,CAAC;AAElD,qBACa,SAAU,SAAQ,SAAS;IACtC,IAAW,aAAa,IAAI,MAAM,CAEjC;IAEY,OAAO,CAAC,QAAQ,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,eAAe,EAAE,GAAG,EAAE,QAAQ;;;;CAgBnG;AAED,qBACa,WAAY,SAAQ,SAAS;IAExC,SAAS,CAAC,SAAS,EAAE,UAAU,CAAC;IAGhC,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC;IAEb,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAE9B,IAAW,aAAa,IAAI,MAAM,CAEjC;IAEY,OAAO,CAAC,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,eAAe,EAAE,GAAG,EAAE,QAAQ;;;;IAWjG,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,eAAe,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,EAAE,QAAQ;IAuB1F,SAAS,CAAC,+BAA+B,CAAC,QAAQ,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,eAAe,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,EAAE,QAAQ;CAoDrJ;AAED,qBAAa,eAAgB,SAAQ,WAAW;IACjC,OAAO,CAAC,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC;CAS3E;AAED,wBAAgB,OAAO,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,aAAa,yGAE3D;AAED,wBAAgB,SAAS,CAAC,OAAO,CAAC,EAAE,gBAAgB,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,yGAEnE;AAED,qBACa,mBAAoB,SAAQ,YAAY;IACtC,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAgBxC"}
|
package/lib/cjs/index.js
CHANGED
|
@@ -66,8 +66,7 @@ let FromDbModel = class FromDbModel extends http_1.RouteArgs {
|
|
|
66
66
|
async extract(callData, args, param, req) {
|
|
67
67
|
let result = null;
|
|
68
68
|
if (param?.Options?.query) {
|
|
69
|
-
result = await param.Options.query.call(param.RuntimeType.query(), args, this._extractValue(param, req)).firstOrThrow(new orm_1.OrmNotFoundException(
|
|
70
|
-
;
|
|
69
|
+
result = await param.Options.query.call(param.RuntimeType.query(), args, this._extractValue(param, req)).firstOrThrow(new orm_1.OrmNotFoundException('Resource not found'));
|
|
71
70
|
}
|
|
72
71
|
else {
|
|
73
72
|
result = await this.fromDbModelDefaultQueryFunction(callData, args, param, req);
|
|
@@ -127,10 +126,10 @@ let FromDbModel = class FromDbModel extends http_1.RouteArgs {
|
|
|
127
126
|
}
|
|
128
127
|
}
|
|
129
128
|
/**
|
|
130
|
-
|
|
131
|
-
|
|
129
|
+
* Checks include field
|
|
130
|
+
*/
|
|
132
131
|
if (param.Options?.noInclude === true) {
|
|
133
|
-
return query.firstOrThrow(new orm_1.OrmNotFoundException(
|
|
132
|
+
return query.firstOrThrow(new orm_1.OrmNotFoundException('Resource not found'));
|
|
134
133
|
}
|
|
135
134
|
/**
|
|
136
135
|
* Checks include field
|
|
@@ -138,7 +137,7 @@ let FromDbModel = class FromDbModel extends http_1.RouteArgs {
|
|
|
138
137
|
if (callData.Payload?.Query?.Args?.include || callData.Payload?.Query?.Args?._include) {
|
|
139
138
|
query.populate(callData.Payload.Query.Args.include ?? callData.Payload.Query.Args._include);
|
|
140
139
|
}
|
|
141
|
-
return query.firstOrThrow(new orm_1.OrmNotFoundException(
|
|
140
|
+
return query.firstOrThrow(new orm_1.OrmNotFoundException('Resource not found'));
|
|
142
141
|
}
|
|
143
142
|
};
|
|
144
143
|
exports.FromDbModel = FromDbModel;
|
package/lib/cjs/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sCAA4I;AAC5I,wCAA0I;AAC1I,oCAA8F;AAC9F,yCAAiD;AAEjD,oDAAsD;AAEtD,kDAAgC;AAChC,6CAA2B;AAC3B,kDAAgC;AAChC,iDAA+B;AAC/B,iDAA+B;AAC/B,gDAA8B;AAC9B,2CAAyB;AACzB,oEAAkD;AAG3C,IAAM,SAAS,GAAf,MAAM,SAAU,SAAQ,gBAAS;IACtC,IAAW,aAAa;QACtB,OAAO,WAAW,CAAC;IACrB,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,QAAoB,EAAE,KAAgB,EAAE,KAAsB,EAAE,GAAa;QAChG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;YACd,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;QAC5C,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,KAAK,CAAC,WAAW,EAAe,CAAC;QACpD,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC;QAEzD,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,IAAI,kBAAY,CAAC,+BAA+B,KAAK,CAAC,OAAO,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,cAAc,CAAC,CAAC;QACzG,CAAC;QAED,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAErB,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IAC9C,CAAC;CACF,CAAA;AArBY,8BAAS;oBAAT,SAAS;IADrB,IAAA,eAAU,GAAE;GACA,SAAS,CAqBrB;AAGM,IAAM,WAAW,GAAjB,MAAM,WAAY,SAAQ,gBAAS;IAOxC,KAAK,CAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
|
package/lib/cjs/interfaces.d.ts
CHANGED
|
@@ -27,6 +27,14 @@ export interface IFilter {
|
|
|
27
27
|
Operator: FilterableOperators;
|
|
28
28
|
Value: any;
|
|
29
29
|
}
|
|
30
|
+
export interface IFilterRequest {
|
|
31
|
+
op: FilterableLogicalOperators;
|
|
32
|
+
filters: IFilter[];
|
|
33
|
+
}
|
|
34
|
+
export declare enum FilterableLogicalOperators {
|
|
35
|
+
And = "and",
|
|
36
|
+
Or = "or"
|
|
37
|
+
}
|
|
30
38
|
export interface FromModelOptions<T extends ModelBase> {
|
|
31
39
|
/**
|
|
32
40
|
* Optiona route/param/body field for primary key
|
|
@@ -62,5 +70,5 @@ export interface FromModelOptions<T extends ModelBase> {
|
|
|
62
70
|
*/
|
|
63
71
|
query?: (this: SelectQueryBuilder<T>, routeParams: any, value: any) => SelectQueryBuilder;
|
|
64
72
|
}
|
|
65
|
-
export type FilterableOperators = 'eq' | 'neq' | 'gt' | 'gte' | 'lt' | 'lte' | 'like' | 'in' | 'nin' | 'between' | 'isnull' | 'notnull' | 'notbetween' | 'b-like' | 'e-like' | 'exists' | 'n-exists';
|
|
73
|
+
export type FilterableOperators = 'eq' | 'neq' | 'gt' | 'gte' | 'lt' | 'lte' | 'like' | 'in' | 'nin' | 'between' | 'isnull' | 'notnull' | 'notbetween' | 'b-like' | 'e-like' | 'exists' | 'n-exists' | 'regexp';
|
|
66
74
|
//# sourceMappingURL=interfaces.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../src/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAGvF,qBACa,qBAAqB;IACzB,IAAI,EAAE;QACX,IAAI,EAAE,MAAM,CAAC;QACb,EAAE,EAAE,MAAM,CAAC;QACX,UAAU,EAAE,GAAG,CAAC;QAChB,aAAa,EAAE,GAAG,CAAC;KACpB,CAAQ;gBAEG,IAAI,EAAE,GAAG;CAGtB;AAED,MAAM,WAAW,iBAAiB;IAChC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;CAClC;AAED,MAAM,WAAW,aAAa,CAAC,CAAC;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,mBAAmB,EAAE,CAAC;IACjC,KAAK,CAAC,EAAE,CAAC,QAAQ,
|
|
1
|
+
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../src/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAGvF,qBACa,qBAAqB;IACzB,IAAI,EAAE;QACX,IAAI,EAAE,MAAM,CAAC;QACb,EAAE,EAAE,MAAM,CAAC;QACX,UAAU,EAAE,GAAG,CAAC;QAChB,aAAa,EAAE,GAAG,CAAC;KACpB,CAAQ;gBAEG,IAAI,EAAE,GAAG;CAGtB;AAED,MAAM,WAAW,iBAAiB;IAChC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;CAClC;AAED,MAAM,WAAW,aAAa,CAAC,CAAC;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,mBAAmB,EAAE,CAAC;IACjC,KAAK,CAAC,EAAE,CAAC,QAAQ,EAAE,mBAAmB,EAAE,KAAK,EAAE,GAAG,KAAK,aAAa,CAAC,CAAC,CAAC,CAAC;CACzE;AAED,MAAM,WAAW,OAAO;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,mBAAmB,CAAC;IAC9B,KAAK,EAAE,GAAG,CAAC;CACZ;AAGD,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,0BAA0B,CAAC;IAC/B,OAAO,EAAE,OAAO,EAAE,CAAC;CACpB;AAED,oBAAY,0BAA0B;IACpC,GAAG,QAAQ;IACX,EAAE,OAAO;CACV;AAED,MAAM,WAAW,gBAAgB,CAAC,CAAC,SAAS,SAAS;IACnD;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;OAGG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;;;;;;;;;OAUG;IACH,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,KAAK,kBAAkB,CAAC;CAC3F;AAED,MAAM,MAAM,mBAAmB,GAAG,IAAI,GAAG,KAAK,GAAG,IAAI,GAAG,KAAK,GAAG,IAAI,GAAG,KAAK,GAAG,MAAM,GAAG,IAAI,GAAG,KAAK,GAAG,SAAS,GAAG,QAAQ,GAAG,SAAS,GAAG,YAAY,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,UAAU,GAAG,QAAQ,CAAC"}
|
package/lib/cjs/interfaces.js
CHANGED
|
@@ -9,7 +9,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.JsonApiIncomingObject = void 0;
|
|
12
|
+
exports.FilterableLogicalOperators = exports.JsonApiIncomingObject = void 0;
|
|
13
13
|
const validation_1 = require("@spinajs/validation");
|
|
14
14
|
let JsonApiIncomingObject = class JsonApiIncomingObject {
|
|
15
15
|
constructor(data) {
|
|
@@ -22,4 +22,9 @@ exports.JsonApiIncomingObject = JsonApiIncomingObject = __decorate([
|
|
|
22
22
|
(0, validation_1.Schema)('http://json-schema.org/draft-07/schema#'),
|
|
23
23
|
__metadata("design:paramtypes", [Object])
|
|
24
24
|
], JsonApiIncomingObject);
|
|
25
|
+
var FilterableLogicalOperators;
|
|
26
|
+
(function (FilterableLogicalOperators) {
|
|
27
|
+
FilterableLogicalOperators["And"] = "and";
|
|
28
|
+
FilterableLogicalOperators["Or"] = "or";
|
|
29
|
+
})(FilterableLogicalOperators || (exports.FilterableLogicalOperators = FilterableLogicalOperators = {}));
|
|
25
30
|
//# sourceMappingURL=interfaces.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../src/interfaces.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,oDAA6C;AAGtC,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAQhC,YAAY,IAAS;QAPd,SAAI,GAKP,IAAI,CAAC;QAGP,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC5B,CAAC;CACF,CAAA;AAXY,sDAAqB;gCAArB,qBAAqB;IADjC,IAAA,mBAAM,EAAC,yCAAyC,CAAC;;GACrC,qBAAqB,CAWjC"}
|
|
1
|
+
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../src/interfaces.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,oDAA6C;AAGtC,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAQhC,YAAY,IAAS;QAPd,SAAI,GAKP,IAAI,CAAC;QAGP,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC5B,CAAC;CACF,CAAA;AAXY,sDAAqB;gCAArB,qBAAqB;IADjC,IAAA,mBAAM,EAAC,yCAAyC,CAAC;;GACrC,qBAAqB,CAWjC;AA6BD,IAAY,0BAGX;AAHD,WAAY,0BAA0B;IACpC,yCAAW,CAAA;IACX,uCAAS,CAAA;AACX,CAAC,EAHW,0BAA0B,0CAA1B,0BAA0B,QAGrC"}
|
package/lib/cjs/model.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import './builders.js';
|
|
2
|
-
import {
|
|
2
|
+
import { IFilterRequest, FilterableLogicalOperators } from './interfaces.js';
|
|
3
3
|
export declare const MODEL_STATIC_MIXINS: {
|
|
4
|
-
filter(
|
|
4
|
+
filter(filterRequest: IFilterRequest): Promise<any>;
|
|
5
5
|
filterColumns(): {
|
|
6
6
|
column: string;
|
|
7
7
|
operators: import("./interfaces.js").FilterableOperators[];
|
|
@@ -9,24 +9,33 @@ export declare const MODEL_STATIC_MIXINS: {
|
|
|
9
9
|
}[];
|
|
10
10
|
filterSchema(): {
|
|
11
11
|
type: string;
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
anyOf: {
|
|
12
|
+
properties: {
|
|
13
|
+
op: {
|
|
15
14
|
type: string;
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
};
|
|
24
|
-
Operator: {
|
|
15
|
+
enum: FilterableLogicalOperators[];
|
|
16
|
+
};
|
|
17
|
+
filters: {
|
|
18
|
+
type: string;
|
|
19
|
+
items: {
|
|
20
|
+
type: string;
|
|
21
|
+
anyOf: {
|
|
25
22
|
type: string;
|
|
26
|
-
|
|
27
|
-
|
|
23
|
+
required: string[];
|
|
24
|
+
properties: {
|
|
25
|
+
Column: {
|
|
26
|
+
const: string;
|
|
27
|
+
};
|
|
28
|
+
Value: {
|
|
29
|
+
type: string[];
|
|
30
|
+
};
|
|
31
|
+
Operator: {
|
|
32
|
+
type: string;
|
|
33
|
+
enum: import("./interfaces.js").FilterableOperators[];
|
|
34
|
+
};
|
|
35
|
+
};
|
|
36
|
+
}[];
|
|
28
37
|
};
|
|
29
|
-
}
|
|
38
|
+
};
|
|
30
39
|
};
|
|
31
40
|
};
|
|
32
41
|
};
|
package/lib/cjs/model.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/model.ts"],"names":[],"mappings":"AACA,OAAO,eAAe,CAAC;AACvB,OAAO,EAAiB,
|
|
1
|
+
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/model.ts"],"names":[],"mappings":"AACA,OAAO,eAAe,CAAC;AACvB,OAAO,EAAiB,cAAc,EAAE,0BAA0B,EAAE,MAAM,iBAAiB,CAAC;AAE5F,eAAO,MAAM,mBAAmB;0BACF,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuD3C,CAAC"}
|
package/lib/cjs/model.js
CHANGED
|
@@ -3,10 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.MODEL_STATIC_MIXINS = void 0;
|
|
4
4
|
const orm_1 = require("@spinajs/orm");
|
|
5
5
|
require("./builders.js");
|
|
6
|
+
const interfaces_js_1 = require("./interfaces.js");
|
|
6
7
|
exports.MODEL_STATIC_MIXINS = {
|
|
7
|
-
async filter(
|
|
8
|
+
async filter(filterRequest) {
|
|
8
9
|
const { query } = (0, orm_1.createQuery)(this, orm_1.SelectQueryBuilder);
|
|
9
|
-
return query.filter(filters);
|
|
10
|
+
return query.filter(filterRequest.filters, filterRequest.op);
|
|
10
11
|
},
|
|
11
12
|
filterColumns() {
|
|
12
13
|
const modelDescriptor = this.getModelDescriptor();
|
|
@@ -27,20 +28,29 @@ exports.MODEL_STATIC_MIXINS = {
|
|
|
27
28
|
throw new orm_1.OrmException(`Model ${this.constructor.name} has no descriptor`);
|
|
28
29
|
}
|
|
29
30
|
return {
|
|
30
|
-
type: '
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
31
|
+
type: 'object',
|
|
32
|
+
properties: {
|
|
33
|
+
op: {
|
|
34
|
+
type: 'string',
|
|
35
|
+
enum: [interfaces_js_1.FilterableLogicalOperators.And, interfaces_js_1.FilterableLogicalOperators.Or],
|
|
36
|
+
},
|
|
37
|
+
filters: {
|
|
38
|
+
type: 'array',
|
|
39
|
+
items: {
|
|
35
40
|
type: 'object',
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
41
|
+
anyOf: [...modelDescriptor.FilterableColumns.entries()].map(([key, val]) => {
|
|
42
|
+
return {
|
|
43
|
+
type: 'object',
|
|
44
|
+
required: ['Column', 'Operator'],
|
|
45
|
+
properties: {
|
|
46
|
+
Column: { const: key },
|
|
47
|
+
Value: { type: ['string', 'integer', 'array', 'boolean'] },
|
|
48
|
+
Operator: { type: 'string', enum: val.operators },
|
|
49
|
+
},
|
|
50
|
+
};
|
|
51
|
+
}),
|
|
52
|
+
},
|
|
53
|
+
},
|
|
44
54
|
},
|
|
45
55
|
};
|
|
46
56
|
},
|
package/lib/cjs/model.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../src/model.ts"],"names":[],"mappings":";;;AAAA,sCAA+F;AAC/F,yBAAuB;
|
|
1
|
+
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../src/model.ts"],"names":[],"mappings":";;;AAAA,sCAA+F;AAC/F,yBAAuB;AACvB,mDAA4F;AAE/E,QAAA,mBAAmB,GAAG;IACjC,KAAK,CAAC,MAAM,CAAC,aAA6B;QACxC,MAAM,EAAE,KAAK,EAAE,GAAG,IAAA,iBAAW,EAAC,IAAI,EAAE,wBAAkB,CAAC,CAAC;QACxD,OAAQ,KAAa,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,EAAE,aAAa,CAAC,EAAE,CAAC,CAAC;IACxE,CAAC;IAED,aAAa;QACX,MAAM,eAAe,GAAI,IAAY,CAAC,kBAAkB,EAAsB,CAAC;QAE/E,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,MAAM,IAAI,kBAAY,CAAC,SAAS,IAAI,CAAC,WAAW,CAAC,IAAI,oBAAoB,CAAC,CAAC;QAC7E,CAAC;QAED,OAAO,CAAC,GAAG,eAAe,CAAC,iBAAiB,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAmC,EAAE,EAAE;YAC3G,OAAO;gBACL,MAAM,EAAE,GAAG;gBACX,SAAS,EAAE,GAAG,CAAC,SAAS;gBACxB,KAAK,EAAE,GAAG,CAAC,KAAK;aACjB,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAED,YAAY;QACV,MAAM,eAAe,GAAI,IAAY,CAAC,kBAAkB,EAAsB,CAAC;QAE/E,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,MAAM,IAAI,kBAAY,CAAC,SAAS,IAAI,CAAC,WAAW,CAAC,IAAI,oBAAoB,CAAC,CAAC;QAC7E,CAAC;QAED,OAAO;YACL,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE;gBACV,EAAE,EAAE;oBACF,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE,CAAC,0CAA0B,CAAC,GAAG,EAAE,0CAA0B,CAAC,EAAE,CAAC;iBACtE;gBACD,OAAO,EAAE;oBACP,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE;wBACL,IAAI,EAAE,QAAQ;wBACd,KAAK,EAAE,CAAC,GAAG,eAAe,CAAC,iBAAiB,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,CAAmC,EAAE,EAAE;4BAC3G,OAAO;gCACL,IAAI,EAAE,QAAQ;gCACd,QAAQ,EAAE,CAAC,QAAQ,EAAE,UAAU,CAAC;gCAChC,UAAU,EAAE;oCACV,MAAM,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE;oCACtB,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE;oCAC1D,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,CAAC,SAAS,EAAE;iCAClD;6BACF,CAAC;wBACJ,CAAC,CAAC;qBACH;iBACF;aACF;SACF,CAAC;IACJ,CAAC;CACF,CAAC"}
|