@ptc-org/nestjs-query-graphql 4.2.0 → 4.3.0
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 +1 -0
- package/src/decorators/filterable-field.decorator.js +1 -0
- package/src/decorators/filterable-field.decorator.js.map +1 -1
- package/src/decorators/graphql-resolve-info.utils.js +17 -4
- package/src/decorators/graphql-resolve-info.utils.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/resolvers/relations/relations.interface.d.ts +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/filter.type.js +8 -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.
|
|
3
|
+
"version": "4.3.0",
|
|
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.3.0",
|
|
43
43
|
"lodash.merge": "4.6.2",
|
|
44
44
|
"reflect-metadata": "0.1.13"
|
|
45
45
|
},
|
|
@@ -9,6 +9,7 @@ export type FilterableFieldOptions = {
|
|
|
9
9
|
} & FieldOptions;
|
|
10
10
|
export interface FilterableFieldDescriptor {
|
|
11
11
|
propertyName: string;
|
|
12
|
+
schemaName: string;
|
|
12
13
|
target: Class<unknown>;
|
|
13
14
|
returnTypeFunc?: ReturnTypeFunc<ReturnTypeFuncValue>;
|
|
14
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"}
|
|
@@ -2,6 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createLookAheadInfo = exports.removePagingFromSimplifiedInfo = exports.simplifyResolveInfo = void 0;
|
|
4
4
|
const graphql_1 = require("graphql");
|
|
5
|
+
/**
|
|
6
|
+
* Parts based of https://github.com/graphile/graphile-engine/blob/master/packages/graphql-parse-resolve-info/src/index.ts
|
|
7
|
+
*/
|
|
5
8
|
function getFieldFromAST(fieldNode, parentType) {
|
|
6
9
|
if (fieldNode.kind === graphql_1.Kind.FIELD) {
|
|
7
10
|
if (!(parentType instanceof graphql_1.GraphQLUnionType)) {
|
|
@@ -41,7 +44,17 @@ function getDirectiveResults(fieldNode, info) {
|
|
|
41
44
|
function parseFieldNodes(inASTs, resolveInfo, initTree, parentType) {
|
|
42
45
|
const asts = Array.isArray(inASTs) ? inASTs : [inASTs];
|
|
43
46
|
return asts.reduce((tree, fieldNode) => {
|
|
44
|
-
|
|
47
|
+
let name;
|
|
48
|
+
let alias;
|
|
49
|
+
if (fieldNode.kind === graphql_1.Kind.INLINE_FRAGMENT) {
|
|
50
|
+
name = fieldNode?.typeCondition?.name.value;
|
|
51
|
+
}
|
|
52
|
+
else {
|
|
53
|
+
name = fieldNode.name.value;
|
|
54
|
+
}
|
|
55
|
+
if (fieldNode.kind === graphql_1.Kind.FIELD) {
|
|
56
|
+
alias = fieldNode?.alias?.value ?? name;
|
|
57
|
+
}
|
|
45
58
|
const field = getFieldFromAST(fieldNode, parentType);
|
|
46
59
|
if (field == null) {
|
|
47
60
|
return tree;
|
|
@@ -59,10 +72,10 @@ function parseFieldNodes(inASTs, resolveInfo, initTree, parentType) {
|
|
|
59
72
|
}
|
|
60
73
|
}
|
|
61
74
|
const parsedField = {
|
|
62
|
-
name
|
|
75
|
+
name,
|
|
63
76
|
alias,
|
|
64
|
-
args: (0, graphql_1.getArgumentValues)(field, fieldNode, resolveInfo.variableValues),
|
|
65
|
-
fields: fieldNode.selectionSet && (0, graphql_1.isCompositeType)(fieldGqlTypeOrUndefined)
|
|
77
|
+
args: fieldNode.kind === graphql_1.Kind.FIELD ? (0, graphql_1.getArgumentValues)(field, fieldNode, resolveInfo.variableValues) : {},
|
|
78
|
+
fields: fieldNode.kind !== graphql_1.Kind.FRAGMENT_SPREAD && fieldNode.selectionSet && (0, graphql_1.isCompositeType)(fieldGqlTypeOrUndefined)
|
|
66
79
|
? parseFieldNodes(fieldNode.selectionSet.selections, resolveInfo, {}, fieldGqlTypeOrUndefined)
|
|
67
80
|
: {}
|
|
68
81
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graphql-resolve-info.utils.js","sourceRoot":"","sources":["../../../../../packages/query-graphql/src/decorators/graphql-resolve-info.utils.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"graphql-resolve-info.utils.js","sourceRoot":"","sources":["../../../../../packages/query-graphql/src/decorators/graphql-resolve-info.utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -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"}
|
|
@@ -69,7 +69,7 @@ export type ResolverRelation<Relation> = {
|
|
|
69
69
|
auth?: AuthorizerOptions<Relation>;
|
|
70
70
|
} & DTONamesOpts & ResolverMethodOpts & QueryArgsTypeOpts<Relation> & Pick<ConnectionOptions, 'enableTotalCount'>;
|
|
71
71
|
export type RelationTypeMap<RT> = Record<string, RT>;
|
|
72
|
-
export type ResolverOneRelation<Relation> = Omit<ResolverRelation<Relation>, 'disableFilter' | 'disableSort'>;
|
|
72
|
+
export type ResolverOneRelation<Relation> = Omit<ResolverRelation<Relation>, 'disableFilter' | 'disableSort' | 'enableAggregate' | 'aggregate'>;
|
|
73
73
|
export type ResolverManyRelation<Relation> = Omit<ResolverRelation<Relation>, 'enableLookAhead'>;
|
|
74
74
|
export type RelationsOpts<Relation = unknown> = {
|
|
75
75
|
/**
|
|
@@ -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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"}
|
|
@@ -76,25 +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
87
|
returnTypeFunc,
|
|
88
88
|
decorators: advancedOptions?.filterDecorators,
|
|
89
89
|
overrideTypeNamePrefix: advancedOptions?.overrideFilterTypeNamePrefix
|
|
90
90
|
});
|
|
91
91
|
const nullable = advancedOptions?.filterRequired !== true;
|
|
92
|
-
(0, class_validator_1.ValidateNested)()(GraphQLFilter.prototype,
|
|
92
|
+
(0, class_validator_1.ValidateNested)()(GraphQLFilter.prototype, schemaName);
|
|
93
93
|
if (advancedOptions?.filterRequired) {
|
|
94
|
-
(0, has_required_filter_1.HasRequiredFilter)()(GraphQLFilter.prototype,
|
|
94
|
+
(0, has_required_filter_1.HasRequiredFilter)()(GraphQLFilter.prototype, schemaName);
|
|
95
95
|
}
|
|
96
|
-
(0, graphql_1.Field)(() => FC, { nullable })(GraphQLFilter.prototype,
|
|
97
|
-
(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);
|
|
98
98
|
});
|
|
99
99
|
if (depth > 0) {
|
|
100
100
|
Object.keys(filterableRelations).forEach((field) => {
|
|
@@ -136,7 +136,8 @@ function SubscriptionFilterType(TClass) {
|
|
|
136
136
|
}
|
|
137
137
|
exports.SubscriptionFilterType = SubscriptionFilterType;
|
|
138
138
|
function AggregateFilterType(TClass) {
|
|
139
|
-
|
|
139
|
+
const { filterDepth = 1 } = (0, decorators_1.getQueryOptions)(TClass) ?? {};
|
|
140
|
+
return getOrCreateFilterType(TClass, null, 'Aggregate', filterDepth);
|
|
140
141
|
}
|
|
141
142
|
exports.AggregateFilterType = AggregateFilterType;
|
|
142
143
|
//# sourceMappingURL=filter.type.js.map
|
|
@@ -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"}
|