@tsed/schema 7.87.5 → 7.87.6

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 (39) hide show
  1. package/lib/browser/schema.umd.min.js +1 -1
  2. package/lib/browser/schema.umd.min.js.map +1 -1
  3. package/lib/cjs/components/open-spec/nullableMapper.js +17 -22
  4. package/lib/cjs/components/open-spec/nullableMapper.js.map +1 -1
  5. package/lib/cjs/decorators/common/allOf.js.map +1 -1
  6. package/lib/cjs/decorators/common/anyOf.js.map +1 -1
  7. package/lib/cjs/decorators/common/nullable.js +1 -1
  8. package/lib/cjs/decorators/common/nullable.js.map +1 -1
  9. package/lib/cjs/decorators/common/oneOf.js.map +1 -1
  10. package/lib/cjs/fn/allOf.js.map +1 -1
  11. package/lib/cjs/fn/any.js.map +1 -1
  12. package/lib/cjs/fn/anyOf.js.map +1 -1
  13. package/lib/cjs/fn/oneOf.js.map +1 -1
  14. package/lib/esm/components/open-spec/nullableMapper.js +17 -22
  15. package/lib/esm/components/open-spec/nullableMapper.js.map +1 -1
  16. package/lib/esm/decorators/common/allOf.js.map +1 -1
  17. package/lib/esm/decorators/common/anyOf.js.map +1 -1
  18. package/lib/esm/decorators/common/nullable.js +1 -1
  19. package/lib/esm/decorators/common/nullable.js.map +1 -1
  20. package/lib/esm/decorators/common/oneOf.js.map +1 -1
  21. package/lib/esm/fn/allOf.js.map +1 -1
  22. package/lib/esm/fn/any.js.map +1 -1
  23. package/lib/esm/fn/anyOf.js.map +1 -1
  24. package/lib/esm/fn/oneOf.js.map +1 -1
  25. package/lib/types/decorators/common/allOf.d.ts +2 -2
  26. package/lib/types/decorators/common/anyOf.d.ts +2 -2
  27. package/lib/types/decorators/common/oneOf.d.ts +2 -2
  28. package/lib/types/fn/allOf.d.ts +1 -1
  29. package/lib/types/fn/any.d.ts +1 -1
  30. package/lib/types/fn/anyOf.d.ts +1 -1
  31. package/lib/types/fn/oneOf.d.ts +1 -1
  32. package/lib/types-esm/decorators/common/allOf.d.ts +2 -2
  33. package/lib/types-esm/decorators/common/anyOf.d.ts +2 -2
  34. package/lib/types-esm/decorators/common/oneOf.d.ts +2 -2
  35. package/lib/types-esm/fn/allOf.d.ts +1 -1
  36. package/lib/types-esm/fn/any.d.ts +1 -1
  37. package/lib/types-esm/fn/anyOf.d.ts +1 -1
  38. package/lib/types-esm/fn/oneOf.d.ts +1 -1
  39. package/package.json +6 -6
