@ptc-org/nestjs-query-rest 10.0.0 → 10.0.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.
Files changed (60) hide show
  1. package/README.md +4 -7
  2. package/package.json +3 -3
  3. package/src/auth/default-crud.authorizer.js +0 -1
  4. package/src/auth/default-crud.authorizer.js.map +1 -1
  5. package/src/common/enum.utils.d.ts +4 -0
  6. package/src/common/enum.utils.js +49 -0
  7. package/src/common/enum.utils.js.map +1 -0
  8. package/src/common/index.d.ts +2 -1
  9. package/src/common/index.js +2 -1
  10. package/src/common/index.js.map +1 -1
  11. package/src/common/method.utils.d.ts +2 -0
  12. package/src/common/{resolver.utils.js → method.utils.js} +5 -5
  13. package/src/common/method.utils.js.map +1 -0
  14. package/src/controllers/controller.interface.d.ts +8 -8
  15. package/src/controllers/controller.interface.js +4 -4
  16. package/src/controllers/controller.interface.js.map +1 -1
  17. package/src/controllers/create.controller.d.ts +3 -3
  18. package/src/controllers/create.controller.js +3 -3
  19. package/src/controllers/create.controller.js.map +1 -1
  20. package/src/controllers/crud.controller.d.ts +6 -6
  21. package/src/controllers/crud.controller.js +15 -23
  22. package/src/controllers/crud.controller.js.map +1 -1
  23. package/src/controllers/delete.controller.d.ts +3 -3
  24. package/src/controllers/delete.controller.js +6 -6
  25. package/src/controllers/delete.controller.js.map +1 -1
  26. package/src/controllers/export.controller.js +6 -6
  27. package/src/controllers/export.controller.js.map +1 -1
  28. package/src/controllers/index.d.ts +2 -2
  29. package/src/controllers/index.js.map +1 -1
  30. package/src/controllers/read.controller.js +8 -8
  31. package/src/controllers/read.controller.js.map +1 -1
  32. package/src/controllers/update.controller.js +6 -6
  33. package/src/controllers/update.controller.js.map +1 -1
  34. package/src/decorators/controller-methods.decorator.d.ts +14 -11
  35. package/src/decorators/controller-methods.decorator.js +21 -17
  36. package/src/decorators/controller-methods.decorator.js.map +1 -1
  37. package/src/decorators/field.decorator.js +19 -8
  38. package/src/decorators/field.decorator.js.map +1 -1
  39. package/src/decorators/filterable-field.decorator.d.ts +0 -1
  40. package/src/decorators/filterable-field.decorator.js +0 -1
  41. package/src/decorators/filterable-field.decorator.js.map +1 -1
  42. package/src/decorators/index.d.ts +2 -2
  43. package/src/decorators/index.js +2 -2
  44. package/src/decorators/index.js.map +1 -1
  45. package/src/decorators/{resolver-method.decorator.d.ts → method.decorator.d.ts} +14 -14
  46. package/src/decorators/{resolver-method.decorator.js → method.decorator.js} +9 -9
  47. package/src/decorators/method.decorator.js.map +1 -0
  48. package/src/decorators/query-method.decorator.d.ts +4 -0
  49. package/src/decorators/{resolver-query.decorator.js → query-method.decorator.js} +1 -1
  50. package/src/decorators/query-method.decorator.js.map +1 -0
  51. package/src/module.js.map +1 -1
  52. package/src/providers/controller.provider.js +15 -15
  53. package/src/providers/controller.provider.js.map +1 -1
  54. package/src/types/query/paging/none-paging.type.js +7 -7
  55. package/src/types/query/paging/none-paging.type.js.map +1 -1
  56. package/src/common/resolver.utils.d.ts +0 -2
  57. package/src/common/resolver.utils.js.map +0 -1
  58. package/src/decorators/resolver-method.decorator.js.map +0 -1
  59. package/src/decorators/resolver-query.decorator.d.ts +0 -4
  60. package/src/decorators/resolver-query.decorator.js.map +0 -1
@@ -20,7 +20,7 @@ const Readable = (DTOClass, opts) => (BaseClass) => {
20
20
  }
21
21
  const dtoNames = (0, common_1.getDTONames)(DTOClass, opts);
22
22
  const { QueryArgs = (0, __1.QueryArgsType)(DTOClass, { ...opts, connectionName: `${dtoNames.baseName}Connection` }), FindDTOClass = DTOClass } = opts;
23
- const commonResolverOpts = (0, lodash_omit_1.default)(opts, 'dtoName', 'one', 'many', 'QueryArgs', 'FindDTOClass', 'Connection', 'withDeleted');
23
+ const commonControllerOpts = (0, lodash_omit_1.default)(opts, 'dtoName', 'one', 'many', 'QueryArgs', 'FindDTOClass', 'Connection', 'withDeleted');
24
24
  class QA extends QueryArgs {
25
25
  }
26
26
  let FOP = class FOP extends (0, __1.ParamArgsType)(FindDTOClass) {
@@ -38,7 +38,7 @@ const Readable = (DTOClass, opts) => (BaseClass) => {
38
38
  // set a unique name otherwise DI does not inject a unique one for each request
39
39
  value: `Query${DTOClass.name}Args`
40
40
  });
