@hg-ts/http-controller 0.5.35 → 0.5.37

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 (37) hide show
  1. package/dist/decorators/decorators.d.ts +5 -1
  2. package/dist/decorators/decorators.d.ts.map +1 -1
  3. package/dist/decorators/decorators.js +44 -6
  4. package/dist/decorators/decorators.js.map +1 -1
  5. package/dist/middlewares/exception-mapper.interceptor.d.ts.map +1 -1
  6. package/dist/middlewares/exception-mapper.interceptor.js +4 -1
  7. package/dist/middlewares/exception-mapper.interceptor.js.map +1 -1
  8. package/dist/services/exception.service.d.ts.map +1 -1
  9. package/dist/services/exception.service.js +2 -0
  10. package/dist/services/exception.service.js.map +1 -1
  11. package/dist/services/swagger.service.d.ts.map +1 -1
  12. package/dist/services/swagger.service.js +6 -1
  13. package/dist/services/swagger.service.js.map +1 -1
  14. package/dist/tests/abstracts/base-controller-suite.d.ts.map +1 -1
  15. package/dist/tests/abstracts/base-controller-suite.js +3 -0
  16. package/dist/tests/abstracts/base-controller-suite.js.map +1 -1
  17. package/dist/tests/echo/controllers/dto/echo-get.query.d.ts +1 -1
  18. package/dist/tests/echo/controllers/dto/echo-get.query.d.ts.map +1 -1
  19. package/dist/tests/echo/controllers/dto/echo-get.query.js +6 -1
  20. package/dist/tests/echo/controllers/dto/echo-get.query.js.map +1 -1
  21. package/dist/tests/echo/controllers/echo.controller.d.ts +1 -0
  22. package/dist/tests/echo/controllers/echo.controller.d.ts.map +1 -1
  23. package/dist/tests/echo/controllers/echo.controller.js +18 -4
  24. package/dist/tests/echo/controllers/echo.controller.js.map +1 -1
  25. package/dist/tests/echo/echo.test.d.ts +3 -0
  26. package/dist/tests/echo/echo.test.d.ts.map +1 -1
  27. package/dist/tests/echo/echo.test.js +38 -4
  28. package/dist/tests/echo/echo.test.js.map +1 -1
  29. package/package.json +16 -15
  30. package/src/decorators/decorators.ts +72 -6
  31. package/src/middlewares/exception-mapper.interceptor.ts +5 -1
  32. package/src/services/exception.service.ts +7 -1
  33. package/src/services/swagger.service.ts +16 -2
  34. package/src/tests/abstracts/base-controller-suite.ts +5 -1
  35. package/src/tests/echo/controllers/dto/echo-get.query.ts +6 -1
  36. package/src/tests/echo/controllers/echo.controller.ts +15 -5
  37. package/src/tests/echo/echo.test.ts +36 -4
package/dist/decorators/decorators.d.ts CHANGED
@@ -1,10 +1,14 @@
1
1
  import { BaseException } from '@hg-ts/exception';
2
2
  import { z } from '@hg-ts/validation';
3
+ import { ApiResponseOptions } from '@nestjs/swagger';
3
4
  export type ExceptionMap = Map<Class<BaseException, any[]>, number>;
4
5
  export declare const EXCEPTION_METADATA_KEY: unique symbol;
5
6
  export declare class Http {
6
7
  private constructor();
7
- static ExceptionStatus(exception: Class<BaseException, any[]>, statusCode: number): MethodDecorator;
8
+ static ExceptionStatus(exception: Class<BaseException, any[]>, statusCode: number, options?: Omit<ApiResponseOptions, 'status'>): MethodDecorator;
9
+ static Params(): ParameterDecorator;
10
+ static Query(): ParameterDecorator;
8
11
  static ValidatedHeader<T>(headerName: string, schema: z.ZodSchema<T>): () => ParameterDecorator;
12
+ private static getApiPropertyDecorator;
9
13
  }
10
14
  //# sourceMappingURL=decorators.d.ts.map
