@tsed/schema 8.1.0 → 8.2.0

package/lib/esm/registries/JsonSchemaMapperContainer.js

@@ -28,7 +28,7 @@ export function execMapper(type, args, options, parent) {
 export function hasMapper(type) {
     return JsonSchemaMappersContainer.has(type);
 }
-export function oneOfMapper(types, options) {
+export function execOneOfMapper(types, options) {
     return (types.find((type) => JsonSchemaMappersContainer.has(`${options?.specType}:${type}`)) ||
         types.find((type) => JsonSchemaMappersContainer.has(type)));
 }

package/lib/esm/registries/JsonSchemaMapperContainer.js.map

@@ -1 +1 @@
-{"version":3,"file":"JsonSchemaMapperContainer.js","sourceRoot":"","sources":["../../../src/registries/JsonSchemaMapperContainer.ts"],"names":[],"mappings":"AASA;;GAEG;AACH,MAAM,0BAA0B,GAAkC,IAAI,GAAG,EAAE,CAAC;AAE5E;;GAEG;AACH,MAAM,UAAU,wBAAwB,CAAC,IAAY,EAAE,MAAwB,EAAE,IAAgB;IAC/F,OAAO,0BAA0B,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AACjF,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,mBAAmB,CAAC,IAAY,EAAE,OAAY;IAC5D,MAAM,MAAM,GAAG,0BAA0B,CAAC,GAAG,CAAC,GAAG,OAAO,EAAE,QAAQ,IAAI,IAAI,EAAE,CAAE,IAAI,0BAA0B,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC;IAExH,IAAI,MAAM,EAAE,CAAC;QACX,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,uBAAuB;IACvB,MAAM,IAAI,KAAK,CAAC,cAAc,IAAI,wBAAwB,CAAC,CAAC;AAC9D,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,UAAU,CAAC,IAAY,EAAE,IAAW,EAAE,OAAY,EAAE,MAAY;IAC9E,OAAO,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;AACtE,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,IAAY;IACpC,OAAO,0BAA0B,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AAC9C,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,KAAe,EAAE,OAAY;IACvD,OAAO,CACL,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,0BAA0B,CAAC,GAAG,CAAC,GAAG,OAAO,EAAE,QAAQ,IAAI,IAAI,EAAE,CAAC,CAAC;QACpF,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,0BAA0B,CAAC,GAAG,CAAC,IAAI,CAAC,CAAE,CAC5D,CAAC;AACJ,CAAC"}
+{"version":3,"file":"JsonSchemaMapperContainer.js","sourceRoot":"","sources":["../../../src/registries/JsonSchemaMapperContainer.ts"],"names":[],"mappings":"AASA;;GAEG;AACH,MAAM,0BAA0B,GAAkC,IAAI,GAAG,EAAE,CAAC;AAE5E;;GAEG;AACH,MAAM,UAAU,wBAAwB,CAAC,IAAY,EAAE,MAAwB,EAAE,IAAgB;IAC/F,OAAO,0BAA0B,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AACjF,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,mBAAmB,CAAC,IAAY,EAAE,OAAY;IAC5D,MAAM,MAAM,GAAG,0BAA0B,CAAC,GAAG,CAAC,GAAG,OAAO,EAAE,QAAQ,IAAI,IAAI,EAAE,CAAE,IAAI,0BAA0B,CAAC,GAAG,CAAC,IAAI,CAAE,CAAC;IAExH,IAAI,MAAM,EAAE,CAAC;QACX,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,uBAAuB;IACvB,MAAM,IAAI,KAAK,CAAC,cAAc,IAAI,wBAAwB,CAAC,CAAC;AAC9D,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,UAAU,CAAC,IAAY,EAAE,IAAW,EAAE,OAAY,EAAE,MAAY;IAC9E,OAAO,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;AACtE,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,IAAY;IACpC,OAAO,0BAA0B,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AAC9C,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,KAAe,EAAE,OAAY;IAC3D,OAAO,CACL,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,0BAA0B,CAAC,GAAG,CAAC,GAAG,OAAO,EAAE,QAAQ,IAAI,IAAI,EAAE,CAAC,CAAC;QACpF,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,0BAA0B,CAAC,GAAG,CAAC,IAAI,CAAC,CAAE,CAC5D,CAAC;AACJ,CAAC"}

package/lib/esm/utils/ref.js.map

@@ -1 +1 @@
-{"version":3,"file":"ref.js","sourceRoot":"","sources":["../../../src/utils/ref.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAE,QAAQ,EAAC,MAAM,YAAY,CAAC;AACjD,OAAO,EAAC,UAAU,EAAC,MAAM,aAAa,CAAC;AAGvC,OAAO,EAAC,SAAS,EAAC,MAAM,wBAAwB,CAAC;AAIjD;;;GAGG;AACH,SAAS,OAAO,CAAC,OAA0B;IACzC,MAAM,EAAC,IAAI,GAAG,KAAK,CAAC,SAAS,CAAC,OAAO,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAS,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,aAAa,EAAE,EAAC,GAC9H,OAAO,CAAC;IAEV,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,aAAa,CAAC,IAAY,EAAE,OAA0B;IACpE,IAAI,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QAC5C,OAAO,UAAU,CAAC,GAAG,IAAI,IAAI,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACjF,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,SAAS,CAAC,IAAY,EAAE,MAAkB,EAAE,OAA0B;IACpF,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9B,MAAM,GAAG,GAAG;QACV,IAAI,EAAE,GAAG,IAAI,IAAI,IAAI,EAAE;KACxB,CAAC;IAEF,MAAM,QAAQ,GAAG,MAAM,CAAC,UAAU,CAAC;IACnC,MAAM,SAAS,GAAG,MAAM,CAAC,WAAW,CAAC;IAErC,OAAO,WAAW,CAAC;QACjB,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;QACrC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;QACvC,GAAG,CAAC,QAAQ,IAAI,SAAS;YACvB,CAAC,CAAC;gBACE,KAAK,EAAE,CAAC,GAAG,CAAC;aACb;YACH,CAAC,CAAC,GAAG,CAAC;KACT,CAAC,CAAC;AACL,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,KAAK,CAAC,KAAiB,EAAE,MAA2B,EAAE,OAA0B;IAC9F,MAAM,IAAI,GAAG,aAAa,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,OAAO,CAAC,CAAC;IAErD,IAAI,MAAM,EAAE,CAAC;QACX,QAAQ,CAAC,OAAO,EAAE,sBAAsB,IAAI,EAAE,EAAE,MAAM,CAAC,CAAC;IAC1D,CAAC;IAED,OAAO,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;AACzC,CAAC"}
+{"version":3,"file":"ref.js","sourceRoot":"","sources":["../../../src/utils/ref.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAE,QAAQ,EAAC,MAAM,YAAY,CAAC;AACjD,OAAO,EAAC,UAAU,EAAC,MAAM,aAAa,CAAC;AAGvC,OAAO,EAAC,SAAS,EAAC,MAAM,wBAAwB,CAAC;AAGjD;;;GAGG;AACH,SAAS,OAAO,CAAC,OAA0B;IACzC,MAAM,EAAC,IAAI,GAAG,KAAK,CAAC,SAAS,CAAC,OAAO,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAS,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,aAAa,EAAE,EAAC,GAC9H,OAAO,CAAC;IAEV,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,aAAa,CAAC,IAAY,EAAE,OAA0B;IACpE,IAAI,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QAC5C,OAAO,UAAU,CAAC,GAAG,IAAI,IAAI,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACjF,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,SAAS,CAAC,IAAY,EAAE,MAAkB,EAAE,OAA0B;IACpF,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9B,MAAM,GAAG,GAAG;QACV,IAAI,EAAE,GAAG,IAAI,IAAI,IAAI,EAAE;KACxB,CAAC;IAEF,MAAM,QAAQ,GAAG,MAAM,CAAC,UAAU,CAAC;IACnC,MAAM,SAAS,GAAG,MAAM,CAAC,WAAW,CAAC;IAErC,OAAO,WAAW,CAAC;QACjB,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;QACrC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;QACvC,GAAG,CAAC,QAAQ,IAAI,SAAS;YACvB,CAAC,CAAC;gBACE,KAAK,EAAE,CAAC,GAAG,CAAC;aACb;YACH,CAAC,CAAC,GAAG,CAAC;KACT,CAAC,CAAC;AACL,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,KAAK,CAAC,KAAiB,EAAE,MAA2B,EAAE,OAA0B;IAC9F,MAAM,IAAI,GAAG,aAAa,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,OAAO,CAAC,CAAC;IAErD,IAAI,MAAM,EAAE,CAAC;QACX,QAAQ,CAAC,OAAO,EAAE,sBAAsB,IAAI,EAAE,EAAE,MAAM,CAAC,CAAC;IAC1D,CAAC;IAED,OAAO,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;AACzC,CAAC"}

package/lib/types/decorators/common/labelledAs.d.ts

@@ -0,0 +1,24 @@
+/**
+ * Use label to create ref on the current decorated property.
+ *
+ * ### Example
+ *
+ * ```ts
+ * class Model {
+ *   // For single property
+ *   ＠LabelledAs("UserSchema")
+ *   name: string;
+ *
+ *   // For collection
+ *   ＠LabelledAs("UserCollectionSchema", "collection")
+ *   users: User[];
+ * }
+ * ```
+ *
+ * @param label The name of the label
+ * @param includeCollection Add the label to the collection. By default, the label is added to the item of the collection it the property is a collection.
+ * @returns PropertyDecorator
+ *
+ * @decorator
+ */
+export declare function LabelledAs(label: string, includeCollection?: false | "collection"): PropertyDecorator;

package/lib/types/fn/allOf.d.ts

@@ -0,0 +1,9 @@
+import type { AnyJsonSchema, JsonSchema } from "../domain/JsonSchema.js";
+/**
+ * See https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.26
+ *
+ *  * See @@JsonSchema@@ to discover available methods.
+ *
+ * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.26
+ */
+export declare function allOf(...allOf: AnyJsonSchema[]): JsonSchema;

package/lib/types/fn/any.d.ts

@@ -0,0 +1,7 @@
+import type { AnyJsonSchema, JsonSchema } from "../domain/JsonSchema.js";
+/**
+ * Declare a model with any type (By default: `integer`, `number`, `string`, `boolean`, `array`, `object`, `null`)
+ *
+ * See @@JsonSchema@@ to discover available methods.
+ */
+export declare function any(...types: AnyJsonSchema[]): JsonSchema;

package/lib/types/fn/anyOf.d.ts

@@ -0,0 +1,9 @@
+import type { AnyJsonSchema, JsonSchema } from "../domain/JsonSchema.js";
+/**
+ * See https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.27
+ *
+ *  * See @@JsonSchema@@ to discover available methods.
+ *
+ * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.27
+ */
+export declare function anyOf(...anyOf: AnyJsonSchema[]): JsonSchema;

package/lib/types/fn/boolean.d.ts

@@ -0,0 +1,7 @@
+import type { JsonSchema } from "../domain/JsonSchema.js";
+/**
+ * Declare a new boolean model.
+ *
+ *  * See @@JsonSchema@@ to discover available methods.
+ */
+export declare function boolean(): JsonSchema;

package/lib/types/fn/collection.d.ts

@@ -0,0 +1,43 @@
+import type { JsonSchema } from "../domain/JsonSchema.js";
+/**
+ * Declare a new object model with `additionalProperties: true`.
+ *
+ * ```json
+ * {
+ *   "type": "array"
+ * }
+ * ```
+ *
+ *  * See @@JsonSchema@@ to discover available methods.
+ *
+ * @schemaFunctional
+ */
+export declare function array(): JsonSchema;
+/**
+ * Declare a new object model with `additionalProperties: true`.
+ *
+ * ```json
+ * {
+ *   "type": "object",
+ *   "additionalProperties": true
+ * }
+ * ```
+ *
+ *  * See @@JsonSchema@@ to discover available methods.
+ *
+ * @schemaFunctional
+ */
+export declare function map(): JsonSchema;
+/**
+ * Declare a new array model with `uniqueItems: true`.
+ *
+ * ```json
+ * {
+ *   "type": "array",
+ *   "uniqueItems": true
+ * }
+ * ```
+ *
+ *  * See @@JsonSchema@@ to discover available methods.
+ */
+export declare function set(): JsonSchema;

package/lib/types/fn/date.d.ts

@@ -0,0 +1,19 @@
+import type { JsonSchema } from "../domain/JsonSchema.js";
+/**
+ * Declare a new string model with `format: date`.
+ *
+ * See @@JsonSchema@@ to discover available methods.
+ */
+export declare function date(): JsonSchema;
+/**
+ * Declare a new string model with `format: datetime`.
+ *
+ * See @@JsonSchema@@ to discover available methods.
+ */
+export declare function datetime(): JsonSchema;
+/**
+ * Declare a new string model with `format: time`.
+ *
+ * See @@JsonSchema@@ to discover available methods.
+ */
+export declare function time(): JsonSchema;

package/lib/types/fn/email.d.ts

@@ -0,0 +1,14 @@
+import type { JsonSchema } from "../domain/JsonSchema.js";
+/**
+ * Declare a new string model with `format: email`.
+ *
+ * See @@JsonSchema@@ to discover available methods.
+ *
+ * ### Example
+ *
+ * ```typescript
+ * const schema = email();
+ * // Results in: { type: "string", format: "email" }
+ * ```
+ */
+export declare function email(): JsonSchema;

package/lib/types/fn/enums.d.ts

@@ -0,0 +1 @@
+export declare function enums(e: Record<string, any>): import("../index.js").JsonSchema;

package/lib/types/fn/from.d.ts

@@ -0,0 +1,14 @@
+import { Type } from "@tsed/core";
+import { JsonSchema } from "../domain/JsonSchema.js";
+/**
+ * Create a new model from the given type.
+ *
+ * ```typescript
+ * from(String)
+ * ```
+ *
+ *  * See @@JsonSchema@@ to discover available methods.
+ *
+ * @schemaFunctional
+ */
+export declare function from(type?: Type<any>): JsonSchema;

package/lib/types/fn/integer.d.ts

@@ -0,0 +1,10 @@
+import type { JsonSchema } from "../domain/JsonSchema.js";
+/**
+ * Declare a new integer model.
+ *
+ * See @@JsonSchema@@ to discover available methods.
+ *
+ * @returns {JsonSchema} A schema configured for integer values
+ * @function
+ */
+export declare function integer(): JsonSchema;

package/lib/types/fn/lazyRef.d.ts

@@ -0,0 +1,5 @@
+import type { Type } from "@tsed/core";
+/**
+ * Declare a sub schema which will be resolved later. Use this function when you have a circular reference between two schemes.
+ */
+export declare function lazyRef(cb: () => Type<any>): any;

package/lib/types/fn/number.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Declare a new number model.
+ *
+ * * See @@JsonSchema@@ to discover available methods.
+ */
+export declare function number(): import("../index.js").JsonSchema;

package/lib/types/fn/object.d.ts

@@ -0,0 +1,21 @@
+import { JsonSchema } from "../domain/JsonSchema.js";
+/**
+ * Declare a new object model.
+ *
+ * See @@JsonSchema@@ to discover available methods.
+ *
+ * ### Example
+ *
+ * ```typescript
+ * const userSchema = object({
+ *   name: string(),
+ *   age: number()
+ * });
+ * ```
+ *
+ * @param properties - An object containing property definitions where each value is a JsonSchema
+ * @returns {JsonSchema} A new object model with the specified properties
+ */
+export declare function object(properties?: {
+    [key: string]: JsonSchema;
+}): JsonSchema;

package/lib/types/fn/oneOf.d.ts

@@ -0,0 +1,10 @@
+import type { AnyJsonSchema, JsonSchema } from "../domain/JsonSchema.js";
+/**
+ * See https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.28
+ *
+ *  * See @@JsonSchema@@ to discover available methods.
+ *
+ * @schemaFunctional
+ * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.28
+ */
+export declare function oneOf(...oneOf: AnyJsonSchema[]): JsonSchema;

package/lib/types/fn/string.d.ts

@@ -0,0 +1,7 @@
+import type { JsonSchema } from "../domain/JsonSchema.js";
+/**
+ * Declare a new string model.
+ *
+ * See @@JsonSchema@@ to discover available methods.
+ */
+export declare function string(): JsonSchema;

package/lib/types/fn/uri.d.ts

@@ -0,0 +1,9 @@
+import type { JsonSchema } from "../domain/JsonSchema.js";
+/**
+ * Declare a new string model with `format: uri`.
+ *
+ *  * See @@JsonSchema@@ to discover available methods.
+ *
+ * @schemaFunctional
+ */
+export declare function uri(): JsonSchema;

package/lib/types/fn/url.d.ts

@@ -0,0 +1,7 @@
+import type { JsonSchema } from "../domain/JsonSchema.js";
+/**
+ * Declare a new string model with `format: url`.
+ *
+ * See @@JsonSchema@@ to discover available methods.
+ */
+export declare function url(): JsonSchema;

package/lib/types/index.d.ts

@@ -71,6 +71,7 @@ export * from "./decorators/common/hidden.js";
 export * from "./decorators/common/ignore.js";
 export * from "./decorators/common/integer.js";
 export * from "./decorators/common/jsonEntityFn.js";
+export * from "./decorators/common/labelledAs.js";
 export * from "./decorators/common/maximum.js";
 export * from "./decorators/common/maxLength.js";
 export * from "./decorators/common/minimum.js";
@@ -138,6 +139,23 @@ export * from "./domain/JsonRequestBody.js";
 export * from "./domain/JsonResponse.js";
 export * from "./domain/JsonSchema.js";
 export * from "./domain/SpecTypes.js";
+export * from "./fn/allOf.js";
+export * from "./fn/any.js";
+export * from "./fn/anyOf.js";
+export * from "./fn/boolean.js";
+export * from "./fn/collection.js";
+export * from "./fn/date.js";
+export * from "./fn/email.js";
+export * from "./fn/enums.js";
+export * from "./fn/from.js";
+export * from "./fn/integer.js";
+export * from "./fn/lazyRef.js";
+export * from "./fn/number.js";
+export * from "./fn/object.js";
+export * from "./fn/oneOf.js";
+export * from "./fn/string.js";
+export * from "./fn/uri.js";
+export * from "./fn/url.js";
 export * from "./hooks/alterIgnore.js";
 export * from "./hooks/alterOneOf.js";
 export * from "./hooks/alterRequiredGroups.js";
@@ -151,7 +169,6 @@ export * from "./utils/buildPath.js";
 export * from "./utils/concatParameters.js";
 export * from "./utils/concatPath.js";
 export * from "./utils/defineStatusModel.js";
-export * from "./utils/from.js";
 export * from "./utils/generateSpec.js";
 export * from "./utils/generics.js";
 export * from "./utils/getComputedType.js";

package/lib/types/registries/JsonSchemaMapperContainer.d.ts

@@ -18,4 +18,4 @@ export declare function getJsonSchemaMapper(type: string, options: any): JsonSch
  */
 export declare function execMapper(type: string, args: any[], options: any, parent?: any): any;
 export declare function hasMapper(type: string): boolean;
-export declare function oneOfMapper(types: string[], options: any): string;
+export declare function execOneOfMapper(types: string[], options: any): string;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@tsed/schema",
   "description": "JsonSchema module for Ts.ED Framework",
   "type": "module",
-  "version": "8.1.0",
+  "version": "8.2.0",
   "source": "./src/index.ts",
   "main": "./lib/esm/index.js",
   "module": "./lib/esm/index.js",
@@ -37,7 +37,7 @@
     "tsed"
   ],
   "dependencies": {
-    "@tsed/openspec": "8.1.0",
+    "@tsed/openspec": "8.2.0",
     "change-case": "^5.4.4",
     "json-schema": "0.4.0",
     "picomatch": "2.3.1",
@@ -46,11 +46,11 @@
   },
   "devDependencies": {
     "@apidevtools/swagger-parser": "10.1.0",
-    "@tsed/barrels": "8.1.0",
-    "@tsed/core": "8.1.0",
-    "@tsed/hooks": "8.1.0",
-    "@tsed/openspec": "8.1.0",
-    "@tsed/typescript": "8.1.0",
+    "@tsed/barrels": "8.2.0",
+    "@tsed/core": "8.2.0",
+    "@tsed/hooks": "8.2.0",
+    "@tsed/openspec": "8.2.0",
+    "@tsed/typescript": "8.2.0",
     "@types/fs-extra": "11.0.4",
     "@types/json-schema": "7.0.15",
     "@types/picomatch": "3.0.1",
@@ -63,9 +63,9 @@
     "webpack": "^5.75.0"
   },
   "peerDependencies": {
-    "@tsed/core": "8.1.0",
-    "@tsed/hooks": "8.1.0",
-    "@tsed/openspec": "8.1.0"
+    "@tsed/core": "8.2.0",
+    "@tsed/hooks": "8.2.0",
+    "@tsed/openspec": "8.2.0"
   },
   "peerDependenciesMeta": {
     "@tsed/core": {

package/src/components/default/anyMapper.ts

@@ -1,7 +1,7 @@
 import {JsonLazyRef} from "../../domain/JsonLazyRef.js";
 import {JsonSchema} from "../../domain/JsonSchema.js";
 import {JsonSchemaOptions} from "../../interfaces/JsonSchemaOptions.js";
-import {execMapper, oneOfMapper, registerJsonSchemaMapper} from "../../registries/JsonSchemaMapperContainer.js";
+import {execMapper, execOneOfMapper, registerJsonSchemaMapper} from "../../registries/JsonSchemaMapperContainer.js";
 import {mapGenericsOptions} from "../../utils/generics.js";
 import {toRef} from "../../utils/ref.js";
 
@@ -21,7 +21,7 @@ export function anyMapper(input: any, options: JsonSchemaOptions = {}): any {
   }
 
   if (input.$kind && input.$isJsonDocument) {
-    const kind = oneOfMapper([input.$kind, "map"], options);
+    const kind = execOneOfMapper([input.$kind, "map"], options);
     const schema = execMapper(kind, [input], mapGenericsOptions(options));
 
     return input.canRef ? toRef(input, schema, options) : schema;

package/src/components/default/inheritedClassMapper.ts

@@ -4,6 +4,23 @@ import {JsonSchemaOptions} from "../../interfaces/JsonSchemaOptions.js";
 import {execMapper, registerJsonSchemaMapper} from "../../registries/JsonSchemaMapperContainer.js";
 import {getInheritedStores} from "../../utils/getInheritedStores.js";
 
+function alterMerge(_: string, obj: any) {
+  if (obj?.type && obj?.$ref) {
+    const {$ref, ...schema} = obj;
+
+    obj = {
+      allOf: [
+        {
+          $ref
+        },
+        schema
+      ]
+    };
+  }
+
+  return obj;
+}
+
 /**
  * @ignore
  */
@@ -12,10 +29,10 @@ export function inheritedClassMapper(obj: any, {target, ...options}: JsonSchemaO
 
   if (stores.length) {
     const schema = stores.reduce((obj, [, store]) => {
-      return deepMerge(obj, execMapper("schema", [store.schema], options));
+      return deepMerge(obj, execMapper("schema", [store.schema], options), {alter: alterMerge});
     }, {});
 
-    obj = deepMerge(schema, obj);
+    return deepMerge(schema, obj, {alter: alterMerge});
   }
 
   return obj;

package/src/decorators/collections/collectionOf.spec.ts

@@ -1,7 +1,8 @@
 import {catchError} from "@tsed/core";
 
 import {JsonEntityStore} from "../../domain/JsonEntityStore.js";
-import {array, map, string} from "../../utils/from.js";
+import {array, map} from "../../fn/collection.js";
+import {string} from "../../fn/string.js";
 import {getJsonSchema} from "../../utils/getJsonSchema.js";
 import {Property} from "../common/property.js";
 import {Schema} from "../common/schema.js";

package/src/decorators/common/allOf.spec.ts

@@ -1,6 +1,7 @@
 import {JsonEntityStore} from "../../domain/JsonEntityStore.js";
 import {SpecTypes} from "../../domain/SpecTypes.js";
-import {number, string} from "../../utils/from.js";
+import {number} from "../../fn/number.js";
+import {string} from "../../fn/string.js";
 import {getJsonSchema} from "../../utils/getJsonSchema.js";
 import {getSpec} from "../../utils/getSpec.js";
 import {In} from "../operations/in.js";

package/src/decorators/common/anyOf.spec.ts

@@ -1,6 +1,7 @@
 import {JsonEntityStore} from "../../domain/JsonEntityStore.js";
+import {number} from "../../fn/number.js";
+import {string} from "../../fn/string.js";
 import {AllOf, getJsonSchema, getSpec, In, OneOf, OperationPath, Path, Property, SpecTypes} from "../../index.js";
-import {number, string} from "../../utils/from.js";
 import {AnyOf} from "./anyOf.js";
 
 describe("@AnyOf", () => {

package/src/decorators/common/enum.spec.ts

@@ -1,4 +1,4 @@
-import {enums} from "../../utils/from.js";
+import {enums} from "../../fn/enums.js";
 import {getJsonSchema} from "../../utils/getJsonSchema.js";
 import {Enum} from "./enum.js";
 

package/src/decorators/common/labelledAs.spec.ts

@@ -0,0 +1,85 @@
+import {getJsonSchema} from "../../utils/getJsonSchema.js";
+import {MaxItems} from "../collections/maxItems.js";
+import {Enum} from "./enum.js";
+import {LabelledAs} from "./labelledAs.js";
+
+describe("LabelledAs", () => {
+  it("should create label on item schema", () => {
+    enum Test {
+      VALUE = "VALUE",
+      TEST = "TEST"
+    }
+
+    class Model {
+      @Enum(Test)
+      @MaxItems(3)
+      @LabelledAs("ModelPropItem")
+      prop: Test[];
+    }
+
+    const schema = getJsonSchema(Model);
+
+    expect(schema).toMatchInlineSnapshot(`
+      {
+        "definitions": {
+          "ModelPropItem": {
+            "enum": [
+              "VALUE",
+              "TEST",
+            ],
+            "type": "string",
+          },
+        },
+        "properties": {
+          "prop": {
+            "items": {
+              "$ref": "#/definitions/ModelPropItem",
+            },
+            "maxItems": 3,
+            "type": "array",
+          },
+        },
+        "type": "object",
+      }
+    `);
+  });
+  it("should create label on collection", () => {
+    enum Test {
+      VALUE = "VALUE",
+      TEST = "TEST"
+    }
+
+    class Model {
+      @Enum(Test)
+      @MaxItems(3)
+      @LabelledAs("ModelPropItem", "collection")
+      prop: Test[];
+    }
+
+    const schema = getJsonSchema(Model);
+
+    expect(schema).toMatchInlineSnapshot(`
+      {
+        "definitions": {
+          "ModelPropItem": {
+            "items": {
+              "enum": [
+                "VALUE",
+                "TEST",
+              ],
+              "type": "string",
+            },
+            "maxItems": 3,
+            "type": "array",
+          },
+        },
+        "properties": {
+          "prop": {
+            "$ref": "#/definitions/ModelPropItem",
+          },
+        },
+        "type": "object",
+      }
+    `);
+  });
+});

package/src/decorators/common/labelledAs.ts

@@ -0,0 +1,34 @@
+import {JsonEntityFn} from "./jsonEntityFn.js";
+
+/**
+ * Use label to create ref on the current decorated property.
+ *
+ * ### Example
+ *
+ * ```ts
+ * class Model {
+ *   // For single property
+ *   ＠LabelledAs("UserSchema")
+ *   name: string;
+ *
+ *   // For collection
+ *   ＠LabelledAs("UserCollectionSchema", "collection")
+ *   users: User[];
+ * }
+ * ```
+ *
+ * @param label The name of the label
+ * @param includeCollection Add the label to the collection. By default, the label is added to the item of the collection it the property is a collection.
+ * @returns PropertyDecorator
+ *
+ * @decorator
+ */
+export function LabelledAs(label: string, includeCollection: false | "collection" = false): PropertyDecorator {
+  return JsonEntityFn((entity) => {
+    if (includeCollection) {
+      entity.schema.label(label);
+    } else {
+      entity.itemSchema.label(label);
+    }
+  });
+}

package/src/decorators/common/oneOf.spec.ts

@@ -1,5 +1,6 @@
+import {number} from "../../fn/number.js";
+import {string} from "../../fn/string.js";
 import {AllOf, getJsonSchema, getSpec, In, OneOf, OperationPath, Path, Property, SpecTypes} from "../../index.js";
-import {number, string} from "../../utils/from.js";
 
 describe("@OneOf", () => {
   it("should declare return schema", () => {

package/src/decorators/generics/genericOf.ts

@@ -1,7 +1,7 @@
 import {isObject, Type} from "@tsed/core";
 
 import {JsonEntityStore} from "../../domain/JsonEntityStore.js";
-import {string} from "../../utils/from.js";
+import {string} from "../../fn/string.js";
 import {GenericValue} from "../../utils/generics.js";
 
 /**

package/src/decorators/operations/returns.ts

@@ -18,9 +18,9 @@ import {JsonEntityStore} from "../../domain/JsonEntityStore.js";
 import {JsonParameter} from "../../domain/JsonParameter.js";
 import {JsonResponse} from "../../domain/JsonResponse.js";
 import {JsonSchema, JsonSchemaObject} from "../../domain/JsonSchema.js";
+import {string} from "../../fn/string.js";
 import {JsonHeader, JsonHeaders} from "../../interfaces/JsonOpenSpec.js";
 import {getStatusModel} from "../../utils/defineStatusModel.js";
-import {string} from "../../utils/from.js";
 import {GenericValue} from "../../utils/generics.js";
 import {isSuccessStatus} from "../../utils/isSuccessStatus.js";
 import {mapHeaders} from "../../utils/mapHeaders.js";

package/src/fn/allOf.ts

@@ -0,0 +1,13 @@
+import type {AnyJsonSchema, JsonSchema} from "../domain/JsonSchema.js";
+import {from} from "./from.js";
+
+/**
+ * See https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.26
+ *
+ *  * See @@JsonSchema@@ to discover available methods.
+ *
+ * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.26
+ */
+export function allOf(...allOf: AnyJsonSchema[]): JsonSchema {
+  return from().allOf(allOf);
+}

package/src/fn/any.ts

@@ -0,0 +1,11 @@
+import type {AnyJsonSchema, JsonSchema} from "../domain/JsonSchema.js";
+import {from} from "./from.js";
+
+/**
+ * Declare a model with any type (By default: `integer`, `number`, `string`, `boolean`, `array`, `object`, `null`)
+ *
+ * See @@JsonSchema@@ to discover available methods.
+ */
+export function any(...types: AnyJsonSchema[]): JsonSchema {
+  return from().any(...types);
+}