41
- class ReadResolverBase extends BaseClass {
41
+ class ReadControllerBase extends BaseClass {
42
42
  async findById(params, authorizeFilter) {
43
43
  return this.service.getById(params.getId(), {
44
44
  filter: authorizeFilter,
@@ -62,7 +62,7 @@ const Readable = (DTOClass, opts) => (BaseClass) => {
62
62
  description: opts?.one?.description,
63
63
  ...opts?.one?.operationOptions
64
64
  }
65
- }, { interceptors: [(0, interceptors_1.HookInterceptor)(__1.HookTypes.BEFORE_FIND_ONE, DTOClass), (0, interceptors_1.AuthorizerInterceptor)(DTOClass)] }, commonResolverOpts, opts.one ?? {}),
65
+ }, { interceptors: [(0, interceptors_1.HookInterceptor)(__1.HookTypes.BEFORE_FIND_ONE, DTOClass), (0, interceptors_1.AuthorizerInterceptor)(DTOClass)] }, commonControllerOpts, opts.one ?? {}),
66
66
  tslib_1.__param(0, (0, param_args_decorator_1.ParamArgs)()),
67
67
  tslib_1.__param(1, (0, __1.AuthorizerFilter)({
68
68
  operationGroup: __1.OperationGroup.READ,
@@ -71,7 +71,7 @@ const Readable = (DTOClass, opts) => (BaseClass) => {
71
71
  tslib_1.__metadata("design:type", Function),
72
72
  tslib_1.__metadata("design:paramtypes", [FOP, Object]),
73
73
  tslib_1.__metadata("design:returntype", Promise)
74
- ], ReadResolverBase.prototype, "findById", null);
74
+ ], ReadControllerBase.prototype, "findById", null);
75
75
  tslib_1.__decorate([
76
76
  (0, __1.Get)(() => QueryArgs.ConnectionType, {
77
77
  path: opts?.many?.path,
@@ -81,7 +81,7 @@ const Readable = (DTOClass, opts) => (BaseClass) => {
81
81
  description: opts?.many?.description,
82
82
  ...opts?.many?.operationOptions
83
83
  }
84
- }, { interceptors: [(0, interceptors_1.HookInterceptor)(__1.HookTypes.BEFORE_QUERY_MANY, DTOClass), (0, interceptors_1.AuthorizerInterceptor)(DTOClass)] }, commonResolverOpts, opts.many ?? {}),
84
+ }, { interceptors: [(0, interceptors_1.HookInterceptor)(__1.HookTypes.BEFORE_QUERY_MANY, DTOClass), (0, interceptors_1.AuthorizerInterceptor)(DTOClass)] }, commonControllerOpts, opts.many ?? {}),
85
85
  tslib_1.__param(0, (0, __1.ParamHookArgs)()),
86
86
  tslib_1.__param(1, (0, hook_args_decorator_1.QueryHookArgs)()),
87
87
  tslib_1.__param(2, (0, __1.AuthorizerFilter)({
@@ -92,11 +92,11 @@ const Readable = (DTOClass, opts) => (BaseClass) => {
92
92
  tslib_1.__metadata("design:paramtypes", [QOP,
93
93
  QA, Object]),
94
94
  tslib_1.__metadata("design:returntype", Promise)
95
- ], ReadResolverBase.prototype, "queryMany", null);
96
- return ReadResolverBase;
95
+ ], ReadControllerBase.prototype, "queryMany", null);
96
+ return ReadControllerBase;
97
97
  };
98
98
  exports.Readable = Readable;
99
99
  // eslint-disable-next-line @typescript-eslint/no-redeclare -- intentional
100
- const ReadController = (DTOClass, opts = {}) => (0, exports.Readable)(DTOClass, opts)(controller_interface_1.BaseServiceResolver);
100
+ const ReadController = (DTOClass, opts = {}) => (0, exports.Readable)(DTOClass, opts)(controller_interface_1.BaseServiceController);
101
101
  exports.ReadController = ReadController;
102
102
  //# sourceMappingURL=read.controller.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"read.controller.js","sourceRoot":"","sources":["../../../../../packages/query-rest/src/controllers/read.controller.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"read.controller.js","sourceRoot":"","sources":["../../../../../packages/query-rest/src/controllers/read.controller.ts"],"names":[],"mappings":"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"}
@@ -35,7 +35,7 @@ const Updateable = (DTOClass, opts) => (BaseClass) => {
35
35
  }
36
36
  const dtoNames = (0, common_1.getDTONames)(DTOClass, opts);
37
37
  const { UpdateDTOClass = defaultUpdateDTO(dtoNames, DTOClass), UpdateOneInput = defaultUpdateOneInput(dtoNames, UpdateDTOClass) } = opts;
38
- const commonResolverOpts = (0, lodash_omit_1.default)(opts, 'dtoName', 'one', 'many', 'UpdateDTOClass', 'UpdateOneInput', 'UpdateManyInput');
38
+ const commonControllerOpts = (0, lodash_omit_1.default)(opts, 'dtoName', 'one', 'many', 'UpdateDTOClass', 'UpdateOneInput', 'UpdateManyInput');
39
39
  let UOI = class UOI extends (0, __1.MutationArgsType)(UpdateOneInput) {
40
40
  };
41
41
  UOI = tslib_1.__decorate([
@@ -46,7 +46,7 @@ const Updateable = (DTOClass, opts) => (BaseClass) => {
46
46
  UOP = tslib_1.__decorate([
47
47
  (0, __1.ApiSchema)({ name: `FindUpdate${DTOClass.name}Args` })
48
48
  ], UOP);
49
- class UpdateResolverBase extends BaseClass {
49
+ class UpdateControllerBase extends BaseClass {
50
50
  updateOne(params, { input }, authorizeFilter) {
51
51
  return this.service.updateOne(params.getId(), input.update, { filter: authorizeFilter ?? {} });
52
52
  }
@@ -65,7 +65,7 @@ const Updateable = (DTOClass, opts) => (BaseClass) => {
65
65
  }
66
66
  }, {
67
67
  interceptors: [(0, interceptors_1.HookInterceptor)(hooks_1.HookTypes.BEFORE_UPDATE_ONE, UpdateDTOClass, DTOClass), (0, interceptors_1.AuthorizerInterceptor)(DTOClass)]
68
- }, commonResolverOpts, opts?.one ?? {}),
68
+ }, commonControllerOpts, opts?.one ?? {}),
69
69
  tslib_1.__param(0, (0, param_args_decorator_1.ParamArgs)()),
70
70
  tslib_1.__param(1, (0, decorators_1.BodyHookArgs)()),
71
71
  tslib_1.__param(2, (0, decorators_1.AuthorizerFilter)({
@@ -76,11 +76,11 @@ const Updateable = (DTOClass, opts) => (BaseClass) => {
76
76
  tslib_1.__metadata("design:paramtypes", [UOP,
77
77
  UOI, Object]),
78
78
  tslib_1.__metadata("design:returntype", Promise)
79
- ], UpdateResolverBase.prototype, "updateOne", null);
80
- return UpdateResolverBase;
79
+ ], UpdateControllerBase.prototype, "updateOne", null);
80
+ return UpdateControllerBase;
81
81
  };
82
82
  exports.Updateable = Updateable;
83
83
  // eslint-disable-next-line @typescript-eslint/no-redeclare -- intentional
