@ptc-org/nestjs-query-rest 11.1.0-alpha.3 → 11.1.0-alpha.4

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 (36) hide show
  1. package/controllers/create.controller.d.ts +2 -0
  2. package/controllers/create.controller.js +3 -3
  3. package/controllers/create.controller.js.map +1 -1
  4. package/controllers/crud.controller.js +9 -2
  5. package/controllers/crud.controller.js.map +1 -1
  6. package/controllers/export.controller.d.ts +7 -1
  7. package/controllers/export.controller.js +6 -5
  8. package/controllers/export.controller.js.map +1 -1
  9. package/controllers/read.controller.d.ts +13 -5
  10. package/controllers/read.controller.js +11 -8
  11. package/controllers/read.controller.js.map +1 -1
  12. package/controllers/update.controller.d.ts +2 -0
  13. package/controllers/update.controller.js +3 -3
  14. package/controllers/update.controller.js.map +1 -1
  15. package/decorators/authorize-filter.decorator.js +1 -1
  16. package/decorators/authorize-filter.decorator.js.map +1 -1
  17. package/decorators/hook-args.decorator.js +9 -5
  18. package/decorators/hook-args.decorator.js.map +1 -1
  19. package/decorators/query-options.decorator.js +1 -1
  20. package/decorators/query-options.decorator.js.map +1 -1
  21. package/interceptors/hook.interceptor.d.ts +1 -0
  22. package/interceptors/hook.interceptor.js +1 -0
  23. package/interceptors/hook.interceptor.js.map +1 -1
  24. package/package.json +2 -2
  25. package/types/param-args.type.js +3 -3
  26. package/types/param-args.type.js.map +1 -1
  27. package/types/query/query-args/export-paging-query-args.type.js +2 -4
  28. package/types/query/query-args/export-paging-query-args.type.js.map +1 -1
  29. package/types/query/query-args/interfaces.d.ts +2 -0
  30. package/types/query/query-args/none-paging-query-args.type.js +3 -4
  31. package/types/query/query-args/none-paging-query-args.type.js.map +1 -1
  32. package/types/query/query-args/offset-query-args.type.js +4 -6
  33. package/types/query/query-args/offset-query-args.type.js.map +1 -1
  34. package/types/query/sorting.type.d.ts +8 -0
  35. package/types/query/sorting.type.js +56 -0
  36. package/types/query/sorting.type.js.map +1 -0
@@ -12,6 +12,8 @@ export interface CreateControllerOpts<DTO, C = DeepPartial<DTO>> extends Mutatio
12
12
  * The class to be used for `createOne` input.
13
13
  */
14
14
  CreateOneInput?: Class<CreateOneInputType<C>>;
15
+ /** DTO used for response serialization and OpenAPI. Defaults to DTOClass. */
16
+ ReturnDTOClass?: Class<unknown>;
15
17
  one?: MutationOpts['one'] & AuthValidationOpts;
16
18
  }
17
19
  export interface CreateController<DTO, C, QS extends QueryService<DTO, C, unknown>> extends ServiceController<DTO, QS> {
@@ -37,8 +37,8 @@ const Creatable = (DTOClass, opts) => (BaseClass) => {
37
37
  return BaseClass;
38
38
  }
39
39
  const dtoNames = (0, common_1.getDTONames)(DTOClass, opts);
40
- const { CreateDTOClass = defaultCreateDTO(dtoNames, DTOClass), CreateOneInput = defaultCreateOneInput(dtoNames, CreateDTOClass) } = opts;
41
- const commonControllerOpts = (0, nestjs_query_core_1.omit)(opts, 'dtoName', 'one', 'many', 'CreateDTOClass', 'CreateOneInput', 'CreateManyInput');
40
+ const { ReturnDTOClass = DTOClass, CreateDTOClass = defaultCreateDTO(dtoNames, DTOClass), CreateOneInput = defaultCreateOneInput(dtoNames, CreateDTOClass) } = opts;
41
+ const commonControllerOpts = (0, nestjs_query_core_1.omit)(opts, 'dtoName', 'one', 'many', 'CreateDTOClass', 'CreateOneInput', 'CreateManyInput', 'ReturnDTOClass');
42
42
  const validateCreateOneWithAuthFilter = opts.one?.validateWithAuthFilter ?? opts.validateWithAuthFilter ?? false;
43
43
  let COI = class COI extends (0, __1.MutationArgsType)(CreateOneInput) {
44
44
  };
@@ -63,7 +63,7 @@ const Creatable = (DTOClass, opts) => (BaseClass) => {
63
63
  }
64
64
  }
