@steroidsjs/nest 4.3.0 → 4.4.1
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/infrastructure/adapters/QueryAdapterTypeORM.js +2 -1
- package/infrastructure/adapters/QueryAdapterTypeORM.js.map +1 -1
- package/infrastructure/applications/rest/IRestAppModuleConfig.d.ts +4 -0
- package/infrastructure/applications/rest/RestApplication.d.ts +5 -0
- package/infrastructure/applications/rest/RestApplication.js +9 -0
- package/infrastructure/applications/rest/RestApplication.js.map +1 -1
- package/infrastructure/decorators/Transform.d.ts +2 -2
- package/infrastructure/decorators/fields/BaseField.d.ts +15 -47
- package/infrastructure/decorators/fields/BaseField.js +36 -105
- package/infrastructure/decorators/fields/BaseField.js.map +1 -1
- package/infrastructure/decorators/fields/BooleanField.js +1 -1
- package/infrastructure/decorators/fields/BooleanField.js.map +1 -1
- package/infrastructure/decorators/fields/ComputableField.js +0 -1
- package/infrastructure/decorators/fields/ComputableField.js.map +1 -1
- package/infrastructure/decorators/fields/CoordinateField.js +1 -1
- package/infrastructure/decorators/fields/CoordinateField.js.map +1 -1
- package/infrastructure/decorators/fields/CreateTimeField.js +1 -1
- package/infrastructure/decorators/fields/CreateTimeField.js.map +1 -1
- package/infrastructure/decorators/fields/DateField.js +1 -1
- package/infrastructure/decorators/fields/DateField.js.map +1 -1
- package/infrastructure/decorators/fields/DateTimeField.js +2 -2
- package/infrastructure/decorators/fields/DateTimeField.js.map +1 -1
- package/infrastructure/decorators/fields/DecimalField.js +1 -1
- package/infrastructure/decorators/fields/DecimalField.js.map +1 -1
- package/infrastructure/decorators/fields/DecimalNumberField.js +1 -1
- package/infrastructure/decorators/fields/DecimalNumberField.js.map +1 -1
- package/infrastructure/decorators/fields/DeleteDateField.js +1 -1
- package/infrastructure/decorators/fields/DeleteDateField.js.map +1 -1
- package/infrastructure/decorators/fields/EmailField.js +1 -1
- package/infrastructure/decorators/fields/EmailField.js.map +1 -1
- package/infrastructure/decorators/fields/EnumField.js +1 -1
- package/infrastructure/decorators/fields/EnumField.js.map +1 -1
- package/infrastructure/decorators/fields/FileField.js +1 -1
- package/infrastructure/decorators/fields/FileField.js.map +1 -1
- package/infrastructure/decorators/fields/GeometryField.d.ts +2 -0
- package/infrastructure/decorators/fields/GeometryField.js +2 -1
- package/infrastructure/decorators/fields/GeometryField.js.map +1 -1
- package/infrastructure/decorators/fields/HtmlField.js +1 -1
- package/infrastructure/decorators/fields/HtmlField.js.map +1 -1
- package/infrastructure/decorators/fields/IntegerField.js +1 -1
- package/infrastructure/decorators/fields/IntegerField.js.map +1 -1
- package/infrastructure/decorators/fields/JSONBField.d.ts +4 -1
- package/infrastructure/decorators/fields/JSONBField.js +2 -2
- package/infrastructure/decorators/fields/JSONBField.js.map +1 -1
- package/infrastructure/decorators/fields/PasswordField.js +1 -1
- package/infrastructure/decorators/fields/PasswordField.js.map +1 -1
- package/infrastructure/decorators/fields/PhoneField.js +1 -1
- package/infrastructure/decorators/fields/PhoneField.js.map +1 -1
- package/infrastructure/decorators/fields/PrimaryKeyField.js +1 -1
- package/infrastructure/decorators/fields/PrimaryKeyField.js.map +1 -1
- package/infrastructure/decorators/fields/RelationField.d.ts +6 -4
- package/infrastructure/decorators/fields/RelationField.js +5 -8
- package/infrastructure/decorators/fields/RelationField.js.map +1 -1
- package/infrastructure/decorators/fields/RelationIdField.js +1 -1
- package/infrastructure/decorators/fields/RelationIdField.js.map +1 -1
- package/infrastructure/decorators/fields/StringField.js +1 -1
- package/infrastructure/decorators/fields/StringField.js.map +1 -1
- package/infrastructure/decorators/fields/TextField.js +1 -1
- package/infrastructure/decorators/fields/TextField.js.map +1 -1
- package/infrastructure/decorators/fields/TimeField.js +1 -1
- package/infrastructure/decorators/fields/TimeField.js.map +1 -1
- package/infrastructure/decorators/fields/UidField.js +1 -1
- package/infrastructure/decorators/fields/UidField.js.map +1 -1
- package/infrastructure/decorators/fields/UpdateTimeField.js +1 -1
- package/infrastructure/decorators/fields/UpdateTimeField.js.map +1 -1
- package/infrastructure/decorators/fields/helpers/InternalFieldMetadataHelpers.d.ts +27 -0
- package/infrastructure/decorators/fields/helpers/InternalFieldMetadataHelpers.js +104 -0
- package/infrastructure/decorators/fields/helpers/InternalFieldMetadataHelpers.js.map +1 -0
- package/infrastructure/decorators/typeorm/TypeOrmDecoratorFactory.d.ts +3 -2
- package/infrastructure/decorators/typeorm/TypeOrmDecoratorFactory.js.map +1 -1
- package/infrastructure/decorators/typeorm/TypeOrmTableFromModel.js.map +1 -1
- package/infrastructure/decorators/typeorm/fields/TypeOrmBooleanField/index.js +1 -1
- package/infrastructure/decorators/typeorm/fields/TypeOrmBooleanField/index.js.map +1 -1
- package/infrastructure/decorators/typeorm/fields/TypeOrmUidField/index.js +1 -1
- package/infrastructure/decorators/typeorm/fields/TypeOrmUidField/index.js.map +1 -1
- package/infrastructure/pipes/CreateDtoPipe.d.ts +5 -1
- package/infrastructure/pipes/CreateDtoPipe.js +23 -4
- package/infrastructure/pipes/CreateDtoPipe.js.map +1 -1
- package/infrastructure/pipes/CreateDtoPipe.test.d.ts +1 -0
- package/infrastructure/pipes/CreateDtoPipe.test.js +98 -0
- package/infrastructure/pipes/CreateDtoPipe.test.js.map +1 -0
- package/package.json +3 -1
- package/tsconfig.tsbuildinfo +1 -1
- package/usecases/base/SearchQuery.d.ts +11 -0
- package/usecases/base/SearchQuery.js +28 -2
- package/usecases/base/SearchQuery.js.map +1 -1
- package/usecases/base/SearchQuery.test.d.ts +1 -0
- package/usecases/base/SearchQuery.test.js +102 -0
- package/usecases/base/SearchQuery.test.js.map +1 -0
- package/usecases/helpers/DataMapper.js +4 -2
- package/usecases/helpers/DataMapper.js.map +1 -1
- package/usecases/helpers/getMetaRelationsFromObject.js +3 -2
- package/usecases/helpers/getMetaRelationsFromObject.js.map +1 -1
- package/usecases/utils/wrapInDoubleQuotes.d.ts +1 -0
- package/usecases/utils/wrapInDoubleQuotes.js +15 -0
- package/usecases/utils/wrapInDoubleQuotes.js.map +1 -0
|
@@ -1,4 +1,13 @@
|
|
|
1
1
|
import { ICondition } from '../../infrastructure/helpers/typeORM/ConditionHelperTypeORM';
|
|
2
|
+
/**
|
|
3
|
+
* Order keys can be:
|
|
4
|
+
* - a field name, for example `name`
|
|
5
|
+
* - a root alias field path, for example `model.name`
|
|
6
|
+
* - a relation field path, for example `author.name` or `author.profile.name`
|
|
7
|
+
* - an already resolved relation alias path, for example `model_author.name`
|
|
8
|
+
*
|
|
9
|
+
* Field path parts can already be wrapped in double quotes.
|
|
10
|
+
*/
|
|
2
11
|
export type ISearchQueryOrder = {
|
|
3
12
|
[key: string]: 'asc' | 'desc';
|
|
4
13
|
};
|
|
@@ -67,6 +76,8 @@ export default class SearchQuery<TModel> {
|
|
|
67
76
|
orWhere(condition: ICondition): this;
|
|
68
77
|
orFilterWhere(condition: ICondition): this;
|
|
69
78
|
getWhere(): ICondition;
|
|
79
|
+
private resolveOrderByFieldPath;
|
|
80
|
+
private resolveOrderByFieldPaths;
|
|
70
81
|
orderBy(value: string | ISearchQueryOrder, direction?: 'asc' | 'desc'): this;
|
|
71
82
|
addOrderBy(value: string | ISearchQueryOrder, direction?: 'asc' | 'desc'): this;
|
|
72
83
|
getOrderBy(): ISearchQueryOrder;
|
|
@@ -5,6 +5,7 @@ const lodash_1 = require("lodash");
|
|
|
5
5
|
const crypto_1 = require("crypto");
|
|
6
6
|
const SchemaSelect_1 = require("../../infrastructure/decorators/schema/SchemaSelect");
|
|
7
7
|
const BaseField_1 = require("../../infrastructure/decorators/fields/BaseField");
|
|
8
|
+
const wrapInDoubleQuotes_1 = require("../utils/wrapInDoubleQuotes");
|
|
8
9
|
exports.DEFAULT_ALIAS = 'model';
|
|
9
10
|
const ALIAS_HASH_LENGTH = 16;
|
|
10
11
|
class SearchQuery {
|
|
@@ -193,12 +194,37 @@ class SearchQuery {
|
|
|
193
194
|
getWhere() {
|
|
194
195
|
return this._condition;
|
|
195
196
|
}
|
|
197
|
+
resolveOrderByFieldPath(fieldPath) {
|
|
198
|
+
const pathToField = fieldPath.split('.');
|
|
199
|
+
const field = pathToField.pop();
|
|
200
|
+
if (pathToField[0] && (0, wrapInDoubleQuotes_1.wrapInDoubleQuotes)(pathToField[0]) === (0, wrapInDoubleQuotes_1.wrapInDoubleQuotes)(this._alias)) {
|
|
201
|
+
pathToField.shift();
|
|
202
|
+
}
|
|
203
|
+
if (!pathToField.length) {
|
|
204
|
+
if (field.split('_')[0] === this._alias) {
|
|
205
|
+
return (0, wrapInDoubleQuotes_1.wrapInDoubleQuotes)(field);
|
|
206
|
+
}
|
|
207
|
+
return `${(0, wrapInDoubleQuotes_1.wrapInDoubleQuotes)(this._alias)}.${(0, wrapInDoubleQuotes_1.wrapInDoubleQuotes)(field)}`;
|
|
208
|
+
}
|
|
209
|
+
if (pathToField.length === 1 && pathToField[0].split('_')[0] === this._alias) {
|
|
210
|
+
return `${(0, wrapInDoubleQuotes_1.wrapInDoubleQuotes)(pathToField[0])}.${(0, wrapInDoubleQuotes_1.wrapInDoubleQuotes)(field)}`;
|
|
211
|
+
}
|
|
212
|
+
return `${(0, wrapInDoubleQuotes_1.wrapInDoubleQuotes)(this.getRelationAlias(pathToField.join('.')))}.${(0, wrapInDoubleQuotes_1.wrapInDoubleQuotes)(field)}`;
|
|
213
|
+
}
|
|
214
|
+
resolveOrderByFieldPaths(orderValue, direction) {
|
|
215
|
+
if (typeof orderValue === 'string') {
|
|
216
|
+
return {
|
|
217
|
+
[this.resolveOrderByFieldPath(orderValue)]: direction,
|
|
218
|
+
};
|
|
219
|
+
}
|
|
220
|
+
return Object.entries(orderValue).reduce((acc, [key, value]) => (Object.assign(Object.assign({}, acc), { [this.resolveOrderByFieldPath(key)]: value })), {});
|
|
221
|
+
}
|
|
196
222
|
orderBy(value, direction = 'asc') {
|
|
197
|
-
this._orders =
|
|
223
|
+
this._orders = this.resolveOrderByFieldPaths(value, direction);
|
|
198
224
|
return this;
|
|
199
225
|
}
|
|
200
226
|
addOrderBy(value, direction = 'asc') {
|
|
201
|
-
this._orders = Object.assign(Object.assign({}, this._orders), (
|
|
227
|
+
this._orders = Object.assign(Object.assign({}, this._orders), this.resolveOrderByFieldPaths(value, direction));
|
|
202
228
|
return this;
|
|
203
229
|
}
|
|
204
230
|
getOrderBy() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SearchQuery.js","sourceRoot":"","sources":["../../../src/usecases/base/SearchQuery.ts"],"names":[],"mappings":";;;AAAA,mCAAqC;AACrC,mCAAkC;AAClC,sFAA2F;AAC3F,gFAAkF;
|
|
1
|
+
{"version":3,"file":"SearchQuery.js","sourceRoot":"","sources":["../../../src/usecases/base/SearchQuery.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,102 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const globals_1 = require("@jest/globals");
|
|
4
|
+
const SearchQuery_1 = require("./SearchQuery");
|
|
5
|
+
(0, globals_1.describe)('SearchQuery', () => {
|
|
6
|
+
let searchQuery;
|
|
7
|
+
(0, globals_1.beforeEach)(() => {
|
|
8
|
+
searchQuery = new SearchQuery_1.default();
|
|
9
|
+
searchQuery.alias('model');
|
|
10
|
+
});
|
|
11
|
+
(0, globals_1.describe)('orderBy', () => {
|
|
12
|
+
(0, globals_1.it)('should resolve field name', () => {
|
|
13
|
+
searchQuery.orderBy('name');
|
|
14
|
+
(0, globals_1.expect)(searchQuery.getOrderBy()).toEqual({
|
|
15
|
+
'"model"."name"': 'asc',
|
|
16
|
+
});
|
|
17
|
+
});
|
|
18
|
+
(0, globals_1.it)('should resolve root alias field path', () => {
|
|
19
|
+
searchQuery.orderBy('model.email');
|
|
20
|
+
(0, globals_1.expect)(searchQuery.getOrderBy()).toEqual({
|
|
21
|
+
'"model"."email"': 'asc',
|
|
22
|
+
});
|
|
23
|
+
});
|
|
24
|
+
(0, globals_1.it)('should resolve root alias relation field path', () => {
|
|
25
|
+
searchQuery.orderBy('model.relation.age');
|
|
26
|
+
(0, globals_1.expect)(searchQuery.getOrderBy()).toEqual({
|
|
27
|
+
'"model_relation"."age"': 'asc',
|
|
28
|
+
});
|
|
29
|
+
});
|
|
30
|
+
(0, globals_1.it)('should resolve relation alias field path', () => {
|
|
31
|
+
searchQuery.orderBy('model_relation.city');
|
|
32
|
+
(0, globals_1.expect)(searchQuery.getOrderBy()).toEqual({
|
|
33
|
+
'"model_relation"."city"': 'asc',
|
|
34
|
+
});
|
|
35
|
+
});
|
|
36
|
+
(0, globals_1.it)('should resolve nested root alias relation field path', () => {
|
|
37
|
+
searchQuery.orderBy('model.relation1.relation2.address');
|
|
38
|
+
(0, globals_1.expect)(searchQuery.getOrderBy()).toEqual({
|
|
39
|
+
'"model_relation1_relation2"."address"': 'asc',
|
|
40
|
+
});
|
|
41
|
+
});
|
|
42
|
+
(0, globals_1.it)('should resolve nested relation alias field path', () => {
|
|
43
|
+
searchQuery.orderBy('model_relation1_relation2.country');
|
|
44
|
+
(0, globals_1.expect)(searchQuery.getOrderBy()).toEqual({
|
|
45
|
+
'"model_relation1_relation2"."country"': 'asc',
|
|
46
|
+
});
|
|
47
|
+
});
|
|
48
|
+
(0, globals_1.it)('should resolve relation alias with nested relation field path', () => {
|
|
49
|
+
searchQuery.orderBy('model_relation1_relation2.relation3.field');
|
|
50
|
+
(0, globals_1.expect)(searchQuery.getOrderBy()).toEqual({
|
|
51
|
+
'"model_model_relation1_relation2_relation3"."field"': 'asc',
|
|
52
|
+
});
|
|
53
|
+
});
|
|
54
|
+
(0, globals_1.it)('should resolve quoted root alias field path', () => {
|
|
55
|
+
searchQuery.orderBy('"model"."createdTime"');
|
|
56
|
+
(0, globals_1.expect)(searchQuery.getOrderBy()).toEqual({
|
|
57
|
+
'"model"."createdTime"': 'asc',
|
|
58
|
+
});
|
|
59
|
+
});
|
|
60
|
+
(0, globals_1.it)('should resolve partially quoted root alias field path', () => {
|
|
61
|
+
searchQuery.orderBy('model."updatedTime"');
|
|
62
|
+
(0, globals_1.expect)(searchQuery.getOrderBy()).toEqual({
|
|
63
|
+
'"model"."updatedTime"': 'asc',
|
|
64
|
+
});
|
|
65
|
+
});
|
|
66
|
+
(0, globals_1.it)('should resolve quoted root alias with unquoted field path', () => {
|
|
67
|
+
searchQuery.orderBy('"model".deleteTime');
|
|
68
|
+
(0, globals_1.expect)(searchQuery.getOrderBy()).toEqual({
|
|
69
|
+
'"model"."deleteTime"': 'asc',
|
|
70
|
+
});
|
|
71
|
+
});
|
|
72
|
+
(0, globals_1.it)('should resolve root alias field', () => {
|
|
73
|
+
searchQuery.orderBy('model_name');
|
|
74
|
+
(0, globals_1.expect)(searchQuery.getOrderBy()).toEqual({
|
|
75
|
+
'"model_name"': 'asc',
|
|
76
|
+
});
|
|
77
|
+
});
|
|
78
|
+
(0, globals_1.it)('should resolve relation alias field', () => {
|
|
79
|
+
searchQuery.orderBy('model_relation_name');
|
|
80
|
+
(0, globals_1.expect)(searchQuery.getOrderBy()).toEqual({
|
|
81
|
+
'"model_relation_name"': 'asc',
|
|
82
|
+
});
|
|
83
|
+
});
|
|
84
|
+
(0, globals_1.it)('should use provided direction for a string field path', () => {
|
|
85
|
+
searchQuery.orderBy('relation.age', 'desc');
|
|
86
|
+
(0, globals_1.expect)(searchQuery.getOrderBy()).toEqual({
|
|
87
|
+
'"model_relation"."age"': 'desc',
|
|
88
|
+
});
|
|
89
|
+
});
|
|
90
|
+
(0, globals_1.it)('should resolve object field paths with their directions', () => {
|
|
91
|
+
searchQuery.orderBy({
|
|
92
|
+
name: 'asc',
|
|
93
|
+
'relation.age': 'desc',
|
|
94
|
+
});
|
|
95
|
+
(0, globals_1.expect)(searchQuery.getOrderBy()).toEqual({
|
|
96
|
+
'"model"."name"': 'asc',
|
|
97
|
+
'"model_relation"."age"': 'desc',
|
|
98
|
+
});
|
|
99
|
+
});
|
|
100
|
+
});
|
|
101
|
+
});
|
|
102
|
+
//# sourceMappingURL=SearchQuery.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"SearchQuery.test.js","sourceRoot":"","sources":["../../../src/usecases/base/SearchQuery.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -54,6 +54,7 @@ class DataMapper {
|
|
|
54
54
|
: [transformType];
|
|
55
55
|
keys.forEach(name => {
|
|
56
56
|
const options = (0, BaseField_1.getFieldOptions)(MetaClass, name);
|
|
57
|
+
const appType = (0, BaseField_1.getFieldAppType)(MetaClass, name);
|
|
57
58
|
const sourceName = (options === null || options === void 0 ? void 0 : options.sourceFieldName) || name;
|
|
58
59
|
if (!options && (0, BaseField_1.isMetaClass)(MetaClass)) {
|
|
59
60
|
return;
|
|
@@ -62,7 +63,7 @@ class DataMapper {
|
|
|
62
63
|
const value = (options === null || options === void 0 ? void 0 : options.isArray) && values[sourceName] != null && !Array.isArray(values[sourceName])
|
|
63
64
|
? [values[sourceName]]
|
|
64
65
|
: values[sourceName];
|
|
65
|
-
if (
|
|
66
|
+
if (appType === 'relation') {
|
|
66
67
|
if (options.isArray && Array.isArray(value)) {
|
|
67
68
|
object[name] = value
|
|
68
69
|
.map(item => DataMapper.create(options.relationClass(), item, transformType));
|
|
@@ -106,7 +107,8 @@ class DataMapper {
|
|
|
106
107
|
attributes: fieldNames.map(fieldName => {
|
|
107
108
|
const apiMeta = Reflect.getMetadata(constants_1.DECORATORS.API_MODEL_PROPERTIES, type.prototype, fieldName);
|
|
108
109
|
const options = (0, BaseField_1.getFieldOptions)(type, fieldName);
|
|
109
|
-
const
|
|
110
|
+
const appType = (0, BaseField_1.getFieldAppType)(type, fieldName);
|
|
111
|
+
const fieldData = Object.assign({ attribute: fieldName, type: appType || 'string', label: options.label || apiMeta.description, required: apiMeta.required }, (options.enum
|
|
110
112
|
? {
|
|
111
113
|
items: (Array.isArray(options.enum) ? options.enum[0] : options.enum).name
|
|
112
114
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DataMapper.js","sourceRoot":"","sources":["../../../src/usecases/helpers/DataMapper.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AACnC,mCAA6C;AAC7C,
|
|
1
|
+
{"version":3,"file":"DataMapper.js","sourceRoot":"","sources":["../../../src/usecases/helpers/DataMapper.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AACnC,mCAA6C;AAC7C,gFAA8H;AAE9H,8DAA0D;AAE1D,yEAKmD;AAEnD,mFAA4E;AAE5E,MAAa,UAAU;IAenB;;;;;;;;;;;;OAYG;IACH,MAAM,CAAC,MAAM,CACT,SAAmB,EACnB,MAAyC,EACzC,gBAAgC,kCAAsB,EACtD,WAAW,GAAG,KAAK;QAEnB,cAAc;QACd,IAAI,MAAM,KAAK,IAAI,EAAE;YACjB,OAAO,IAAI,CAAC;SACf;QACD,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YACvB,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CACzB,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,KAAK,EAAE,aAAa,EAAE,WAAW,CAAC,CAC5D,CAAC,CAAC;SACN;QAED,MAAM,OAAO,GAAG,CAAC,WAAW,IAAI,IAAA,mCAAe,EAAC,SAAS,CAAC,CAAC;QAC3D,IAAI,OAAO,EAAE;YACT,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC;SAC1B;QAED,MAAM,MAAM,GAAG,IAAI,SAAS,EAAE,CAAC;QAE/B;;;WAGG;QACH,yCAAyC;QACzC,IAAI,MAAM,CAAC,iBAAiB,CAAC,IAAI,OAAO,MAAM,CAAC,iBAAiB,CAAC,KAAK,UAAU,IAAI,MAAM,EAAE;YACxF,MAAM,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC;YAClC,OAAO,MAAM,CAAC;SACjB;QAED,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;QAEhD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,gBAAgC,kCAAsB;QACrF,MAAM,SAAS,GAAG,MAAM,CAAC,WAAW,CAAC;QACrC,MAAM,IAAI,GAAG,IAAA,uBAAW,EAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAA,yBAAa,EAAC,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAErF,MAAM,cAAc,GAAG,aAAa,KAAK,kCAAsB;YAC3D,CAAC,CAAC,CAAC,aAAa,EAAE,qCAAyB,CAAC;YAC5C,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;QAEtB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAChB,MAAM,OAAO,GAAG,IAAA,2BAAe,EAAC,SAAS,EAAE,IAAI,CAAC,CAAC;YACjD,MAAM,OAAO,GAAG,IAAA,2BAAe,EAAC,SAAS,EAAE,IAAI,CAAC,CAAC;YACjD,MAAM,UAAU,GAAG,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,eAAe,KAAI,IAAI,CAAC;YAEpD,IAAI,CAAC,OAAO,IAAI,IAAA,uBAAW,EAAC,SAAS,CAAC,EAAE;gBACpC,OAAO;aACV;YAED,IAAI,IAAA,YAAI,EAAC,MAAM,EAAE,UAAU,CAAC,EAAE;gBAC1B,MAAM,KAAK,GAAG,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,KAAI,MAAM,CAAC,UAAU,CAAC,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;oBAC9F,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;oBACtB,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;gBAEzB,IAAI,OAAO,KAAK,UAAU,EAAE;oBACxB,IAAI,OAAO,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;wBACzC,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK;6BACf,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,IAAI,EAAE,aAAa,CAAC,CAAC,CAAC;qBACrF;yBAAM,IAAI,IAAA,iBAAS,EAAC,KAAK,CAAC,EAAE;wBACzB,MAAM,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC;qBACnF;yBAAM;wBACH,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;qBACxB;iBACJ;qBAAM;oBACH,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;iBACxB;aACJ;YAED,KAAK,IAAI,IAAI,IAAI,cAAc,EAAE;gBAC7B,IAAI,IAAA,YAAI,EAAC,MAAM,EAAE,UAAU,CAAC,IAAI,IAAI,KAAK,kCAAsB,EAAE;oBAC7D,MAAM,SAAS,GAAG,IAAA,iCAAqB,EAAC,SAAS,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;oBACzE,KAAK,IAAI,QAAQ,IAAI,SAAS,EAAE;wBAC5B,MAAM,KAAK,GAAG,QAAQ,CAAC;4BACnB,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC;4BACnB,IAAI,EAAE,MAAM;4BACZ,GAAG,EAAE,IAAI;4BACT,aAAa,EAAE,IAAI;4BACnB,OAAO;4BACP,MAAM;yBACT,CAAC,CAAC;wBACH,IAAI,OAAO,KAAK,KAAK,WAAW,EAAE;4BAC9B,MAAM,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;yBACxB;qBACJ;iBACJ;aACJ;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAED,MAAM,CAAC,YAAY,CAAC,KAAY;QAC5B,MAAM,MAAM,GAAG,EAAE,CAAC;QAClB,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACjB,MAAM,UAAU,GAAG,IAAA,yBAAa,EAAC,IAAI,CAAC,CAAC;YACvC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;gBAChB,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;oBACnC,MAAM,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,sBAAU,CAAC,oBAAoB,EAAE,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;oBAChG,MAAM,OAAO,GAAG,IAAA,2BAAe,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;oBACjD,MAAM,OAAO,GAAG,IAAA,2BAAe,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;oBAEjD,MAAM,SAAS,mBACX,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,OAAO,IAAI,QAAQ,EACzB,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,WAAW,EAC3C,QAAQ,EAAE,OAAO,CAAC,QAAQ,IACvB,CAAC,OAAO,CAAC,IAAI;wBACZ,CAAC,CAAC;4BACE,KAAK,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI;yBAC7E;wBACD,CAAC,CAAC,EAAE,CAAC,CACZ,CAAC;oBAEF,IAAI,SAAS,CAAC,IAAI,KAAK,UAAU,EAAE;wBAC/B,SAAS,CAAC,YAAY,CAAC,GAAI,OAAiC,CAAC,aAAa,EAAE,CAAC,IAAI,CAAC;qBACrF;oBAED,OAAO,SAAS,CAAC;gBACrB,CAAC,CAAC;aACL,CAAC;QACN,CAAC,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,MAAM,CAAC,WAAW,CAAC,KAAY;QAC3B,MAAM,MAAM,GAAG,EAAE,CAAC;QAClB,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACjB,IAAI,IAAI,CAAC,OAAO,EAAE;gBACd,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;oBAChB,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE;iBACzB,CAAC;aACL;QACL,CAAC,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AAvKD,gCAuKC"}
|
|
@@ -21,14 +21,15 @@ const getMetaRelationsFromObject = (obj, ModelClass) => {
|
|
|
21
21
|
const collectRelationNames = (currentObject, RelationMetaClass, parentPath = '') => {
|
|
22
22
|
Object.entries(currentObject).forEach(([fieldName, value]) => {
|
|
23
23
|
const options = (0, BaseField_1.getFieldOptions)(RelationMetaClass, fieldName);
|
|
24
|
+
const appType = (0, BaseField_1.getFieldAppType)(RelationMetaClass, fieldName);
|
|
24
25
|
if (!options) {
|
|
25
26
|
return;
|
|
26
27
|
}
|
|
27
|
-
if (
|
|
28
|
+
if (appType === 'relationId' && options.relationName) {
|
|
28
29
|
relationNames.add(joinRelationPath(parentPath, fieldName));
|
|
29
30
|
return;
|
|
30
31
|
}
|
|
31
|
-
if (
|
|
32
|
+
if (appType !== 'relation') {
|
|
32
33
|
return;
|
|
33
34
|
}
|
|
34
35
|
const relationPath = joinRelationPath(parentPath, fieldName);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getMetaRelationsFromObject.js","sourceRoot":"","sources":["../../../src/usecases/helpers/getMetaRelationsFromObject.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"getMetaRelationsFromObject.js","sourceRoot":"","sources":["../../../src/usecases/helpers/getMetaRelationsFromObject.ts"],"names":[],"mappings":";;;AAAA,gFAA+G;AAG/G,MAAM,gBAAgB,GAAG,CAAC,UAAkB,EAAE,SAAiB,EAAU,EAAE,CAAC,UAAU;IAClF,CAAC,CAAC,GAAG,UAAU,IAAI,SAAS,EAAE;IAC9B,CAAC,CAAC,SAAS,CAAC;AAEhB,MAAM,wBAAwB,GAAG,CAAC,KAAc,EAAgC,EAAE,CAAC,CAC/E,OAAO,KAAK,KAAK,QAAQ;OACtB,KAAK,KAAK,IAAI;OACd,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAC3B,CAAC;AAEF,MAAM,uBAAuB,GAAG,CAAC,KAAc,EAAyB,EAAE;IACtE,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACtB,OAAO,KAAK,CAAC,MAAM,CAAC,wBAAwB,CAAC,CAAC;KACjD;IAED,OAAO,wBAAwB,CAAC,KAAK,CAAC;QAClC,CAAC,CAAC,CAAC,KAAK,CAAC;QACT,CAAC,CAAC,EAAE,CAAC;AACb,CAAC,CAAC;AAEK,MAAM,0BAA0B,GAAG,CAAC,GAAwB,EAAE,UAAiB,EAAE,EAAE;IACtF,MAAM,aAAa,GAAG,IAAI,GAAG,EAAU,CAAC;IAExC,MAAM,oBAAoB,GAAG,CACzB,aAAkC,EAClC,iBAAwB,EACxB,UAAU,GAAG,EAAE,EACjB,EAAE;QACA,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,EAAE,KAAK,CAAC,EAAE,EAAE;YACzD,MAAM,OAAO,GAAG,IAAA,2BAAe,EAAC,iBAAiB,EAAE,SAAS,CAAC,CAAC;YAC9D,MAAM,OAAO,GAAG,IAAA,2BAAe,EAAC,iBAAiB,EAAE,SAAS,CAAC,CAAC;YAE9D,IAAI,CAAC,OAAO,EAAE;gBACV,OAAO;aACV;YAED,IAAI,OAAO,KAAK,YAAY,IAAI,OAAO,CAAC,YAAY,EAAE;gBAClD,aAAa,CAAC,GAAG,CAAC,gBAAgB,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC,CAAC;gBAC3D,OAAO;aACV;YAED,IAAI,OAAO,KAAK,UAAU,EAAE;gBACxB,OAAO;aACV;YAED,MAAM,YAAY,GAAG,gBAAgB,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;YAC7D,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;YAEhC,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE;gBACxB,OAAO;aACV;YAED,MAAM,eAAe,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;YAChD,IAAI,CAAC,IAAA,uBAAW,EAAC,eAAe,CAAC,EAAE;gBAC/B,OAAO;aACV;YAED,uBAAuB,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;gBACjD,oBAAoB,CAAC,WAAW,EAAE,eAAe,EAAE,YAAY,CAAC,CAAC;YACrE,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC,CAAC;IAEF,oBAAoB,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;IAEtC,OAAO,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;AACrC,CAAC,CAAC;AA9CW,QAAA,0BAA0B,8BA8CrC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function wrapInDoubleQuotes(str: string): string;
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.wrapInDoubleQuotes = void 0;
|
|
4
|
+
function wrapInDoubleQuotes(str) {
|
|
5
|
+
let result = str;
|
|
6
|
+
if (!result.startsWith('"')) {
|
|
7
|
+
result = `"${result}`;
|
|
8
|
+
}
|
|
9
|
+
if (!result.endsWith('"')) {
|
|
10
|
+
result = `${result}"`;
|
|
11
|
+
}
|
|
12
|
+
return result;
|
|
13
|
+
}
|
|
14
|
+
exports.wrapInDoubleQuotes = wrapInDoubleQuotes;
|
|
15
|
+
//# sourceMappingURL=wrapInDoubleQuotes.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"wrapInDoubleQuotes.js","sourceRoot":"","sources":["../../../src/usecases/utils/wrapInDoubleQuotes.ts"],"names":[],"mappings":";;;AAAA,SAAgB,kBAAkB,CAAC,GAAW;IAC1C,IAAI,MAAM,GAAG,GAAG,CAAC;IAEjB,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QACzB,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;KACzB;IAED,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QACvB,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC;KACzB;IAED,OAAO,MAAM,CAAC;AAClB,CAAC;AAZD,gDAYC"}
|