84
- const UpdateController = (DTOClass, opts = {}) => (0, exports.Updateable)(DTOClass, opts)(controller_interface_1.BaseServiceResolver);
84
+ const UpdateController = (DTOClass, opts = {}) => (0, exports.Updateable)(DTOClass, opts)(controller_interface_1.BaseServiceController);
85
85
  exports.UpdateController = UpdateController;
86
86
  //# sourceMappingURL=update.controller.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"update.controller.js","sourceRoot":"","sources":["../../../../../packages/query-rest/src/controllers/update.controller.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"update.controller.js","sourceRoot":"","sources":["../../../../../packages/query-rest/src/controllers/update.controller.ts"],"names":[],"mappings":"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"}
@@ -1,21 +1,24 @@
1
- import { ApiOperationOptions } from '@nestjs/swagger';
1
+ import { ApiOperationOptions, ApiResponseOptions } from '@nestjs/swagger';
2
2
  import { ApiBodyOptions } from '@nestjs/swagger/dist/decorators/api-body.decorator';
3
3
  import { ReturnTypeFunc } from '../interfaces/return-type-func';
4
- import { ResolverMethodOpts } from './resolver-method.decorator';
5
- interface MethodDecoratorArg extends ResolverMethodOpts {
4
+ import { MethodOpts } from './method.decorator';
5
+ interface MethodDecoratorArg extends MethodOpts {
6
6
  path?: string | string[];
7
7
  operation?: ApiOperationOptions;
8
+ response?: Omit<ApiResponseOptions, 'status' | 'isArray' | 'type'> & {
9
+ status: number;
10
+ };
8
11
  }
9
12
  interface MutationMethodDecoratorArg extends MethodDecoratorArg {
10
13
  body?: ApiBodyOptions;
11
14
  consumes?: string[];
12
15
  }
13
- export declare function Get(options: MethodDecoratorArg, ...resolverOpts: ResolverMethodOpts[]): PropertyDecorator & MethodDecorator;
14
- export declare function Get(returnTypeFunction?: ReturnTypeFunc, options?: MethodDecoratorArg, ...resolverOpts: ResolverMethodOpts[]): PropertyDecorator & MethodDecorator;
15
- export declare function Post(options: MutationMethodDecoratorArg, ...resolverOpts: ResolverMethodOpts[]): PropertyDecorator & MethodDecorator;
16
- export declare function Post(returnTypeFunction?: ReturnTypeFunc, options?: MutationMethodDecoratorArg, ...resolverOpts: ResolverMethodOpts[]): PropertyDecorator & MethodDecorator;
17
- export declare function Put(options: MutationMethodDecoratorArg, ...resolverOpts: ResolverMethodOpts[]): PropertyDecorator & MethodDecorator;
18
- export declare function Put(returnTypeFunction?: ReturnTypeFunc, options?: MutationMethodDecoratorArg, ...resolverOpts: ResolverMethodOpts[]): PropertyDecorator & MethodDecorator;
19
- export declare function Delete(options: MutationMethodDecoratorArg, ...resolverOpts: ResolverMethodOpts[]): PropertyDecorator & MethodDecorator;
20
- export declare function Delete(returnTypeFunction?: ReturnTypeFunc, options?: MutationMethodDecoratorArg, ...resolverOpts: ResolverMethodOpts[]): PropertyDecorator & MethodDecorator;
16
+ export declare function Get(options: MethodDecoratorArg, ...methodOpts: MethodOpts[]): PropertyDecorator & MethodDecorator;
17
+ export declare function Get(returnTypeFunction?: ReturnTypeFunc, options?: MethodDecoratorArg, ...methodOpts: MethodOpts[]): PropertyDecorator & MethodDecorator;
18
+ export declare function Post(options: MutationMethodDecoratorArg, ...methodOpts: MethodOpts[]): PropertyDecorator & MethodDecorator;
19
+ export declare function Post(returnTypeFunction?: ReturnTypeFunc, options?: MutationMethodDecoratorArg, ...methodOpts: MethodOpts[]): PropertyDecorator & MethodDecorator;
20
+ export declare function Put(options: MutationMethodDecoratorArg, ...methodOpts: MethodOpts[]): PropertyDecorator & MethodDecorator;
21
+ export declare function Put(returnTypeFunction?: ReturnTypeFunc, options?: MutationMethodDecoratorArg, ...methodOpts: MethodOpts[]): PropertyDecorator & MethodDecorator;
22
+ export declare function Delete(options: MutationMethodDecoratorArg, ...methodOpts: MethodOpts[]): PropertyDecorator & MethodDecorator;
23
+ export declare function Delete(returnTypeFunction?: ReturnTypeFunc, options?: MutationMethodDecoratorArg, ...methodOpts: MethodOpts[]): PropertyDecorator & MethodDecorator;
21
24
  export {};
@@ -7,9 +7,9 @@ exports.Delete = Delete;
7
7
  const common_1 = require("@nestjs/common");
8
8
  const swagger_1 = require("@nestjs/swagger");
9
9
  const class_validator_1 = require("class-validator");
10
- const resolver_method_decorator_1 = require("./resolver-method.decorator");
10
+ const method_decorator_1 = require("./method.decorator");
11
11
  const methodDecorator = (method, successStatus) => {
12
- return (returnTypeFuncOrOptions, maybeOptions = {}, ...resolverOpts) => {
12
+ return (returnTypeFuncOrOptions, maybeOptions = {}, ...methodOpts) => {
13
13
  let returnTypeFunc;
14
14
  let options = maybeOptions;
15
15
  if (typeof returnTypeFuncOrOptions === 'object') {
@@ -19,23 +19,25 @@ const methodDecorator = (method, successStatus) => {
19
19
  else {
20
20
  returnTypeFunc = returnTypeFuncOrOptions;
21
21
  }
22
- if ((0, resolver_method_decorator_1.isDisabled)([options, ...resolverOpts])) {
22
+ if ((0, method_decorator_1.isDisabled)([options, ...methodOpts])) {
23
23
  return () => { };
24
24
  }
25
25
  if (!options.path) {
26
26
  options.path = [];
27
27
  }
28
28
  const paths = options.path && !(0, class_validator_1.isArray)(options.path) ? [options.path] : options.path;
29
- const decorators = [method(paths), (0, resolver_method_decorator_1.ResolverMethod)(options, ...resolverOpts)];
29
+ const decorators = [method(paths), (0, method_decorator_1.Method)(options, ...methodOpts)];
30
+ const status = options.response?.status ?? (returnTypeFunc ? successStatus : common_1.HttpStatus.NO_CONTENT);
30
31
  if (returnTypeFunc) {
31
32
  const returnedType = returnTypeFunc();
32
33
  const isReturnTypeArray = Array.isArray(returnedType);
33
34
  const type = isReturnTypeArray ? returnedType[0] : returnedType;
34
35
  decorators.push((0, swagger_1.ApiResponse)({
35
- status: successStatus,
36
36
  description: 'Successful response.',
37
+ ...options.response,
37
38
  type,
38
- isArray: isReturnTypeArray
39
+ isArray: isReturnTypeArray,
40
+ status
39
41
  }));
40
42
  decorators.push((0, common_1.SerializeOptions)({
41
43
  type,
@@ -43,11 +45,13 @@ const methodDecorator = (method, successStatus) => {
43
45
  }), (0, common_1.UseInterceptors)(common_1.ClassSerializerInterceptor));
44
46
  }
45
47
  else {
46
- decorators.push((0, common_1.HttpCode)(common_1.HttpStatus.NO_CONTENT), (0, swagger_1.ApiResponse)({
47
- status: common_1.HttpStatus.NO_CONTENT,
48
- description: 'Request completed successfully.'
48
+ decorators.push((0, swagger_1.ApiResponse)({
49
+ description: 'Request completed successfully.',
50
+ ...options.response,
51
+ status
49
52
  }));
50
53
  }
54
+ decorators.push((0, common_1.HttpCode)(status));
51
55
  if (options.operation) {
52
56
  decorators.push((0, swagger_1.ApiOperation)(options.operation));
53
57
  }
@@ -60,16 +64,16 @@ const methodDecorator = (method, successStatus) => {
60
64
  return (0, common_1.applyDecorators)(...decorators);
61
65
  };
62
66
  };
63
- function Get(returnTypeFuncOrOptions, maybeOptions, ...resolverOpts) {
64
- return methodDecorator(common_1.Get, common_1.HttpStatus.OK)(returnTypeFuncOrOptions, maybeOptions, ...resolverOpts);
67
+ function Get(returnTypeFuncOrOptions, maybeOptions, ...methodOpts) {
68
+ return methodDecorator(common_1.Get, common_1.HttpStatus.OK)(returnTypeFuncOrOptions, maybeOptions, ...methodOpts);
65
69
  }
66
- function Post(returnTypeFuncOrOptions, maybeOptions, ...resolverOpts) {
67
- return methodDecorator(common_1.Post, common_1.HttpStatus.CREATED)(returnTypeFuncOrOptions, maybeOptions, ...resolverOpts);
70
+ function Post(returnTypeFuncOrOptions, maybeOptions, ...methodOpts) {
71
+ return methodDecorator(common_1.Post, common_1.HttpStatus.CREATED)(returnTypeFuncOrOptions, maybeOptions, ...methodOpts);
68
72
  }
69
- function Put(returnTypeFuncOrOptions, maybeOptions, ...resolverOpts) {
70
- return methodDecorator(common_1.Put, common_1.HttpStatus.OK)(returnTypeFuncOrOptions, maybeOptions, ...resolverOpts);
73
+ function Put(returnTypeFuncOrOptions, maybeOptions, ...methodOpts) {
74
+ return methodDecorator(common_1.Put, common_1.HttpStatus.OK)(returnTypeFuncOrOptions, maybeOptions, ...methodOpts);
71
75
  }
72
- function Delete(returnTypeFuncOrOptions, maybeOptions, ...resolverOpts) {
73
- return methodDecorator(common_1.Delete, common_1.HttpStatus.OK)(returnTypeFuncOrOptions, maybeOptions, ...resolverOpts);
76
+ function Delete(returnTypeFuncOrOptions, maybeOptions, ...methodOpts) {
77
+ return methodDecorator(common_1.Delete, common_1.HttpStatus.OK)(returnTypeFuncOrOptions, maybeOptions, ...methodOpts);
74
78
  }
75
79
  //# sourceMappingURL=controller-methods.decorator.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"controller-methods.decorator.js","sourceRoot":"","sources":["../../../../../packages/query-rest/src/decorators/controller-methods.decorator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"controller-methods.decorator.js","sourceRoot":"","sources":["../../../../../packages/query-rest/src/decorators/controller-methods.decorator.ts"],"names":[],"mappings":"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"}
@@ -5,6 +5,7 @@ const common_1 = require("@nestjs/common");
5
5
  const swagger_1 = require("@nestjs/swagger");
6
6
  const class_transformer_1 = require("class-transformer");
7
7
  const class_validator_1 = require("class-validator");
8
+ const common_2 = require("../common");
8
9
  const OPENAPI_METADATA_FACTORY = '_OPENAPI_METADATA_FACTORY';
9
10
  function Field(returnTypeFuncOrOptions, maybeOptions) {
10
11
  let returnTypeFunc;
@@ -32,6 +33,10 @@ function Field(returnTypeFuncOrOptions, maybeOptions) {
32
33
  example: advancedOptions?.default,
33
34
  ...advancedOptions
34
35
  };
36
+ // TypeScript emits Object as the design type for enum properties. Infer the
37
+ // primitive type from the enum so Swagger does not generate an Object schema.
38
+ const enumType = (0, common_2.getEnumType)(options.enum);
39
+ const resolvedType = type === Object ? (enumType ?? type) : type;
35
40
  // Remove non-valid options
36
41
  delete options.forceArray;
37
42
  delete options.skipIsEnum;
@@ -39,7 +44,7 @@ function Field(returnTypeFuncOrOptions, maybeOptions) {
39
44
  const decorators = [
40
45
  (0, class_transformer_1.Expose)({ name: advancedOptions?.name }),
41
46
  (0, swagger_1.ApiProperty)({
42
- type: metadataType ?? type,
47
+ type: metadataType ?? resolvedType,
43
48
  isArray: metadataType ? undefined : isArray,
44
49
  ...options
45
50
  })
@@ -76,23 +81,29 @@ function Field(returnTypeFuncOrOptions, maybeOptions) {
76
81
  if (options.maximum !== undefined) {
77
82
  decorators.push((0, class_validator_1.Max)(options.maximum));
78
83
  }
79
- if (type && type !== Boolean) {
80
- decorators.push((0, class_transformer_1.Type)(() => type));
84
+ if (resolvedType && resolvedType !== Boolean) {
85
+ decorators.push((0, class_transformer_1.Type)(() => resolvedType));
86
+ if (resolvedType === Number && options.enum) {
87
+ decorators.push((0, class_transformer_1.Transform)(({ value, obj, key, type: transformationType }) => {
88
+ const originalKey = transformationType === class_transformer_1.TransformationType.PLAIN_TO_CLASS ? (advancedOptions?.name ?? key) : key;
89
+ return (0, common_2.restoreEnumBlankValues)(obj[originalKey], value);
90
+ }));
91
+ }
81
92
  }
82
- if (type === String) {
93
+ if (resolvedType === String) {
83
94
  decorators.push((0, class_validator_1.IsString)({ each: isArray }));
84
95
  }
85
- else if (type === Number) {
96
+ else if (resolvedType === Number) {
86
97
  decorators.push((0, class_validator_1.IsNumber)({}, { each: isArray }));
87
98
  }
88
- else if (type === Date) {
99
+ else if (resolvedType === Date) {
89
100
  decorators.push((0, class_validator_1.IsDate)({ each: isArray }));
90
101
  }
91
- else if (type === Boolean) {
102
+ else if (resolvedType === Boolean) {
92
103
  // Boolean('false') is true, so parse HTTP query parameter values explicitly.
93
104
  decorators.push((0, class_transformer_1.Transform)(({ value }) => (value === 'true' ? true : value === 'false' ? false : value)), (0, class_validator_1.IsBoolean)({ each: isArray }));
94
105
  }
95
- else if ((returnTypeFunc || metadataType) && typeof type === 'function') {
106
+ else if ((returnTypeFunc || metadataType) && typeof resolvedType === 'function') {
96
107
  decorators.push((0, class_validator_1.ValidateNested)({ each: isArray }));
97
108
  if (!isArray) {
98
109
  decorators.push((0, class_validator_1.IsObject)());
@@ -1 +1 @@
1
- {"version":3,"file":"field.decorator.js","sourceRoot":"","sources":["../../../../../packages/query-rest/src/decorators/field.decorator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"field.decorator.js","sourceRoot":"","sources":["../../../../../packages/query-rest/src/decorators/field.decorator.ts"],"names":[],"mappings":"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"}
@@ -10,7 +10,6 @@ export type FilterableFieldOptions = {
10
10
  export interface FilterableFieldDescriptor {
11
11
  propertyName: string;
12
12
  schemaName: string;
13
- target: Class<unknown>;
14
13
  returnTypeFunc?: ReturnTypeFunc<ReturnTypeFuncValue>;
15
14
  advancedOptions?: FilterableFieldOptions;
16
15
  }
@@ -31,7 +31,6 @@ function FilterableField(returnTypeFuncOrOptions, maybeOptions) {
31
31
  reflector.append(target.constructor, {
32
32
  propertyName: propertyName.toString(),
33
33
  schemaName: propertyName.toString(),
34
- target: Ctx,
35
34
  returnTypeFunc: rt,
36
35
  advancedOptions
37
36
  });
@@ -1 +1 @@
1
- {"version":3,"file":"filterable-field.decorator.js","sourceRoot":"","sources":["../../../../../packages/query-rest/src/decorators/filterable-field.decorator.ts"],"names":[],"mappings":";;AAsBA,sEAKC;AAoCD,0CAyCC;AAED,kDAOC;AAjHD,kEAAqF;AAGrF,2CAAkD;AAClD,uDAAuD;AAEvD,MAAM,SAAS,GAAG,IAAI,kCAAc,CAAC,gCAAoB,CAAC,CAAA;AAgB1D,SAAgB,6BAA6B,CAAC,kBAA0C,EAAE;IACxF,2DAA2D;IAC3D,MAAM,EAAE,cAAc,EAAE,gBAAgB,EAAE,UAAU,EAAE,GAAG,YAAY,EAAE,GAAG,eAAe,CAAA;IAEzF,OAAO,YAAY,CAAA;AACrB,CAAC;AAoCD,SAAgB,eAAe,CAC7B,uBAAiE,EACjE,YAAqC;IAErC,IAAI,cAA0C,CAAA;IAC9C,IAAI,eAAmD,CAAA;IACvD,IAAI,OAAO,uBAAuB,KAAK,UAAU,EAAE,CAAC;QAClD,cAAc,GAAG,uBAAuB,CAAA;QACxC,eAAe,GAAG,YAAY,CAAA;IAChC,CAAC;SAAM,IAAI,OAAO,uBAAuB,KAAK,QAAQ,EAAE,CAAC;QACvD,eAAe,GAAG,uBAAuB,CAAA;IAC3C,CAAC;SAAM,IAAI,OAAO,YAAY,KAAK,QAAQ,EAAE,CAAC;QAC5C,eAAe,GAAG,YAAY,CAAA;IAChC,CAAC;IACD,OAAO,CACL,MAAc,EACd,YAA6B,EAC7B,UAAsC,EACH,EAAE;QACrC,MAAM,GAAG,GAAG,OAAO,CAAC,WAAW,CAAC,aAAa,EAAE,MAAM,EAAE,YAAY,CAAmB,CAAA;QACtF,MAAM,EAAE,GAAG,cAAc,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAA;QACxC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,WAA6B,EAAE;YACrD,YAAY,EAAE,YAAY,CAAC,QAAQ,EAAE;YACrC,UAAU,EAAE,YAAY,CAAC,QAAQ,EAAE;YACnC,MAAM,EAAE,GAAG;YACX,cAAc,EAAE,EAAE;YAClB,eAAe;SAChB,CAAC,CAAA;QAEF,IAAI,eAAe,EAAE,UAAU,EAAE,CAAC;YAChC,OAAO,SAAS,CAAA;QAClB,CAAC;QAED,IAAI,cAAc,EAAE,CAAC;YACnB,OAAO,IAAA,uBAAK,EAAC,cAAc,EAAE,6BAA6B,CAAC,eAAe,CAAC,CAAC,CAAC,MAAM,EAAE,YAAY,EAAE,UAAU,CAAC,CAAA;QAChH,CAAC;QACD,IAAI,eAAe,EAAE,CAAC;YACpB,OAAO,IAAA,uBAAK,EAAC,6BAA6B,CAAC,eAAe,CAAC,CAAC,CAAC,MAAM,EAAE,YAAY,EAAE,UAAU,CAAC,CAAA;QAChG,CAAC;QACD,OAAO,IAAA,uBAAK,GAAE,CAAC,MAAM,EAAE,YAAY,EAAE,UAAU,CAAC,CAAA;IAClD,CAAC,CAAA;AACH,CAAC;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"}
1
+ {"version":3,"file":"filterable-field.decorator.js","sourceRoot":"","sources":["../../../../../packages/query-rest/src/decorators/filterable-field.decorator.ts"],"names":[],"mappings":";;AAqBA,sEAKC;AAoCD,0CAyCC;AAED,kDAOC;AAhHD,kEAAqF;AAGrF,2CAAkD;AAClD,uDAAuD;AAEvD,MAAM,SAAS,GAAG,IAAI,kCAAc,CAAC,gCAAoB,CAAC,CAAA;AAe1D,SAAgB,6BAA6B,CAAC,kBAA0C,EAAE;IACxF,2DAA2D;IAC3D,MAAM,EAAE,cAAc,EAAE,gBAAgB,EAAE,UAAU,EAAE,GAAG,YAAY,EAAE,GAAG,eAAe,CAAA;IAEzF,OAAO,YAAY,CAAA;AACrB,CAAC;AAoCD,SAAgB,eAAe,CAC7B,uBAAiE,EACjE,YAAqC;IAErC,IAAI,cAA0C,CAAA;IAC9C,IAAI,eAAmD,CAAA;IACvD,IAAI,OAAO,uBAAuB,KAAK,UAAU,EAAE,CAAC;QAClD,cAAc,GAAG,uBAAuB,CAAA;QACxC,eAAe,GAAG,YAAY,CAAA;IAChC,CAAC;SAAM,IAAI,OAAO,uBAAuB,KAAK,QAAQ,EAAE,CAAC;QACvD,eAAe,GAAG,uBAAuB,CAAA;IAC3C,CAAC;SAAM,IAAI,OAAO,YAAY,KAAK,QAAQ,EAAE,CAAC;QAC5C,eAAe,GAAG,YAAY,CAAA;IAChC,CAAC;IACD,OAAO,CACL,MAAc,EACd,YAA6B,EAC7B,UAAsC,EACH,EAAE;QACrC,MAAM,GAAG,GAAG,OAAO,CAAC,WAAW,CAAC,aAAa,EAAE,MAAM,EAAE,YAAY,CAAmB,CAAA;QACtF,MAAM,EAAE,GAAG,cAAc,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAA;QAExC,SAAS,CAAC,MAAM,CAA+B,MAAM,CAAC,WAAuB,EAAE;YAC7E,YAAY,EAAE,YAAY,CAAC,QAAQ,EAAE;YACrC,UAAU,EAAE,YAAY,CAAC,QAAQ,EAAE;YACnC,cAAc,EAAE,EAAE;YAClB,eAAe;SAChB,CAAC,CAAA;QAEF,IAAI,eAAe,EAAE,UAAU,EAAE,CAAC;YAChC,OAAO,SAAS,CAAA;QAClB,CAAC;QAED,IAAI,cAAc,EAAE,CAAC;YACnB,OAAO,IAAA,uBAAK,EAAC,cAAc,EAAE,6BAA6B,CAAC,eAAe,CAAC,CAAC,CAAC,MAAM,EAAE,YAAY,EAAE,UAAU,CAAC,CAAA;QAChH,CAAC;QACD,IAAI,eAAe,EAAE,CAAC;YACpB,OAAO,IAAA,uBAAK,EAAC,6BAA6B,CAAC,eAAe,CAAC,CAAC,CAAC,MAAM,EAAE,YAAY,EAAE,UAAU,CAAC,CAAA;QAChG,CAAC;QACD,OAAO,IAAA,uBAAK,GAAE,CAAC,MAAM,EAAE,YAAY,EAAE,UAAU,CAAC,CAAA;IAClD,CAAC,CAAA;AACH,CAAC;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"}
@@ -8,7 +8,7 @@ export * from './hook.decorator';
8
8
  export * from './hook-args.decorator';
9
9
  export * from './id-field.decorator';
10
10
  export * from './inject-authorizer.decorator';
11
+ export * from './method.decorator';
12
+ export * from './query-method.decorator';
11
13
  export * from './query-options.decorator';
12
- export * from './resolver-method.decorator';
13
- export * from './resolver-query.decorator';
14
14
  export * from './skip-if.decorator';
@@ -11,8 +11,8 @@ tslib_1.__exportStar(require("./hook.decorator"), exports);
11
11
  tslib_1.__exportStar(require("./hook-args.decorator"), exports);
12
12
  tslib_1.__exportStar(require("./id-field.decorator"), exports);
13
13
  tslib_1.__exportStar(require("./inject-authorizer.decorator"), exports);
14
+ tslib_1.__exportStar(require("./method.decorator"), exports);
15
+ tslib_1.__exportStar(require("./query-method.decorator"), exports);
14
16
  tslib_1.__exportStar(require("./query-options.decorator"), exports);
15
- tslib_1.__exportStar(require("./resolver-method.decorator"), exports);
16
- tslib_1.__exportStar(require("./resolver-query.decorator"), exports);
17
17
  tslib_1.__exportStar(require("./skip-if.decorator"), exports);
18
18
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/query-rest/src/decorators/index.ts"],"names":[],"mappings":";;;AAAA,iEAAsC;AACtC,uEAA4C;AAC5C,iEAAsC;AACtC,yEAA8C;AAC9C,4DAAiC;AACjC,uEAA4C;AAC5C,2DAAgC;AAChC,gEAAqC;AACrC,+DAAoC;AACpC,wEAA6C;AAC7C,oEAAyC;AACzC,sEAA2C;AAC3C,qEAA0C;AAC1C,8DAAmC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/query-rest/src/decorators/index.ts"],"names":[],"mappings":";;;AAAA,iEAAsC;AACtC,uEAA4C;AAC5C,iEAAsC;AACtC,yEAA8C;AAC9C,4DAAiC;AACjC,uEAA4C;AAC5C,2DAAgC;AAChC,gEAAqC;AACrC,+DAAoC;AACpC,wEAA6C;AAC7C,6DAAkC;AAClC,mEAAwC;AACxC,oEAAyC;AACzC,8DAAmC"}
@@ -1,6 +1,6 @@
1
1
  import { CanActivate, ExceptionFilter, NestInterceptor, PipeTransform } from '@nestjs/common';
2
2
  import { Class } from '@ptc-org/nestjs-query-core';
3
- export interface BaseResolverOptions {
3
+ export interface BaseMethodOptions {
4
4
  /** An array of `nestjs` guards to apply to a endpoint */
5
5
  guards?: (Class<CanActivate> | CanActivate)[];
6
6
  /** An array of `nestjs` interceptors to apply to a endpoint */
@@ -17,35 +17,35 @@ export interface BaseResolverOptions {
17
17
  tags?: string[];
18
18
  }
19
19
  /**
20
- * Options for resolver methods.
20
+ * Options for controller methods.
21
21
  */
22
- export interface ResolverMethodOpts extends BaseResolverOptions {
22
+ export interface MethodOpts extends BaseMethodOptions {
23
23
  /** Set to true to disable the endpoint */
24
24
  disabled?: boolean;
25
25
  }
26
26
  /**
27
- * Options for relation resolver methods.
27
+ * Options for relation methods.
28
28
  */
29
- export interface ResolverRelationMethodOpts extends BaseResolverOptions {
29
+ export interface RelationMethodOpts extends BaseMethodOptions {
30
30
  /** Set to true to enable the endpoint */
31
31
  enabled?: boolean;
32
32
  }
33
33
  /**
34
34
  * @internal
35
- * Returns true if any of the [[ResolverMethodOpts]] are disabled.
36
- * @param opts - The array of [[ResolverMethodOpts]] to check.
35
+ * Returns true if any of the [[MethodOpts]] are disabled.
36
+ * @param opts - The array of [[MethodOpts]] to check.
37
37
  */
38
- export declare function isDisabled(opts: ResolverMethodOpts[]): boolean;
38
+ export declare function isDisabled(opts: MethodOpts[]): boolean;
39
39
  /**
40
40
  * @internal
41
- * Returns true if any of the [[ResolverRelationMethodOpts]] are disabled.
42
- * @param opts - The array of [[ResolverRelationMethodOpts]] to check.
41
+ * Returns true if any of the [[RelationMethodOpts]] are enabled.
42
+ * @param opts - The array of [[RelationMethodOpts]] to check.
43
43
  */
44
- export declare function isEnabled(opts: ResolverRelationMethodOpts[]): boolean;
44
+ export declare function isEnabled(opts: RelationMethodOpts[]): boolean;
45
45
  /**
46
46
  * @internal
47
- * Decorator for all ResolverMethods
47
+ * Decorator for controller methods.
48
48
  *
49
- * @param opts - the [[ResolverMethodOpts]] to apply.
49
+ * @param opts - the [[MethodOpts]] to apply.
50
50
  */
51
- export declare function ResolverMethod(...opts: ResolverMethodOpts[]): MethodDecorator;
51
+ export declare function Method(...opts: MethodOpts[]): MethodDecorator;
@@ -2,7 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.isDisabled = isDisabled;
4
4
  exports.isEnabled = isEnabled;
5
- exports.ResolverMethod = ResolverMethod;
5
+ exports.Method = Method;
6
6
  /* eslint-disable @typescript-eslint/no-explicit-any */
7
7
  const common_1 = require("@nestjs/common");
8
8
  /**
@@ -17,27 +17,27 @@ function createSetArray(...arrs) {
17
17
  }
18
18
  /**
19
19
  * @internal
20
- * Returns true if any of the [[ResolverMethodOpts]] are disabled.
21
- * @param opts - The array of [[ResolverMethodOpts]] to check.
20
+ * Returns true if any of the [[MethodOpts]] are disabled.
21
+ * @param opts - The array of [[MethodOpts]] to check.
22
22
  */
23
23
  function isDisabled(opts) {
24
24
  return !!opts.find((o) => o.disabled);
25
25
  }
26
26
  /**
27
27
  * @internal
28
- * Returns true if any of the [[ResolverRelationMethodOpts]] are disabled.
29
- * @param opts - The array of [[ResolverRelationMethodOpts]] to check.
28
+ * Returns true if any of the [[RelationMethodOpts]] are enabled.
29
+ * @param opts - The array of [[RelationMethodOpts]] to check.
30
30
  */
31
31
  function isEnabled(opts) {
32
32
  return opts.some((o) => o.enabled);
33
33
  }
34
34
  /**
35
35
  * @internal
36
- * Decorator for all ResolverMethods
36
+ * Decorator for controller methods.
37
37
  *
38
- * @param opts - the [[ResolverMethodOpts]] to apply.
38
+ * @param opts - the [[MethodOpts]] to apply.
39
39
  */
40
- function ResolverMethod(...opts) {
40
+ function Method(...opts) {
41
41
  return (0, common_1.applyDecorators)((0, common_1.UseGuards)(...createSetArray(...opts.map((o) => o.guards ?? []))), (0, common_1.UseInterceptors)(...createSetArray(...opts.map((o) => o.interceptors ?? []))), (0, common_1.UsePipes)(...createSetArray(...opts.map((o) => o.pipes ?? []))), (0, common_1.UseFilters)(...createSetArray(...opts.map((o) => o.filters ?? []))), ...createSetArray(...opts.map((o) => o.decorators ?? [])));
42
42
  }
43
- //# sourceMappingURL=resolver-method.decorator.js.map
43
+ //# sourceMappingURL=method.decorator.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"method.decorator.js","sourceRoot":"","sources":["../../../../../packages/query-rest/src/decorators/method.decorator.ts"],"names":[],"mappings":";;AA+DA,gCAEC;AAOD,8BAEC;AAQD,wBAQC;AA1FD,uDAAuD;AACvD,2CAUuB;AAoCvB;;;;GAIG;AACH,6DAA6D;AAC7D,SAAS,cAAc,CAAI,GAAG,IAAW;IACvC,MAAM,GAAG,GAAW,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,CAAM,CAAC,GAAQ,EAAE,GAAQ,EAAO,EAAE,CAAC,CAAC,GAAG,GAAG,EAAE,GAAG,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,CAAA;IAChG,OAAO,CAAC,GAAG,GAAG,CAAC,CAAA;AACjB,CAAC;AAED;;;;GAIG;AACH,SAAgB,UAAU,CAAC,IAAkB;IAC3C,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAA;AACvC,CAAC;AAED;;;;GAIG;AACH,SAAgB,SAAS,CAAC,IAA0B;IAClD,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;AACpC,CAAC;AAED;;;;;GAKG;AACH,SAAgB,MAAM,CAAC,GAAG,IAAkB;IAC1C,OAAO,IAAA,wBAAe,EACpB,IAAA,kBAAS,EAAC,GAAG,cAAc,CAAmC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,CAAC,EAClG,IAAA,wBAAe,EAAC,GAAG,cAAc,CAAyB,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,CAAC,EACpG,IAAA,iBAAQ,EAAC,GAAG,cAAc,CAAuB,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC,EACpF,IAAA,mBAAU,EAAC,GAAG,cAAc,CAAyB,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,CAAC,EAC1F,GAAG,cAAc,CAAsC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,CAC/F,CAAA;AACH,CAAC"}
@@ -0,0 +1,4 @@
1
+ import { MethodOpts } from './method.decorator';
2
+ export interface QueryMethodOpts extends MethodOpts {
3
+ withDeleted?: boolean;
4
+ }
@@ -1,3 +1,3 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- //# sourceMappingURL=resolver-query.decorator.js.map
3
+ //# sourceMappingURL=query-method.decorator.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"query-method.decorator.js","sourceRoot":"","sources":["../../../../../packages/query-rest/src/decorators/query-method.decorator.ts"],"names":[],"mappings":""}
package/src/module.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"module.js","sourceRoot":"","sources":["../../../../packages/query-rest/src/module.ts"],"names":[],"mappings":";;;AACA,kEAAoF;AAGpF,2CAAiH;AAuBjH,MAAa,qBAAqB;IACzB,MAAM,CAAC,UAAU,CAAC,IAAsC;QAC7D,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAA;QAC3C,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAA;QACzC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,EAAE,CAAA;QAClC,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,IAAI,EAAE,CAAA;QAE1C,OAAO;YACL,MAAM,EAAE,qBAAqB;YAC7B,OAAO,EAAE,CAAC,GAAG,OAAO,EAAE,UAAU,CAAC;YACjC,SAAS,EAAE,CAAC,GAAG,SAAS,CAAC;YACzB,OAAO,EAAE,CAAC,GAAG,SAAS,EAAE,GAAG,OAAO,EAAE,UAAU,CAAC;YAC/C,WAAW,EAAE,CAAC,GAAG,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,GAAG,WAAW,CAAC;SAClE,CAAA;IACH,CAAC;IAEO,MAAM,CAAC,aAAa,CAAC,IAAsC;QACjE,OAAO,yCAAqB,CAAC,UAAU,CAAC;YACtC,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,OAAO,EAAE,IAAI,CAAC,OAAO,IAAI,EAAE;SAC5B,CAAC,CAAA;IACJ,CAAC;IAEO,MAAM,CAAC,YAAY,CAAC,IAAsC;QAChE,OAAO,CAAC,GAAG,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAA;IACnH,CAAC;IAEO,MAAM,CAAC,oBAAoB,CAAC,IAAsC;QACxE,OAAO,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAA;IAC5B,CAAC;IAEO,MAAM,CAAC,sBAAsB,CAAC,IAAsC;QAC1E,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAA;QACjE,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAA;QACpD,OAAO,IAAA,qCAAyB,EAAC,CAAC,GAAG,YAAY,EAAE,GAAG,IAAI,CAAC,CAAC,CAAA;IAC9D,CAAC;IAEO,MAAM,CAAC,oBAAoB,CAAC,IAAsC;QACxE,OAAO,IAAA,2BAAe,EAAC,IAAI,CAAC,SAAS,IAAI,EAAE,CAAC,CAAA;IAC9C,CAAC;IAEO,MAAM,CAAC,gBAAgB,CAAC,IAAsC;QACpE,OAAO,IAAA,+BAAmB,EAAC,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;IAC/E,CAAC;CACF;AA5CD,sDA4CC"}
1
+ {"version":3,"file":"module.js","sourceRoot":"","sources":["../../../../packages/query-rest/src/module.ts"],"names":[],"mappings":";;;AACA,kEAAoF;AAGpF,2CAAiH;AAoBjH,MAAa,qBAAqB;IACzB,MAAM,CAAC,UAAU,CAAC,IAAsC;QAC7D,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAA;QAC3C,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAA;QACzC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,EAAE,CAAA;QAClC,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,IAAI,EAAE,CAAA;QAE1C,OAAO;YACL,MAAM,EAAE,qBAAqB;YAC7B,OAAO,EAAE,CAAC,GAAG,OAAO,EAAE,UAAU,CAAC;YACjC,SAAS,EAAE,CAAC,GAAG,SAAS,CAAC;YACzB,OAAO,EAAE,CAAC,GAAG,SAAS,EAAE,GAAG,OAAO,EAAE,UAAU,CAAC;YAC/C,WAAW,EAAE,CAAC,GAAG,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,GAAG,WAAW,CAAC;SAClE,CAAA;IACH,CAAC;IAEO,MAAM,CAAC,aAAa,CAAC,IAAsC;QACjE,OAAO,yCAAqB,CAAC,UAAU,CAAC;YACtC,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,OAAO,EAAE,IAAI,CAAC,OAAO,IAAI,EAAE;SAC5B,CAAC,CAAA;IACJ,CAAC;IAEO,MAAM,CAAC,YAAY,CAAC,IAAsC;QAChE,OAAO,CAAC,GAAG,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAA;IACnH,CAAC;IAEO,MAAM,CAAC,oBAAoB,CAAC,IAAsC;QACxE,OAAO,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAA;IAC5B,CAAC;IAEO,MAAM,CAAC,sBAAsB,CAAC,IAAsC;QAC1E,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAA;QACjE,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAA;QACpD,OAAO,IAAA,qCAAyB,EAAC,CAAC,GAAG,YAAY,EAAE,GAAG,IAAI,CAAC,CAAC,CAAA;IAC9D,CAAC;IAEO,MAAM,CAAC,oBAAoB,CAAC,IAAsC;QACxE,OAAO,IAAA,2BAAe,EAAC,IAAI,CAAC,SAAS,IAAI,EAAE,CAAC,CAAA;IAC9C,CAAC;IAEO,MAAM,CAAC,gBAAgB,CAAC,IAAsC;QACpE,OAAO,IAAA,+BAAmB,EAAC,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;IAC/E,CAAC;CACF;AA5CD,sDA4CC"}