package/lib/cjs/components/open-spec/nullableMapper.js CHANGED
@@ -15,35 +15,30 @@ function nullableMapperOpenApi(obj, schema, options) {
15
15
  if (obj.$ref) {
16
16
  return (0, core_1.cleanObject)({
17
17
  ...obj,
18
- ...(obj.$ref && {
19
- anyOf: [
20
- {
21
- $ref: obj.$ref
22
- }
23
- ],
24
- type: undefined
25
- }),
26
- nullable: true,
27
- $ref: undefined
18
+ nullable: true
28
19
  });
29
20
  }
30
- return (0, core_1.cleanObject)({
31
- ...obj,
32
- ...(obj.anyOf?.length === 1
33
- ? {
34
- ...obj.anyOf[0],
35
- anyOf: undefined,
36
- type: Number.isInteger(obj.multipleOf) ? "integer" : obj.anyOf[0]?.type
37
- }
38
- : {
39
- type: obj.anyOf?.length > 1 ? undefined : obj.type,
40
- anyOf: obj.anyOf?.map((item) => {
21
+ function map(manyOf) {
22
+ return obj[manyOf]?.length === 1
23
+ ? (0, core_1.cleanObject)({
24
+ ...obj[manyOf][0],
25
+ [manyOf]: undefined,
26
+ type: Number.isInteger(obj.multipleOf) ? "integer" : obj[manyOf][0]?.type
27
+ })
28
+ : (0, core_1.cleanObject)({
29
+ type: obj[manyOf]?.length > 1 ? undefined : obj.type,
30
+ [manyOf]: obj[manyOf]?.map((item) => {
41
31
  if (Number.isInteger(item.multipleOf)) {
42
32
  item.type = "integer";
43
33
  }
44
34
  return item;
45
35
  })
46
- }),
36
+ });
37
+ }
38
+ return (0, core_1.cleanObject)({
39
+ ...obj,
40
+ ...map("oneOf"),
41
+ ...map("anyOf"),
47
42
  nullable: true
48
43
  });
49
44
  }
package/lib/cjs/components/open-spec/nullableMapper.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"nullableMapper.js","sourceRoot":"","sources":["../../../../src/components/open-spec/nullableMapper.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AAGvC,4DAAoD;AAEpD,gGAAuF;AACvF,oEAA4D;AAE5D,SAAgB,qBAAqB,CAAC,GAAQ,EAAE,MAAyB,EAAE,OAA0B;IACnG,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE;QACvB,OAAO,GAAG,CAAC;KACZ;IAED,IAAI,OAAO,CAAC,WAAW,KAAK,OAAO,EAAE;QACnC,OAAO,IAAA,kCAAc,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;KACpC;IAED,IAAI,GAAG,CAAC,IAAI,EAAE;QACZ,OAAO,IAAA,kBAAW,EAAC;YACjB,GAAG,GAAG;YACN,GAAG,CAAC,GAAG,CAAC,IAAI,IAAI;gBACd,KAAK,EAAE;oBACL;wBACE,IAAI,EAAE,GAAG,CAAC,IAAI;qBACf;iBACF;gBACD,IAAI,EAAE,SAAS;aAChB,CAAC;YACF,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,SAAS;SAChB,CAAC,CAAC;KACJ;IAED,OAAO,IAAA,kBAAW,EAAC;QACjB,GAAG,GAAG;QACN,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,KAAK,CAAC;YACzB,CAAC,CAAC;gBACE,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;gBACf,KAAK,EAAE,SAAS;gBAChB,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI;aACxE;YACH,CAAC,CAAC;gBACE,IAAI,EAAE,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI;gBAClD,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE;oBAClC,IAAI,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;wBACrC,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC;qBACvB;oBAED,OAAO,IAAI,CAAC;gBACd,CAAC,CAAC;aACH,CAAC;QACN,QAAQ,EAAE,IAAI;KACf,CAAC,CAAC;AACL,CAAC;AA7CD,sDA6CC;AAED,IAAA,uDAAwB,EAAC,UAAU,EAAE,qBAAqB,EAAE,wBAAS,CAAC,OAAO,CAAC,CAAC;AAC/E,IAAA,uDAAwB,EAAC,UAAU,EAAE,qBAAqB,EAAE,wBAAS,CAAC,OAAO,CAAC,CAAC"}
1
+ {"version":3,"file":"nullableMapper.js","sourceRoot":"","sources":["../../../../src/components/open-spec/nullableMapper.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AAGvC,4DAAoD;AAEpD,gGAAuF;AACvF,oEAA4D;AAE5D,SAAgB,qBAAqB,CAAC,GAAQ,EAAE,MAAyB,EAAE,OAA0B;IACnG,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE;QACvB,OAAO,GAAG,CAAC;KACZ;IAED,IAAI,OAAO,CAAC,WAAW,KAAK,OAAO,EAAE;QACnC,OAAO,IAAA,kCAAc,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;KACpC;IAED,IAAI,GAAG,CAAC,IAAI,EAAE;QACZ,OAAO,IAAA,kBAAW,EAAC;YACjB,GAAG,GAAG;YACN,QAAQ,EAAE,IAAI;SACf,CAAC,CAAC;KACJ;IAED,SAAS,GAAG,CAAC,MAAc;QACzB,OAAO,GAAG,CAAC,MAAM,CAAC,EAAE,MAAM,KAAK,CAAC;YAC9B,CAAC,CAAC,IAAA,kBAAW,EAAC;gBACV,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBACjB,CAAC,MAAM,CAAC,EAAE,SAAS;gBACnB,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI;aAC1E,CAAC;YACJ,CAAC,CAAC,IAAA,kBAAW,EAAC;gBACV,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI;gBACpD,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE;oBACvC,IAAI,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;wBACrC,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC;qBACvB;oBAED,OAAO,IAAI,CAAC;gBACd,CAAC,CAAC;aACH,CAAC,CAAC;IACT,CAAC;IAED,OAAO,IAAA,kBAAW,EAAC;QACjB,GAAG,GAAG;QACN,GAAG,GAAG,CAAC,OAAO,CAAC;QACf,GAAG,GAAG,CAAC,OAAO,CAAC;QACf,QAAQ,EAAE,IAAI;KACf,CAAC,CAAC;AACL,CAAC;AAzCD,sDAyCC;AAED,IAAA,uDAAwB,EAAC,UAAU,EAAE,qBAAqB,EAAE,wBAAS,CAAC,OAAO,CAAC,CAAC;AAC/E,IAAA,uDAAwB,EAAC,UAAU,EAAE,qBAAqB,EAAE,wBAAS,CAAC,OAAO,CAAC,CAAC"}
package/lib/cjs/decorators/common/allOf.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"allOf.js","sourceRoot":"","sources":["../../../../src/decorators/common/allOf.ts"],"names":[],"mappings":";;;AACA,uDAA+C;AAE/C;;;;;;;;;;GAUG;AACH,SAAgB,KAAK,CAAC,GAAG,KAAuD;IAC9E,OAAO,IAAA,8BAAY,EAAC,CAAC,MAAM,EAAE,EAAE;QAC7B,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC,CAAC,CAAC;AACL,CAAC;AAJD,sBAIC"}
1
+ {"version":3,"file":"allOf.js","sourceRoot":"","sources":["../../../../src/decorators/common/allOf.ts"],"names":[],"mappings":";;;AACA,uDAA+C;AAE/C;;;;;;;;;;GAUG;AACH,SAAgB,KAAK,CAAC,GAAG,KAAyC;IAChE,OAAO,IAAA,8BAAY,EAAC,CAAC,MAAM,EAAE,EAAE;QAC7B,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC,CAAC,CAAC;AACL,CAAC;AAJD,sBAIC"}
package/lib/cjs/decorators/common/anyOf.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"anyOf.js","sourceRoot":"","sources":["../../../../src/decorators/common/anyOf.ts"],"names":[],"mappings":";;;AACA,uDAA+C;AAE/C;;;;;;;;;;;;;;GAcG;AACH,SAAgB,KAAK,CAAC,GAAG,KAAuD;IAC9E,OAAO,IAAA,8BAAY,EAAC,CAAC,MAAM,EAAE,EAAE;QAC7B,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC,CAAC,CAAC;AACL,CAAC;AAJD,sBAIC"}
1
+ {"version":3,"file":"anyOf.js","sourceRoot":"","sources":["../../../../src/decorators/common/anyOf.ts"],"names":[],"mappings":";;;AACA,uDAA+C;AAE/C;;;;;;;;;;;;;;GAcG;AACH,SAAgB,KAAK,CAAC,GAAG,KAAyC;IAChE,OAAO,IAAA,8BAAY,EAAC,CAAC,MAAM,EAAE,EAAE;QAC7B,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC,CAAC,CAAC;AACL,CAAC;AAJD,sBAIC"}
package/lib/cjs/decorators/common/nullable.js CHANGED
@@ -35,7 +35,7 @@ function Nullable(type, ...types) {
35
35
  return (0, jsonEntityFn_js_1.JsonEntityFn)((entity) => {
36
36
  entity.schema.assign((0, collection_js_1.array)()
37
37
  .items({})
38
- .$comment("Warning: you should not use @Nullable(Array) which lead to an incorrect schema. Use @Schema(array().items().nullable()) instead")
38
+ .$comment("Warning: you should not use @Nullable(Array), which leads to an incorrect schema. Use @Schema(array().items().nullable()) instead")
39
39
  .nullable(true));
40
40
  });
41
41
  }
package/lib/cjs/decorators/common/nullable.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"nullable.js","sourceRoot":"","sources":["../../../../src/decorators/common/nullable.ts"],"names":[],"mappings":";;;AAAA,qCAA+C;AAG/C,8DAAsD;AACtD,0DAA6C;AAC7C,uDAA+C;AAC/C,yCAAiC;AACjC,+CAAuC;AAEvC;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,SAAgB,QAAQ,CAAC,IAA2C,EAAE,GAAG,KAAgD;IACvH,KAAK,GAAG,CAAC,IAAI,EAAE,GAAG,KAAK,CAAC,CAAC;IAEzB,IAAI,IAAI,KAAK,KAAK,EAAE;QAClB,OAAO,IAAA,8BAAY,EAAC,CAAC,MAAM,EAAE,EAAE;YAC7B,MAAM,CAAC,MAAM,CAAC,MAAM,CAClB,IAAA,qBAAK,GAAE;iBACJ,KAAK,CAAC,EAAE,CAAC;iBACT,QAAQ,CACP,iIAAiI,CAClI;iBACA,QAAQ,CAAC,IAAI,CAAC,CAClB,CAAC;QACJ,CAAC,CAAC,CAAC;KACJ;IAED,OAAO,IAAA,oBAAa,EAAC,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,YAAY,0BAAU,CAAC,IAAI,IAAA,sBAAQ,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,IAAA,gBAAK,EAAC,IAAI,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC;AACzH,CAAC;AAjBD,4BAiBC"}
1
+ {"version":3,"file":"nullable.js","sourceRoot":"","sources":["../../../../src/decorators/common/nullable.ts"],"names":[],"mappings":";;;AAAA,qCAA+C;AAG/C,8DAAsD;AACtD,0DAA6C;AAC7C,uDAA+C;AAC/C,yCAAiC;AACjC,+CAAuC;AAEvC;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,SAAgB,QAAQ,CAAC,IAA2C,EAAE,GAAG,KAAgD;IACvH,KAAK,GAAG,CAAC,IAAI,EAAE,GAAG,KAAK,CAAC,CAAC;IAEzB,IAAI,IAAI,KAAK,KAAK,EAAE;QAClB,OAAO,IAAA,8BAAY,EAAC,CAAC,MAAM,EAAE,EAAE;YAC7B,MAAM,CAAC,MAAM,CAAC,MAAM,CAClB,IAAA,qBAAK,GAAE;iBACJ,KAAK,CAAC,EAAE,CAAC;iBACT,QAAQ,CACP,mIAAmI,CACpI;iBACA,QAAQ,CAAC,IAAI,CAAC,CAClB,CAAC;QACJ,CAAC,CAAC,CAAC;KACJ;IAED,OAAO,IAAA,oBAAa,EAAC,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,YAAY,0BAAU,CAAC,IAAI,IAAA,sBAAQ,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,IAAA,gBAAK,EAAC,IAAI,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC;AACzH,CAAC;AAjBD,4BAiBC"}
package/lib/cjs/decorators/common/oneOf.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"oneOf.js","sourceRoot":"","sources":["../../../../src/decorators/common/oneOf.ts"],"names":[],"mappings":";;;AACA,uDAA+C;AAE/C;;;;;;;;;;;;;;GAcG;AACH,SAAgB,KAAK,CAAC,GAAG,KAAuD;IAC9E,OAAO,IAAA,8BAAY,EAAC,CAAC,MAAM,EAAE,EAAE;QAC7B,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;AACL,CAAC;AAJD,sBAIC"}
1
+ {"version":3,"file":"oneOf.js","sourceRoot":"","sources":["../../../../src/decorators/common/oneOf.ts"],"names":[],"mappings":";;;AACA,uDAA+C;AAE/C;;;;;;;;;;;;;;GAcG;AACH,SAAgB,KAAK,CAAC,GAAG,KAAyC;IAChE,OAAO,IAAA,8BAAY,EAAC,CAAC,MAAM,EAAE,EAAE;QAC7B,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;AACL,CAAC;AAJD,sBAIC"}
package/lib/cjs/fn/allOf.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"allOf.js","sourceRoot":"","sources":["../../../src/fn/allOf.ts"],"names":[],"mappings":";;;AACA,uCAA+B;AAE/B;;;;;;GAMG;AACH,SAAgB,KAAK,CAAC,GAAG,KAAuD;IAC9E,OAAO,IAAA,cAAI,GAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;AAC7B,CAAC;AAFD,sBAEC"}
1
+ {"version":3,"file":"allOf.js","sourceRoot":"","sources":["../../../src/fn/allOf.ts"],"names":[],"mappings":";;;AACA,uCAA+B;AAE/B;;;;;;GAMG;AACH,SAAgB,KAAK,CAAC,GAAG,KAAyC;IAChE,OAAO,IAAA,cAAI,GAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;AAC7B,CAAC;AAFD,sBAEC"}
package/lib/cjs/fn/any.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"any.js","sourceRoot":"","sources":["../../../src/fn/any.ts"],"names":[],"mappings":";;;AACA,uCAA+B;AAE/B;;;;GAIG;AACH,SAAgB,GAAG,CAAC,GAAG,KAAuD;IAC5E,OAAO,IAAA,cAAI,GAAE,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC;AAC9B,CAAC;AAFD,kBAEC"}
1
+ {"version":3,"file":"any.js","sourceRoot":"","sources":["../../../src/fn/any.ts"],"names":[],"mappings":";;;AACA,uCAA+B;AAE/B;;;;GAIG;AACH,SAAgB,GAAG,CAAC,GAAG,KAAyC;IAC9D,OAAO,IAAA,cAAI,GAAE,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC;AAC9B,CAAC;AAFD,kBAEC"}
package/lib/cjs/fn/anyOf.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"anyOf.js","sourceRoot":"","sources":["../../../src/fn/anyOf.ts"],"names":[],"mappings":";;;AACA,uCAA+B;AAE/B;;;;;;GAMG;AACH,SAAgB,KAAK,CAAC,GAAG,KAAuD;IAC9E,OAAO,IAAA,cAAI,GAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;AAC7B,CAAC;AAFD,sBAEC"}
1
+ {"version":3,"file":"anyOf.js","sourceRoot":"","sources":["../../../src/fn/anyOf.ts"],"names":[],"mappings":";;;AACA,uCAA+B;AAE/B;;;;;;GAMG;AACH,SAAgB,KAAK,CAAC,GAAG,KAAyC;IAChE,OAAO,IAAA,cAAI,GAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;AAC7B,CAAC;AAFD,sBAEC"}
package/lib/cjs/fn/oneOf.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"oneOf.js","sourceRoot":"","sources":["../../../src/fn/oneOf.ts"],"names":[],"mappings":";;;AACA,uCAA+B;AAE/B;;;;;;;GAOG;AACH,SAAgB,KAAK,CAAC,GAAG,KAAuD;IAC9E,OAAO,IAAA,cAAI,GAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;AAC7B,CAAC;AAFD,sBAEC"}
1
+ {"version":3,"file":"oneOf.js","sourceRoot":"","sources":["../../../src/fn/oneOf.ts"],"names":[],"mappings":";;;AACA,uCAA+B;AAE/B;;;;;;;GAOG;AACH,SAAgB,KAAK,CAAC,GAAG,KAAyC;IAChE,OAAO,IAAA,cAAI,GAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;AAC7B,CAAC;AAFD,sBAEC"}
package/lib/esm/components/open-spec/nullableMapper.js CHANGED
@@ -12,35 +12,30 @@ export function nullableMapperOpenApi(obj, schema, options) {
12
12
  if (obj.$ref) {
13
13
  return cleanObject({
14
14
  ...obj,
15
- ...(obj.$ref && {
16
- anyOf: [
17
- {
18
- $ref: obj.$ref
19
- }
20
- ],
21
- type: undefined
22
- }),
23
- nullable: true,
24
- $ref: undefined
15
+ nullable: true
25
16
  });
26
17
  }
27
- return cleanObject({
28
- ...obj,
29
- ...(obj.anyOf?.length === 1
30
- ? {
31
- ...obj.anyOf[0],
32
- anyOf: undefined,
33
- type: Number.isInteger(obj.multipleOf) ? "integer" : obj.anyOf[0]?.type
34
- }
35
- : {
36
- type: obj.anyOf?.length > 1 ? undefined : obj.type,
37
- anyOf: obj.anyOf?.map((item) => {
18
+ function map(manyOf) {
19
+ return obj[manyOf]?.length === 1
20
+ ? cleanObject({
21
+ ...obj[manyOf][0],
22
+ [manyOf]: undefined,
23
+ type: Number.isInteger(obj.multipleOf) ? "integer" : obj[manyOf][0]?.type
24
+ })
25
+ : cleanObject({
26
+ type: obj[manyOf]?.length > 1 ? undefined : obj.type,
27
+ [manyOf]: obj[manyOf]?.map((item) => {
38
28
  if (Number.isInteger(item.multipleOf)) {
39
29
  item.type = "integer";
40
30
  }
41
31
  return item;
42
32
  })
43
- }),
33
+ });
34
+ }
35
+ return cleanObject({
36
+ ...obj,
37
+ ...map("oneOf"),
38
+ ...map("anyOf"),
44
39
  nullable: true
45
40
  });
46
41
  }
package/lib/esm/components/open-spec/nullableMapper.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"nullableMapper.js","sourceRoot":"","sources":["../../../../src/components/open-spec/nullableMapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,YAAY,CAAC;AAGvC,OAAO,EAAC,SAAS,EAAC,MAAM,2BAA2B,CAAC;AAEpD,OAAO,EAAC,wBAAwB,EAAC,MAAM,+CAA+C,CAAC;AACvF,OAAO,EAAC,cAAc,EAAC,MAAM,8BAA8B,CAAC;AAE5D,MAAM,UAAU,qBAAqB,CAAC,GAAQ,EAAE,MAAyB,EAAE,OAA0B;IACnG,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE;QACvB,OAAO,GAAG,CAAC;KACZ;IAED,IAAI,OAAO,CAAC,WAAW,KAAK,OAAO,EAAE;QACnC,OAAO,cAAc,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;KACpC;IAED,IAAI,GAAG,CAAC,IAAI,EAAE;QACZ,OAAO,WAAW,CAAC;YACjB,GAAG,GAAG;YACN,GAAG,CAAC,GAAG,CAAC,IAAI,IAAI;gBACd,KAAK,EAAE;oBACL;wBACE,IAAI,EAAE,GAAG,CAAC,IAAI;qBACf;iBACF;gBACD,IAAI,EAAE,SAAS;aAChB,CAAC;YACF,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,SAAS;SAChB,CAAC,CAAC;KACJ;IAED,OAAO,WAAW,CAAC;QACjB,GAAG,GAAG;QACN,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,KAAK,CAAC;YACzB,CAAC,CAAC;gBACE,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;gBACf,KAAK,EAAE,SAAS;gBAChB,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI;aACxE;YACH,CAAC,CAAC;gBACE,IAAI,EAAE,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI;gBAClD,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE;oBAClC,IAAI,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;wBACrC,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC;qBACvB;oBAED,OAAO,IAAI,CAAC;gBACd,CAAC,CAAC;aACH,CAAC;QACN,QAAQ,EAAE,IAAI;KACf,CAAC,CAAC;AACL,CAAC;AAED,wBAAwB,CAAC,UAAU,EAAE,qBAAqB,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;AAC/E,wBAAwB,CAAC,UAAU,EAAE,qBAAqB,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC"}
1
+ {"version":3,"file":"nullableMapper.js","sourceRoot":"","sources":["../../../../src/components/open-spec/nullableMapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,YAAY,CAAC;AAGvC,OAAO,EAAC,SAAS,EAAC,MAAM,2BAA2B,CAAC;AAEpD,OAAO,EAAC,wBAAwB,EAAC,MAAM,+CAA+C,CAAC;AACvF,OAAO,EAAC,cAAc,EAAC,MAAM,8BAA8B,CAAC;AAE5D,MAAM,UAAU,qBAAqB,CAAC,GAAQ,EAAE,MAAyB,EAAE,OAA0B;IACnG,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE;QACvB,OAAO,GAAG,CAAC;KACZ;IAED,IAAI,OAAO,CAAC,WAAW,KAAK,OAAO,EAAE;QACnC,OAAO,cAAc,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;KACpC;IAED,IAAI,GAAG,CAAC,IAAI,EAAE;QACZ,OAAO,WAAW,CAAC;YACjB,GAAG,GAAG;YACN,QAAQ,EAAE,IAAI;SACf,CAAC,CAAC;KACJ;IAED,SAAS,GAAG,CAAC,MAAc;QACzB,OAAO,GAAG,CAAC,MAAM,CAAC,EAAE,MAAM,KAAK,CAAC;YAC9B,CAAC,CAAC,WAAW,CAAC;gBACV,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBACjB,CAAC,MAAM,CAAC,EAAE,SAAS;gBACnB,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI;aAC1E,CAAC;YACJ,CAAC,CAAC,WAAW,CAAC;gBACV,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI;gBACpD,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE;oBACvC,IAAI,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;wBACrC,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC;qBACvB;oBAED,OAAO,IAAI,CAAC;gBACd,CAAC,CAAC;aACH,CAAC,CAAC;IACT,CAAC;IAED,OAAO,WAAW,CAAC;QACjB,GAAG,GAAG;QACN,GAAG,GAAG,CAAC,OAAO,CAAC;QACf,GAAG,GAAG,CAAC,OAAO,CAAC;QACf,QAAQ,EAAE,IAAI;KACf,CAAC,CAAC;AACL,CAAC;AAED,wBAAwB,CAAC,UAAU,EAAE,qBAAqB,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;AAC/E,wBAAwB,CAAC,UAAU,EAAE,qBAAqB,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC"}
package/lib/esm/decorators/common/allOf.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"allOf.js","sourceRoot":"","sources":["../../../../src/decorators/common/allOf.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,YAAY,EAAC,MAAM,mBAAmB,CAAC;AAE/C;;;;;;;;;;GAUG;AACH,MAAM,UAAU,KAAK,CAAC,GAAG,KAAuD;IAC9E,OAAO,YAAY,CAAC,CAAC,MAAM,EAAE,EAAE;QAC7B,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC,CAAC,CAAC;AACL,CAAC"}
1
+ {"version":3,"file":"allOf.js","sourceRoot":"","sources":["../../../../src/decorators/common/allOf.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,YAAY,EAAC,MAAM,mBAAmB,CAAC;AAE/C;;;;;;;;;;GAUG;AACH,MAAM,UAAU,KAAK,CAAC,GAAG,KAAyC;IAChE,OAAO,YAAY,CAAC,CAAC,MAAM,EAAE,EAAE;QAC7B,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC,CAAC,CAAC;AACL,CAAC"}
package/lib/esm/decorators/common/anyOf.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"anyOf.js","sourceRoot":"","sources":["../../../../src/decorators/common/anyOf.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,YAAY,EAAC,MAAM,mBAAmB,CAAC;AAE/C;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,KAAK,CAAC,GAAG,KAAuD;IAC9E,OAAO,YAAY,CAAC,CAAC,MAAM,EAAE,EAAE;QAC7B,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC,CAAC,CAAC;AACL,CAAC"}
1
+ {"version":3,"file":"anyOf.js","sourceRoot":"","sources":["../../../../src/decorators/common/anyOf.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,YAAY,EAAC,MAAM,mBAAmB,CAAC;AAE/C;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,KAAK,CAAC,GAAG,KAAyC;IAChE,OAAO,YAAY,CAAC,CAAC,MAAM,EAAE,EAAE;QAC7B,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC,CAAC,CAAC;AACL,CAAC"}
package/lib/esm/decorators/common/nullable.js CHANGED
@@ -32,7 +32,7 @@ export function Nullable(type, ...types) {
32
32
  return JsonEntityFn((entity) => {
33
33
  entity.schema.assign(array()
34
34
  .items({})
35
- .$comment("Warning: you should not use @Nullable(Array) which lead to an incorrect schema. Use @Schema(array().items().nullable()) instead")
35
+ .$comment("Warning: you should not use @Nullable(Array), which leads to an incorrect schema. Use @Schema(array().items().nullable()) instead")
36
36
  .nullable(true));
37
37
  });
38
38
  }
package/lib/esm/decorators/common/nullable.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"nullable.js","sourceRoot":"","sources":["../../../../src/decorators/common/nullable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,aAAa,EAAC,MAAM,YAAY,CAAC;AAG/C,OAAO,EAAC,UAAU,EAAC,MAAM,4BAA4B,CAAC;AACtD,OAAO,EAAC,KAAK,EAAC,MAAM,wBAAwB,CAAC;AAC7C,OAAO,EAAC,YAAY,EAAC,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAC,KAAK,EAAC,MAAM,YAAY,CAAC;AACjC,OAAO,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAC;AAEvC;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,UAAU,QAAQ,CAAC,IAA2C,EAAE,GAAG,KAAgD;IACvH,KAAK,GAAG,CAAC,IAAI,EAAE,GAAG,KAAK,CAAC,CAAC;IAEzB,IAAI,IAAI,KAAK,KAAK,EAAE;QAClB,OAAO,YAAY,CAAC,CAAC,MAAM,EAAE,EAAE;YAC7B,MAAM,CAAC,MAAM,CAAC,MAAM,CAClB,KAAK,EAAE;iBACJ,KAAK,CAAC,EAAE,CAAC;iBACT,QAAQ,CACP,iIAAiI,CAClI;iBACA,QAAQ,CAAC,IAAI,CAAC,CAClB,CAAC;QACJ,CAAC,CAAC,CAAC;KACJ;IAED,OAAO,aAAa,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,YAAY,UAAU,CAAC,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,IAAI,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC;AACzH,CAAC"}
1
+ {"version":3,"file":"nullable.js","sourceRoot":"","sources":["../../../../src/decorators/common/nullable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,aAAa,EAAC,MAAM,YAAY,CAAC;AAG/C,OAAO,EAAC,UAAU,EAAC,MAAM,4BAA4B,CAAC;AACtD,OAAO,EAAC,KAAK,EAAC,MAAM,wBAAwB,CAAC;AAC7C,OAAO,EAAC,YAAY,EAAC,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAC,KAAK,EAAC,MAAM,YAAY,CAAC;AACjC,OAAO,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAC;AAEvC;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,UAAU,QAAQ,CAAC,IAA2C,EAAE,GAAG,KAAgD;IACvH,KAAK,GAAG,CAAC,IAAI,EAAE,GAAG,KAAK,CAAC,CAAC;IAEzB,IAAI,IAAI,KAAK,KAAK,EAAE;QAClB,OAAO,YAAY,CAAC,CAAC,MAAM,EAAE,EAAE;YAC7B,MAAM,CAAC,MAAM,CAAC,MAAM,CAClB,KAAK,EAAE;iBACJ,KAAK,CAAC,EAAE,CAAC;iBACT,QAAQ,CACP,mIAAmI,CACpI;iBACA,QAAQ,CAAC,IAAI,CAAC,CAClB,CAAC;QACJ,CAAC,CAAC,CAAC;KACJ;IAED,OAAO,aAAa,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,YAAY,UAAU,CAAC,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,IAAI,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC;AACzH,CAAC"}
package/lib/esm/decorators/common/oneOf.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"oneOf.js","sourceRoot":"","sources":["../../../../src/decorators/common/oneOf.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,YAAY,EAAC,MAAM,mBAAmB,CAAC;AAE/C;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,KAAK,CAAC,GAAG,KAAuD;IAC9E,OAAO,YAAY,CAAC,CAAC,MAAM,EAAE,EAAE;QAC7B,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;AACL,CAAC"}
1
+ {"version":3,"file":"oneOf.js","sourceRoot":"","sources":["../../../../src/decorators/common/oneOf.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,YAAY,EAAC,MAAM,mBAAmB,CAAC;AAE/C;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,KAAK,CAAC,GAAG,KAAyC;IAChE,OAAO,YAAY,CAAC,CAAC,MAAM,EAAE,EAAE;QAC7B,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;AACL,CAAC"}
package/lib/esm/fn/allOf.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"allOf.js","sourceRoot":"","sources":["../../../src/fn/allOf.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,IAAI,EAAC,MAAM,WAAW,CAAC;AAE/B;;;;;;GAMG;AACH,MAAM,UAAU,KAAK,CAAC,GAAG,KAAuD;IAC9E,OAAO,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;AAC7B,CAAC"}
1
+ {"version":3,"file":"allOf.js","sourceRoot":"","sources":["../../../src/fn/allOf.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,IAAI,EAAC,MAAM,WAAW,CAAC;AAE/B;;;;;;GAMG;AACH,MAAM,UAAU,KAAK,CAAC,GAAG,KAAyC;IAChE,OAAO,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;AAC7B,CAAC"}
package/lib/esm/fn/any.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"any.js","sourceRoot":"","sources":["../../../src/fn/any.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,IAAI,EAAC,MAAM,WAAW,CAAC;AAE/B;;;;GAIG;AACH,MAAM,UAAU,GAAG,CAAC,GAAG,KAAuD;IAC5E,OAAO,IAAI,EAAE,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC;AAC9B,CAAC"}
1
+ {"version":3,"file":"any.js","sourceRoot":"","sources":["../../../src/fn/any.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,IAAI,EAAC,MAAM,WAAW,CAAC;AAE/B;;;;GAIG;AACH,MAAM,UAAU,GAAG,CAAC,GAAG,KAAyC;IAC9D,OAAO,IAAI,EAAE,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC;AAC9B,CAAC"}
package/lib/esm/fn/anyOf.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"anyOf.js","sourceRoot":"","sources":["../../../src/fn/anyOf.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,IAAI,EAAC,MAAM,WAAW,CAAC;AAE/B;;;;;;GAMG;AACH,MAAM,UAAU,KAAK,CAAC,GAAG,KAAuD;IAC9E,OAAO,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;AAC7B,CAAC"}
1
+ {"version":3,"file":"anyOf.js","sourceRoot":"","sources":["../../../src/fn/anyOf.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,IAAI,EAAC,MAAM,WAAW,CAAC;AAE/B;;;;;;GAMG;AACH,MAAM,UAAU,KAAK,CAAC,GAAG,KAAyC;IAChE,OAAO,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;AAC7B,CAAC"}
package/lib/esm/fn/oneOf.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"oneOf.js","sourceRoot":"","sources":["../../../src/fn/oneOf.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,IAAI,EAAC,MAAM,WAAW,CAAC;AAE/B;;;;;;;GAOG;AACH,MAAM,UAAU,KAAK,CAAC,GAAG,KAAuD;IAC9E,OAAO,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;AAC7B,CAAC"}
1
+ {"version":3,"file":"oneOf.js","sourceRoot":"","sources":["../../../src/fn/oneOf.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,IAAI,EAAC,MAAM,WAAW,CAAC;AAE/B;;;;;;;GAOG;AACH,MAAM,UAAU,KAAK,CAAC,GAAG,KAAyC;IAChE,OAAO,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;AAC7B,CAAC"}
package/lib/types/decorators/common/allOf.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { JsonSchema } from "../../domain/JsonSchema.js";
1
+ import type { JsonSchema } from "../../domain/JsonSchema.js";
2
2
  /**
3
3
  * See https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.26
4
4
  *
@@ -10,4 +10,4 @@ import { JsonSchema } from "../../domain/JsonSchema.js";
10
10
  * @input
11
11
  * @param allOf
12
12
  */
13
- export declare function AllOf(...allOf: Parameters<typeof JsonSchema.prototype.allOf>[0]): (...args: any[]) => any;
13
+ export declare function AllOf(...allOf: Parameters<JsonSchema["allOf"]>[0]): (...args: any[]) => any;
package/lib/types/decorators/common/anyOf.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { JsonSchema } from "../../domain/JsonSchema.js";
1
+ import type { JsonSchema } from "../../domain/JsonSchema.js";
2
2
  /**
3
3
  * See https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.27
4
4
  *
@@ -14,4 +14,4 @@ import { JsonSchema } from "../../domain/JsonSchema.js";
14
14
  * @input
15
15
  * @param anyOf
16
16
  */
17
- export declare function AnyOf(...anyOf: Parameters<typeof JsonSchema.prototype.anyOf>[0]): (...args: any[]) => any;
17
+ export declare function AnyOf(...anyOf: Parameters<JsonSchema["anyOf"]>[0]): (...args: any[]) => any;
package/lib/types/decorators/common/oneOf.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { JsonSchema } from "../../domain/JsonSchema.js";
1
+ import type { JsonSchema } from "../../domain/JsonSchema.js";
2
2
  /**
3
3
  * See https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.28
4
4
  *
@@ -14,4 +14,4 @@ import { JsonSchema } from "../../domain/JsonSchema.js";
14
14
  * @input
15
15
  * @param oneOf
16
16
  */
17
- export declare function OneOf(...oneOf: Parameters<typeof JsonSchema.prototype.oneOf>[0]): (...args: any[]) => any;
17
+ export declare function OneOf(...oneOf: Parameters<JsonSchema["oneOf"]>[0]): (...args: any[]) => any;
package/lib/types/fn/allOf.d.ts CHANGED
@@ -6,4 +6,4 @@ import type { JsonSchema } from "../domain/JsonSchema.js";
6
6
  *
7
7
  * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.26
8
8
  */
9
- export declare function allOf(...allOf: Parameters<typeof JsonSchema.prototype.allOf>[0]): JsonSchema;
9
+ export declare function allOf(...allOf: Parameters<JsonSchema["allOf"]>[0]): JsonSchema;
package/lib/types/fn/any.d.ts CHANGED
@@ -4,4 +4,4 @@ import type { JsonSchema } from "../domain/JsonSchema.js";
4
4
  *
5
5
  * See @@JsonSchema@@ to discover available methods.
6
6
  */
7
- export declare function any(...types: Parameters<typeof JsonSchema.prototype.oneOf>[0]): JsonSchema;
7
+ export declare function any(...types: Parameters<JsonSchema["oneOf"]>[0]): JsonSchema;
package/lib/types/fn/anyOf.d.ts CHANGED
@@ -6,4 +6,4 @@ import type { JsonSchema } from "../domain/JsonSchema.js";
6
6
  *
7
7
  * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.27
8
8
  */
9
- export declare function anyOf(...anyOf: Parameters<typeof JsonSchema.prototype.allOf>[0]): JsonSchema;
9
+ export declare function anyOf(...anyOf: Parameters<JsonSchema["allOf"]>[0]): JsonSchema;
package/lib/types/fn/oneOf.d.ts CHANGED
@@ -7,4 +7,4 @@ import type { JsonSchema } from "../domain/JsonSchema.js";
7
7
  * @schemaFunctional
8
8
  * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.28
9
9
  */
10
- export declare function oneOf(...oneOf: Parameters<typeof JsonSchema.prototype.oneOf>[0]): JsonSchema;
10
+ export declare function oneOf(...oneOf: Parameters<JsonSchema["oneOf"]>[0]): JsonSchema;
package/lib/types-esm/decorators/common/allOf.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { JsonSchema } from "../../domain/JsonSchema.js";
1
+ import type { JsonSchema } from "../../domain/JsonSchema.js";
2
2
  /**
3
3
  * See https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.26
4
4
  *
@@ -10,4 +10,4 @@ import { JsonSchema } from "../../domain/JsonSchema.js";
10
10
  * @input
11
11
  * @param allOf
12
12
  */
13
- export declare function AllOf(...allOf: Parameters<typeof JsonSchema.prototype.allOf>[0]): (...args: any[]) => any;
13
+ export declare function AllOf(...allOf: Parameters<JsonSchema["allOf"]>[0]): (...args: any[]) => any;
package/lib/types-esm/decorators/common/anyOf.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { JsonSchema } from "../../domain/JsonSchema.js";
1
+ import type { JsonSchema } from "../../domain/JsonSchema.js";
2
2
  /**
3
3
  * See https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.27
4
4
  *
@@ -14,4 +14,4 @@ import { JsonSchema } from "../../domain/JsonSchema.js";
14
14
  * @input
15
15
  * @param anyOf
16
16
  */
17
- export declare function AnyOf(...anyOf: Parameters<typeof JsonSchema.prototype.anyOf>[0]): (...args: any[]) => any;
17
+ export declare function AnyOf(...anyOf: Parameters<JsonSchema["anyOf"]>[0]): (...args: any[]) => any;
package/lib/types-esm/decorators/common/oneOf.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { JsonSchema } from "../../domain/JsonSchema.js";
1
+ import type { JsonSchema } from "../../domain/JsonSchema.js";
2
2
  /**
3
3
  * See https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.28
4
4
  *
@@ -14,4 +14,4 @@ import { JsonSchema } from "../../domain/JsonSchema.js";
14
14
  * @input
15
15
  * @param oneOf
16
16
  */
17
- export declare function OneOf(...oneOf: Parameters<typeof JsonSchema.prototype.oneOf>[0]): (...args: any[]) => any;
17
+ export declare function OneOf(...oneOf: Parameters<JsonSchema["oneOf"]>[0]): (...args: any[]) => any;
package/lib/types-esm/fn/allOf.d.ts CHANGED
@@ -6,4 +6,4 @@ import type { JsonSchema } from "../domain/JsonSchema.js";
6
6
  *
7
7
  * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.26
8
8
  */
9
- export declare function allOf(...allOf: Parameters<typeof JsonSchema.prototype.allOf>[0]): JsonSchema;
9
+ export declare function allOf(...allOf: Parameters<JsonSchema["allOf"]>[0]): JsonSchema;
package/lib/types-esm/fn/any.d.ts CHANGED
@@ -4,4 +4,4 @@ import type { JsonSchema } from "../domain/JsonSchema.js";
4
4
  *
5
5
  * See @@JsonSchema@@ to discover available methods.
6
6
  */
7
- export declare function any(...types: Parameters<typeof JsonSchema.prototype.oneOf>[0]): JsonSchema;
7
+ export declare function any(...types: Parameters<JsonSchema["oneOf"]>[0]): JsonSchema;
package/lib/types-esm/fn/anyOf.d.ts CHANGED
@@ -6,4 +6,4 @@ import type { JsonSchema } from "../domain/JsonSchema.js";
6
6
  *
7
7
  * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.27
8
8
  */
9
- export declare function anyOf(...anyOf: Parameters<typeof JsonSchema.prototype.allOf>[0]): JsonSchema;
9
+ export declare function anyOf(...anyOf: Parameters<JsonSchema["allOf"]>[0]): JsonSchema;
package/lib/types-esm/fn/oneOf.d.ts CHANGED
@@ -7,4 +7,4 @@ import type { JsonSchema } from "../domain/JsonSchema.js";
7
7
  * @schemaFunctional
8
8
  * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.28
9
9
  */
10
- export declare function oneOf(...oneOf: Parameters<typeof JsonSchema.prototype.oneOf>[0]): JsonSchema;
10
+ export declare function oneOf(...oneOf: Parameters<JsonSchema["oneOf"]>[0]): JsonSchema;
package/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "name": "@tsed/schema",
3
3
  "description": "JsonSchema module for Ts.ED Framework",
4
4
  "type": "commonjs",
5
- "version": "7.87.5",
5
+ "version": "7.87.6",
6
6
  "source": "./src/index.ts",
7
7
  "main": "./lib/cjs/index.js",
8
8
  "module": "./lib/esm/index.js",
@@ -37,7 +37,7 @@
37
37
  "tsed"
38
38
  ],
39
39
  "dependencies": {
40
- "@tsed/openspec": "7.87.5",
40
+ "@tsed/openspec": "7.87.6",
41
41
  "change-case": "^4.1.2",
42
42
  "fs-extra": "^11.2.0",
43
43
  "json-schema": "0.4.0",
@@ -47,10 +47,10 @@
47
47
  },
48
48
  "devDependencies": {
49
49
  "@apidevtools/swagger-parser": "10.1.0",
50
- "@tsed/barrels": "7.87.5",
51
- "@tsed/core": "7.87.5",
52
- "@tsed/openspec": "7.87.5",
53
- "@tsed/typescript": "7.87.5",
50
+ "@tsed/barrels": "7.87.6",
51
+ "@tsed/core": "7.87.6",
52
+ "@tsed/openspec": "7.87.6",
53
+ "@tsed/typescript": "7.87.6",
54
54
  "@types/fs-extra": "11.0.4",
55
55
  "@types/json-schema": "7.0.15",
56
56
  "@types/picomatch": "2.3.3",