package/dist/decorators/decorators.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"decorators.d.ts","sourceRoot":"","sources":["../../src/decorators/decorators.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAEN,CAAC,EACD,MAAM,mBAAmB,CAAC;AAS3B,MAAM,MAAM,YAAY,GAAG,GAAG,CAAC,KAAK,CAAC,aAAa,EAAE,GAAG,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;AAEpE,eAAO,MAAM,sBAAsB,eAAmC,CAAC;AAEvE,qBAAa,IAAI;IAChB,OAAO;WAEO,eAAe,CAAC,SAAS,EAAE,KAAK,CAAC,aAAa,EAAE,GAAG,EAAE,CAAC,EAAE,UAAU,EAAE,MAAM,GAAG,eAAe;WA4B5F,eAAe,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,MAAM,kBAAkB;CAQtG"}
1
+ {"version":3,"file":"decorators.d.ts","sourceRoot":"","sources":["../../src/decorators/decorators.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAGN,CAAC,EAED,MAAM,mBAAmB,CAAC;AAO3B,OAAO,EAIN,kBAAkB,EAClB,MAAM,iBAAiB,CAAC;AAMzB,MAAM,MAAM,YAAY,GAAG,GAAG,CAAC,KAAK,CAAC,aAAa,EAAE,GAAG,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;AAEpE,eAAO,MAAM,sBAAsB,eAAmC,CAAC;AAEvE,qBAAa,IAAI;IAChB,OAAO;WAGO,eAAe,CAC5B,SAAS,EAAE,KAAK,CAAC,aAAa,EAAE,GAAG,EAAE,CAAC,EACtC,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,IAAI,CAAC,kBAAkB,EAAE,QAAQ,CAAC,GAC1C,eAAe;WA6BJ,MAAM,IAAI,kBAAkB;WAO5B,KAAK,IAAI,kBAAkB;WAO3B,eAAe,CAAC,CAAC,EAC9B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GACpB,MAAM,kBAAkB;IAyB3B,OAAO,CAAC,MAAM,CAAC,uBAAuB;CAetC"}
package/dist/decorators/decorators.js CHANGED
@@ -1,12 +1,13 @@
1
- import { createSchema, } from '@hg-ts/validation';
2
- import { createParamDecorator } from '@nestjs/common';
3
- import { ApiResponse } from '@nestjs/swagger';
1
+ import { createSchema, isZodDto, } from '@hg-ts/validation';
2
+ import { createParamDecorator, Param, Query, } from '@nestjs/common';
3
+ import { ApiHeader, ApiProperty, ApiResponse, } from '@nestjs/swagger';
4
4
  import { ExceptionStatusAlreadyDefinedException } from '../exceptions/index.js';
5
5
  import { ExceptionService } from '../services/index.js';
6
6
  export const EXCEPTION_METADATA_KEY = Symbol('EXCEPTION_METADATA_KEY');
7
7
  export class Http {
8
- constructor() { }
9
- static ExceptionStatus(exception, statusCode) {
8
+ constructor() {
9
+ }
10
+ static ExceptionStatus(exception, statusCode, options) {
10
11
  return (target, propertyKey, descriptor) => {
11
12
  const statusMap = Reflect.getMetadata(EXCEPTION_METADATA_KEY, target, propertyKey) ?? new Map();
12
13
  if (statusMap.has(exception)) {
@@ -22,17 +23,54 @@ export class Http {
22
23
  .map(item => createSchema(item, { io: 'input' }))
23
24
  .map(item => item.schema);
24
25
  ApiResponse({
26
+ ...options,
25
27
  schema: schemas.length === 1 ? schemas[0] : { oneOf: schemas },
26
28
  status: statusCode,
27
29
  })(target, propertyKey, descriptor);
28
30
  };
29
31
  }
32
+ static Params() {
33
+ return (target, propertyKey, parameterIndex) => {
34
+ Param()(target, propertyKey, parameterIndex);
35
+ this.getApiPropertyDecorator()(target, propertyKey, parameterIndex);
36
+ };
37
+ }
38
+ static Query() {
39
+ return (target, propertyKey, parameterIndex) => {
40
+ Query()(target, propertyKey, parameterIndex);
41
+ this.getApiPropertyDecorator()(target, propertyKey, parameterIndex);
42
+ };
43
+ }
30
44
  static ValidatedHeader(headerName, schema) {
31
- return createParamDecorator((_data, ctx) => {
45
+ const validationDecorator = createParamDecorator((_data, ctx) => {
32
46
  const request = ctx.switchToHttp().getRequest();
33
47
  const header = request.headers[headerName];
34
48
  return schema.parse(header);
49
+ })();
50
+ const { description, ...openApiSchema } = createSchema(schema).schema;
51
+ const openapiDecorator = ApiHeader({
52
+ name: headerName,
53
+ description: description ?? '',
54
+ schema: openApiSchema,
35
55
  });
56
+ const decorator = (target, propertyKey, parameterIndex) => {
57
+ validationDecorator(target, propertyKey, parameterIndex);
58
+ openapiDecorator(target, propertyKey, Object.getOwnPropertyDescriptor(target, propertyKey));
59
+ };
60
+ return () => decorator;
61
+ }
62
+ static getApiPropertyDecorator() {
63
+ return (target, propertyKey, parameterIndex) => {
64
+ const metadata = Reflect.getMetadata('design:paramtypes', target, propertyKey);
65
+ const dto = metadata[parameterIndex];
66
+ if (isZodDto(dto)) {
67
+ Object.entries(dto.schema.shape).forEach(([key, value]) => {
68
+ const { description, deprecated, ...openApiSchema } = createSchema(value).schema;
69
+ const optional = value.safeParse().success;
70
+ ApiProperty({ schema: openApiSchema, required: !optional, description, deprecated })(dto.prototype, key);
71
+ });
72
+ }
73
+ };
36
74
  }
37
75
  }
38
76
  //# sourceMappingURL=decorators.js.map
package/dist/decorators/decorators.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"decorators.js","sourceRoot":"","sources":["../../src/decorators/decorators.ts"],"names":[],"mappings":"AACA,OAAO,EACN,YAAY,GAEZ,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAEtD,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAG9C,OAAO,EAAE,sCAAsC,EAAE,MAAM,wBAAwB,CAAC;AAChF,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAIxD,MAAM,CAAC,MAAM,sBAAsB,GAAG,MAAM,CAAC,wBAAwB,CAAC,CAAC;AAEvE,MAAM,OAAO,IAAI;IAChB,gBAAuB,CAAC;IAEjB,MAAM,CAAC,eAAe,CAAC,SAAsC,EAAE,UAAkB;QACvF,OAAO,CAAC,MAAW,EAAE,WAA4B,EAAE,UAA8B,EAAE,EAAE;YACpF,MAAM,SAAS,GACd,OAAO,CAAC,WAAW,CAAC,sBAAsB,EAAE,MAAM,EAAE,WAAW,CAAC,IAAI,IAAI,GAAG,EAAE,CAAC;YAE/E,IAAI,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC9B,MAAM,IAAI,sCAAsC,CAAC,SAAS,CAAC,CAAC;YAC7D,CAAC;YAED,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;YACrC,OAAO,CAAC,cAAc,CAAC,sBAAsB,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;YAE/E,MAAM,iBAAiB,GAAG,CAAC,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC;YAEnD,MAAM,OAAO,GAAG,iBAAiB;iBAC/B,MAAM,CAAC,CAAC,CAAC,EAAE,mBAAmB,CAAC,EAAE,EAAE,CAAC,mBAAmB,KAAK,UAAU,CAAC;iBACvE,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,gBAAgB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;iBACjD,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC;iBACxB,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;iBAChD,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAa,CAAC,CAAC;YAElC,WAAW,CAAC;gBACX,MAAM,EAAE,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE;gBAC9D,MAAM,EAAE,UAAU;aAClB,CAAC,CAAC,MAAM,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC;QACrC,CAAC,CAAC;IACH,CAAC;IAEM,MAAM,CAAC,eAAe,CAAI,UAAkB,EAAE,MAAsB;QAC1E,OAAO,oBAAoB,CAAC,CAAC,KAAc,EAAE,GAAG,EAAK,EAAE;YACtD,MAAM,OAAO,GAAG,GAAG,CAAC,YAAY,EAAE,CAAC,UAAU,EAAkB,CAAC;YAChE,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YAE3C,OAAO,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;IACJ,CAAC;CACD"}
1
+ {"version":3,"file":"decorators.js","sourceRoot":"","sources":["../../src/decorators/decorators.ts"],"names":[],"mappings":"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"}
package/dist/middlewares/exception-mapper.interceptor.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"exception-mapper.interceptor.d.ts","sourceRoot":"","sources":["../../src/middlewares/exception-mapper.interceptor.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAGvC,OAAO,EACN,WAAW,EAEX,gBAAgB,EAEhB,eAAe,EACf,MAAM,gBAAgB,CAAC;AAGxB,OAAO,EACN,UAAU,EAEV,MAAM,MAAM,CAAC;AAMd,qBACa,0BAA2B,YAAW,eAAe;IAEjE,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAE3B,SAAS,CACf,OAAO,EAAE,gBAAgB,EACzB,IAAI,EAAE,WAAW,GACf,UAAU,CAAC,GAAG,CAAC;IAoBlB,OAAO,CAAC,eAAe;IAavB,OAAO,CAAC,gBAAgB;IAKxB,OAAO,CAAC,YAAY;CAWpB"}
1
+ {"version":3,"file":"exception-mapper.interceptor.d.ts","sourceRoot":"","sources":["../../src/middlewares/exception-mapper.interceptor.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAGvC,OAAO,EACN,WAAW,EAEX,gBAAgB,EAEhB,eAAe,EACf,MAAM,gBAAgB,CAAC;AAGxB,OAAO,EACN,UAAU,EAEV,MAAM,MAAM,CAAC;AAMd,qBACa,0BAA2B,YAAW,eAAe;IAEjE,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAE3B,SAAS,CACf,OAAO,EAAE,gBAAgB,EACzB,IAAI,EAAE,WAAW,GACf,UAAU,CAAC,GAAG,CAAC;IAoBlB,OAAO,CAAC,eAAe;IAavB,OAAO,CAAC,gBAAgB;IAKxB,OAAO,CAAC,YAAY;CAepB"}
package/dist/middlewares/exception-mapper.interceptor.js CHANGED
@@ -27,7 +27,7 @@ let ExceptionMapperInterceptor = class ExceptionMapperInterceptor {
27
27
  getExceptionMap(context) {
28
28
  const exceptionMap = Reflect.getMetadata(EXCEPTION_METADATA_KEY, context.getClass().prototype, context.getHandler().name) ?? new Map();
29
29
  if (!exceptionMap.has(ValidationException)) {
30
- exceptionMap.set(ValidationException, 404);
30
+ exceptionMap.set(ValidationException, 400);
31
31
  }
32
32
  return exceptionMap;
33
33
  }
@@ -38,6 +38,9 @@ let ExceptionMapperInterceptor = class ExceptionMapperInterceptor {
38
38
  if (exception instanceof BaseException) {
39
39
  return exception;
40
40
  }
41
+ if (ValidationException.canBeParsed(exception)) {
42
+ return new ValidationException(exception);
43
+ }
41
44
  if (exception instanceof Error) {
42
45
  return new ErrorException(exception);
43
46
  }
package/dist/middlewares/exception-mapper.interceptor.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"exception-mapper.interceptor.js","sourceRoot":"","sources":["../../src/middlewares/exception-mapper.interceptor.ts"],"names":[],"mappings":";AAAA,OAAO,EACN,aAAa,EACb,cAAc,GACd,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAExD,OAAO,EAEN,KAAK,EAEL,MAAM,GAEN,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAErC,OAAO,EAEN,GAAG,GACH,MAAM,MAAM,CAAC;AACd,OAAO,EACN,sBAAsB,GAEtB,MAAM,wBAAwB,CAAC;AAGzB,IAAM,0BAA0B,GAAhC,MAAM,0BAA0B;IAEnB,MAAM,CAAS;IAE3B,SAAS,CACf,OAAyB,EACzB,IAAiB;QAEjB,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC;YAC7B,KAAK,EAAE,KAAK,CAAC,EAAE;gBACd,MAAM,QAAQ,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,WAAW,EAAgB,CAAC;gBAEpE,IAAI,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;oBACzB,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;oBAEhE,OAAO;gBACR,CAAC;gBACD,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;gBAC3C,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;gBACnD,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;gBACvD,MAAM,MAAM,GAAG,YAAY,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;gBAE/C,QAAQ,CAAC,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC;YACzD,CAAC;SACD,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,eAAe,CAAC,OAAyB;QAChD,MAAM,YAAY,GAAiB,OAAO,CAAC,WAAW,CACrD,sBAAsB,EACtB,OAAO,CAAC,QAAQ,EAAE,CAAC,SAAS,EAC5B,OAAO,CAAC,UAAU,EAAE,CAAC,IAAI,CACzB,IAAI,IAAI,GAAG,EAAE,CAAC;QAEf,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,mBAAmB,CAAC,EAAE,CAAC;YAC5C,YAAY,CAAC,GAAG,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;QAC5C,CAAC;QACD,OAAO,YAAY,CAAC;IACrB,CAAC;IAEO,gBAAgB,CAA0B,SAAY;QAC7D,OAAO,MAAM,CAAC,cAAc,CAAC,SAAS,CAAE,CAAC,WAA8B,CAAC;IACzE,CAAC;IAGO,YAAY,CAAC,SAAkB;QACtC,IAAI,SAAS,YAAY,aAAa,EAAE,CAAC;YACxC,OAAO,SAAS,CAAC;QAClB,CAAC;QAED,IAAI,SAAS,YAAY,KAAK,EAAE,CAAC;YAChC,OAAO,IAAI,cAAc,CAAC,SAAS,CAAC,CAAC;QACtC,CAAC;QAED,OAAO,IAAI,cAAc,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IACzD,CAAC;CACD,CAAA;AAtDmB;IADlB,MAAM,EAAE;8BACkB,MAAM;0DAAC;AAFtB,0BAA0B;IADtC,KAAK,EAAE;GACK,0BAA0B,CAwDtC"}
1
+ {"version":3,"file":"exception-mapper.interceptor.js","sourceRoot":"","sources":["../../src/middlewares/exception-mapper.interceptor.ts"],"names":[],"mappings":";AAAA,OAAO,EACN,aAAa,EACb,cAAc,GACd,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAExD,OAAO,EAEN,KAAK,EAEL,MAAM,GAEN,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAErC,OAAO,EAEN,GAAG,GACH,MAAM,MAAM,CAAC;AACd,OAAO,EACN,sBAAsB,GAEtB,MAAM,wBAAwB,CAAC;AAGzB,IAAM,0BAA0B,GAAhC,MAAM,0BAA0B;IAEnB,MAAM,CAAS;IAE3B,SAAS,CACf,OAAyB,EACzB,IAAiB;QAEjB,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC;YAC7B,KAAK,EAAE,KAAK,CAAC,EAAE;gBACd,MAAM,QAAQ,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,WAAW,EAAgB,CAAC;gBAEpE,IAAI,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;oBACzB,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;oBAEhE,OAAO;gBACR,CAAC;gBACD,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;gBAC3C,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;gBACnD,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;gBACvD,MAAM,MAAM,GAAG,YAAY,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;gBAE/C,QAAQ,CAAC,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC;YACzD,CAAC;SACD,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,eAAe,CAAC,OAAyB;QAChD,MAAM,YAAY,GAAiB,OAAO,CAAC,WAAW,CACrD,sBAAsB,EACtB,OAAO,CAAC,QAAQ,EAAE,CAAC,SAAS,EAC5B,OAAO,CAAC,UAAU,EAAE,CAAC,IAAI,CACzB,IAAI,IAAI,GAAG,EAAE,CAAC;QAEf,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,mBAAmB,CAAC,EAAE,CAAC;YAC5C,YAAY,CAAC,GAAG,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;QAC5C,CAAC;QACD,OAAO,YAAY,CAAC;IACrB,CAAC;IAEO,gBAAgB,CAA0B,SAAY;QAC7D,OAAO,MAAM,CAAC,cAAc,CAAC,SAAS,CAAE,CAAC,WAA8B,CAAC;IACzE,CAAC;IAGO,YAAY,CAAC,SAAkB;QACtC,IAAI,SAAS,YAAY,aAAa,EAAE,CAAC;YACxC,OAAO,SAAS,CAAC;QAClB,CAAC;QAED,IAAI,mBAAmB,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,CAAC;YAChD,OAAO,IAAI,mBAAmB,CAAC,SAAS,CAAC,CAAC;QAC3C,CAAC;QAED,IAAI,SAAS,YAAY,KAAK,EAAE,CAAC;YAChC,OAAO,IAAI,cAAc,CAAC,SAAS,CAAC,CAAC;QACtC,CAAC;QAED,OAAO,IAAI,cAAc,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IACzD,CAAC;CACD,CAAA;AA1DmB;IADlB,MAAM,EAAE;8BACkB,MAAM;0DAAC;AAFtB,0BAA0B;IADtC,KAAK,EAAE;GACK,0BAA0B,CA4DtC"}
package/dist/services/exception.service.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"exception.service.d.ts","sourceRoot":"","sources":["../../src/services/exception.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAM3C,qBAAa,gBAAgB;IAC5B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAA2C;WAEjE,cAAc,CAAC,CAAC,SAAS,aAAa,EACnD,IAAI,EAAE,OAAO,gBAAgB,EAC7B,SAAS,EAAE,KAAK,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAC1B,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,GACrC,IAAI;WAQO,SAAS,CAAC,CAAC,SAAS,aAAa,EAC9C,IAAI,EAAE,OAAO,gBAAgB,EAC7B,SAAS,EAAE,KAAK,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,GACxB,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;CAQlC"}
1
+ {"version":3,"file":"exception.service.d.ts","sourceRoot":"","sources":["../../src/services/exception.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAGN,MAAM,EACN,MAAM,mBAAmB,CAAC;AAM3B,qBAAa,gBAAgB;IAC5B,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAA2C;WAEjE,cAAc,CAAC,CAAC,SAAS,aAAa,EACnD,IAAI,EAAE,OAAO,gBAAgB,EAC7B,SAAS,EAAE,KAAK,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAC1B,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,GACrC,IAAI;WAQO,SAAS,CAAC,CAAC,SAAS,aAAa,EAC9C,IAAI,EAAE,OAAO,gBAAgB,EAC7B,SAAS,EAAE,KAAK,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,GACxB,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;CAQlC"}
package/dist/services/exception.service.js CHANGED
@@ -1,3 +1,4 @@
1
+ import { baseValidationExceptionSchema, ValidationException, } from '@hg-ts/validation';
1
2
  import { ExceptionSchemaAlreadyExistsException, ExceptionSchemaNotFoundException, } from '../exceptions/index.js';
2
3
  export class ExceptionService {
3
4
  static exceptionMap = new Map();
@@ -15,4 +16,5 @@ export class ExceptionService {
15
16
  return schema;
16
17
  }
17
18
  }
19
+ ExceptionService.registerSchema(ValidationException, baseValidationExceptionSchema.toClass());
18
20
  //# sourceMappingURL=exception.service.js.map
package/dist/services/exception.service.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"exception.service.js","sourceRoot":"","sources":["../../src/services/exception.service.ts"],"names":[],"mappings":"AAEA,OAAO,EACN,qCAAqC,EACrC,gCAAgC,GAChC,MAAM,wBAAwB,CAAC;AAEhC,MAAM,OAAO,gBAAgB;IACpB,MAAM,CAAU,YAAY,GAAG,IAAI,GAAG,EAAgC,CAAC;IAExE,MAAM,CAAC,cAAc,CAE3B,SAA0B,EAC1B,MAAuC;QAEvC,IAAI,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;YACtC,MAAM,IAAI,qCAAqC,CAAC,SAAS,CAAC,CAAC;QAC5D,CAAC;QAED,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAC1C,CAAC;IAEM,MAAM,CAAC,SAAS,CAEtB,SAA0B;QAE1B,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAChD,IAAI,CAAC,MAAM,EAAE,CAAC;YACb,MAAM,IAAI,gCAAgC,CAAC,SAAS,CAAC,CAAC;QACvD,CAAC;QAED,OAAO,MAAM,CAAC;IACf,CAAC"}
1
+ {"version":3,"file":"exception.service.js","sourceRoot":"","sources":["../../src/services/exception.service.ts"],"names":[],"mappings":"AACA,OAAO,EACN,6BAA6B,EAC7B,mBAAmB,GAEnB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACN,qCAAqC,EACrC,gCAAgC,GAChC,MAAM,wBAAwB,CAAC;AAEhC,MAAM,OAAO,gBAAgB;IACpB,MAAM,CAAU,YAAY,GAAG,IAAI,GAAG,EAAgC,CAAC;IAExE,MAAM,CAAC,cAAc,CAE3B,SAA0B,EAC1B,MAAuC;QAEvC,IAAI,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;YACtC,MAAM,IAAI,qCAAqC,CAAC,SAAS,CAAC,CAAC;QAC5D,CAAC;QAED,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IAC1C,CAAC;IAEM,MAAM,CAAC,SAAS,CAEtB,SAA0B;QAE1B,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAChD,IAAI,CAAC,MAAM,EAAE,CAAC;YACb,MAAM,IAAI,gCAAgC,CAAC,SAAS,CAAC,CAAC;QACvD,CAAC;QAED,OAAO,MAAM,CAAC;IACf,CAAC;;AAGF,gBAAgB,CAAC,cAAc,CAAC,mBAAmB,EAAE,6BAA6B,CAAC,OAAO,EAAE,CAAC,CAAC"}
package/dist/services/swagger.service.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"swagger.service.d.ts","sourceRoot":"","sources":["../../src/services/swagger.service.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAQlD,qBAAa,cAAc;IACnB,KAAK,CAAC,GAAG,EAAE,gBAAgB,GAAG,IAAI;IAYzC,OAAO,CAAC,kBAAkB;CAc1B"}
1
+ {"version":3,"file":"swagger.service.d.ts","sourceRoot":"","sources":["../../src/services/swagger.service.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAYlD,qBAAa,cAAc;IACnB,KAAK,CAAC,GAAG,EAAE,gBAAgB,GAAG,IAAI;IAazC,OAAO,CAAC,kBAAkB;CAuB1B"}
package/dist/services/swagger.service.js CHANGED
@@ -9,7 +9,8 @@ export class SwaggerService {
9
9
  .setOpenAPIVersion('3.0.0')
10
10
  .build();
11
11
  const document = SwaggerModule.createDocument(app, config);
12
- SwaggerModule.setup('/api', app, document, { jsonDocumentUrl: '/api/json' });
12
+ console.log(JSON.stringify(document, null, 2));
13
+ SwaggerModule.setup('/api', app, document, { jsonDocumentUrl: '/api/json', yamlDocumentUrl: '/api/yaml' });
13
14
  }
14
15
  patchSwaggerModule() {
15
16
  SchemaObjectFactory.prototype.exploreModelSchema = function (type, schemas) {
@@ -19,6 +20,10 @@ export class SwaggerService {
19
20
  schemas[type.name] = createSchema(type.schema, { io: 'input' }).schema;
20
21
  return type.name;
21
22
  };
23
+ const originalMethod = SchemaObjectFactory.prototype.createFromModel;
24
+ SchemaObjectFactory.prototype.createFromModel = function (parameters, schemas) {
25
+ return originalMethod.call(this, parameters, schemas);
26
+ };
22
27
  }
23
28
  }
24
29
  //# sourceMappingURL=swagger.service.js.map
package/dist/services/swagger.service.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"swagger.service.js","sourceRoot":"","sources":["../../src/services/swagger.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EACN,YAAY,EACZ,QAAQ,GACR,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EACN,eAAe,EACf,aAAa,GACb,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,mBAAmB,EAAE,MAAM,wDAAwD,CAAC;AAE7F,MAAM,OAAO,cAAc;IACnB,KAAK,CAAC,GAAqB;QACjC,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAE1B,MAAM,MAAM,GAAG,IAAI,eAAe,EAAE;aAClC,iBAAiB,CAAC,OAAO,CAAC;aAC1B,KAAK,EAAE,CAAC;QAEV,MAAM,QAAQ,GAAG,aAAa,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAE3D,aAAa,CAAC,KAAK,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,eAAe,EAAE,WAAW,EAAE,CAAC,CAAC;IAC9E,CAAC;IAEO,kBAAkB;QACzB,mBAAmB,CAAC,SAAS,CAAC,kBAAkB,GAAG,UAClD,IAA4B,EAC5B,OAA2C;YAE3C,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;gBACrB,MAAM,IAAI,0BAA0B,CAAC,yBAAyB,CAAC,CAAC;YACjE,CAAC;YAED,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC;YAEvE,OAAO,IAAI,CAAC,IAAI,CAAC;QAClB,CAAC,CAAC;IACH,CAAC;CACD"}
1
+ {"version":3,"file":"swagger.service.js","sourceRoot":"","sources":["../../src/services/swagger.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EACN,YAAY,EACZ,QAAQ,GACR,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EACN,eAAe,EACf,aAAa,GACb,MAAM,iBAAiB,CAAC;AAMzB,OAAO,EAAE,mBAAmB,EAAE,MAAM,wDAAwD,CAAC;AAE7F,MAAM,OAAO,cAAc;IACnB,KAAK,CAAC,GAAqB;QACjC,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAE1B,MAAM,MAAM,GAAG,IAAI,eAAe,EAAE;aAClC,iBAAiB,CAAC,OAAO,CAAC;aAC1B,KAAK,EAAE,CAAC;QAEV,MAAM,QAAQ,GAAG,aAAa,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAE3D,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAC/C,aAAa,CAAC,KAAK,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,eAAe,EAAE,WAAW,EAAE,eAAe,EAAE,WAAW,EAAE,CAAC,CAAC;IAC5G,CAAC;IAEO,kBAAkB;QACzB,mBAAmB,CAAC,SAAS,CAAC,kBAAkB,GAAG,UAClD,IAA4B,EAC5B,OAA2C;YAE3C,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;gBACrB,MAAM,IAAI,0BAA0B,CAAC,yBAAyB,CAAC,CAAC;YACjE,CAAC;YAED,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC;YAEvE,OAAO,IAAI,CAAC,IAAI,CAAC;QAClB,CAAC,CAAC;QAGF,MAAM,cAAc,GAAG,mBAAmB,CAAC,SAAS,CAAC,eAAe,CAAC;QACrE,mBAAmB,CAAC,SAAS,CAAC,eAAe,GAAG,UAC/C,UAAmC,EACnC,OAAqC;YAErC,OAAO,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;QACvD,CAAC,CAAC;IACH,CAAC;CACD"}
package/dist/tests/abstracts/base-controller-suite.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"base-controller-suite.d.ts","sourceRoot":"","sources":["../../../src/tests/abstracts/base-controller-suite.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAErC,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAElD,OAAO,EAEN,aAAa,EACb,MAAM,iBAAiB,CAAC;AAEzB,OAAc,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAG7C,8BAAsB,mBAAoB,SAAQ,KAAK;IACtD,SAAS,CAAC,MAAM,EAAE,aAAa,CAAC;IAChC,SAAS,CAAC,SAAS,EAAE,gBAAgB,CAAC;IACtC,SAAS,CAAC,MAAM,EAAE,aAAa,CAAC;IAChC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAoB;gBAE5B,UAAU,EAAE,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC;IAM1B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAgBtB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAI/C,SAAS,CAAC,QAAQ,CAAC,OAAO,IAAI,MAAM;CACpC"}
1
+ {"version":3,"file":"base-controller-suite.d.ts","sourceRoot":"","sources":["../../../src/tests/abstracts/base-controller-suite.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAErC,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAElD,OAAO,EAEN,aAAa,EACb,MAAM,iBAAiB,CAAC;AAEzB,OAAc,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAI7C,8BAAsB,mBAAoB,SAAQ,KAAK;IACtD,SAAS,CAAC,MAAM,EAAE,aAAa,CAAC;IAChC,SAAS,CAAC,SAAS,EAAE,gBAAgB,CAAC;IACtC,SAAS,CAAC,MAAM,EAAE,aAAa,CAAC;IAChC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAoB;gBAE5B,UAAU,EAAE,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC;IAM1B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAmBtB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAI/C,SAAS,CAAC,QAAQ,CAAC,OAAO,IAAI,MAAM;CACpC"}
package/dist/tests/abstracts/base-controller-suite.js CHANGED
@@ -4,6 +4,7 @@ import { FastifyAdapter } from '@nestjs/platform-fastify';
4
4
  import { Test as TestFactory, } from '@nestjs/testing';
5
5
  import axios from 'axios';
6
6
  import { HttpControllerModule } from '../../http-controller.module.js';
7
+ import { SwaggerService } from '../../services/index.js';
7
8
  export class BaseControllerSuite extends Suite {
8
9
  module;
9
10
  container;
@@ -20,6 +21,8 @@ export class BaseControllerSuite extends Suite {
20
21
  const port = this.getPort();
21
22
  this.container = this.module.createNestApplication(new FastifyAdapter());
22
23
  await this.container.init();
24
+ const swagger = this.container.get(SwaggerService);
25
+ swagger.setup(this.container);
23
26
  await this.container.listen(port, 'localhost');
24
27
  this.client = axios.create({ baseURL: `http://localhost:${port}` });
25
28
  }
package/dist/tests/abstracts/base-controller-suite.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"base-controller-suite.js","sourceRoot":"","sources":["../../../src/tests/abstracts/base-controller-suite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAGrC,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EACN,IAAI,IAAI,WAAW,GAEnB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAwB,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAEvE,MAAM,OAAgB,mBAAoB,SAAQ,KAAK;IAC5C,MAAM,CAAgB;IACtB,SAAS,CAAmB;IAC5B,MAAM,CAAgB;IACf,UAAU,CAAoB;IAE/C,YAAmB,UAA6B;QAC/C,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC9B,CAAC;IAEe,KAAK,CAAC,KAAK;QAC1B,IAAI,CAAC,MAAM,GAAG,MAAM,WAAW;aAC7B,mBAAmB,CAAC,EAAE,OAAO,EAAE,CAAC,IAAI,CAAC,UAAU,EAAE,YAAY,EAAE,oBAAoB,CAAC,EAAE,CAAC;aACvF,OAAO,EAAE,CAAC;QAEZ,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAG5B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,IAAI,cAAc,EAAE,CAAC,CAAC;QAEzE,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QAC5B,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAE/C,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,oBAAoB,IAAI,EAAE,EAAE,CAAC,CAAC;IACrE,CAAC;IAEe,KAAK,CAAC,QAAQ;QAC7B,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;IAC9B,CAAC;CAGD"}
1
+ {"version":3,"file":"base-controller-suite.js","sourceRoot":"","sources":["../../../src/tests/abstracts/base-controller-suite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAGrC,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EACN,IAAI,IAAI,WAAW,GAEnB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAwB,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAEzD,MAAM,OAAgB,mBAAoB,SAAQ,KAAK;IAC5C,MAAM,CAAgB;IACtB,SAAS,CAAmB;IAC5B,MAAM,CAAgB;IACf,UAAU,CAAoB;IAE/C,YAAmB,UAA6B;QAC/C,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC9B,CAAC;IAEe,KAAK,CAAC,KAAK;QAC1B,IAAI,CAAC,MAAM,GAAG,MAAM,WAAW;aAC7B,mBAAmB,CAAC,EAAE,OAAO,EAAE,CAAC,IAAI,CAAC,UAAU,EAAE,YAAY,EAAE,oBAAoB,CAAC,EAAE,CAAC;aACvF,OAAO,EAAE,CAAC;QAEZ,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAE5B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,IAAI,cAAc,EAAE,CAAC,CAAC;QAEzE,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QAE5B,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QACnD,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAE9B,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAE/C,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,oBAAoB,IAAI,EAAE,EAAE,CAAC,CAAC;IACrE,CAAC;IAEe,KAAK,CAAC,QAAQ;QAC7B,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;IAC9B,CAAC;CAGD"}
package/dist/tests/echo/controllers/dto/echo-get.query.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  declare const EchoGetQuery_base: import("@hg-ts/validation").ZodDto<{
2
- test: string;
2
+ test: number;
3
3
  }>;
4
4
  export declare class EchoGetQuery extends EchoGetQuery_base {
5
5
  }
package/dist/tests/echo/controllers/dto/echo-get.query.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"echo-get.query.d.ts","sourceRoot":"","sources":["../../../../../src/tests/echo/controllers/dto/echo-get.query.ts"],"names":[],"mappings":";;;AAIA,qBAAa,YAAa,SAAQ,iBAA4B;CAAG"}
1
+ {"version":3,"file":"echo-get.query.d.ts","sourceRoot":"","sources":["../../../../../src/tests/echo/controllers/dto/echo-get.query.ts"],"names":[],"mappings":";;;AASA,qBAAa,YAAa,SAAQ,iBAA4B;CAAG"}
package/dist/tests/echo/controllers/dto/echo-get.query.js CHANGED
@@ -1,5 +1,10 @@
1
1
  import { z } from '@hg-ts/validation';
2
- const echoGetQuerySchema = z.object({ test: z.string() });
2
+ const echoGetQuerySchema = z.object({
3
+ test: z.string()
4
+ .transform(value => Number(value))
5
+ .pipe(z.number())
6
+ .meta({ description: 'Test param', deprecated: true }),
7
+ });
3
8
  export class EchoGetQuery extends echoGetQuerySchema.toClass() {
4
9
  }
5
10
  //# sourceMappingURL=echo-get.query.js.map
package/dist/tests/echo/controllers/dto/echo-get.query.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"echo-get.query.js","sourceRoot":"","sources":["../../../../../src/tests/echo/controllers/dto/echo-get.query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,mBAAmB,CAAC;AAEtC,MAAM,kBAAkB,GAAG,CAAC,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;AAE1D,MAAM,OAAO,YAAa,SAAQ,kBAAkB,CAAC,OAAO,EAAE;CAAG"}
1
+ {"version":3,"file":"echo-get.query.js","sourceRoot":"","sources":["../../../../../src/tests/echo/controllers/dto/echo-get.query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,mBAAmB,CAAC;AAEtC,MAAM,kBAAkB,GAAG,CAAC,CAAC,MAAM,CAAC;IACnC,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;SACd,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;SACjC,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;SAChB,IAAI,CAAC,EAAE,WAAW,EAAE,YAAY,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;CACvD,CAAC,CAAC;AAEH,MAAM,OAAO,YAAa,SAAQ,kBAAkB,CAAC,OAAO,EAAE;CAAG"}
package/dist/tests/echo/controllers/echo.controller.d.ts CHANGED
@@ -2,6 +2,7 @@ import { EchoGetQuery, EchoPostBody } from './dto/index.js';
2
2
  export declare class EchoController {
3
3
  getEchoQuery(query: EchoGetQuery): Promise<EchoGetQuery>;
4
4
  getEchoParam(params: EchoGetQuery): Promise<EchoGetQuery>;
5
+ getEchoHeader(test: number): Promise<EchoPostBody>;
5
6
  postEchoQuery(query: EchoGetQuery): Promise<EchoGetQuery>;
6
7
  postEchoBody(body: EchoPostBody): Promise<EchoPostBody>;
7
8
  }
package/dist/tests/echo/controllers/echo.controller.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"echo.controller.d.ts","sourceRoot":"","sources":["../../../../src/tests/echo/controllers/echo.controller.ts"],"names":[],"mappings":"AASA,OAAO,EACN,YAAY,EACZ,YAAY,EACZ,MAAM,gBAAgB,CAAC;AAExB,qBAEa,cAAc;IAEb,YAAY,CACf,KAAK,EAAE,YAAY,GAC1B,OAAO,CAAC,YAAY,CAAC;IAKX,YAAY,CACf,MAAM,EAAE,YAAY,GAC3B,OAAO,CAAC,YAAY,CAAC;IAKX,aAAa,CAChB,KAAK,EAAE,YAAY,GAC1B,OAAO,CAAC,YAAY,CAAC;IAKX,YAAY,CAChB,IAAI,EAAE,YAAY,GACxB,OAAO,CAAC,YAAY,CAAC;CAGxB"}
1
+ {"version":3,"file":"echo.controller.d.ts","sourceRoot":"","sources":["../../../../src/tests/echo/controllers/echo.controller.ts"],"names":[],"mappings":"AASA,OAAO,EACN,YAAY,EACZ,YAAY,EACZ,MAAM,gBAAgB,CAAC;AAKxB,qBAEa,cAAc;IAEb,YAAY,CACV,KAAK,EAAE,YAAY,GAC/B,OAAO,CAAC,YAAY,CAAC;IAKX,YAAY,CACT,MAAM,EAAE,YAAY,GACjC,OAAO,CAAC,YAAY,CAAC;IAKX,aAAa,CACX,IAAI,EAAE,MAAM,GACxB,OAAO,CAAC,YAAY,CAAC;IAKX,aAAa,CACX,KAAK,EAAE,YAAY,GAC/B,OAAO,CAAC,YAAY,CAAC;IAKX,YAAY,CAChB,IAAI,EAAE,YAAY,GACxB,OAAO,CAAC,YAAY,CAAC;CAGxB"}
package/dist/tests/echo/controllers/echo.controller.js CHANGED
@@ -1,7 +1,11 @@
1
1
  import { __decorate, __metadata, __param } from "tslib";
2
- import { Body, Controller, Get, Param, Post, Query, } from '@nestjs/common';
2
+ import { z } from '@hg-ts/validation';
3
+ import { Body, Controller, Get, Post, } from '@nestjs/common';
3
4
  import { ApiTags } from '@nestjs/swagger';
5
+ import { Http } from '../../../decorators/index.js';
4
6
  import { EchoGetQuery, EchoPostBody, } from './dto/index.js';
7
+ const TestHeader = Http.ValidatedHeader('test', z.string().transform(value => Number(value)).pipe(z.number())
8
+ .meta({ description: 'Test header' }));
5
9
  let EchoController = class EchoController {
6
10
  async getEchoQuery(query) {
7
11
  return query;
@@ -9,6 +13,9 @@ let EchoController = class EchoController {
9
13
  async getEchoParam(params) {
10
14
  return params;
11
15
  }
16
+ async getEchoHeader(test) {
17
+ return { test };
18
+ }
12
19
  async postEchoQuery(query) {
13
20
  return query;
14
21
  }
@@ -18,21 +25,28 @@ let EchoController = class EchoController {
18
25
  };
19
26
  __decorate([
20
27
  Get('/query'),
21
- __param(0, Query()),
28
+ __param(0, Http.Query()),
22
29
  __metadata("design:type", Function),
23
30
  __metadata("design:paramtypes", [EchoGetQuery]),
24
31
  __metadata("design:returntype", Promise)
25
32
  ], EchoController.prototype, "getEchoQuery", null);
26
33
  __decorate([
27
34
  Get('/param/:test'),
28
- __param(0, Param()),
35
+ __param(0, Http.Params()),
29
36
  __metadata("design:type", Function),
30
37
  __metadata("design:paramtypes", [EchoGetQuery]),
31
38
  __metadata("design:returntype", Promise)
32
39
  ], EchoController.prototype, "getEchoParam", null);
40
+ __decorate([
41
+ Get('/headers'),
42
+ __param(0, TestHeader()),
43
+ __metadata("design:type", Function),
44
+ __metadata("design:paramtypes", [Number]),
45
+ __metadata("design:returntype", Promise)
46
+ ], EchoController.prototype, "getEchoHeader", null);
33
47
  __decorate([
34
48
  Post('/query'),
35
- __param(0, Query()),
49
+ __param(0, Http.Query()),
36
50
  __metadata("design:type", Function),
37
51
  __metadata("design:paramtypes", [EchoGetQuery]),
38
52
  __metadata("design:returntype", Promise)
package/dist/tests/echo/controllers/echo.controller.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"echo.controller.js","sourceRoot":"","sources":["../../../../src/tests/echo/controllers/echo.controller.ts"],"names":[],"mappings":";AAAA,OAAO,EACN,IAAI,EACJ,UAAU,EACV,GAAG,EACH,KAAK,EACL,IAAI,EACJ,KAAK,GACL,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EACN,YAAY,EACZ,YAAY,GACZ,MAAM,gBAAgB,CAAC;AAIjB,IAAM,cAAc,GAApB,MAAM,cAAc;IAEb,AAAN,KAAK,CAAC,YAAY,CACf,KAAmB;QAE5B,OAAO,KAAK,CAAC;IACd,CAAC;IAGY,AAAN,KAAK,CAAC,YAAY,CACf,MAAoB;QAE7B,OAAO,MAAM,CAAC;IACf,CAAC;IAGY,AAAN,KAAK,CAAC,aAAa,CAChB,KAAmB;QAE5B,OAAO,KAAK,CAAC;IACd,CAAC;IAGY,AAAN,KAAK,CAAC,YAAY,CAChB,IAAkB;QAE1B,OAAO,IAAI,CAAC;IACb,CAAC;CACD,CAAA;AA1Ba;IADZ,GAAG,CAAC,QAAQ,CAAC;IAEZ,WAAA,KAAK,EAAE,CAAA;;qCAAQ,YAAY;;kDAG5B;AAGY;IADZ,GAAG,CAAC,cAAc,CAAC;IAElB,WAAA,KAAK,EAAE,CAAA;;qCAAS,YAAY;;kDAG7B;AAGY;IADZ,IAAI,CAAC,QAAQ,CAAC;IAEb,WAAA,KAAK,EAAE,CAAA;;qCAAQ,YAAY;;mDAG5B;AAGY;IADZ,IAAI,CAAC,OAAO,CAAC;IAEZ,WAAA,IAAI,EAAE,CAAA;;qCAAO,YAAY;;kDAG1B;AA3BW,cAAc;IAF1B,OAAO,CAAC,MAAM,CAAC;IACf,UAAU,CAAC,OAAO,CAAC;GACP,cAAc,CA4B1B"}
1
+ {"version":3,"file":"echo.controller.js","sourceRoot":"","sources":["../../../../src/tests/echo/controllers/echo.controller.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,mBAAmB,CAAC;AACtC,OAAO,EACN,IAAI,EACJ,UAAU,EACV,GAAG,EACH,IAAI,GACJ,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,IAAI,EAAE,MAAM,8BAA8B,CAAC;AACpD,OAAO,EACN,YAAY,EACZ,YAAY,GACZ,MAAM,gBAAgB,CAAC;AAExB,MAAM,UAAU,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;KAC3G,IAAI,CAAC,EAAE,WAAW,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC;AAIjC,IAAM,cAAc,GAApB,MAAM,cAAc;IAEb,AAAN,KAAK,CAAC,YAAY,CACV,KAAmB;QAEjC,OAAO,KAAK,CAAC;IACd,CAAC;IAGY,AAAN,KAAK,CAAC,YAAY,CACT,MAAoB;QAEnC,OAAO,MAAM,CAAC;IACf,CAAC;IAGY,AAAN,KAAK,CAAC,aAAa,CACX,IAAY;QAE1B,OAAO,EAAE,IAAI,EAAE,CAAC;IACjB,CAAC;IAGY,AAAN,KAAK,CAAC,aAAa,CACX,KAAmB;QAEjC,OAAO,KAAK,CAAC;IACd,CAAC;IAGY,AAAN,KAAK,CAAC,YAAY,CAChB,IAAkB;QAE1B,OAAO,IAAI,CAAC;IACb,CAAC;CACD,CAAA;AAjCa;IADZ,GAAG,CAAC,QAAQ,CAAC;IAEZ,WAAA,IAAI,CAAC,KAAK,EAAE,CAAA;;qCAAQ,YAAY;;kDAGjC;AAGY;IADZ,GAAG,CAAC,cAAc,CAAC;IAElB,WAAA,IAAI,CAAC,MAAM,EAAE,CAAA;;qCAAS,YAAY;;kDAGnC;AAGY;IADZ,GAAG,CAAC,UAAU,CAAC;IAEd,WAAA,UAAU,EAAE,CAAA;;;;mDAGb;AAGY;IADZ,IAAI,CAAC,QAAQ,CAAC;IAEb,WAAA,IAAI,CAAC,KAAK,EAAE,CAAA;;qCAAQ,YAAY;;mDAGjC;AAGY;IADZ,IAAI,CAAC,OAAO,CAAC;IAEZ,WAAA,IAAI,EAAE,CAAA;;qCAAO,YAAY;;kDAG1B;AAlCW,cAAc;IAF1B,OAAO,CAAC,MAAM,CAAC;IACf,UAAU,CAAC,OAAO,CAAC;GACP,cAAc,CAmC1B"}
package/dist/tests/echo/echo.test.d.ts CHANGED
@@ -2,11 +2,14 @@ import { BaseControllerSuite } from '../abstracts/index.js';
2
2
  export declare class EchoTest extends BaseControllerSuite {
3
3
  constructor();
4
4
  echoGet(): Promise<void>;
5
+ echoHeader(): Promise<void>;
6
+ echoHeaderNotPassed(): Promise<void>;
5
7
  echoPostQuery(): Promise<void>;
6
8
  echoPostBody(): Promise<void>;
7
9
  echoGetParam(): Promise<void>;
8
10
  echoGetInvalidQuery(): Promise<void>;
9
11
  echoGetFieldInvalidQuery(): Promise<void>;
10
12
  protected getPort(): number;
13
+ private checkIsAxiosError;
11
14
  }
12
15
  //# sourceMappingURL=echo.test.d.ts.map
package/dist/tests/echo/echo.test.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"echo.test.d.ts","sourceRoot":"","sources":["../../../src/tests/echo/echo.test.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAG5D,qBACa,QAAS,SAAQ,mBAAmB;;IAMnC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IASxB,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAS9B,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAS7B,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAU7B,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAQpC,wBAAwB,IAAI,OAAO,CAAC,IAAI,CAAC;cAOnC,OAAO,IAAI,MAAM;CAGpC"}
1
+ {"version":3,"file":"echo.test.d.ts","sourceRoot":"","sources":["../../../src/tests/echo/echo.test.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAG5D,qBACa,QAAS,SAAQ,mBAAmB;;IAMnC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IASxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAU3B,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAepC,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAS9B,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAS7B,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAS7B,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAQpC,wBAAwB,IAAI,OAAO,CAAC,IAAI,CAAC;cAOnC,OAAO,IAAI,MAAM;IAIpC,OAAO,CAAC,iBAAiB;CAGzB"}
package/dist/tests/echo/echo.test.js CHANGED
@@ -1,5 +1,6 @@
1
1
  import { __decorate, __metadata } from "tslib";
2
2
  import { Describe, expect, ExpectException, Test, } from '@hg-ts/tests';
3
+ import { AxiosError, isAxiosError, } from 'axios';
3
4
  import { BaseControllerSuite } from '../abstracts/index.js';
4
5
  import { EchoTestModule } from './echo.test.module.js';
5
6
  let EchoTest = class EchoTest extends BaseControllerSuite {
@@ -10,13 +11,31 @@ let EchoTest = class EchoTest extends BaseControllerSuite {
10
11
  const value = '3.12';
11
12
  const params = { test: value };
12
13
  const response = await this.client.get('/echo/query', { params });
13
- expect(response.data).toMatchObject(params);
14
+ expect(response.data).toMatchObject({ test: Number(value) });
15
+ }
16
+ async echoHeader() {
17
+ const value = '3.12';
18
+ const headers = { test: value };
19
+ const response = await this.client.get('/echo/headers', { headers });
20
+ expect(response.data.test).toStrictEqual(Number(value));
21
+ }
22
+ async echoHeaderNotPassed() {
23
+ try {
24
+ const value = '3.12s';
25
+ const headers = { test: value };
26
+ await this.client.get('/echo/headers', { headers });
27
+ }
28
+ catch (error) {
29
+ this.checkIsAxiosError(isAxiosError(error));
30
+ expect(error.response?.status).toBe(400);
31
+ throw error;
32
+ }
14
33
  }
15
34
  async echoPostQuery() {
16
35
  const value = '3.12';
17
36
  const params = { test: value };
18
37
  const response = await this.client.post('/echo/query', null, { params });
19
- expect(response.data).toMatchObject(params);
38
+ expect(response.data).toMatchObject({ test: Number(value) });
20
39
  }
21
40
  async echoPostBody() {
22
41
  const value = 3.12;
@@ -26,9 +45,8 @@ let EchoTest = class EchoTest extends BaseControllerSuite {
26
45
  }
27
46
  async echoGetParam() {
28
47
  const value = '3.12';
29
- const params = { test: value };
30
48
  const response = await this.client.get(`/echo/param/${value}`);
31
- expect(response.data).toMatchObject(params);
49
+ expect(response.data).toMatchObject({ test: Number(value) });
32
50
  }
33
51
  async echoGetInvalidQuery() {
34
52
  const value = '5.16';
@@ -43,6 +61,9 @@ let EchoTest = class EchoTest extends BaseControllerSuite {
43
61
  getPort() {
44
62
  return 50003;
45
63
  }
64
+ checkIsAxiosError(isAxiosError) {
65
+ expect(isAxiosError).toBe(true);
66
+ }
46
67
  };
47
68
  __decorate([
48
69
  Test(),
@@ -50,6 +71,19 @@ __decorate([
50
71
  __metadata("design:paramtypes", []),
51
72
  __metadata("design:returntype", Promise)
52
73
  ], EchoTest.prototype, "echoGet", null);
74
+ __decorate([
75
+ Test(),
76
+ __metadata("design:type", Function),
77
+ __metadata("design:paramtypes", []),
78
+ __metadata("design:returntype", Promise)
79
+ ], EchoTest.prototype, "echoHeader", null);
80
+ __decorate([
81
+ Test(),
82
+ ExpectException(AxiosError),
83
+ __metadata("design:type", Function),
84
+ __metadata("design:paramtypes", []),
85
+ __metadata("design:returntype", Promise)
86
+ ], EchoTest.prototype, "echoHeaderNotPassed", null);
53
87
  __decorate([
54
88
  Test(),
55
89
  __metadata("design:type", Function),
package/dist/tests/echo/echo.test.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"echo.test.js","sourceRoot":"","sources":["../../../src/tests/echo/echo.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"echo.test.js","sourceRoot":"","sources":["../../../src/tests/echo/echo.test.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@hg-ts/http-controller",
3
- "version": "0.5.35",
3
+ "version": "0.5.37",
4
4
  "main": "dist/index.js",
5
5
  "type": "module",
6
6
  "exports": {
@@ -18,15 +18,16 @@
18
18
  "test:dev": "vitest watch"
19
19
  },
20
20
  "devDependencies": {
21
- "@hg-ts-config/typescript": "0.5.35",
22
- "@hg-ts/exception": "0.5.35",
23
- "@hg-ts/execution-mode": "0.5.35",
24
- "@hg-ts/knex": "0.5.35",
25
- "@hg-ts/linter": "0.5.35",
26
- "@hg-ts/logger": "0.5.35",
27
- "@hg-ts/tests": "0.5.35",
28
- "@hg-ts/types": "0.5.35",
29
- "@hg-ts/validation": "0.5.35",
21
+ "@fastify/static": "9.0.0",
22
+ "@hg-ts-config/typescript": "0.5.37",
23
+ "@hg-ts/exception": "0.5.37",
24
+ "@hg-ts/execution-mode": "0.5.37",
25
+ "@hg-ts/knex": "0.5.37",
26
+ "@hg-ts/linter": "0.5.37",
27
+ "@hg-ts/logger": "0.5.37",
28
+ "@hg-ts/tests": "0.5.37",
29
+ "@hg-ts/types": "0.5.37",
30
+ "@hg-ts/validation": "0.5.37",
30
31
  "@nestjs/common": "11.1.0",
31
32
  "@nestjs/core": "11.1.0",
32
33
  "@nestjs/platform-fastify": "11.1.0",
@@ -47,11 +48,11 @@
47
48
  "vitest": "4.0.14"
48
49
  },
49
50
  "peerDependencies": {
50
- "@hg-ts/exception": "0.5.35",
51
- "@hg-ts/execution-mode": "0.5.35",
52
- "@hg-ts/knex": "0.5.35",
53
- "@hg-ts/logger": "0.5.35",
54
- "@hg-ts/validation": "0.5.35",
51
+ "@hg-ts/exception": "0.5.37",
52
+ "@hg-ts/execution-mode": "0.5.37",
53
+ "@hg-ts/knex": "0.5.37",
54
+ "@hg-ts/logger": "0.5.37",
55
+ "@hg-ts/validation": "0.5.37",
55
56
  "@nestjs/common": "*",
56
57
  "@nestjs/core": "*",
57
58
  "@nestjs/platform-fastify": "*",
package/src/decorators/decorators.ts CHANGED
@@ -1,11 +1,22 @@
1
1
  import { BaseException } from '@hg-ts/exception';
2
2
  import {
3
3
  createSchema,
4
+ isZodDto,
4
5
  z,
6
+ ZodObject,
5
7
  } from '@hg-ts/validation';
6
- import { createParamDecorator } from '@nestjs/common';
8
+ import {
9
+ createParamDecorator,
10
+ Param,
11
+ Query,
12
+ } from '@nestjs/common';
7
13
 
8
- import { ApiResponse } from '@nestjs/swagger';
14
+ import {
15
+ ApiHeader,
16
+ ApiProperty,
17
+ ApiResponse,
18
+ ApiResponseOptions,
19
+ } from '@nestjs/swagger';
9
20
  import { FastifyRequest } from 'fastify';
10
21
 
11
22
  import { ExceptionStatusAlreadyDefinedException } from '../exceptions/index.js';
@@ -16,9 +27,14 @@ export type ExceptionMap = Map<Class<BaseException, any[]>, number>;
16
27
  export const EXCEPTION_METADATA_KEY = Symbol('EXCEPTION_METADATA_KEY');
17
28
 
18
29
  export class Http {
19
- private constructor() {}
30
+ private constructor() {
31
+ }
20
32
 
21
- public static ExceptionStatus(exception: Class<BaseException, any[]>, statusCode: number): MethodDecorator {
33
+ public static ExceptionStatus(
34
+ exception: Class<BaseException, any[]>,
35
+ statusCode: number,
36
+ options?: Omit<ApiResponseOptions, 'status'>,
37
+ ): MethodDecorator {
22
38
  return (target: any, propertyKey: string | symbol, descriptor: PropertyDescriptor) => {
23
39
  const statusMap: ExceptionMap =
24
40
  Reflect.getMetadata(EXCEPTION_METADATA_KEY, target, propertyKey) ?? new Map();
@@ -40,18 +56,68 @@ export class Http {
40
56
  .map(item => item.schema as any);
41
57
 
42
58
  ApiResponse({
59
+ ...options,
43
60
  schema: schemas.length === 1 ? schemas[0] : { oneOf: schemas },
44
61
  status: statusCode,
45
62
  })(target, propertyKey, descriptor);
46
63
  };
47
64
  }
48
65
 
49
- public static ValidatedHeader<T>(headerName: string, schema: z.ZodSchema<T>): () => ParameterDecorator {
50
- return createParamDecorator((_data: unknown, ctx): T => {
66
+ public static Params(): ParameterDecorator {
67
+ return (target, propertyKey, parameterIndex) => {
68
+ Param()(target, propertyKey, parameterIndex);
69
+ this.getApiPropertyDecorator()(target, propertyKey, parameterIndex);
70
+ };
71
+ }
72
+
73
+ public static Query(): ParameterDecorator {
74
+ return (target, propertyKey, parameterIndex) => {
75
+ Query()(target, propertyKey, parameterIndex);
76
+ this.getApiPropertyDecorator()(target, propertyKey, parameterIndex);
77
+ };
78
+ }
79
+
80
+ public static ValidatedHeader<T>(
81
+ headerName: string,
82
+ schema: z.ZodSchema<T>,
83
+ ): () => ParameterDecorator {
84
+ const validationDecorator: ParameterDecorator = createParamDecorator((_data: unknown, ctx): T => {
51
85
  const request = ctx.switchToHttp().getRequest<FastifyRequest>();
52
86
  const header = request.headers[headerName];
53
87
 
54
88
  return schema.parse(header);
89
+ })();
90
+
91
+ const { description, ...openApiSchema } = createSchema(schema).schema;
92
+
93
+ const openapiDecorator: MethodDecorator = ApiHeader({
94
+ name: headerName,
95
+ description: description ?? '',
96
+ // @ts-expect-error
97
+ schema: openApiSchema,
55
98
  });
99
+
100
+ const decorator: ParameterDecorator = (target, propertyKey, parameterIndex) => {
101
+ validationDecorator(target, propertyKey, parameterIndex);
102
+ openapiDecorator(target, propertyKey!, Object.getOwnPropertyDescriptor(target, propertyKey!)!);
103
+ };
104
+
105
+ return () => decorator;
106
+ }
107
+
108
+ private static getApiPropertyDecorator(): ParameterDecorator {
109
+ return (target, propertyKey, parameterIndex) => {
110
+ const metadata = Reflect.getMetadata('design:paramtypes', target, propertyKey!);
111
+ const dto = metadata[parameterIndex];
112
+ if (isZodDto(dto)) {
113
+ Object.entries((dto.schema as ZodObject).shape).forEach(([key, value]) => {
114
+ // @ts-expect-error
115
+ const { description, deprecated, ...openApiSchema } = createSchema(value).schema;
116
+ const optional = value.safeParse().success;
117
+ // @ts-expect-error
118
+ ApiProperty({ schema: openApiSchema, required: !optional, description, deprecated })(dto.prototype, key);
119
+ });
120
+ }
121
+ };
56
122
  }
57
123
  }
package/src/middlewares/exception-mapper.interceptor.ts CHANGED
@@ -59,7 +59,7 @@ export class ExceptionMapperInterceptor implements NestInterceptor {
59
59
  ) ?? new Map();
60
60
 
61
61
  if (!exceptionMap.has(ValidationException)) {
62
- exceptionMap.set(ValidationException, 404);
62
+ exceptionMap.set(ValidationException, 400);
63
63
  }
64
64
  return exceptionMap;
65
65
  }
@@ -74,6 +74,10 @@ export class ExceptionMapperInterceptor implements NestInterceptor {
74
74
  return exception;
75
75
  }
76
76
 
77
+ if (ValidationException.canBeParsed(exception)) {
78
+ return new ValidationException(exception);
79
+ }
80
+
77
81
  if (exception instanceof Error) {
78
82
  return new ErrorException(exception);
79
83
  }
package/src/services/exception.service.ts CHANGED
@@ -1,5 +1,9 @@
1
1
  import { BaseException } from '@hg-ts/exception';
2
- import { ZodDto } from '@hg-ts/validation';
2
+ import {
3
+ baseValidationExceptionSchema,
4
+ ValidationException,
5
+ ZodDto,
6
+ } from '@hg-ts/validation';
3
7
  import {
4
8
  ExceptionSchemaAlreadyExistsException,
5
9
  ExceptionSchemaNotFoundException,
@@ -32,3 +36,5 @@ export class ExceptionService {
32
36
  return schema;
33
37
  }
34
38
  }
39
+
40
+ ExceptionService.registerSchema(ValidationException, baseValidationExceptionSchema.toClass());
package/src/services/swagger.service.ts CHANGED
@@ -9,7 +9,11 @@ import {
9
9
  DocumentBuilder,
10
10
  SwaggerModule,
11
11
  } from '@nestjs/swagger';
12
- import { SchemaObject } from '@nestjs/swagger/dist/interfaces/open-api-spec.interface.js';
12
+ import {
13
+ BaseParameterObject,
14
+ SchemaObject,
15
+ } from '@nestjs/swagger/dist/interfaces/open-api-spec.interface.js';
16
+ import { ParamWithTypeMetadata } from '@nestjs/swagger/dist/services/parameter-metadata-accessor.js';
13
17
  import { SchemaObjectFactory } from '@nestjs/swagger/dist/services/schema-object-factory.js';
14
18
 
15
19
  export class SwaggerService {
@@ -22,7 +26,8 @@ export class SwaggerService {
22
26
 
23
27
  const document = SwaggerModule.createDocument(app, config);
24
28
 
25
- SwaggerModule.setup('/api', app, document, { jsonDocumentUrl: '/api/json' });
29
+ console.log(JSON.stringify(document, null, 2));
30
+ SwaggerModule.setup('/api', app, document, { jsonDocumentUrl: '/api/json', yamlDocumentUrl: '/api/yaml' });
26
31
  }
27
32
 
28
33
  private patchSwaggerModule(): void {
@@ -38,5 +43,14 @@ export class SwaggerService {
38
43
 
39
44
  return type.name;
40
45
  };
46
+
47
+ // eslint-disable-next-line @typescript/unbound-method
48
+ const originalMethod = SchemaObjectFactory.prototype.createFromModel;
49
+ SchemaObjectFactory.prototype.createFromModel = function(
50
+ parameters: ParamWithTypeMetadata[],
51
+ schemas: Record<string, SchemaObject>,
52
+ ): (ParamWithTypeMetadata | BaseParameterObject)[] {
53
+ return originalMethod.call(this, parameters, schemas);
54
+ };
41
55
  }
42
56
  }
package/src/tests/abstracts/base-controller-suite.ts CHANGED
@@ -10,6 +10,7 @@ import {
10
10
 
11
11
  import axios, { AxiosInstance } from 'axios';
12
12
  import { HttpControllerModule } from '../../http-controller.module.js';
13
+ import { SwaggerService } from '../../services/index.js';
13
14
 
14
15
  export abstract class BaseControllerSuite extends Suite {
15
16
  protected module: TestingModule;
@@ -30,10 +31,13 @@ export abstract class BaseControllerSuite extends Suite {
30
31
 
31
32
  const port = this.getPort();
32
33
 
33
-
34
34
  this.container = this.module.createNestApplication(new FastifyAdapter());
35
35
 
36
36
  await this.container.init();
37
+
38
+ const swagger = this.container.get(SwaggerService);
39
+ swagger.setup(this.container);
40
+
37
41
  await this.container.listen(port, 'localhost');
38
42
 
39
43
  this.client = axios.create({ baseURL: `http://localhost:${port}` });
package/src/tests/echo/controllers/dto/echo-get.query.ts CHANGED
@@ -1,5 +1,10 @@
1
1
  import { z } from '@hg-ts/validation';
2
2
 
3
- const echoGetQuerySchema = z.object({ test: z.string() });
3
+ const echoGetQuerySchema = z.object({
4
+ test: z.string()
5
+ .transform(value => Number(value))
6
+ .pipe(z.number())
7
+ .meta({ description: 'Test param', deprecated: true }),
8
+ });
4
9
 
5
10
  export class EchoGetQuery extends echoGetQuerySchema.toClass() {}
package/src/tests/echo/controllers/echo.controller.ts CHANGED
@@ -1,37 +1,47 @@
1
+ import { z } from '@hg-ts/validation';
1
2
  import {
2
3
  Body,
3
4
  Controller,
4
5
  Get,
5
- Param,
6
6
  Post,
7
- Query,
8
7
  } from '@nestjs/common';
9
8
  import { ApiTags } from '@nestjs/swagger';
9
+ import { Http } from '../../../decorators/index.js';
10
10
  import {
11
11
  EchoGetQuery,
12
12
  EchoPostBody,
13
13
  } from './dto/index.js';
14
14
 
15
+ const TestHeader = Http.ValidatedHeader('test', z.string().transform(value => Number(value)).pipe(z.number())
16
+ .meta({ description: 'Test header' }));
17
+
15
18
  @ApiTags('Echo')
16
19
  @Controller('/echo')
17
20
  export class EchoController {
18
21
  @Get('/query')
19
22
  public async getEchoQuery(
20
- @Query() query: EchoGetQuery,
23
+ @Http.Query() query: EchoGetQuery,
21
24
  ): Promise<EchoGetQuery> {
22
25
  return query;
23
26
  }
24
27
 
25
28
  @Get('/param/:test')
26
29
  public async getEchoParam(
27
- @Param() params: EchoGetQuery,
30
+ @Http.Params() params: EchoGetQuery,
28
31
  ): Promise<EchoGetQuery> {
29
32
  return params;
30
33
  }
31
34
 
35
+ @Get('/headers')
36
+ public async getEchoHeader(
37
+ @TestHeader() test: number,
38
+ ): Promise<EchoPostBody> {
39
+ return { test };
40
+ }
41
+
32
42
  @Post('/query')
33
43
  public async postEchoQuery(
34
- @Query() query: EchoGetQuery,
44
+ @Http.Query() query: EchoGetQuery,
35
45
  ): Promise<EchoGetQuery> {
36
46
  return query;
37
47
  }
package/src/tests/echo/echo.test.ts CHANGED
@@ -4,6 +4,10 @@ import {
4
4
  ExpectException,
5
5
  Test,
6
6
  } from '@hg-ts/tests';
7
+ import {
8
+ AxiosError,
9
+ isAxiosError,
10
+ } from 'axios';
7
11
 
8
12
  import { BaseControllerSuite } from '../abstracts/index.js';
9
13
  import { EchoTestModule } from './echo.test.module.js';
@@ -20,7 +24,32 @@ export class EchoTest extends BaseControllerSuite {
20
24
  const params: Record<string, unknown> = { test: value };
21
25
  const response = await this.client.get('/echo/query', { params });
22
26
 
23
- expect(response.data).toMatchObject(params);
27
+ expect(response.data).toMatchObject({ test: Number(value) });
28
+ }
29
+
30
+ @Test()
31
+ public async echoHeader(): Promise<void> {
32
+ const value = '3.12';
33
+ const headers = { test: value };
34
+ const response = await this.client.get('/echo/headers', { headers });
35
+
36
+ expect(response.data.test).toStrictEqual(Number(value));
37
+ }
38
+
39
+ @Test()
40
+ @ExpectException(AxiosError)
41
+ public async echoHeaderNotPassed(): Promise<void> {
42
+ try {
43
+ const value = '3.12s';
44
+ const headers = { test: value };
45
+ await this.client.get('/echo/headers', { headers });
46
+ } catch (error) {
47
+ this.checkIsAxiosError(isAxiosError(error));
48
+
49
+ expect(error.response?.status).toBe(400);
50
+
51
+ throw error;
52
+ }
24
53
  }
25
54
 
26
55
  @Test()
@@ -29,7 +58,7 @@ export class EchoTest extends BaseControllerSuite {
29
58
  const params: Record<string, unknown> = { test: value };
30
59
  const response = await this.client.post('/echo/query', null, { params });
31
60
 
32
- expect(response.data).toMatchObject(params);
61
+ expect(response.data).toMatchObject({ test: Number(value) });
33
62
  }
34
63
 
35
64
  @Test()
@@ -44,10 +73,9 @@ export class EchoTest extends BaseControllerSuite {
44
73
  @Test()
45
74
  public async echoGetParam(): Promise<void> {
46
75
  const value = '3.12';
47
- const params: Record<string, unknown> = { test: value };
48
76
  const response = await this.client.get(`/echo/param/${value}`);
49
77
 
50
- expect(response.data).toMatchObject(params);
78
+ expect(response.data).toMatchObject({ test: Number(value) });
51
79
  }
52
80
 
53
81
  @Test()
@@ -70,4 +98,8 @@ export class EchoTest extends BaseControllerSuite {
70
98
  protected override getPort(): number {
71
99
  return 50003;
72
100
  }
101
+
102
+ private checkIsAxiosError(isAxiosError: boolean): asserts isAxiosError {
103
+ expect(isAxiosError).toBe(true);
104
+ }
73
105
  }