65
65
  tslib_1.__decorate([
66
- (0, __1.Post)(() => DTOClass, {
66
+ (0, __1.Post)(() => ReturnDTOClass, {
67
67
  disabled: opts.disabled,
68
68
  path: opts.one?.path,
69
69
  operation: {
@@ -1 +1 @@
1
- {"version":3,"file":"create.controller.js","sourceRoot":"","sources":["../../../../packages/query-rest/src/controllers/create.controller.ts"],"names":[],"mappings":";;;;AAAA,gDAAgD;AAChD,6CAA0C;AAC1C,kEAA+G;AAE/G,2BAAkE;AAClE,kCAAwC;AACxC,sCAAiD;AACjD,8CAAgD;AAChD,2EAAgE;AAChE,6EAA8D;AAC9D,kDAAiD;AACjD,mFAA8E;AAC9E,oCAA6C;AAC7C,8DAAwD;AACxD,iEAAgH;AAmBhH,gBAAgB;AAChB,MAAM,gBAAgB,GAAG,CAAS,QAAkB,EAAE,QAAoB,EAAY,EAAE;IACtF,6DAA6D;IAC7D,aAAa;IACb,MAAM,gBAAiB,SAAQ,IAAA,kBAAQ,EAAC,QAAQ,EAAE,EAAE,CAAC;KAAG;IAExD,OAAO,gBAA4B,CAAA;AACrC,CAAC,CAAA;AAED,gBAAgB;AAChB,MAAM,qBAAqB,GAAG,CAAI,QAAkB,EAAE,QAAkB,EAAgC,EAAE;IACxG,OAAO,IAAA,0BAAkB,EAAC,QAAQ,CAAC,CAAA;AACrC,CAAC,CAAA;AAED;;;GAGG;AACI,MAAM,SAAS,GACpB,CAAmD,QAAoB,EAAE,IAAkC,EAAE,EAAE,CAC/G,CAA8C,SAAY,EAA2C,EAAE;IACrG,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;QAClB,OAAO,SAAkB,CAAA;IAC3B,CAAC;IAED,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;IAE5C,MAAM,EACJ,cAAc,GAAG,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,CAAC,EACrD,cAAc,GAAG,qBAAqB,CAAC,QAAQ,EAAE,cAAc,CAAC,EACjE,GAAG,IAAI,CAAA;IAER,MAAM,oBAAoB,GAAG,IAAA,wBAAI,EAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,iBAAiB,CAAC,CAAA;IACxH,MAAM,+BAA+B,GAAG,IAAI,CAAC,GAAG,EAAE,sBAAsB,IAAI,IAAI,CAAC,sBAAsB,IAAI,KAAK,CAAA;IAGhH,IAAM,GAAG,GAAT,MAAM,GAAI,SAAQ,IAAA,oBAAgB,EAAC,cAAc,CAAC;KAAG,CAAA;IAA/C,GAAG;QADR,IAAA,aAAS,EAAC,EAAE,IAAI,EAAE,SAAS,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC;OACxC,GAAG,CAA4C;IAGrD,IAAM,GAAG,GAAT,MAAM,GAAI,SAAQ,IAAA,+BAAa,EAAC,cAAc,CAAC;KAAG,CAAA;IAA5C,GAAG;QADR,IAAA,aAAS,EAAC,EAAE,IAAI,EAAE,SAAS,QAAQ,CAAC,IAAI,MAAM,EAAE,CAAC;OAC5C,GAAG,CAAyC;IAElD,MAAM,oBAAqB,SAAQ,SAAS;QAsB7B,AAAN,KAAK,CAAC,SAAS,CACP,MAAW,EACR,EAAE,KAAK,EAAO,EAK9B,eAA6B;YAE7B,MAAM,aAAa,GAAG,+BAA+B,IAAI,eAAe,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC,SAAS,CAAA;YAClH,6DAA6D;YAC7D,aAAa;YACb,MAAM,cAAc,GAAM;gBACxB,GAAG,MAAM;gBACT,GAAG,KAAK;aACT,CAAA;YACD,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,cAAc,EAAE,aAAa,CAAC,CAAA;QAC9D,CAAC;KACF;IAlBc;QArBZ,IAAA,QAAI,EACH,GAAG,EAAE,CAAC,QAAQ,EACd;YACE,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI;YACpB,SAAS,EAAE;gBACT,WAAW,EAAE,GAAG,QAAQ,CAAC,mBAAmB,YAAY;gBACxD,IAAI,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC;gBACvD,WAAW,EAAE,IAAI,EAAE,GAAG,EAAE,WAAW;gBACnC,GAAG,IAAI,EAAE,GAAG,EAAE,gBAAgB;aAC/B;YACD,IAAI,EAAE;gBACJ,IAAI,EAAE,GAAG;aACV;SACF,EACD;YACE,YAAY,EAAE,CAAC,IAAA,8BAAe,EAAC,aAAS,CAAC,iBAAiB,EAAE,cAAc,EAAE,QAAQ,CAAC,EAAE,IAAA,8CAAqB,EAAC,QAAQ,CAAC,CAAC;SACxH,EACD,oBAAoB,EACpB,IAAI,CAAC,GAAG,IAAI,EAAE,CACf;QAEE,mBAAA,IAAA,gCAAS,GAAE,CAAA;QACX,mBAAA,IAAA,kCAAY,GAAE,CAAA;QACd,mBAAA,IAAA,6BAAgB,EAAC;YAChB,cAAc,EAAE,qBAAc,CAAC,MAAM;YACrC,IAAI,EAAE,KAAK;SACZ,CAAC,CAAA;;iDALmB,GAAG;YACG,GAAG;;yDAe/B;IAGH,OAAO,oBAAoB,CAAA;AAC7B,CAAC,CAAA;AAlEU,QAAA,SAAS,GAAT,SAAS,CAkEnB;AAEH;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,0EAA0E;AACnE,MAAM,gBAAgB,GAAG,CAK9B,QAAoB,EACpB,IAAI,GAAiC,EAAE,EACiB,EAAE,CAAC,IAAA,QAAA,SAAS,EAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,4CAAqB,CAAC,CAAA;AAPhG,QAAA,gBAAgB,GAAhB,gBAAgB,CAOgF"}
1
+ {"version":3,"file":"create.controller.js","sourceRoot":"","sources":["../../../../packages/query-rest/src/controllers/create.controller.ts"],"names":[],"mappings":"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"}
@@ -28,8 +28,15 @@ function extractDeleteOpts(opts) {
28
28
  return (0, common_1.mergeBaseMethodOpts)(deleteArgs, opts);
29
29
  }
30
30
  function extractExportOpts(opts) {
31
- const { export: exportArgs = {} } = opts;
32
- return (0, common_1.mergeBaseMethodOpts)(exportArgs, opts);
31
+ const { export: exportArgs = {}, read } = opts;
32
+ return (0, common_1.mergeBaseMethodOpts)({
33
+ ...exportArgs,
34
+ many: {
35
+ ...exportArgs.many,
36
+ ReturnDTOClass: exportArgs.many?.ReturnDTOClass ?? read?.many?.ReturnDTOClass,
37
+ relations: exportArgs.many?.relations ?? read?.many?.relations
38
+ }
39
+ }, opts);
33
40
  }
34
41
  /**
35
42
  * Factory to create a controller that includes create, read, update, delete, and export endpoints.
@@ -1 +1 @@
1
- {"version":3,"file":"crud.controller.js","sourceRoot":"","sources":["../../../../packages/query-rest/src/controllers/crud.controller.ts"],"names":[],"mappings":";;;AAEA,sCAA+C;AAK/C,2DAA4E;AAC5E,2DAAuF;AACvF,2DAAwF;AACxF,uDAAwF;AACxF,2DAAwF;AAgDxF,SAAS,iBAAiB,CACxB,IAA6F;IAE7F,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,GAAG,IAAI,CAAA;IACvC,OAAO,IAAA,4BAAmB,EAA+B,EAAE,cAAc,EAAE,GAAG,MAAM,EAAE,EAAE,IAAI,CAAC,CAAA;AAC/F,CAAC;AAED,SAAS,eAAe,CACtB,IAA6E;IAE7E,MAAM,EAAE,gBAAgB,EAAE,cAAc,EAAE,IAAI,EAAE,GAAG,IAAI,CAAA;IACvD,OAAO,IAAA,4BAAmB,EACxB;QACE,gBAAgB;QAChB,cAAc;QACd,GAAG,IAAI;KAC+B,EACxC,IAAI,CACL,CAAA;AACH,CAAC;AAED,SAAS,iBAAiB,CACxB,IAA6F;IAE7F,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,GAAG,IAAI,CAAA;IACvC,OAAO,IAAA,4BAAmB,EAA+B,EAAE,cAAc,EAAE,GAAG,MAAM,EAAE,EAAE,IAAI,CAAC,CAAA;AAC/F,CAAC;AAED,SAAS,iBAAiB,CACxB,IAAmG;IAEnG,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,EAAE,EAAE,GAAG,IAAI,CAAA;IACxC,OAAO,IAAA,4BAAmB,EAAuB,UAAU,EAAE,IAAI,CAAC,CAAA;AACpE,CAAC;AAED,SAAS,iBAAiB,CACxB,IAA6F;IAE7F,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,EAAE,EAAE,GAAG,IAAI,CAAA;IACxC,OAAO,IAAA,4BAAmB,EAA+B,UAAU,EAAE,IAAI,CAAC,CAAA;AAC5E,CAAC;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,0EAA0E;AACnE,MAAM,cAAc,GAAG,CAQ5B,QAAoB,EACpB,IAAI,GAA4C,EAAE,EAC6D,EAAE;IACjH,MAAM,QAAQ,GAAG,IAAA,0BAAQ,EAAC,QAAQ,EAAE,eAAe,CAAC,IAAI,CAAC,CAAC,CAAA;IAC1D,MAAM,SAAS,GAAG,IAAA,8BAAU,EAAC,QAAQ,EAAE,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAA;IAC/D,MAAM,SAAS,GAAG,IAAA,6BAAS,EAAC,QAAQ,EAAE,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAA;IAC9D,MAAM,UAAU,GAAG,IAAA,8BAAU,EAAC,QAAQ,EAAE,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAA;IAEhE,OAAO,UAAU,CAAC,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAC,IAAA,oCAAgB,EAAC,QAAQ,EAAE,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;AACxG,CAAC,CAAA;AAjBY,QAAA,cAAc,GAAd,cAAc,CAiB1B"}
1
+ {"version":3,"file":"crud.controller.js","sourceRoot":"","sources":["../../../../packages/query-rest/src/controllers/crud.controller.ts"],"names":[],"mappings":";;;AAEA,sCAA+C;AAK/C,2DAA4E;AAC5E,2DAAuF;AACvF,2DAAwF;AACxF,uDAAwF;AACxF,2DAAwF;AAgDxF,SAAS,iBAAiB,CACxB,IAA6F;IAE7F,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,GAAG,IAAI,CAAA;IACvC,OAAO,IAAA,4BAAmB,EAA+B,EAAE,cAAc,EAAE,GAAG,MAAM,EAAE,EAAE,IAAI,CAAC,CAAA;AAC/F,CAAC;AAED,SAAS,eAAe,CACtB,IAA6E;IAE7E,MAAM,EAAE,gBAAgB,EAAE,cAAc,EAAE,IAAI,EAAE,GAAG,IAAI,CAAA;IACvD,OAAO,IAAA,4BAAmB,EACxB;QACE,gBAAgB;QAChB,cAAc;QACd,GAAG,IAAI;KAC+B,EACxC,IAAI,CACL,CAAA;AACH,CAAC;AAED,SAAS,iBAAiB,CACxB,IAA6F;IAE7F,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,GAAG,IAAI,CAAA;IACvC,OAAO,IAAA,4BAAmB,EAA+B,EAAE,cAAc,EAAE,GAAG,MAAM,EAAE,EAAE,IAAI,CAAC,CAAA;AAC/F,CAAC;AAED,SAAS,iBAAiB,CACxB,IAAmG;IAEnG,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,EAAE,EAAE,GAAG,IAAI,CAAA;IACxC,OAAO,IAAA,4BAAmB,EAAuB,UAAU,EAAE,IAAI,CAAC,CAAA;AACpE,CAAC;AAED,SAAS,iBAAiB,CACxB,IAA6F;IAE7F,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,EAAE,EAAE,IAAI,EAAE,GAAG,IAAI,CAAA;IAC9C,OAAO,IAAA,4BAAmB,EACxB;QACE,GAAG,UAAU;QACb,IAAI,EAAE;YACJ,GAAG,UAAU,CAAC,IAAI;YAClB,cAAc,EAAE,UAAU,CAAC,IAAI,EAAE,cAAc,IAAI,IAAI,EAAE,IAAI,EAAE,cAAc;YAC7E,SAAS,EAAE,UAAU,CAAC,IAAI,EAAE,SAAS,IAAI,IAAI,EAAE,IAAI,EAAE,SAAS;SAC/D;KACF,EACD,IAAI,CACL,CAAA;AACH,CAAC;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,0EAA0E;AACnE,MAAM,cAAc,GAAG,CAQ5B,QAAoB,EACpB,IAAI,GAA4C,EAAE,EAC6D,EAAE;IACjH,MAAM,QAAQ,GAAG,IAAA,0BAAQ,EAAC,QAAQ,EAAE,eAAe,CAAC,IAAI,CAAC,CAAC,CAAA;IAC1D,MAAM,SAAS,GAAG,IAAA,8BAAU,EAAC,QAAQ,EAAE,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAA;IAC/D,MAAM,SAAS,GAAG,IAAA,6BAAS,EAAC,QAAQ,EAAE,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAA;IAC9D,MAAM,UAAU,GAAG,IAAA,8BAAU,EAAC,QAAQ,EAAE,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAA;IAEhE,OAAO,UAAU,CAAC,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAC,IAAA,oCAAgB,EAAC,QAAQ,EAAE,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;AACxG,CAAC,CAAA;AAjBY,QAAA,cAAc,GAAd,cAAc,CAiB1B"}
@@ -1,4 +1,4 @@
1
- import { Class, DeepPartial, Filter, QueryService } from '@ptc-org/nestjs-query-core';
1
+ import { Class, DeepPartial, Filter, Query, QueryService } from '@ptc-org/nestjs-query-core';
2
2
  import { NonePagingQueryArgsTypeOpts, QueryType } from '../';
3
3
  import { PagingStrategies, StaticQueryType } from '../types/query';
4
4
  import { ControllerClass, ControllerOpts, ServiceController } from './controller.interface';
@@ -9,6 +9,12 @@ export type ExportControllerOpts<DTO, ExportDTO = DeepPartial<DTO>> = {
9
9
  * DTO used to select fields for CSV serialization.
10
10
  */
11
11
  ExportDTOClass?: Class<ExportDTO>;
12
+ many?: ControllerOpts['many'] & {
13
+ /** DTO defining generated export queries and default CSV fields. Defaults to DTOClass. */
14
+ ReturnDTOClass?: Class<unknown>;
15
+ /** Default relations to load for export queries. */
16
+ relations?: Query<DTO>['relations'];
17
+ };
12
18
  } & ControllerOpts & NonePagingQueryArgsTypeOpts<DTO>;
13
19
  export interface ExportController<DTO, QS extends QueryService<DTO, unknown, unknown>> extends ServiceController<DTO, QS> {
14
20
  exportMany(query: QueryType<DTO, PagingStrategies.NONE>, authorizeFilter?: Filter<DTO>): Promise<string>;
@@ -43,11 +43,12 @@ const Exportable = (DTOClass, opts) => (BaseClass) => {
43
43
  return BaseClass;
44
44
  }
45
45
  const dtoNames = (0, common_2.getDTONames)(DTOClass, opts);
46
- const { QueryArgs = (0, export_paging_query_args_type_1.createExportQueryArgs)(DTOClass, {
46
+ const ManyReturnDTOClass = (opts.many?.ReturnDTOClass ?? DTOClass);
47
+ const { QueryArgs = (0, export_paging_query_args_type_1.createExportQueryArgs)(ManyReturnDTOClass, {
47
48
  ...opts,
48
49
  connectionName: `${dtoNames.baseName}Connection`
49
- }), ExportDTOClass = DTOClass } = opts;
50
- const commonControllerOpts = (0, nestjs_query_core_1.omit)(opts, 'dtoName', 'one', 'many', 'QueryArgs', 'FindDTOClass', 'Connection', 'withDeleted');
50
+ }), ExportDTOClass = ManyReturnDTOClass } = opts;
51
+ const commonControllerOpts = (0, nestjs_query_core_1.omit)(opts, 'dtoName', 'one', 'many', 'QueryArgs', 'Connection', 'withDeleted');
51
52
  class EQA extends QueryArgs {
52
53
  }
53
54
  Object.defineProperty(EQA, 'name', {
@@ -58,7 +59,7 @@ const Exportable = (DTOClass, opts) => (BaseClass) => {
58
59
  class ExportControllerBase extends BaseClass {
59
60
  // Returns CSV
60
61
  async exportMany(query, authorizeFilter) {
61
- const items = await this.service.exportMany((0, nestjs_query_core_1.mergeQuery)(query, {
62
+ const items = await this.service.exportMany((0, nestjs_query_core_1.mergeQuery)({ ...query, relations: [...(opts.many?.relations ?? []), ...(query.relations ?? [])] }, {
62
63
  filter: authorizeFilter,
63
64
  paging: {
64
65
  limit: opts?.limit ?? 1000,
@@ -79,7 +80,7 @@ const Exportable = (DTOClass, opts) => (BaseClass) => {
79
80
  description: opts?.many?.description,
80
81
  ...opts?.many?.operationOptions
81
82
  }
82
- }, { interceptors: [(0, interceptors_1.HookInterceptor)(__1.HookTypes.BEFORE_QUERY_MANY, DTOClass), (0, interceptors_1.AuthorizerInterceptor)(DTOClass)] }, commonControllerOpts, opts.many ?? {}),
83
+ }, { interceptors: [(0, interceptors_1.HookInterceptor)(__1.HookTypes.BEFORE_QUERY_MANY, DTOClass), (0, interceptors_1.AuthorizerInterceptor)(DTOClass)] }, commonControllerOpts, (0, nestjs_query_core_1.omit)(opts.many ?? {}, 'ReturnDTOClass', 'relations')),
83
84
  (0, common_1.Header)('content-type', 'text/csv'),
84
85
  (0, swagger_1.ApiProduces)('text/csv'),
85
86
  tslib_1.__param(0, (0, decorators_1.QueryHookArgs)()),
@@ -1 +1 @@
1
- {"version":3,"file":"export.controller.js","sourceRoot":"","sources":["../../../../packages/query-rest/src/controllers/export.controller.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"export.controller.js","sourceRoot":"","sources":["../../../../packages/query-rest/src/controllers/export.controller.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import { Class, Filter, QueryService } from '@ptc-org/nestjs-query-core';
1
+ import { Class, Filter, GetByIdOptions, QueryService } from '@ptc-org/nestjs-query-core';
2
2
  import { OffsetQueryArgsTypeOpts, ParamArgsType, QueryType } from '../';
3
3
  import { ConnectionOptions, InferConnectionTypeFromStrategy } from '../connection/interfaces';
4
4
  import { PagingStrategies, QueryArgsTypeOpts, StaticQueryType } from '../types/query';
@@ -6,10 +6,18 @@ import { ControllerClass, ControllerOpts, ExtractPagingStrategy, ServiceControll
6
6
  export type ReadControllerFromOpts<DTO, Opts extends ReadControllerOpts<DTO>, QS extends QueryService<DTO, unknown, unknown>> = ReadController<DTO, ExtractPagingStrategy<DTO, Opts>, QS>;
7
7
  export type ReadControllerOpts<DTO> = {
8
8
  QueryArgs?: StaticQueryType<DTO, PagingStrategies>;
9
- /**
10
- * DTO to return with finding one record
11
- */
12
- FindDTOClass?: Class<DTO>;
9
+ one?: ControllerOpts['one'] & {
10
+ /** DTO used for single-record response serialization and OpenAPI. Defaults to DTOClass. */
11
+ ReturnDTOClass?: Class<unknown>;
12
+ /** Default relations to load when finding a single record. */
13
+ relations?: GetByIdOptions<DTO>['relations'];
14
+ };
15
+ many?: ControllerOpts['many'] & {
16
+ /** DTO defining collection items, filters, sorting, and query defaults. Defaults to DTOClass. */
17
+ ReturnDTOClass?: Class<unknown>;
18
+ /** Default relations to load for collection queries. */
19
+ relations?: GetByIdOptions<DTO>['relations'];
20
+ };
13
21
  } & ControllerOpts & QueryArgsTypeOpts<DTO> & Pick<ConnectionOptions, 'enableTotalCount'>;
14
22
  export interface ReadController<DTO, PS extends PagingStrategies, QS extends QueryService<DTO, unknown, unknown>> extends ServiceController<DTO, QS> {
15
23
  queryMany(query: QueryType<DTO, PagingStrategies>, authorizeFilter?: Filter<DTO>): Promise<InferConnectionTypeFromStrategy<DTO, PS>>;
@@ -18,11 +18,13 @@ const Readable = (DTOClass, opts) => (BaseClass) => {
18
18
  return BaseClass;
19
19
  }
20
20
  const dtoNames = (0, common_1.getDTONames)(DTOClass, opts);
21
- const { QueryArgs = (0, __1.QueryArgsType)(DTOClass, { ...opts, connectionName: `${dtoNames.baseName}Connection` }), FindDTOClass = DTOClass } = opts;
22
- const commonControllerOpts = (0, nestjs_query_core_1.omit)(opts, 'dtoName', 'one', 'many', 'QueryArgs', 'FindDTOClass', 'Connection', 'withDeleted');
21
+ const ManyReturnDTOClass = (opts.many?.ReturnDTOClass ?? DTOClass);
22
+ const { QueryArgs = (0, __1.QueryArgsType)(ManyReturnDTOClass, { ...opts, connectionName: `${dtoNames.baseName}Connection` }) } = opts;
23
+ const commonControllerOpts = (0, nestjs_query_core_1.omit)(opts, 'dtoName', 'one', 'many', 'QueryArgs', 'Connection', 'withDeleted');
24
+ const OneReturnDTOClass = opts.one?.ReturnDTOClass ?? DTOClass;
23
25
  class QA extends QueryArgs {
24
26
  }
25
- let FOP = class FOP extends (0, __1.ParamArgsType)(FindDTOClass) {
27
+ let FOP = class FOP extends (0, __1.ParamArgsType)(DTOClass) {
26
28
  };
27
29
  FOP = tslib_1.__decorate([
28
30
  (0, __1.ApiSchema)({ name: `Find${DTOClass.name}Args` })
@@ -41,19 +43,20 @@ const Readable = (DTOClass, opts) => (BaseClass) => {
41
43
  async findById(params, authorizeFilter) {
42
44
  return this.service.getById(params.getId(), {
43
45
  filter: authorizeFilter,
46
+ relations: opts?.one?.relations,
44
47
  withDeleted: opts?.one?.withDeleted
45
48
  });
46
49
  }
47
50
  async queryMany(params, query, authorizeFilter) {
48
51
  return QueryArgs.ConnectionType.createFromPromise((q) => this.service.query(q, {
49
52
  withDeleted: opts?.many?.withDeleted
50
- }), (0, nestjs_query_core_1.mergeQuery)(query, { filter: (0, nestjs_query_core_1.mergeFilter)(params.getFilter(), authorizeFilter ?? {}) }), (filter) => this.service.count(filter, {
53
+ }), (0, nestjs_query_core_1.mergeQuery)({ ...query, relations: [...(opts.many?.relations ?? []), ...(query.relations ?? [])] }, { filter: (0, nestjs_query_core_1.mergeFilter)(params.getFilter(), authorizeFilter ?? {}) }), (filter) => this.service.count(filter, {
51
54
  withDeleted: opts?.many?.withDeleted
52
55
  }));
53
56
  }
54
57
  }
55
58
  tslib_1.__decorate([
56
- (0, __1.Get)(() => FindDTOClass, {
59
+ (0, __1.Get)(() => OneReturnDTOClass, {
57
60
  path: opts?.one?.path ?? ':id',
58
61
  operation: {
59
62
  operationId: `${dtoNames.pluralBaseNameLower}.findById`,
@@ -61,7 +64,7 @@ const Readable = (DTOClass, opts) => (BaseClass) => {
61
64
  description: opts?.one?.description,
62
65
  ...opts?.one?.operationOptions
63
66
  }
64
- }, { interceptors: [(0, interceptors_1.HookInterceptor)(__1.HookTypes.BEFORE_FIND_ONE, DTOClass), (0, interceptors_1.AuthorizerInterceptor)(DTOClass)] }, commonControllerOpts, opts.one ?? {}),
67
+ }, { interceptors: [(0, interceptors_1.HookInterceptor)(__1.HookTypes.BEFORE_FIND_ONE, DTOClass), (0, interceptors_1.AuthorizerInterceptor)(DTOClass)] }, commonControllerOpts, (0, nestjs_query_core_1.omit)(opts.one ?? {}, 'ReturnDTOClass', 'relations')),
65
68
  tslib_1.__param(0, (0, param_args_decorator_1.ParamArgs)()),
66
69
  tslib_1.__param(1, (0, __1.AuthorizerFilter)({
67
70
  operationGroup: __1.OperationGroup.READ,
@@ -72,7 +75,7 @@ const Readable = (DTOClass, opts) => (BaseClass) => {
72
75
  tslib_1.__metadata("design:returntype", Promise)
73
76
  ], ReadControllerBase.prototype, "findById", null);
74
77
  tslib_1.__decorate([
75
- (0, __1.Get)(() => QueryArgs.ConnectionType, {
78
+ (0, __1.Get)(() => QueryArgs.ResponseType ?? QueryArgs.ConnectionType, {
76
79
  path: opts?.many?.path,
77
80
  operation: {
78
81
  operationId: `${dtoNames.pluralBaseNameLower}.queryMany`,
@@ -80,7 +83,7 @@ const Readable = (DTOClass, opts) => (BaseClass) => {
80
83
  description: opts?.many?.description,
81
84
  ...opts?.many?.operationOptions
82
85
  }
83
- }, { interceptors: [(0, interceptors_1.HookInterceptor)(__1.HookTypes.BEFORE_QUERY_MANY, DTOClass), (0, interceptors_1.AuthorizerInterceptor)(DTOClass)] }, commonControllerOpts, opts.many ?? {}),
86
+ }, { interceptors: [(0, interceptors_1.HookInterceptor)(__1.HookTypes.BEFORE_QUERY_MANY, DTOClass), (0, interceptors_1.AuthorizerInterceptor)(DTOClass)] }, commonControllerOpts, (0, nestjs_query_core_1.omit)(opts.many ?? {}, 'ReturnDTOClass', 'relations')),
84
87
  tslib_1.__param(0, (0, __1.ParamHookArgs)()),
85
88
  tslib_1.__param(1, (0, hook_args_decorator_1.QueryHookArgs)()),
86
89
  tslib_1.__param(2, (0, __1.AuthorizerFilter)({
@@ -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":";;;;AAAA,kEAAuH;AAEvH,2BAYY;AACZ,sCAAuC;AAEvC,2EAAiE;AACjE,6EAA8D;AAC9D,kDAAwE;AAExE,iEAM+B;AAwC/B;;;GAGG;AACI,MAAM,QAAQ,GACnB,CACE,QAAoB,EACpB,IAAc,EACd,EAAE,CACJ,CAA8C,SAAY,EAAwD,EAAE;IAClH,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;QAClB,OAAO,SAAkB,CAAA;IAC3B,CAAC;IAED,MAAM,QAAQ,GAAG,IAAA,oBAAW,EAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;IAC5C,MAAM,kBAAkB,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,IAAI,QAAQ,CAAe,CAAA;IAChF,MAAM,EAAE,SAAS,GAAG,IAAA,iBAAa,EAAC,kBAAkB,EAAE,EAAE,GAAG,IAAI,EAAE,cAAc,EAAE,GAAG,QAAQ,CAAC,QAAQ,YAAY,EAAE,CAAC,EAAE,GAAG,IAAI,CAAA;IAE7H,MAAM,oBAAoB,GAAG,IAAA,wBAAI,EAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,aAAa,CAAC,CAAA;IAC3G,MAAM,iBAAiB,GAAG,IAAI,CAAC,GAAG,EAAE,cAAc,IAAI,QAAQ,CAAA;IAE9D,MAAM,EAAG,SAAQ,SAAS;KAAG;IAG7B,IAAM,GAAG,GAAT,MAAM,GAAI,SAAQ,IAAA,iBAAa,EAAC,QAAQ,CAAC;KAAG,CAAA;IAAtC,GAAG;QADR,IAAA,aAAS,EAAC,EAAE,IAAI,EAAE,OAAO,QAAQ,CAAC,IAAI,MAAM,EAAE,CAAC;OAC1C,GAAG,CAAmC;IAG5C,IAAM,GAAG,GAAT,MAAM,GAAI,SAAQ,IAAA,sBAAkB,EAAC,QAAQ,CAAC;KAAG,CAAA;IAA3C,GAAG;QADR,IAAA,aAAS,EAAC,EAAE,IAAI,EAAE,QAAQ,QAAQ,CAAC,IAAI,MAAM,EAAE,CAAC;OAC3C,GAAG,CAAwC;IAEjD,MAAM,CAAC,cAAc,CAAC,EAAE,EAAE,MAAM,EAAE;QAChC,QAAQ,EAAE,KAAK;QACf,+EAA+E;QAC/E,KAAK,EAAE,QAAQ,QAAQ,CAAC,IAAI,MAAM;KACnC,CAAC,CAAA;IAEF,MAAM,kBAAmB,SAAQ,SAAS;QAgB3B,AAAN,KAAK,CAAC,QAAQ,CACN,MAAW,EAKxB,eAA6B;YAE7B,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE;gBAC1C,MAAM,EAAE,eAAe;gBACvB,SAAS,EAAE,IAAI,EAAE,GAAG,EAAE,SAAS;gBAC/B,WAAW,EAAE,IAAI,EAAE,GAAG,EAAE,WAAW;aACpC,CAAC,CAAA;QACJ,CAAC;QAiBY,AAAN,KAAK,CAAC,SAAS,CACH,MAAW,EACX,KAAS,EAK1B,eAA6B;YAE7B,OAAO,SAAS,CAAC,cAAc,CAAC,iBAAiB,CAC/C,CAAC,CAAC,EAAE,EAAE,CACJ,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE;gBACpB,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW;aACrC,CAAC,EACJ,IAAA,8BAAU,EACR,EAAE,GAAG,KAAK,EAAE,SAAS,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,EAAE,EACtF,EAAE,MAAM,EAAE,IAAA,+BAAW,EAAC,MAAM,CAAC,SAAS,EAAE,EAAE,eAAe,IAAI,EAAE,CAAC,EAAE,CACnE,EACD,CAAC,MAAM,EAAE,EAAE,CACT,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE;gBACzB,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW;aACrC,CAAC,CACL,CAAA;QACH,CAAC;KACF;IAtDc;QAfZ,IAAA,OAAG,EACF,GAAG,EAAE,CAAC,iBAAiB,EACvB;YACE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,IAAI,KAAK;YAC9B,SAAS,EAAE;gBACT,WAAW,EAAE,GAAG,QAAQ,CAAC,mBAAmB,WAAW;gBACvD,IAAI,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC;gBACvD,WAAW,EAAE,IAAI,EAAE,GAAG,EAAE,WAAW;gBACnC,GAAG,IAAI,EAAE,GAAG,EAAE,gBAAgB;aAC/B;SACF,EACD,EAAE,YAAY,EAAE,CAAC,IAAA,8BAAe,EAAC,aAAS,CAAC,eAAe,EAAE,QAAQ,CAAC,EAAE,IAAA,oCAAqB,EAAC,QAAQ,CAAC,CAAC,EAAE,EACzG,oBAAoB,EACpB,IAAA,wBAAI,EAAC,IAAI,CAAC,GAAG,IAAI,EAAE,EAAE,gBAAgB,EAAE,WAAW,CAAC,CACpD;QAEE,mBAAA,IAAA,gCAAS,GAAE,CAAA;QACX,mBAAA,IAAA,oBAAgB,EAAC;YAChB,cAAc,EAAE,kBAAc,CAAC,IAAI;YACnC,IAAI,EAAE,KAAK;SACZ,CAAC,CAAA;;iDAJmB,GAAG;;sDAYzB;IAiBY;QAfZ,IAAA,OAAG,EACF,GAAG,EAAE,CAAC,SAAS,CAAC,YAAY,IAAI,SAAS,CAAC,cAAc,EACxD;YACE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI;YACtB,SAAS,EAAE;gBACT,WAAW,EAAE,GAAG,QAAQ,CAAC,mBAAmB,YAAY;gBACxD,IAAI,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC;gBACxD,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW;gBACpC,GAAG,IAAI,EAAE,IAAI,EAAE,gBAAgB;aAChC;SACF,EACD,EAAE,YAAY,EAAE,CAAC,IAAA,8BAAe,EAAC,aAAS,CAAC,iBAAiB,EAAE,QAAQ,CAAC,EAAE,IAAA,oCAAqB,EAAC,QAAQ,CAAC,CAAC,EAAE,EAC3G,oBAAoB,EACpB,IAAA,wBAAI,EAAC,IAAI,CAAC,IAAI,IAAI,EAAE,EAAE,gBAAgB,EAAE,WAAW,CAAC,CACrD;QAEE,mBAAA,IAAA,iBAAa,GAAE,CAAA;QACf,mBAAA,IAAA,mCAAa,GAAE,CAAA;QACf,mBAAA,IAAA,oBAAgB,EAAC;YAChB,cAAc,EAAE,kBAAc,CAAC,IAAI;YACnC,IAAI,EAAE,IAAI;SACX,CAAC,CAAA;;iDALuB,GAAG;YACJ,EAAE;;uDAqB3B;IAGH,OAAO,kBAA0E,CAAA;AACnF,CAAC,CAAA;AAxGU,QAAA,QAAQ,GAAR,QAAQ,CAwGlB;AAEH,0EAA0E;AACnE,MAAM,cAAc,GAAG,CAK5B,QAAoB,EACpB,IAAI,GAAa,EAAc,EACsC,EAAE,CAAC,IAAA,QAAA,QAAQ,EAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,4CAAqB,CAAC,CAAA;AAP5G,QAAA,cAAc,GAAd,cAAc,CAO8F"}
@@ -3,6 +3,8 @@ import { MutationArgsType } from '../';
3
3
  import { ParamArgsType, UpdateOneInputType } from '../types';
4
4
  import { ControllerClass, MutationOpts, ServiceController } from './controller.interface';
5
5
  export interface UpdateControllerOpts<DTO, U = DeepPartial<DTO>> extends MutationOpts {
6
+ /** DTO used for response serialization and OpenAPI. Defaults to DTOClass. */
7
+ ReturnDTOClass?: Class<unknown>;
6
8
  /** HTTP method for the update endpoint. Defaults to 'put'. */
7
9
  method?: 'put' | 'patch';
8
10
  UpdateDTOClass?: Class<U>;
@@ -34,9 +34,9 @@ const Updateable = (DTOClass, opts) => (BaseClass) => {
34
34
  return BaseClass;
35
35
  }
36
36
  const dtoNames = (0, common_1.getDTONames)(DTOClass, opts);
37
- const { UpdateDTOClass = defaultUpdateDTO(dtoNames, DTOClass), UpdateOneInput = defaultUpdateOneInput(dtoNames, UpdateDTOClass) } = opts;
37
+ const { ReturnDTOClass = DTOClass, UpdateDTOClass = defaultUpdateDTO(dtoNames, DTOClass), UpdateOneInput = defaultUpdateOneInput(dtoNames, UpdateDTOClass) } = opts;
38
38
  const UpdateMethod = opts.method === 'patch' ? __1.Patch : __1.Put;
39
- const commonControllerOpts = (0, nestjs_query_core_1.omit)(opts, 'method', 'dtoName', 'one', 'many', 'UpdateDTOClass', 'UpdateOneInput', 'UpdateManyInput');
39
+ const commonControllerOpts = (0, nestjs_query_core_1.omit)(opts, 'method', 'dtoName', 'one', 'many', 'UpdateDTOClass', 'UpdateOneInput', 'UpdateManyInput', 'ReturnDTOClass');
40
40
  let UOI = class UOI extends (0, __1.MutationArgsType)(UpdateOneInput) {
41
41
  };
42
42
  UOI = tslib_1.__decorate([
@@ -53,7 +53,7 @@ const Updateable = (DTOClass, opts) => (BaseClass) => {
53
53
  }
54
54
  }
55
55
  tslib_1.__decorate([
56
- UpdateMethod(() => DTOClass, {
56
+ UpdateMethod(() => ReturnDTOClass, {
57
57
  path: opts?.one?.path ?? ':id',
58
58
  operation: {
59
59
  operationId: `${dtoNames.pluralBaseNameLower}.updateOne`,
@@ -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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"}
@@ -10,7 +10,7 @@ function getAuthorizerFilter(context, authorizationContext) {
10
10
  if (!context.authorizer) {
11
11
  return undefined;
12
12
  }
13
- return context.authorizer.authorize(context, authorizationContext);
13
+ return context.authorizer.authorize({ req: context }, authorizationContext);
14
14
  }
15
15
  // function getRelationAuthFilter<C extends AuthorizerContext<unknown>>(
16
16
  // context: C,
@@ -1 +1 @@
1
- {"version":3,"file":"authorize-filter.decorator.js","sourceRoot":"","sources":["../../../../packages/query-rest/src/decorators/authorize-filter.decorator.ts"],"names":[],"mappings":";;;AAAA,2CAAuE;AAEvE,kCAA8D;AAK9D,SAAS,UAAU,CAAI,gBAAkC;IACvD,OAAO,gBAAgB,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAA;AACrD,CAAC;AAED,SAAS,mBAAmB,CAAuC,OAAU,EAAE,oBAA0C;IACvH,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;QACxB,OAAO,SAAS,CAAA;IAClB,CAAC;IACD,OAAO,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,OAAO,EAAE,oBAAoB,CAAC,CAAA;AACpE,CAAC;AAED,wEAAwE;AACxE,gBAAgB;AAChB,0BAA0B;AAC1B,+CAA+C;AAC/C,MAAM;AACN,+BAA+B;AAC/B,uBAAuB;AACvB,MAAM;AACN,6FAA6F;AAC7F,IAAI;AAEJ,SAAS,uBAAuB,CAC9B,UAA2B,EAC3B,kBAAgD;IAEhD,IAAI,CAAC,kBAAkB;QACrB,OAAO,IAAI,KAAK,CAAuB,EAA0B,EAAE;YACjE,GAAG,EAAE,GAAG,EAAE;gBACR,MAAM,IAAI,KAAK,CACb,gDAAgD,UAAU,CAAC,QAAQ,EAAE,6HAA6H,CACnM,CAAA;YACH,CAAC;SACF,CAAC,CAAA;IAEJ,OAAO;QACL,aAAa,EAAE,UAAU,CAAC,QAAQ,EAAE;QACpC,QAAQ,EACN,kBAAkB,CAAC,cAAc,KAAK,qBAAc,CAAC,IAAI;YACzD,kBAAkB,CAAC,cAAc,KAAK,qBAAc,CAAC,SAAS;YAC9D,kBAAkB,CAAC,cAAc,KAAK,qBAAc,CAAC,MAAM;QAC7D,GAAG,kBAAkB;KACtB,CAAA;AACH,CAAC;AAED,0BAAsC,kBAAgD;IACpF,yJAAyJ;IACzJ,OAAO,CAAC,MAAc,EAAE,WAAwC,EAAE,cAAsB,EAAE,EAAE;QAC1F,MAAM,oBAAoB,GAAG,uBAAuB,CAAC,WAAW,IAAI,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAA;QAChH,OAAO,IAAA,6BAAoB,EAAC,CAAC,IAAa,EAAE,gBAAkC,EAAE,EAAE,CAChF,mBAAmB,CAAC,UAAU,CAAyB,gBAAgB,CAAC,EAAE,oBAAoB,CAAC,CAChG,EAAE,CAAC,MAAM,EAAE,WAAW,EAAE,cAAc,CAAC,CAAA;IAC1C,CAAC,CAAA;AACH,CAAC;AAED,iDAAiD;AACjD,0BAA0B;AAC1B,qDAAqD;AACrD,0BAA0B;AAC1B,8JAA8J;AAC9J,mGAAmG;AACnG,uHAAuH;AACvH,yFAAyF;AACzF,wHAAwH;AACxH,+CAA+C;AAC/C,MAAM;AACN,IAAI;AACJ,EAAE;AACF,uDAAuD;AACvD,0BAA0B;AAC1B,qDAAqD;AACrD,0BAA0B;AAC1B,8JAA8J;AAC9J,mGAAmG;AACnG,uHAAuH;AACvH,mCAAmC;AACnC,yHAAyH;AACzH,+EAA+E;AAC/E,mBAAmB;AACnB,8EAA8E;AAC9E,qGAAqG;AACrG,YAAY;AACZ,UAAU;AACV,+CAA+C;AAC/C,MAAM;AACN,IAAI"}
1
+ {"version":3,"file":"authorize-filter.decorator.js","sourceRoot":"","sources":["../../../../packages/query-rest/src/decorators/authorize-filter.decorator.ts"],"names":[],"mappings":";;;AAAA,2CAAuE;AAEvE,kCAA8D;AAK9D,SAAS,UAAU,CAAI,gBAAkC;IACvD,OAAO,gBAAgB,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAA;AACrD,CAAC;AAED,SAAS,mBAAmB,CAAuC,OAAU,EAAE,oBAA0C;IACvH,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;QACxB,OAAO,SAAS,CAAA;IAClB,CAAC;IACD,OAAO,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,oBAAoB,CAAC,CAAA;AAC7E,CAAC;AAED,wEAAwE;AACxE,gBAAgB;AAChB,0BAA0B;AAC1B,+CAA+C;AAC/C,MAAM;AACN,+BAA+B;AAC/B,uBAAuB;AACvB,MAAM;AACN,6FAA6F;AAC7F,IAAI;AAEJ,SAAS,uBAAuB,CAC9B,UAA2B,EAC3B,kBAAgD;IAEhD,IAAI,CAAC,kBAAkB;QACrB,OAAO,IAAI,KAAK,CAAuB,EAA0B,EAAE;YACjE,GAAG,EAAE,GAAG,EAAE;gBACR,MAAM,IAAI,KAAK,CACb,gDAAgD,UAAU,CAAC,QAAQ,EAAE,6HAA6H,CACnM,CAAA;YACH,CAAC;SACF,CAAC,CAAA;IAEJ,OAAO;QACL,aAAa,EAAE,UAAU,CAAC,QAAQ,EAAE;QACpC,QAAQ,EACN,kBAAkB,CAAC,cAAc,KAAK,qBAAc,CAAC,IAAI;YACzD,kBAAkB,CAAC,cAAc,KAAK,qBAAc,CAAC,SAAS;YAC9D,kBAAkB,CAAC,cAAc,KAAK,qBAAc,CAAC,MAAM;QAC7D,GAAG,kBAAkB;KACtB,CAAA;AACH,CAAC;AAED,0BAAsC,kBAAgD;IACpF,yJAAyJ;IACzJ,OAAO,CAAC,MAAc,EAAE,WAAwC,EAAE,cAAsB,EAAE,EAAE;QAC1F,MAAM,oBAAoB,GAAG,uBAAuB,CAAC,WAAW,IAAI,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAA;QAChH,OAAO,IAAA,6BAAoB,EAAC,CAAC,IAAa,EAAE,gBAAkC,EAAE,EAAE,CAChF,mBAAmB,CAAC,UAAU,CAAyB,gBAAgB,CAAC,EAAE,oBAAoB,CAAC,CAChG,EAAE,CAAC,MAAM,EAAE,WAAW,EAAE,cAAc,CAAC,CAAA;IAC1C,CAAC,CAAA;AACH,CAAC;AAED,iDAAiD;AACjD,0BAA0B;AAC1B,qDAAqD;AACrD,0BAA0B;AAC1B,8JAA8J;AAC9J,mGAAmG;AACnG,uHAAuH;AACvH,yFAAyF;AACzF,wHAAwH;AACxH,+CAA+C;AAC/C,MAAM;AACN,IAAI;AACJ,EAAE;AACF,uDAAuD;AACvD,0BAA0B;AAC1B,qDAAqD;AACrD,0BAA0B;AAC1B,8JAA8J;AAC9J,mGAAmG;AACnG,uHAAuH;AACvH,mCAAmC;AACnC,yHAAyH;AACzH,+EAA+E;AAC/E,mBAAmB;AACnB,8EAA8E;AAC9E,qGAAqG;AACrG,YAAY;AACZ,UAAU;AACV,+CAA+C;AAC/C,MAAM;AACN,IAAI"}
@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
5
5
  const common_1 = require("@nestjs/common");
6
6
  const core_1 = require("@nestjs/core");
7
7
  const class_transformer_1 = require("class-transformer");
8
+ const hooks_1 = require("../hooks");
8
9
  class HooksTransformer {
9
10
  async transform(value, metadata) {
10
11
  const transformedValue = this.transformValue(value, metadata.metatype);
@@ -23,13 +24,15 @@ class HooksTransformer {
23
24
  return (0, class_transformer_1.plainToInstance)(type, value, { excludeExtraneousValues: true });
24
25
  }
25
26
  async runMutationHooks(data) {
26
- const hooks = this.request.hooks;
27
+ const { hooks, hookType } = this.request;
27
28
  if (hooks && hooks.length > 0) {
28
- let hookedArgs = { input: data };
29
+ const context = { req: this.request };
30
+ const isUpdate = hookType === hooks_1.HookTypes.BEFORE_UPDATE_ONE;
31
+ let hookedArgs = isUpdate ? { update: data } : { input: data };
29
32
  for (const hook of hooks) {
30
- hookedArgs = (await hook.run(hookedArgs, this.request));
33
+ hookedArgs = (await hook.run(hookedArgs, context));
31
34
  }
32
- return hookedArgs;
35
+ return isUpdate ? { input: hookedArgs } : hookedArgs;
33
36
  }
34
37
  return { input: data };
35
38
  }
@@ -37,8 +40,9 @@ class HooksTransformer {
37
40
  const hooks = this.request.hooks;
38
41
  let hookedArgs = data.buildQuery();
39
42
  if (hooks && hooks.length > 0) {
43
+ const context = { req: this.request };
40
44
  for (const hook of hooks) {
41
- hookedArgs = (await hook.run(hookedArgs, this.request));
45
+ hookedArgs = (await hook.run(hookedArgs, context));
42
46
  }
43
47
  return hookedArgs;
44
48
  }
@@ -1 +1 @@
1
- {"version":3,"file":"hook-args.decorator.js","sourceRoot":"","sources":["../../../../packages/query-rest/src/decorators/hook-args.decorator.ts"],"names":[],"mappings":";;;;AAAA,2CAAkI;AAClI,uCAAsC;AAEtC,yDAAmD;AAOnD,MAAM,gBAAgB;IAGb,KAAK,CAAC,SAAS,CAAC,KAAQ,EAAE,QAA0B;QACzD,MAAM,gBAAgB,GAAG,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAA;QAEtE,IAAI,QAAQ,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAC9B,OAAO,gBAAkD,CAAA;QAC3D,CAAC;aAAM,IAAI,QAAQ,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YACrC,OAAO,IAAI,CAAC,aAAa,CAAC,gBAAyC,CAAC,CAAA;QACtE,CAAC;QAED,OAAO,IAAI,CAAC,gBAAgB,CAAC,gBAAqB,CAAC,CAAA;IACrD,CAAC;IAEO,cAAc,CAAI,KAAQ,EAAE,IAAe;QACjD,IAAI,CAAC,IAAI,IAAI,KAAK,YAAY,IAAI,EAAE,CAAC;YACnC,OAAO,KAAK,CAAA;QACd,CAAC;QAED,OAAO,IAAA,mCAAe,EAAa,IAAI,EAAE,KAAK,EAAE,EAAE,uBAAuB,EAAE,IAAI,EAAE,CAAC,CAAA;IACpF,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAAC,IAAO;QACpC,MAAM,KAAK,GAAI,IAAI,CAAC,OAAsC,CAAC,KAAK,CAAA;QAChE,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC9B,IAAI,UAAU,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,CAAA;YAChC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACzB,UAAU,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,CAAwB,CAAA;YAChF,CAAC;YAED,OAAO,UAAU,CAAA;QACnB,CAAC;QAED,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAA;IACxB,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,IAA2B;QACrD,MAAM,KAAK,GAAI,IAAI,CAAC,OAAsC,CAAC,KAAK,CAAA;QAChE,IAAI,UAAU,GAAG,IAAI,CAAC,UAAU,EAAE,CAAA;QAElC,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC9B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACzB,UAAU,GAAG,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,CAAa,CAAA;YACrE,CAAC;YAED,OAAO,UAAU,CAAA;QACnB,CAAC;QAED,OAAO,UAAU,CAAA;IACnB,CAAC;CACF;AAlDqC;IAAnC,IAAA,eAAM,EAAC,cAAO,CAAC;sCAA8B,OAAO;iDAAA;AAoDhD,MAAM,aAAa,GAAG,GAA+D,EAAE;IAC5F,OAAO,IAAA,cAAS,EAAC,gBAAmB,CAAC,CAAA;AACvC,CAAC,CAAA;AAFY,QAAA,aAAa,GAAb,aAAa,CAEzB;AAEM,MAAM,aAAa,GAAG,GAA+D,EAAE;IAC5F,OAAO,IAAA,cAAS,EAAC,gBAAmB,CAAC,CAAA;AACvC,CAAC,CAAA;AAFY,QAAA,aAAa,GAAb,aAAa,CAEzB;AAEM,MAAM,YAAY,GAAG,GAA4D,EAAE;IACxF,OAAO,IAAA,aAAQ,EAAC,gBAAmB,CAAC,CAAA;AACtC,CAAC,CAAA;AAFY,QAAA,YAAY,GAAZ,YAAY,CAExB"}
1
+ {"version":3,"file":"hook-args.decorator.js","sourceRoot":"","sources":["../../../../packages/query-rest/src/decorators/hook-args.decorator.ts"],"names":[],"mappings":"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"}
@@ -11,6 +11,6 @@ function QueryOptions(opts) {
11
11
  valueReflector.set(target, opts);
12
12
  };
13
13
  }
14
- const getQueryOptions = (DTOClass) => valueReflector.get(DTOClass);
14
+ const getQueryOptions = (DTOClass) => valueReflector.get(DTOClass, true);
15
15
  exports.getQueryOptions = getQueryOptions;
16
16
  //# sourceMappingURL=query-options.decorator.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"query-options.decorator.js","sourceRoot":"","sources":["../../../../packages/query-rest/src/decorators/query-options.decorator.ts"],"names":[],"mappings":";;;;AAAA,kEAA6E;AAG7E,2CAA+C;AAE/C,MAAM,cAAc,GAAG,IAAI,kCAAc,CAAC,6BAAiB,CAAC,CAAA;AAI5D,8DAA8D;AAC9D,sBAA6B,IAAoC;IAC/D,OAAO,CAAC,MAAsB,EAAQ,EAAE;QACtC,cAAc,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IAClC,CAAC,CAAA;AACH,CAAC;AAEM,MAAM,eAAe,GAAG,CAAM,QAAoB,EAA6C,EAAE,CACtG,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;AADjB,QAAA,eAAe,GAAf,eAAe,CACE"}
1
+ {"version":3,"file":"query-options.decorator.js","sourceRoot":"","sources":["../../../../packages/query-rest/src/decorators/query-options.decorator.ts"],"names":[],"mappings":";;;;AAAA,kEAA6E;AAG7E,2CAA+C;AAE/C,MAAM,cAAc,GAAG,IAAI,kCAAc,CAAC,6BAAiB,CAAC,CAAA;AAI5D,8DAA8D;AAC9D,sBAA6B,IAAoC;IAC/D,OAAO,CAAC,MAAsB,EAAQ,EAAE;QACtC,cAAc,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IAClC,CAAC,CAAA;AACH,CAAC;AAEM,MAAM,eAAe,GAAG,CAAM,QAAoB,EAA6C,EAAE,CACtG,cAAc,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;AADvB,QAAA,eAAe,GAAf,eAAe,CACQ"}
@@ -3,5 +3,6 @@ import { Class } from '@ptc-org/nestjs-query-core';
3
3
  import { Hook, HookTypes } from '../hooks';
4
4
  export type HookContext<H extends Hook<unknown>> = {
5
5
  hooks?: H[];
6
+ hookType?: HookTypes;
6
7
  };
7
8
  export declare function HookInterceptor(type: HookTypes, ...DTOClasses: Class<unknown>[]): Class<NestInterceptor>;
@@ -23,6 +23,7 @@ function HookInterceptor(type, ...DTOClasses) {
23
23
  intercept(context, next) {
24
24
  const request = context.switchToHttp().getRequest();
25
25
  request.hooks = this.hooks;
26
+ request.hookType = type;
26
27
  return next.handle();
27
28
  }
28
29
  };
@@ -1 +1 @@
1
- {"version":3,"file":"hook.interceptor.js","sourceRoot":"","sources":["../../../../packages/query-rest/src/interceptors/hook.interceptor.ts"],"names":[],"mappings":";;;;AAAA,2CAAmG;AAGnG,8CAA+C;AAC/C,oCAAwD;AAMxD,MAAM,sBAAsB;IAC1B,SAAS,CAAC,OAAyB,EAAE,IAAiB;QACpD,OAAO,IAAI,CAAC,MAAM,EAAE,CAAA;IACtB,CAAC;CACF;AAED,yBAAgC,IAAe,EAAE,GAAG,UAA4B;IAC9E,MAAM,aAAa,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,4BAAe,EAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAA;IAC1E,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,OAAO,sBAAsB,CAAA;IAC/B,CAAC;IACD,MAAM,SAAS,GAAG,IAAA,oBAAY,EAAC,IAAI,EAAE,aAAa,CAAC,CAAA;IAEnD,IACM,WAAW,GADjB,MACM,WAAW;QACf,YAAwC,KAAmC;yBAAnC,KAAK;QAAiC,CAAC;QAExE,SAAS,CAAC,OAAyB,EAAE,IAAiB;YAC3D,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAA2B,CAAA;YAC5E,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAA;YAE1B,OAAO,IAAI,CAAC,MAAM,EAAE,CAAA;QACtB,CAAC;KACF,CAAA;IATK,WAAW;QADhB,IAAA,mBAAU,GAAE;QAEE,mBAAA,IAAA,eAAM,EAAC,SAAS,CAAC,CAAA;;OAD1B,WAAW,CAShB;IAED,MAAM,CAAC,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE;QACzC,QAAQ,EAAE,KAAK;QACf,+EAA+E;QAC/E,KAAK,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,IAAI,iBAAiB;KACrD,CAAC,CAAA;IAEF,OAAO,WAAW,CAAA;AACpB,CAAC"}
1
+ {"version":3,"file":"hook.interceptor.js","sourceRoot":"","sources":["../../../../packages/query-rest/src/interceptors/hook.interceptor.ts"],"names":[],"mappings":";;;;AAAA,2CAAmG;AAGnG,8CAA+C;AAC/C,oCAAwD;AAOxD,MAAM,sBAAsB;IAC1B,SAAS,CAAC,OAAyB,EAAE,IAAiB;QACpD,OAAO,IAAI,CAAC,MAAM,EAAE,CAAA;IACtB,CAAC;CACF;AAED,yBAAgC,IAAe,EAAE,GAAG,UAA4B;IAC9E,MAAM,aAAa,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,4BAAe,EAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAA;IAC1E,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,OAAO,sBAAsB,CAAA;IAC/B,CAAC;IACD,MAAM,SAAS,GAAG,IAAA,oBAAY,EAAC,IAAI,EAAE,aAAa,CAAC,CAAA;IAEnD,IACM,WAAW,GADjB,MACM,WAAW;QACf,YAAwC,KAAmC;yBAAnC,KAAK;QAAiC,CAAC;QAExE,SAAS,CAAC,OAAyB,EAAE,IAAiB;YAC3D,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAA2B,CAAA;YAC5E,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAA;YAC1B,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAA;YAEvB,OAAO,IAAI,CAAC,MAAM,EAAE,CAAA;QACtB,CAAC;KACF,CAAA;IAVK,WAAW;QADhB,IAAA,mBAAU,GAAE;QAEE,mBAAA,IAAA,eAAM,EAAC,SAAS,CAAC,CAAA;;OAD1B,WAAW,CAUhB;IAED,MAAM,CAAC,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE;QACzC,QAAQ,EAAE,KAAK;QACf,+EAA+E;QAC/E,KAAK,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,IAAI,iBAAiB;KACrD,CAAC,CAAA;IAEF,OAAO,WAAW,CAAA;AACpB,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ptc-org/nestjs-query-rest",
3
- "version": "11.1.0-alpha.3",
3
+ "version": "11.1.0-alpha.4",
4
4
  "description": "Nestjs rest query adapter",
5
5
  "keywords": [
6
6
  "rest",
@@ -27,7 +27,7 @@
27
27
  "dependencies": {
28
28
  "pluralize": "^8.0.0",
29
29
  "tslib": "^2.9.1",
30
- "@ptc-org/nestjs-query-core": "11.1.0-alpha.3"
30
+ "@ptc-org/nestjs-query-core": "11.1.0-alpha.4"
31
31
  },
32
32
  "peerDependencies": {
33
33
  "@nestjs/common": "^10.0.0 || ^11.0.0",
@@ -3,13 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.ParamArgsType = ParamArgsType;
4
4
  exports.QueryParamArgsType = QueryParamArgsType;
5
5
  const swagger_1 = require("@nestjs/swagger");
6
- const index_1 = require("../index");
6
+ const id_field_decorator_1 = require("../decorators/id-field.decorator");
7
7
  /**
8
8
  * The input type for "one" endpoints.
9
9
  */
10
10
  // eslint-disable-next-line @typescript-eslint/no-redeclare
11
11
  function ParamArgsType(DTOClass) {
12
- const dtoIDFields = (0, index_1.getIDFields)(DTOClass) ?? [];
12
+ const dtoIDFields = (0, id_field_decorator_1.getIDFields)(DTOClass) ?? [];
13
13
  const properties = dtoIDFields.map(({ propertyName }) => propertyName);
14
14
  if (properties.length === 0) {
15
15
  // @ts-expect-error we want to return empty class
@@ -26,7 +26,7 @@ function ParamArgsType(DTOClass) {
26
26
  }
27
27
  // eslint-disable-next-line @typescript-eslint/no-redeclare
28
28
  function QueryParamArgsType(DTOClass) {
29
- const dtoIDFields = (0, index_1.getIDFields)(DTOClass) ?? [];
29
+ const dtoIDFields = (0, id_field_decorator_1.getIDFields)(DTOClass) ?? [];
30
30
  const properties = dtoIDFields.map(({ propertyName }) => propertyName);
31
31
  if (properties.length === 1) {
32
32
  return class FindOneArgsType {
@@ -1 +1 @@
1
- {"version":3,"file":"param-args.type.js","sourceRoot":"","sources":["../../../../packages/query-rest/src/types/param-args.type.ts"],"names":[],"mappings":";;;;AAAA,6CAA0C;AAG1C,oCAAsC;AAYtC;;GAEG;AACH,2DAA2D;AAC3D,uBAA8B,QAAwB;IACpD,MAAM,WAAW,GAAG,IAAA,mBAAW,EAAC,QAAQ,CAAC,IAAI,EAAE,CAAA;IAC/C,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,YAAY,CAAC,CAAA;IAEtE,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5B,iDAAiD;QACjD,OAAO,MAAM,eAAe;SAAG,CAAA;IACjC,CAAC;IAED,MAAM,WAAY,SAAQ,IAAA,kBAAQ,EAAC,QAAQ,EAAE,UAAmB,CAAC;QAG/D,KAAK;YACH,8EAA8E;YAC9E,OAAO,IAAI,CAAC,EAAE,IAAK,IAAmD,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAA;QACvF,CAAC;KACF;IAED,OAAO,WAAW,CAAA;AACpB,CAAC;AAED,2DAA2D;AAC3D,4BAAmC,QAAwB;IACzD,MAAM,WAAW,GAAG,IAAA,mBAAW,EAAC,QAAQ,CAAC,IAAI,EAAE,CAAA;IAC/C,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,YAAY,CAAC,CAAA;IAEtE,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5B,OAAO,MAAM,eAAe;YAC1B,SAAS;gBACP,OAAO,EAAE,CAAA;YACX,CAAC;SACF,CAAA;IACH,CAAC;IAED,0CAA0C;IAC1C,UAAU,CAAC,KAAK,EAAE,CAAA;IAElB,MAAM,SAAU,SAAQ,IAAA,kBAAQ,EAAC,QAAQ,EAAE,UAAmB,CAAC;QAC7D,SAAS;YACP,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE;gBAC5C,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,EAAG,IAA2C,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAA;gBAErG,OAAO,MAAM,CAAA;YACf,CAAC,EAAE,EAAE,CAAC,CAAA;QACR,CAAC;KACF;IAED,OAAO,SAAS,CAAA;AAClB,CAAC"}
1
+ {"version":3,"file":"param-args.type.js","sourceRoot":"","sources":["../../../../packages/query-rest/src/types/param-args.type.ts"],"names":[],"mappings":";;;;AAAA,6CAA0C;AAG1C,yEAA8D;AAY9D;;GAEG;AACH,2DAA2D;AAC3D,uBAA8B,QAAwB;IACpD,MAAM,WAAW,GAAG,IAAA,gCAAW,EAAC,QAAQ,CAAC,IAAI,EAAE,CAAA;IAC/C,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,YAAY,CAAC,CAAA;IAEtE,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5B,iDAAiD;QACjD,OAAO,MAAM,eAAe;SAAG,CAAA;IACjC,CAAC;IAED,MAAM,WAAY,SAAQ,IAAA,kBAAQ,EAAC,QAAQ,EAAE,UAAmB,CAAC;QAG/D,KAAK;YACH,8EAA8E;YAC9E,OAAO,IAAI,CAAC,EAAE,IAAK,IAAmD,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAA;QACvF,CAAC;KACF;IAED,OAAO,WAAW,CAAA;AACpB,CAAC;AAED,2DAA2D;AAC3D,4BAAmC,QAAwB;IACzD,MAAM,WAAW,GAAG,IAAA,gCAAW,EAAC,QAAQ,CAAC,IAAI,EAAE,CAAA;IAC/C,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,YAAY,CAAC,CAAA;IAEtE,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5B,OAAO,MAAM,eAAe;YAC1B,SAAS;gBACP,OAAO,EAAE,CAAA;YACX,CAAC;SACF,CAAA;IACH,CAAC;IAED,0CAA0C;IAC1C,UAAU,CAAC,KAAK,EAAE,CAAA;IAElB,MAAM,SAAU,SAAQ,IAAA,kBAAQ,EAAC,QAAQ,EAAE,UAAmB,CAAC;QAC7D,SAAS;YACP,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE;gBAC5C,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,EAAG,IAA2C,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAA;gBAErG,OAAO,MAAM,CAAA;YACf,CAAC,EAAE,EAAE,CAAC,CAAA;QACR,CAAC;KACF;IAED,OAAO,SAAS,CAAA;AAClB,CAAC"}
@@ -6,13 +6,11 @@ const decorators_1 = require("../../../decorators");
6
6
  const types_1 = require("../../../types");
7
7
  const filter_type_1 = require("../filter.type");
8
8
  const paging_1 = require("../paging");
9
+ const sorting_type_1 = require("../sorting.type");
9
10
  const constants_1 = require("./constants");
10
11
  function createExportQueryArgs(DTOClass, opts = { ...constants_1.DEFAULT_QUERY_OPTS, pagingStrategy: paging_1.PagingStrategies.NONE }) {
11
12
  const mergedOpts = (0, types_1.getMergedQueryOpts)(DTOClass, opts);
12
- class ExportQueryArgs {
13
- constructor() {
14
- this.sorting = mergedOpts.defaultSort;
15
- }
13
+ class ExportQueryArgs extends (0, sorting_type_1.createSortingQueryArgs)(DTOClass, mergedOpts) {
16
14
  get filter() {
17
15
  return mergedOpts.defaultFilter;
18
16
  }
@@ -1 +1 @@
1
- {"version":3,"file":"export-paging-query-args.type.js","sourceRoot":"","sources":["../../../../../../packages/query-rest/src/types/query/query-args/export-paging-query-args.type.ts"],"names":[],"mappings":";;;;AAEA,oDAAmD;AACnD,0CAA8D;AAE9D,gDAAiD;AACjD,sCAA4C;AAC5C,2CAAgD;AAGhD,+BACE,QAAoB,EACpB,IAAI,GAAqC,EAAE,GAAG,8BAAkB,EAAE,cAAc,EAAE,yBAAgB,CAAC,IAAI,EAAE;IAEzG,MAAM,UAAU,GAAG,IAAA,0BAAkB,EAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;IAErD,MAAM,eAAe;QAArB;YACS,YAAO,GAAG,UAAU,CAAC,WAAW,CAAA;QAwBzC,CAAC;QAtBC,IAAW,MAAM;YACf,OAAO,UAAU,CAAC,aAAa,CAAA;QACjC,CAAC;QAYM,UAAU;YACf,OAAO;gBACL,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,SAAS,EAAE,EAAE;aACd,CAAA;QACH,CAAC;KACF;IAVQ;QARN,IAAA,mBAAM,EACL,GAAG,EAAE,CAAC,CAAC,UAAU,CAAC,YAAY,EAC9B,IAAA,kBAAK,EAAC;YACJ,WAAW,EAAE,sCAAsC;YACnD,QAAQ,EAAE,IAAI;YACd,QAAQ,EAAE,KAAK;SAChB,CAAC,CACH;;kDACoB;IAYvB,OAAO,IAAA,8BAAgB,EAAM,QAAQ,EAAE,eAAe,CAAU,CAAA;AAClE,CAAC"}
1
+ {"version":3,"file":"export-paging-query-args.type.js","sourceRoot":"","sources":["../../../../../../packages/query-rest/src/types/query/query-args/export-paging-query-args.type.ts"],"names":[],"mappings":";;;;AAEA,oDAAmD;AACnD,0CAA8D;AAE9D,gDAAiD;AACjD,sCAA4C;AAC5C,kDAAwD;AACxD,2CAAgD;AAGhD,+BACE,QAAoB,EACpB,IAAI,GAAqC,EAAE,GAAG,8BAAkB,EAAE,cAAc,EAAE,yBAAgB,CAAC,IAAI,EAAE;IAEzG,MAAM,UAAU,GAAG,IAAA,0BAAkB,EAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;IAErD,MAAM,eAAgB,SAAQ,IAAA,qCAAsB,EAAC,QAAQ,EAAE,UAAU,CAAC;QACxE,IAAW,MAAM;YACf,OAAO,UAAU,CAAC,aAAa,CAAA;QACjC,CAAC;QAYM,UAAU;YACf,OAAO;gBACL,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,SAAS,EAAE,EAAE;aACd,CAAA;QACH,CAAC;KACF;IAVQ;QARN,IAAA,mBAAM,EACL,GAAG,EAAE,CAAC,CAAC,UAAU,CAAC,YAAY,EAC9B,IAAA,kBAAK,EAAC;YACJ,WAAW,EAAE,sCAAsC;YACnD,QAAQ,EAAE,IAAI;YACd,QAAQ,EAAE,KAAK;SAChB,CAAC,CACH;;kDACoB;IAYvB,OAAO,IAAA,8BAAgB,EAAM,QAAQ,EAAE,eAAe,CAAU,CAAA;AAClE,CAAC"}
@@ -45,6 +45,8 @@ export interface NonePagingQueryArgsTypeOpts<DTO> extends BaseQueryArgsTypeOpts<
45
45
  export type QueryArgsTypeOpts<DTO> = OffsetQueryArgsTypeOpts<DTO> | NonePagingQueryArgsTypeOpts<DTO>;
46
46
  export interface StaticQueryType<DTO, PS extends PagingStrategies> extends Class<QueryType<DTO, PS>> {
47
47
  ConnectionType: StaticConnectionType<DTO, PS>;
48
+ /** Response schema and serialization type, when different from the connection class. */
49
+ ResponseType?: Class<unknown> | Class<unknown>[];
48
50
  }
49
51
  export interface QueryType<DTO, PS extends PagingStrategies> extends Query<DTO> {
50
52
  paging?: InferPagingTypeFromStrategy<PS>;
@@ -6,14 +6,13 @@ const array_connection_type_1 = require("../../../connection/array-connection.ty
6
6
  const decorators_1 = require("../../../decorators");
7
7
  const filter_type_1 = require("../filter.type");
8
8
  const paging_1 = require("../paging");
9
+ const sorting_type_1 = require("../sorting.type");
9
10
  const constants_1 = require("./constants");
10
11
  function createNonePagingQueryArgs(DTOClass, opts = { ...constants_1.DEFAULT_QUERY_OPTS, pagingStrategy: paging_1.PagingStrategies.NONE }) {
11
12
  const ConnectionType = (0, array_connection_type_1.getOrCreateArrayConnectionType)(DTOClass, opts);
12
- class QueryNonPagingArgs {
13
- constructor() {
14
- this.sorting = opts.defaultSort;
15
- }
13
+ class QueryNonPagingArgs extends (0, sorting_type_1.createSortingQueryArgs)(DTOClass, opts) {
16
14
  static { this.ConnectionType = ConnectionType; }
15
+ static { this.ResponseType = [DTOClass]; }
17
16
  get filter() {
18
17
  return opts.defaultFilter;
19
18
  }
@@ -1 +1 @@
1
- {"version":3,"file":"none-paging-query-args.type.js","sourceRoot":"","sources":["../../../../../../packages/query-rest/src/types/query/query-args/none-paging-query-args.type.ts"],"names":[],"mappings":";;;;AAEA,qFAA0F;AAC1F,oDAAmD;AAGnD,gDAA2C;AAC3C,sCAA4C;AAC5C,2CAAgD;AAGhD,mCACE,QAAoB,EACpB,IAAI,GAAqC,EAAE,GAAG,8BAAkB,EAAE,cAAc,EAAE,yBAAgB,CAAC,IAAI,EAAE;IAEzG,MAAM,cAAc,GAAG,IAAA,sDAA8B,EAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;IAErE,MAAM,kBAAkB;QAAxB;YAGS,YAAO,GAAG,IAAI,CAAC,WAAW,CAAA;QAwBnC,CAAC;iBA1BQ,mBAAc,GAAG,cAAc,AAAjB,CAAiB;QAItC,IAAW,MAAM;YACf,OAAO,IAAI,CAAC,aAAa,CAAA;QAC3B,CAAC;QAYM,UAAU;YACf,OAAO;gBACL,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,SAAS,EAAE,EAAE;aACd,CAAA;QACH,CAAC;KACF;IAVQ;QARN,IAAA,mBAAM,EACL,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,YAAY,EACxB,IAAA,kBAAK,EAAC;YACJ,WAAW,EAAE,sCAAsC;YACnD,QAAQ,EAAE,IAAI;YACd,QAAQ,EAAE,KAAK;SAChB,CAAC,CACH;;qDACoB;IAYvB,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;QACvB,OAAO,kBAAkB,CAAA;IAC3B,CAAC;IAED,OAAO,IAAA,wBAAU,EAAM,QAAQ,EAAE,kBAAkB,CAAU,CAAA;AAC/D,CAAC"}
1
+ {"version":3,"file":"none-paging-query-args.type.js","sourceRoot":"","sources":["../../../../../../packages/query-rest/src/types/query/query-args/none-paging-query-args.type.ts"],"names":[],"mappings":";;;;AAEA,qFAA0F;AAC1F,oDAAmD;AAGnD,gDAA2C;AAC3C,sCAA4C;AAC5C,kDAAwD;AACxD,2CAAgD;AAGhD,mCACE,QAAoB,EACpB,IAAI,GAAqC,EAAE,GAAG,8BAAkB,EAAE,cAAc,EAAE,yBAAgB,CAAC,IAAI,EAAE;IAEzG,MAAM,cAAc,GAAG,IAAA,sDAA8B,EAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;IAErE,MAAM,kBAAmB,SAAQ,IAAA,qCAAsB,EAAC,QAAQ,EAAE,IAAI,CAAC;iBAC9D,mBAAc,GAAG,cAAc,CAAA;iBAE/B,iBAAY,GAAG,CAAC,QAAQ,CAAC,CAAA;QAEhC,IAAW,MAAM;YACf,OAAO,IAAI,CAAC,aAAa,CAAA;QAC3B,CAAC;QAYM,UAAU;YACf,OAAO;gBACL,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,SAAS,EAAE,EAAE;aACd,CAAA;QACH,CAAC;KACF;IAVQ;QARN,IAAA,mBAAM,EACL,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,YAAY,EACxB,IAAA,kBAAK,EAAC;YACJ,WAAW,EAAE,sCAAsC;YACnD,QAAQ,EAAE,IAAI;YACd,QAAQ,EAAE,KAAK;SAChB,CAAC,CACH;;qDACoB;IAYvB,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;QACvB,OAAO,kBAAkB,CAAA;IAC3B,CAAC;IAED,OAAO,IAAA,wBAAU,EAAM,QAAQ,EAAE,kBAAkB,CAAU,CAAA;AAC/D,CAAC"}
@@ -6,15 +6,13 @@ const offset_connection_type_1 = require("../../../connection/offset/offset-conn
6
6
  const decorators_1 = require("../../../decorators");
7
7
  const filter_type_1 = require("../filter.type");
8
8
  const paging_1 = require("../paging");
9
+ const sorting_type_1 = require("../sorting.type");
9
10
  const constants_1 = require("./constants");
10
11
  function createOffsetQueryArgs(DTOClass, opts = { ...constants_1.DEFAULT_QUERY_OPTS, pagingStrategy: paging_1.PagingStrategies.OFFSET }) {
11
12
  const ConnectionType = (0, offset_connection_type_1.getOrCreateOffsetConnectionType)(DTOClass, opts);
12
13
  const defaultResultSize = opts.defaultResultSize ?? constants_1.DEFAULT_QUERY_OPTS.defaultResultSize;
13
14
  const maxResultsSize = opts.maxResultsSize ?? constants_1.DEFAULT_QUERY_OPTS.maxResultsSize;
14
- class QueryArgs {
15
- constructor() {
16
- this.sorting = opts.defaultSort;
17
- }
15
+ class QueryArgs extends (0, sorting_type_1.createSortingQueryArgs)(DTOClass, opts) {
18
16
  static { this.ConnectionType = ConnectionType; }
19
17
  get filter() {
20
18
  return opts.defaultFilter;
@@ -34,7 +32,7 @@ function createOffsetQueryArgs(DTOClass, opts = { ...constants_1.DEFAULT_QUERY_O
34
32
  }
35
33
  tslib_1.__decorate([
36
34
  (0, decorators_1.Field)({
37
- type: Number,
35
+ type: 'integer',
38
36
  description: 'The maximum number of results to return.',
39
37
  nullable: true,
40
38
  default: defaultResultSize,
@@ -45,7 +43,7 @@ function createOffsetQueryArgs(DTOClass, opts = { ...constants_1.DEFAULT_QUERY_O
45
43
  ], QueryArgs.prototype, "limit", void 0);
46
44
  tslib_1.__decorate([
47
45
  (0, decorators_1.Field)({
48
- type: Number,
46
+ type: 'integer',
49
47
  description: 'The offset to start returning results from.',
50
48
  nullable: true,
51
49
  required: false,
@@ -1 +1 @@
1
- {"version":3,"file":"offset-query-args.type.js","sourceRoot":"","sources":["../../../../../../packages/query-rest/src/types/query/query-args/offset-query-args.type.ts"],"names":[],"mappings":";;;;AAEA,8FAAmG;AACnG,oDAAmD;AAGnD,gDAA2C;AAC3C,sCAA4C;AAC5C,2CAAgD;AAGhD,+BACE,QAAoB,EACpB,IAAI,GAAiC,EAAE,GAAG,8BAAkB,EAAE,cAAc,EAAE,yBAAgB,CAAC,MAAM,EAAE;IAEvG,MAAM,cAAc,GAAG,IAAA,wDAA+B,EAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;IACtE,MAAM,iBAAiB,GAAG,IAAI,CAAC,iBAAiB,IAAI,8BAAkB,CAAC,iBAAiB,CAAA;IACxF,MAAM,cAAc,GAAG,IAAI,CAAC,cAAc,IAAI,8BAAkB,CAAC,cAAc,CAAA;IAE/E,MAAM,SAAS;QAAf;YAuBS,YAAO,GAAG,IAAI,CAAC,WAAW,CAAA;QA4BnC,CAAC;iBAlDQ,mBAAc,GAAG,cAAc,AAAjB,CAAiB;QAwBtC,IAAW,MAAM;YACf,OAAO,IAAI,CAAC,aAAa,CAAA;QAC3B,CAAC;QAYM,UAAU;YACf,OAAO;gBACL,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,MAAM,EAAE;oBACN,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,iBAAiB;oBACtC,MAAM,EAAE,IAAI,CAAC,MAAM;iBACpB;gBACD,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,SAAS,EAAE,EAAE;aACd,CAAA;QACH,CAAC;KACF;IAxCC;QARC,IAAA,kBAAK,EAAC;YACL,IAAI,EAAE,MAAM;YACZ,WAAW,EAAE,0CAA0C;YACvD,QAAQ,EAAE,IAAI;YACd,OAAO,EAAE,iBAAiB;YAC1B,OAAO,EAAE,CAAC;YACV,OAAO,EAAE,cAAc;SACxB,CAAC;;4CACY;IAUd;QARC,IAAA,kBAAK,EAAC;YACL,IAAI,EAAE,MAAM;YACZ,WAAW,EAAE,6CAA6C;YAC1D,QAAQ,EAAE,IAAI;YACd,QAAQ,EAAE,KAAK;YACf,OAAO,EAAE,CAAC;YACV,OAAO,EAAE,CAAC;SACX,CAAC;;6CACa;IAgBR;QARN,IAAA,mBAAM,EACL,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,YAAY,EACxB,IAAA,kBAAK,EAAC;YACJ,WAAW,EAAE,sCAAsC;YACnD,QAAQ,EAAE,IAAI;YACd,QAAQ,EAAE,KAAK;SAChB,CAAC,CACH;;4CACoB;IAgBvB,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;QACvB,OAAO,SAAS,CAAA;IAClB,CAAC;IAED,OAAO,IAAA,wBAAU,EAAM,QAAQ,EAAE,SAAS,CAAU,CAAA;AACtD,CAAC"}
1
+ {"version":3,"file":"offset-query-args.type.js","sourceRoot":"","sources":["../../../../../../packages/query-rest/src/types/query/query-args/offset-query-args.type.ts"],"names":[],"mappings":";;;;AAEA,8FAAmG;AACnG,oDAAmD;AAGnD,gDAA2C;AAC3C,sCAA4C;AAC5C,kDAAwD;AACxD,2CAAgD;AAGhD,+BACE,QAAoB,EACpB,IAAI,GAAiC,EAAE,GAAG,8BAAkB,EAAE,cAAc,EAAE,yBAAgB,CAAC,MAAM,EAAE;IAEvG,MAAM,cAAc,GAAG,IAAA,wDAA+B,EAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;IACtE,MAAM,iBAAiB,GAAG,IAAI,CAAC,iBAAiB,IAAI,8BAAkB,CAAC,iBAAiB,CAAA;IACxF,MAAM,cAAc,GAAG,IAAI,CAAC,cAAc,IAAI,8BAAkB,CAAC,cAAc,CAAA;IAE/E,MAAM,SAAU,SAAQ,IAAA,qCAAsB,EAAC,QAAQ,EAAE,IAAI,CAAC;iBACrD,mBAAc,GAAG,cAAc,CAAA;QAsBtC,IAAW,MAAM;YACf,OAAO,IAAI,CAAC,aAAa,CAAA;QAC3B,CAAC;QAYM,UAAU;YACf,OAAO;gBACL,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,MAAM,EAAE;oBACN,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,iBAAiB;oBACtC,MAAM,EAAE,IAAI,CAAC,MAAM;iBACpB;gBACD,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,SAAS,EAAE,EAAE;aACd,CAAA;QACH,CAAC;KACF;IAtCC;QARC,IAAA,kBAAK,EAAC;YACL,IAAI,EAAE,SAAS;YACf,WAAW,EAAE,0CAA0C;YACvD,QAAQ,EAAE,IAAI;YACd,OAAO,EAAE,iBAAiB;YAC1B,OAAO,EAAE,CAAC;YACV,OAAO,EAAE,cAAc;SACxB,CAAC;;4CACY;IAUd;QARC,IAAA,kBAAK,EAAC;YACL,IAAI,EAAE,SAAS;YACf,WAAW,EAAE,6CAA6C;YAC1D,QAAQ,EAAE,IAAI;YACd,QAAQ,EAAE,KAAK;YACf,OAAO,EAAE,CAAC;YACV,OAAO,EAAE,CAAC;SACX,CAAC;;6CACa;IAcR;QARN,IAAA,mBAAM,EACL,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,YAAY,EACxB,IAAA,kBAAK,EAAC;YACJ,WAAW,EAAE,sCAAsC;YACnD,QAAQ,EAAE,IAAI;YACd,QAAQ,EAAE,KAAK;SAChB,CAAC,CACH;;4CACoB;IAgBvB,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;QACvB,OAAO,SAAS,CAAA;IAClB,CAAC;IAED,OAAO,IAAA,wBAAU,EAAM,QAAQ,EAAE,SAAS,CAAU,CAAA;AACtD,CAAC"}
@@ -0,0 +1,8 @@
1
+ import { Class, SortField } from '@ptc-org/nestjs-query-core';
2
+ import { BaseQueryArgsTypeOpts } from './query-args/interfaces';
3
+ export declare function createSortingQueryArgs<DTO>(DTOClass: Class<DTO>, opts: BaseQueryArgsTypeOpts<DTO>): {
4
+ new (): {
5
+ sort?: string[];
6
+ get sorting(): SortField<DTO>[] | undefined;
7
+ };
8
+ };
@@ -0,0 +1,56 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.createSortingQueryArgs = createSortingQueryArgs;
4
+ const tslib_1 = require("tslib");
5
+ const common_1 = require("@nestjs/common");
6
+ const nestjs_query_core_1 = require("@ptc-org/nestjs-query-core");
7
+ const class_validator_1 = require("class-validator");
8
+ const decorators_1 = require("../../decorators");
9
+ function createSortingQueryArgs(DTOClass, opts) {
10
+ const fields = (0, decorators_1.getFilterableFields)(DTOClass);
11
+ const sorts = new Map();
12
+ for (const field of fields) {
13
+ for (const direction of Object.values(nestjs_query_core_1.SortDirection)) {
14
+ const sort = { field: field.propertyName, direction };
15
+ const key = `${field.advancedOptions?.name ?? field.schemaName}:${direction}`;
16
+ sorts.set(key, sort);
17
+ for (const nulls of Object.keys(nestjs_query_core_1.SortNulls)) {
18
+ sorts.set(`${key}:${nulls}`, { ...sort, nulls: nestjs_query_core_1.SortNulls[nulls] });
19
+ }
20
+ }
21
+ }
22
+ const values = [...sorts.keys()];
23
+ const hasSortFilter = fields.some((field) => field.schemaName === 'sort' || field.advancedOptions?.name === 'sort');
24
+ const disableSort = !!opts.disableSort || values.length === 0 || hasSortFilter;
25
+ class SortingQueryArgs {
26
+ get sorting() {
27
+ if (disableSort || this.sort === undefined) {
28
+ return opts.defaultSort;
29
+ }
30
+ if (!Array.isArray(this.sort) || this.sort.length === 0) {
31
+ throw new common_1.BadRequestException('sort must contain at least one field:ASC or field:DESC value');
32
+ }
33
+ return this.sort.map((value) => {
34
+ const sort = sorts.get(value);
35
+ if (!sort) {
36
+ throw new common_1.BadRequestException('Invalid sort value. Use a filterable field followed by :ASC or :DESC.');
37
+ }
38
+ return { ...sort };
39
+ });
40
+ }
41
+ }
42
+ tslib_1.__decorate([
43
+ (0, decorators_1.SkipIf)(() => disableSort, (0, decorators_1.Field)(() => [String], {
44
+ required: false,
45
+ skipRequired: true,
46
+ forceArray: true,
47
+ minItems: 1,
48
+ enum: values,
49
+ skipIsEnum: true,
50
+ description: 'Sort by field:ASC or field:DESC. Repeat for multiple fields. Optionally append :NULLS_FIRST or :NULLS_LAST.'
51
+ }), (0, class_validator_1.ValidateIf)((_object, value) => value !== undefined), (0, class_validator_1.IsIn)(values, { each: true })),
52
+ tslib_1.__metadata("design:type", Array)
53
+ ], SortingQueryArgs.prototype, "sort", void 0);
54
+ return SortingQueryArgs;
55
+ }
56
+ //# sourceMappingURL=sorting.type.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"sorting.type.js","sourceRoot":"","sources":["../../../../../packages/query-rest/src/types/query/sorting.type.ts"],"names":[],"mappings":"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"}