@ptc-org/nestjs-query-graphql 4.1.0 → 4.2.1-alpha.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/package.json +2 -2
- package/src/decorators/filterable-field.decorator.d.ts +3 -0
- package/src/decorators/filterable-field.decorator.js +1 -0
- package/src/decorators/filterable-field.decorator.js.map +1 -1
- package/src/resolvers/aggregate/group-by-aggregate.resolver.js +2 -2
- package/src/resolvers/aggregate/group-by-aggregate.resolver.js.map +1 -1
- package/src/types/aggregate/aggregate-response.type.js +6 -7
- package/src/types/aggregate/aggregate-response.type.js.map +1 -1
- package/src/types/query/field-comparison/field-comparison.factory.d.ts +2 -0
- package/src/types/query/field-comparison/field-comparison.factory.js +18 -2
- package/src/types/query/field-comparison/field-comparison.factory.js.map +1 -1
- package/src/types/query/filter.type.js +9 -7
- package/src/types/query/filter.type.js.map +1 -1
- package/src/types/query/sorting.type.js +1 -1
- package/src/types/query/sorting.type.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ptc-org/nestjs-query-graphql",
|
|
3
|
-
"version": "4.1.
|
|
3
|
+
"version": "4.2.1-alpha.1",
|
|
4
4
|
"description": "Nestjs graphql query adapter",
|
|
5
5
|
"author": "doug-martin <doug@dougamartin.com>",
|
|
6
6
|
"homepage": "https://github.com/tripss/nestjs-query#readme",
|
|
@@ -39,7 +39,7 @@
|
|
|
39
39
|
"pluralize": "^8.0.0",
|
|
40
40
|
"tslib": "^2.6.2",
|
|
41
41
|
"upper-case-first": "^2.0.2",
|
|
42
|
-
"@ptc-org/nestjs-query-core": "4.
|
|
42
|
+
"@ptc-org/nestjs-query-core": "4.2.0",
|
|
43
43
|
"lodash.merge": "4.6.2",
|
|
44
44
|
"reflect-metadata": "0.1.13"
|
|
45
45
|
},
|
|
@@ -4,9 +4,12 @@ export type FilterableFieldOptions = {
|
|
|
4
4
|
allowedComparisons?: FilterComparisonOperators<unknown>[];
|
|
5
5
|
filterRequired?: boolean;
|
|
6
6
|
filterOnly?: boolean;
|
|
7
|
+
filterDecorators?: PropertyDecorator[];
|
|
8
|
+
overrideFilterTypeNamePrefix?: string;
|
|
7
9
|
} & FieldOptions;
|
|
8
10
|
export interface FilterableFieldDescriptor {
|
|
9
11
|
propertyName: string;
|
|
12
|
+
schemaName: string;
|
|
10
13
|
target: Class<unknown>;
|
|
11
14
|
returnTypeFunc?: ReturnTypeFunc<ReturnTypeFuncValue>;
|
|
12
15
|
advancedOptions?: FilterableFieldOptions;
|
|
@@ -24,6 +24,7 @@ function FilterableField(returnTypeFuncOrOptions, maybeOptions) {
|
|
|
24
24
|
const Ctx = Reflect.getMetadata('design:type', target, propertyName);
|
|
25
25
|
reflector.append(target.constructor, {
|
|
26
26
|
propertyName: propertyName.toString(),
|
|
27
|
+
schemaName: advancedOptions?.name || propertyName.toString(),
|
|
27
28
|
target: Ctx,
|
|
28
29
|
returnTypeFunc,
|
|
29
30
|
advancedOptions
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filterable-field.decorator.js","sourceRoot":"","sources":["../../../../../packages/query-graphql/src/decorators/filterable-field.decorator.ts"],"names":[],"mappings":";;;AAAA,6CAA0F;AAC1F,kEAAgH;AAEhH,2CAAkD;AAElD,MAAM,SAAS,GAAG,IAAI,kCAAc,CAAC,gCAAoB,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"filterable-field.decorator.js","sourceRoot":"","sources":["../../../../../packages/query-graphql/src/decorators/filterable-field.decorator.ts"],"names":[],"mappings":";;;AAAA,6CAA0F;AAC1F,kEAAgH;AAEhH,2CAAkD;AAElD,MAAM,SAAS,GAAG,IAAI,kCAAc,CAAC,gCAAoB,CAAC,CAAA;AAqD1D,SAAgB,eAAe,CAC7B,uBAAiE,EACjE,YAAqC;IAErC,IAAI,cAA0C,CAAA;IAC9C,IAAI,eAAmD,CAAA;IACvD,IAAI,OAAO,uBAAuB,KAAK,UAAU,EAAE;QACjD,cAAc,GAAG,uBAAuB,CAAA;QACxC,eAAe,GAAG,YAAY,CAAA;KAC/B;SAAM,IAAI,OAAO,uBAAuB,KAAK,QAAQ,EAAE;QACtD,eAAe,GAAG,uBAAuB,CAAA;KAC1C;SAAM,IAAI,OAAO,YAAY,KAAK,QAAQ,EAAE;QAC3C,eAAe,GAAG,YAAY,CAAA;KAC/B;IACD,OAAO;IACL,wDAAwD;IACxD,MAAc,EACd,YAA6B,EAC7B,UAAsC,EACH,EAAE;QACrC,MAAM,GAAG,GAAG,OAAO,CAAC,WAAW,CAAC,aAAa,EAAE,MAAM,EAAE,YAAY,CAAmB,CAAA;QACtF,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,WAA6B,EAAE;YACrD,YAAY,EAAE,YAAY,CAAC,QAAQ,EAAE;YACrC,UAAU,EAAE,eAAe,EAAE,IAAI,IAAI,YAAY,CAAC,QAAQ,EAAE;YAC5D,MAAM,EAAE,GAAG;YACX,cAAc;YACd,eAAe;SAChB,CAAC,CAAA;QAEF,IAAI,eAAe,EAAE,UAAU,EAAE;YAC/B,OAAO,SAAS,CAAA;SACjB;QAED,IAAI,cAAc,EAAE;YAClB,OAAO,IAAA,eAAK,EAAC,cAAc,EAAE,eAAe,CAAC,CAAC,MAAM,EAAE,YAAY,EAAE,UAAU,CAAC,CAAA;SAChF;QACD,IAAI,eAAe,EAAE;YACnB,OAAO,IAAA,eAAK,EAAC,eAAe,CAAC,CAAC,MAAM,EAAE,YAAY,EAAE,UAAU,CAAC,CAAA;SAChE;QACD,OAAO,IAAA,eAAK,GAAE,CAAC,MAAM,EAAE,YAAY,EAAE,UAAU,CAAC,CAAA;IAClD,CAAC,CAAA;AACH,CAAC;AAzCD,0CAyCC;AAED,SAAgB,mBAAmB,CAAM,QAAoB;IAC3D,OAAO,IAAA,qCAAiB,EAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE;QACxD,MAAM,kBAAkB,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,CAAA;QAC5D,MAAM,UAAU,GAAG,SAAS,CAAC,GAAG,CAAqC,GAAG,CAAC,IAAI,EAAE,CAAA;QAC/E,MAAM,SAAS,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAA;QACxF,OAAO,CAAC,GAAG,SAAS,EAAE,GAAG,MAAM,CAAC,CAAA;IAClC,CAAC,EAAE,EAAiC,CAAC,CAAA;AACvC,CAAC;AAPD,kDAOC"}
|
|
@@ -23,13 +23,13 @@ const GroupByAggregateMixin = (DTOClass, AR) => (Base) => {
|
|
|
23
23
|
return fields.reduce((RB, field) => {
|
|
24
24
|
var _a;
|
|
25
25
|
let ReadOneMixin = class ReadOneMixin extends RB {
|
|
26
|
-
[_a = field.
|
|
26
|
+
[_a = field.schemaName](dto, // eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
27
27
|
by) {
|
|
28
28
|
return dto[field.propertyName];
|
|
29
29
|
}
|
|
30
30
|
};
|
|
31
31
|
tslib_1.__decorate([
|
|
32
|
-
(0, decorators_1.ResolverField)(field.
|
|
32
|
+
(0, decorators_1.ResolverField)(field.schemaName, () => field.target, { nullable: true }),
|
|
33
33
|
tslib_1.__param(0, (0, graphql_1.Parent)()),
|
|
34
34
|
tslib_1.__param(1, (0, graphql_1.Args)('by', {
|
|
35
35
|
type: () => nestjs_query_core_1.GroupBy,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"group-by-aggregate.resolver.js","sourceRoot":"","sources":["../../../../../../packages/query-graphql/src/resolvers/aggregate/group-by-aggregate.resolver.ts"],"names":[],"mappings":";;;;AAAA,6CAA0E;AAC1E,kEAA0G;AAE1G,yCAAmD;AACnD,iDAAqE;AAGrE,MAAM,SAAS,GAAG,IAAI,gCAAY,CAAC,sCAAsC,CAAC,CAAA;AAE1E,IAAA,0BAAgB,EAAC,2BAAO,EAAE;IACxB,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,UAAU,CAAC,uBAAuB;CAChD,CAAC,CAAA;AAEK,MAAM,qBAAqB,GAChC,CAAM,QAAoB,EAAE,EAAiC,EAAE,EAAE,CACjE,CAA6E,IAAO,EAAK,EAAE;IACzF,MAAM,OAAO,GAAG,IAAA,6BAAoB,EAAC,QAAQ,EAAE,yCAAyC,CAAC,CAAA;IAEzF,MAAM,OAAO,GAAG,GAAG,OAAO,kBAAkB,CAAA;IAC5C,OAAO,SAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,EAAE;QAC/C,MAAM,MAAM,GAAG,IAAA,gCAAmB,EAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,KAAK,IAAI,CAAC,CAAA;QAErF,0CAA0C;QAC1C,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YAClB,OAAO,IAAI,CAAA;SACZ;QAED,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE;;YAEjC,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,EAAE;gBAE3B,MAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"group-by-aggregate.resolver.js","sourceRoot":"","sources":["../../../../../../packages/query-graphql/src/resolvers/aggregate/group-by-aggregate.resolver.ts"],"names":[],"mappings":";;;;AAAA,6CAA0E;AAC1E,kEAA0G;AAE1G,yCAAmD;AACnD,iDAAqE;AAGrE,MAAM,SAAS,GAAG,IAAI,gCAAY,CAAC,sCAAsC,CAAC,CAAA;AAE1E,IAAA,0BAAgB,EAAC,2BAAO,EAAE;IACxB,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,UAAU,CAAC,uBAAuB;CAChD,CAAC,CAAA;AAEK,MAAM,qBAAqB,GAChC,CAAM,QAAoB,EAAE,EAAiC,EAAE,EAAE,CACjE,CAA6E,IAAO,EAAK,EAAE;IACzF,MAAM,OAAO,GAAG,IAAA,6BAAoB,EAAC,QAAQ,EAAE,yCAAyC,CAAC,CAAA;IAEzF,MAAM,OAAO,GAAG,GAAG,OAAO,kBAAkB,CAAA;IAC5C,OAAO,SAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,EAAE;QAC/C,MAAM,MAAM,GAAG,IAAA,gCAAmB,EAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,KAAK,IAAI,CAAC,CAAA;QAErF,0CAA0C;QAC1C,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YAClB,OAAO,IAAI,CAAA;SACZ;QAED,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE;;YAEjC,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,EAAE;gBAE3B,MAAC,KAAK,CAAC,UAAU,CAAC,CACN,GAAQ,EAIf,6DAA6D;gBAChE,EAAU;oBAEV,OAAO,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;gBAChC,CAAC;aACF,CAAA;YAVC;gBADC,IAAA,0BAAa,EAAC,KAAK,CAAC,UAAU,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;gBAErE,mBAAA,IAAA,gBAAM,GAAE,CAAA;gBACR,mBAAA,IAAA,cAAI,EAAC,IAAI,EAAE;oBACV,IAAI,EAAE,GAAG,EAAE,CAAC,2BAAO;oBACnB,YAAY,EAAE,2BAAO,CAAC,GAAG;iBAC1B,CAAC,CAAA;;;;gDAIH;YAXG,YAAY;gBADjB,IAAA,kBAAQ,EAAC,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;eACnC,YAAY,CAYjB;YAED,OAAO,YAAY,CAAA;QACrB,CAAC,EAAE,IAAI,CAAC,CAAA;IACV,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAjCU,QAAA,qBAAqB,yBAiC/B"}
|
|
@@ -8,14 +8,13 @@ const common_1 = require("../../common");
|
|
|
8
8
|
const decorators_1 = require("../../decorators");
|
|
9
9
|
const reflector = new nestjs_query_core_1.MapReflector('nestjs-query:aggregate-response-type');
|
|
10
10
|
function NumberAggregatedType(name, fields, NumberType) {
|
|
11
|
-
const fieldNames = fields.map((f) => f.propertyName);
|
|
12
11
|
let Aggregated = class Aggregated {
|
|
13
12
|
};
|
|
14
13
|
Aggregated = tslib_1.__decorate([
|
|
15
14
|
(0, graphql_1.ObjectType)(name)
|
|
16
15
|
], Aggregated);
|
|
17
|
-
|
|
18
|
-
(0, graphql_1.Field)(() => NumberType, { nullable: true })(Aggregated.prototype, propertyName);
|
|
16
|
+
fields.forEach(({ propertyName, schemaName }) => {
|
|
17
|
+
(0, graphql_1.Field)(() => NumberType, { name: schemaName, nullable: true })(Aggregated.prototype, propertyName);
|
|
19
18
|
});
|
|
20
19
|
return Aggregated;
|
|
21
20
|
}
|
|
@@ -25,9 +24,9 @@ function AggregateGroupByType(name, fields) {
|
|
|
25
24
|
Aggregated = tslib_1.__decorate([
|
|
26
25
|
(0, graphql_1.ObjectType)(name)
|
|
27
26
|
], Aggregated);
|
|
28
|
-
fields.forEach(({ propertyName, target, returnTypeFunc }) => {
|
|
27
|
+
fields.forEach(({ propertyName, schemaName, target, returnTypeFunc }) => {
|
|
29
28
|
const rt = returnTypeFunc ? returnTypeFunc() : target;
|
|
30
|
-
(0, graphql_1.Field)(() => rt, { nullable: true })(Aggregated.prototype, propertyName);
|
|
29
|
+
(0, graphql_1.Field)(() => rt, { name: schemaName, nullable: true })(Aggregated.prototype, propertyName);
|
|
31
30
|
});
|
|
32
31
|
return Aggregated;
|
|
33
32
|
}
|
|
@@ -37,9 +36,9 @@ function AggregatedType(name, fields) {
|
|
|
37
36
|
Aggregated = tslib_1.__decorate([
|
|
38
37
|
(0, graphql_1.ObjectType)(name)
|
|
39
38
|
], Aggregated);
|
|
40
|
-
fields.forEach(({ propertyName, target, returnTypeFunc }) => {
|
|
39
|
+
fields.forEach(({ propertyName, schemaName, target, returnTypeFunc }) => {
|
|
41
40
|
const rt = returnTypeFunc ? returnTypeFunc() : target;
|
|
42
|
-
(0, graphql_1.Field)(() => rt, { nullable: true })(Aggregated.prototype, propertyName);
|
|
41
|
+
(0, graphql_1.Field)(() => rt, { name: schemaName, nullable: true })(Aggregated.prototype, propertyName);
|
|
43
42
|
});
|
|
44
43
|
return Aggregated;
|
|
45
44
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aggregate-response.type.js","sourceRoot":"","sources":["../../../../../../packages/query-graphql/src/types/aggregate/aggregate-response.type.ts"],"names":[],"mappings":";;;;AAAA,6CAA+D;AAC/D,kEAAmH;AAGnH,yCAAmD;AACnD,iDAAyF;AAEzF,MAAM,SAAS,GAAG,IAAI,gCAAY,CAAC,sCAAsC,CAAC,CAAA;AAE1E,SAAS,oBAAoB,CAC3B,IAAY,EACZ,MAAmC,EACnC,UAA6B;
|
|
1
|
+
{"version":3,"file":"aggregate-response.type.js","sourceRoot":"","sources":["../../../../../../packages/query-graphql/src/types/aggregate/aggregate-response.type.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,8 @@ type FilterComparisonOptions<T> = {
|
|
|
5
5
|
fieldName: string;
|
|
6
6
|
allowedComparisons?: FilterComparisonOperators<T>[];
|
|
7
7
|
returnTypeFunc?: ReturnTypeFunc<ReturnTypeFuncValue>;
|
|
8
|
+
decorators?: PropertyDecorator[];
|
|
9
|
+
overrideTypeNamePrefix?: string;
|
|
8
10
|
};
|
|
9
11
|
/** @internal */
|
|
10
12
|
export declare function createFilterComparisonType<T>(options: FilterComparisonOptions<T>): Class<FilterFieldComparison<T>>;
|
|
@@ -54,8 +54,11 @@ const getTypeName = (SomeType) => {
|
|
|
54
54
|
}
|
|
55
55
|
throw new Error(`Unable to create filter comparison for ${JSON.stringify(SomeType)}.`);
|
|
56
56
|
};
|
|
57
|
-
const isCustomFieldComparison = (options) => !!options.allowedComparisons;
|
|
57
|
+
const isCustomFieldComparison = (options) => !!options.allowedComparisons || !!options.decorators;
|
|
58
58
|
const getComparisonTypeName = (fieldType, options) => {
|
|
59
|
+
if (options.overrideTypeNamePrefix) {
|
|
60
|
+
return `${options.overrideTypeNamePrefix}FilterComparison`;
|
|
61
|
+
}
|
|
59
62
|
if (isCustomFieldComparison(options)) {
|
|
60
63
|
return `${(0, upper_case_first_1.upperCaseFirst)(options.fieldName)}FilterComparison`;
|
|
61
64
|
}
|
|
@@ -63,10 +66,11 @@ const getComparisonTypeName = (fieldType, options) => {
|
|
|
63
66
|
};
|
|
64
67
|
/** @internal */
|
|
65
68
|
function createFilterComparisonType(options) {
|
|
66
|
-
const { FieldType, returnTypeFunc } = options;
|
|
69
|
+
const { FieldType, returnTypeFunc, decorators = [] } = options;
|
|
67
70
|
const fieldType = returnTypeFunc ? returnTypeFunc() : FieldType;
|
|
68
71
|
const inputName = getComparisonTypeName(fieldType, options);
|
|
69
72
|
const generator = filterComparisonMap.get(inputName);
|
|
73
|
+
const CustomDecorator = () => (0, decorators_1.composeDecorators)(...decorators);
|
|
70
74
|
if (generator) {
|
|
71
75
|
return generator();
|
|
72
76
|
}
|
|
@@ -110,72 +114,84 @@ function createFilterComparisonType(options) {
|
|
|
110
114
|
(0, decorators_1.SkipIf)(isNotAllowed('eq'), (0, graphql_1.Field)(() => fieldType, { nullable: true })),
|
|
111
115
|
(0, validators_1.IsUndefined)(),
|
|
112
116
|
(0, class_transformer_1.Type)(() => FieldType),
|
|
117
|
+
CustomDecorator(),
|
|
113
118
|
tslib_1.__metadata("design:type", Object)
|
|
114
119
|
], Fc.prototype, "eq", void 0);
|
|
115
120
|
tslib_1.__decorate([
|
|
116
121
|
(0, decorators_1.SkipIf)(isNotAllowed('neq'), (0, graphql_1.Field)(() => fieldType, { nullable: true })),
|
|
117
122
|
(0, validators_1.IsUndefined)(),
|
|
118
123
|
(0, class_transformer_1.Type)(() => FieldType),
|
|
124
|
+
CustomDecorator(),
|
|
119
125
|
tslib_1.__metadata("design:type", Object)
|
|
120
126
|
], Fc.prototype, "neq", void 0);
|
|
121
127
|
tslib_1.__decorate([
|
|
122
128
|
(0, decorators_1.SkipIf)(isNotAllowed('gt'), (0, graphql_1.Field)(() => fieldType, { nullable: true })),
|
|
123
129
|
(0, validators_1.IsUndefined)(),
|
|
124
130
|
(0, class_transformer_1.Type)(() => FieldType),
|
|
131
|
+
CustomDecorator(),
|
|
125
132
|
tslib_1.__metadata("design:type", Object)
|
|
126
133
|
], Fc.prototype, "gt", void 0);
|
|
127
134
|
tslib_1.__decorate([
|
|
128
135
|
(0, decorators_1.SkipIf)(isNotAllowed('gte'), (0, graphql_1.Field)(() => fieldType, { nullable: true })),
|
|
129
136
|
(0, validators_1.IsUndefined)(),
|
|
130
137
|
(0, class_transformer_1.Type)(() => FieldType),
|
|
138
|
+
CustomDecorator(),
|
|
131
139
|
tslib_1.__metadata("design:type", Object)
|
|
132
140
|
], Fc.prototype, "gte", void 0);
|
|
133
141
|
tslib_1.__decorate([
|
|
134
142
|
(0, decorators_1.SkipIf)(isNotAllowed('lt'), (0, graphql_1.Field)(() => fieldType, { nullable: true })),
|
|
135
143
|
(0, validators_1.IsUndefined)(),
|
|
136
144
|
(0, class_transformer_1.Type)(() => FieldType),
|
|
145
|
+
CustomDecorator(),
|
|
137
146
|
tslib_1.__metadata("design:type", Object)
|
|
138
147
|
], Fc.prototype, "lt", void 0);
|
|
139
148
|
tslib_1.__decorate([
|
|
140
149
|
(0, decorators_1.SkipIf)(isNotAllowed('lte'), (0, graphql_1.Field)(() => fieldType, { nullable: true })),
|
|
141
150
|
(0, validators_1.IsUndefined)(),
|
|
142
151
|
(0, class_transformer_1.Type)(() => FieldType),
|
|
152
|
+
CustomDecorator(),
|
|
143
153
|
tslib_1.__metadata("design:type", Object)
|
|
144
154
|
], Fc.prototype, "lte", void 0);
|
|
145
155
|
tslib_1.__decorate([
|
|
146
156
|
(0, decorators_1.SkipIf)(isNotAllowed('like'), (0, graphql_1.Field)(() => fieldType, { nullable: true })),
|
|
147
157
|
(0, validators_1.IsUndefined)(),
|
|
148
158
|
(0, class_transformer_1.Type)(() => FieldType),
|
|
159
|
+
CustomDecorator(),
|
|
149
160
|
tslib_1.__metadata("design:type", Object)
|
|
150
161
|
], Fc.prototype, "like", void 0);
|
|
151
162
|
tslib_1.__decorate([
|
|
152
163
|
(0, decorators_1.SkipIf)(isNotAllowed('notLike'), (0, graphql_1.Field)(() => fieldType, { nullable: true })),
|
|
153
164
|
(0, validators_1.IsUndefined)(),
|
|
154
165
|
(0, class_transformer_1.Type)(() => FieldType),
|
|
166
|
+
CustomDecorator(),
|
|
155
167
|
tslib_1.__metadata("design:type", Object)
|
|
156
168
|
], Fc.prototype, "notLike", void 0);
|
|
157
169
|
tslib_1.__decorate([
|
|
158
170
|
(0, decorators_1.SkipIf)(isNotAllowed('iLike'), (0, graphql_1.Field)(() => fieldType, { nullable: true })),
|
|
159
171
|
(0, validators_1.IsUndefined)(),
|
|
160
172
|
(0, class_transformer_1.Type)(() => FieldType),
|
|
173
|
+
CustomDecorator(),
|
|
161
174
|
tslib_1.__metadata("design:type", Object)
|
|
162
175
|
], Fc.prototype, "iLike", void 0);
|
|
163
176
|
tslib_1.__decorate([
|
|
164
177
|
(0, decorators_1.SkipIf)(isNotAllowed('notILike'), (0, graphql_1.Field)(() => fieldType, { nullable: true })),
|
|
165
178
|
(0, validators_1.IsUndefined)(),
|
|
166
179
|
(0, class_transformer_1.Type)(() => FieldType),
|
|
180
|
+
CustomDecorator(),
|
|
167
181
|
tslib_1.__metadata("design:type", Object)
|
|
168
182
|
], Fc.prototype, "notILike", void 0);
|
|
169
183
|
tslib_1.__decorate([
|
|
170
184
|
(0, decorators_1.SkipIf)(isNotAllowed('in'), (0, graphql_1.Field)(() => [fieldType], { nullable: true })),
|
|
171
185
|
(0, validators_1.IsUndefined)(),
|
|
172
186
|
(0, class_transformer_1.Type)(() => FieldType),
|
|
187
|
+
CustomDecorator(),
|
|
173
188
|
tslib_1.__metadata("design:type", Array)
|
|
174
189
|
], Fc.prototype, "in", void 0);
|
|
175
190
|
tslib_1.__decorate([
|
|
176
191
|
(0, decorators_1.SkipIf)(isNotAllowed('notIn'), (0, graphql_1.Field)(() => [fieldType], { nullable: true })),
|
|
177
192
|
(0, validators_1.IsUndefined)(),
|
|
178
193
|
(0, class_transformer_1.Type)(() => FieldType),
|
|
194
|
+
CustomDecorator(),
|
|
179
195
|
tslib_1.__metadata("design:type", Array)
|
|
180
196
|
], Fc.prototype, "notIn", void 0);
|
|
181
197
|
tslib_1.__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"field-comparison.factory.js","sourceRoot":"","sources":["../../../../../../../packages/query-graphql/src/types/query/field-comparison/field-comparison.factory.ts"],"names":[],"mappings":";;;;AAAA,6CAUwB;AACxB,kEAA6G;AAC7G,yDAAwC;AACxC,qDAA+E;AAC/E,uDAAiD;AAEjD,4CAAwD;AACxD,
|
|
1
|
+
{"version":3,"file":"field-comparison.factory.js","sourceRoot":"","sources":["../../../../../../../packages/query-graphql/src/types/query/field-comparison/field-comparison.factory.ts"],"names":[],"mappings":"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"}
|
|
@@ -76,23 +76,25 @@ function getOrCreateFilterType(TClass, prefix, suffix, depth) {
|
|
|
76
76
|
internalCache.set(TClass, TClassCache);
|
|
77
77
|
}
|
|
78
78
|
const { baseName } = (0, common_1.getDTONames)(TClass);
|
|
79
|
-
fields.forEach(({
|
|
79
|
+
fields.forEach(({ schemaName, target, advancedOptions, returnTypeFunc }) => {
|
|
80
80
|
const objectTypeMetadata = graphql_1.TypeMetadataStorage.getObjectTypeMetadataByTarget(target);
|
|
81
81
|
const FC = objectTypeMetadata
|
|
82
82
|
? getOrCreateFilterType(target, typeName, suffix, depth)
|
|
83
83
|
: (0, field_comparison_1.createFilterComparisonType)({
|
|
84
84
|
FieldType: target,
|
|
85
|
-
fieldName: `${baseName}${(0, upper_case_first_1.upperCaseFirst)(
|
|
85
|
+
fieldName: `${baseName}${(0, upper_case_first_1.upperCaseFirst)(schemaName)}`,
|
|
86
86
|
allowedComparisons: advancedOptions?.allowedComparisons,
|
|
87
|
-
returnTypeFunc
|
|
87
|
+
returnTypeFunc,
|
|
88
|
+
decorators: advancedOptions?.filterDecorators,
|
|
89
|
+
overrideTypeNamePrefix: advancedOptions?.overrideFilterTypeNamePrefix
|
|
88
90
|
});
|
|
89
91
|
const nullable = advancedOptions?.filterRequired !== true;
|
|
90
|
-
(0, class_validator_1.ValidateNested)()(GraphQLFilter.prototype,
|
|
92
|
+
(0, class_validator_1.ValidateNested)()(GraphQLFilter.prototype, schemaName);
|
|
91
93
|
if (advancedOptions?.filterRequired) {
|
|
92
|
-
(0, has_required_filter_1.HasRequiredFilter)()(GraphQLFilter.prototype,
|
|
94
|
+
(0, has_required_filter_1.HasRequiredFilter)()(GraphQLFilter.prototype, schemaName);
|
|
93
95
|
}
|
|
94
|
-
(0, graphql_1.Field)(() => FC, { nullable })(GraphQLFilter.prototype,
|
|
95
|
-
(0, class_transformer_1.Type)(() => FC)(GraphQLFilter.prototype,
|
|
96
|
+
(0, graphql_1.Field)(() => FC, { name: schemaName, nullable })(GraphQLFilter.prototype, schemaName);
|
|
97
|
+
(0, class_transformer_1.Type)(() => FC)(GraphQLFilter.prototype, schemaName);
|
|
96
98
|
});
|
|
97
99
|
if (depth > 0) {
|
|
98
100
|
Object.keys(filterableRelations).forEach((field) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter.type.js","sourceRoot":"","sources":["../../../../../../packages/query-graphql/src/types/query/filter.type.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"filter.type.js","sourceRoot":"","sources":["../../../../../../packages/query-graphql/src/types/query/filter.type.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,7 +25,7 @@ function getOrCreateSortType(TClass) {
|
|
|
25
25
|
throw new Error(`No fields found to create SortType for ${TClass.name}. Ensure fields are annotated with @FilterableField`);
|
|
26
26
|
}
|
|
27
27
|
const fieldNames = fields.map((field) => field.propertyName);
|
|
28
|
-
const fieldNameMap =
|
|
28
|
+
const fieldNameMap = fields.reduce((acc, field) => ({ ...acc, [field.schemaName]: field.propertyName }), {});
|
|
29
29
|
(0, graphql_1.registerEnumType)(fieldNameMap, { name: `${prefix}SortFields` });
|
|
30
30
|
let Sort = class Sort {
|
|
31
31
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sorting.type.js","sourceRoot":"","sources":["../../../../../../packages/query-graphql/src/types/query/sorting.type.ts"],"names":[],"mappings":";;;;AAAA,6CAAoE;AACpE,kEAAuG;AACvG,qDAA8C;AAE9C,yCAAmD;AACnD,iDAAsD;AACtD,8CAA2C;AAE3C,IAAA,0BAAgB,EAAC,iCAAa,EAAE;IAC9B,IAAI,EAAE,eAAe;IACrB,WAAW,EAAE,iBAAiB,CAAC,uBAAuB;CACvD,CAAC,CAAA;AAEF,IAAA,0BAAgB,EAAC,6BAAS,EAAE;IAC1B,IAAI,EAAE,WAAW;IACjB,WAAW,EAAE,oBAAoB,CAAC,uBAAuB;CAC1D,CAAC,CAAA;AAEF,MAAM,SAAS,GAAG,IAAI,kCAAc,CAAC,wBAAwB,CAAC,CAAA;AAE9D,SAAgB,mBAAmB,CAAI,MAAgB;IACrD,OAAO,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,EAAE;QACpC,MAAM,MAAM,GAAG,IAAA,6BAAoB,EAAC,MAAM,EAAE,0BAA0B,CAAC,CAAA;QACvE,MAAM,MAAM,GAAG,IAAA,gCAAmB,EAAC,MAAM,CAAC,CAAA;QAE1C,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,0CAA0C,MAAM,CAAC,IAAI,qDAAqD,CAAC,CAAA;SAC5H;QAED,MAAM,UAAU,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;QAC5D,MAAM,YAAY,GAAG,
|
|
1
|
+
{"version":3,"file":"sorting.type.js","sourceRoot":"","sources":["../../../../../../packages/query-graphql/src/types/query/sorting.type.ts"],"names":[],"mappings":";;;;AAAA,6CAAoE;AACpE,kEAAuG;AACvG,qDAA8C;AAE9C,yCAAmD;AACnD,iDAAsD;AACtD,8CAA2C;AAE3C,IAAA,0BAAgB,EAAC,iCAAa,EAAE;IAC9B,IAAI,EAAE,eAAe;IACrB,WAAW,EAAE,iBAAiB,CAAC,uBAAuB;CACvD,CAAC,CAAA;AAEF,IAAA,0BAAgB,EAAC,6BAAS,EAAE;IAC1B,IAAI,EAAE,WAAW;IACjB,WAAW,EAAE,oBAAoB,CAAC,uBAAuB;CAC1D,CAAC,CAAA;AAEF,MAAM,SAAS,GAAG,IAAI,kCAAc,CAAC,wBAAwB,CAAC,CAAA;AAE9D,SAAgB,mBAAmB,CAAI,MAAgB;IACrD,OAAO,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,EAAE;QACpC,MAAM,MAAM,GAAG,IAAA,6BAAoB,EAAC,MAAM,EAAE,0BAA0B,CAAC,CAAA;QACvE,MAAM,MAAM,GAAG,IAAA,gCAAmB,EAAC,MAAM,CAAC,CAAA;QAE1C,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,0CAA0C,MAAM,CAAC,IAAI,qDAAqD,CAAC,CAAA;SAC5H;QAED,MAAM,UAAU,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;QAC5D,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,GAAG,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,KAAK,CAAC,YAAY,EAAE,CAAC,EAAE,EAAE,CAAC,CAAA;QAC5G,IAAA,0BAAgB,EAAC,YAAY,EAAE,EAAE,IAAI,EAAE,GAAG,MAAM,YAAY,EAAE,CAAC,CAAA;QAG/D,IAAM,IAAI,GAAV,MAAM,IAAI;SAaT,CAAA;QAVC;YAFC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,YAAY,CAAC;YACzB,IAAA,sBAAI,EAAC,UAAU,CAAC;;2CACF;QAIf;YAFC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,iCAAa,CAAC;YAC1B,IAAA,wBAAM,EAAC,iCAAa,CAAC;;+CACG;QAKzB;YAHC,IAAA,eAAK,EAAC,GAAG,EAAE,CAAC,6BAAS,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;YAC1C,IAAA,wBAAW,GAAE;YACb,IAAA,wBAAM,EAAC,6BAAS,CAAC;;2CACD;QAZb,IAAI;YADT,IAAA,mBAAS,EAAC,GAAG,MAAM,MAAM,CAAC;WACrB,IAAI,CAaT;QAED,OAAO,IAAI,CAAA;IACb,CAAC,CAAC,CAAA;AACJ,CAAC;AA/BD,kDA+BC"}
|