@tsed/schema 8.17.2 → 8.18.0

package/lib/esm/fn/boolean.js

@@ -2,7 +2,9 @@ import { from } from "./from.js";
 /**
  * Declare a new boolean model.
  *
- *  * See @@JsonSchema@@ to discover available methods.
+ * See @@JsonSchema@@ to discover available methods.
+ *
+ * @schemaFunctional
  */
 export function boolean() {
     return from(Boolean);

package/lib/esm/fn/collection.js

@@ -1,49 +1,17 @@
 import { from } from "./from.js";
-/**
- * Declare a new object model with `additionalProperties: true`.
- *
- * ```json
- * {
- *   "type": "array"
- * }
- * ```
- *
- *  * See @@JsonSchema@@ to discover available methods.
- *
- * @schemaFunctional
- */
-export function array() {
-    return from(Array);
+export function array(item) {
+    const schema = from(Array);
+    return (item ? schema.items(item) : schema);
 }
-/**
- * Declare a new object model with `additionalProperties: true`.
- *
- * ```json
- * {
- *   "type": "object",
- *   "additionalProperties": true
- * }
- * ```
- *
- *  * See @@JsonSchema@@ to discover available methods.
- *
- * @schemaFunctional
- */
-export function map() {
-    return from(Map).unknown(true);
+export function map(value) {
+    const schema = from(Map).unknown(true);
+    return (value ? schema.additionalProperties(value) : schema);
 }
-/**
- * Declare a new array model with `uniqueItems: true`.
- *
- * ```json
- * {
- *   "type": "array",
- *   "uniqueItems": true
- * }
- * ```
- *
- *  * See @@JsonSchema@@ to discover available methods.
- */
-export function set() {
-    return from(Array).uniqueItems(true);
+export function set(item) {
+    const schema = from(Array).uniqueItems(true);
+    return (item ? schema.items(item) : schema);
+}
+export function record(value) {
+    const schema = from(Object).unknown(true);
+    return (value ? schema.additionalProperties(value) : schema);
 }

package/lib/esm/fn/date.js

@@ -4,6 +4,8 @@ import { from } from "./from.js";
  * Declare a new string model with `format: date`.
  *
  * See @@JsonSchema@@ to discover available methods.
+ *
+ * @schemaFunctional
  */
 export function date() {
     return from(Date).format(JsonFormatTypes.DATE);
@@ -12,6 +14,8 @@ export function date() {
  * Declare a new string model with `format: datetime`.
  *
  * See @@JsonSchema@@ to discover available methods.
+ *
+ * @schemaFunctional
  */
 export function datetime() {
     return from(Date).format(JsonFormatTypes.DATE_TIME);
@@ -20,6 +24,8 @@ export function datetime() {
  * Declare a new string model with `format: time`.
  *
  * See @@JsonSchema@@ to discover available methods.
+ *
+ * @schemaFunctional
  */
 export function time() {
     return from(Date).format(JsonFormatTypes.TIME);

package/lib/esm/fn/email.js

@@ -11,6 +11,8 @@ import { string } from "./string.js";
  * const schema = email();
  * // Results in: { type: "string", format: "email" }
  * ```
+ *
+ * @schemaFunctional
  */
 export function email() {
     return string().format(JsonFormatTypes.EMAIL);

package/lib/esm/fn/enums.js

@@ -1,7 +1,7 @@
 import { enumsRegistry } from "../registries/enumRegistries.js";
-import { string } from "./string.js";
+import { from } from "./from.js";
 export function enums(e) {
-    const schema = string().enum(e);
+    const schema = from().enum(e);
     enumsRegistry.set(e, schema);
     return schema;
 }

package/lib/esm/fn/from.js

@@ -1,17 +1,6 @@
 import { isClass } from "@tsed/core";
 import { JsonSchema } from "../domain/JsonSchema.js";
 import { getJsonEntityStore } from "../utils/getJsonEntityStore.js";
-/**
- * Create a new model from the given type.
- *
- * ```typescript
- * from(String)
- * ```
- *
- *  * See @@JsonSchema@@ to discover available methods.
- *
- * @schemaFunctional
- */
 export function from(type = Object) {
     if (isClass(type)) {
         const { schema } = getJsonEntityStore(type);

package/lib/esm/fn/index.js

@@ -1,10 +1,12 @@
 import { allOf } from "./allOf.js";
+import { any } from "./any.js";
 import { anyOf } from "./anyOf.js";
 import { boolean } from "./boolean.js";
-import { array, map, set } from "./collection.js";
+import { array, map, record, set } from "./collection.js";
 import { date, datetime, time } from "./date.js";
 import { email } from "./email.js";
 import { enums } from "./enums.js";
+import { from } from "./from.js";
 import { integer } from "./integer.js";
 import { lazyRef } from "./lazyRef.js";
 import { number } from "./number.js";
@@ -13,13 +15,20 @@ import { oneOf } from "./oneOf.js";
 import { string } from "./string.js";
 import { uri } from "./uri.js";
 import { url } from "./url.js";
+/**
+ * A namespace of all schema builder functions.
+ * @schemaFunctional
+ */
 export const s = {
+    from,
     allOf,
     anyOf,
+    any,
     boolean,
     array,
     map,
     set,
+    record,
     date,
     datetime,
     time,

package/lib/esm/fn/integer.js

@@ -4,8 +4,8 @@ import { from } from "./from.js";
  *
  * See @@JsonSchema@@ to discover available methods.
  *
- * @returns {JsonSchema} A schema configured for integer values
- * @function
+ * @returns A schema configured for integer values
+ * @schemaFunctional
  */
 export function integer() {
     return from(Number).integer();

package/lib/esm/fn/lazyRef.js

@@ -1,8 +1,5 @@
 import { JsonEntityStore } from "../domain/JsonEntityStore.js";
 import { JsonLazyRef } from "../domain/JsonLazyRef.js";
-/**
- * Declare a sub schema which will be resolved later. Use this function when you have a circular reference between two schemes.
- */
 export function lazyRef(cb) {
     try {
         // solve issue with a self referenced model

package/lib/esm/fn/number.js

@@ -3,6 +3,8 @@ import { from } from "./from.js";
  * Declare a new number model.
  *
  * * See @@JsonSchema@@ to discover available methods.
+ *
+ * @schemaFunctional
  */
 export function number() {
     return from(Number);

package/lib/esm/fn/object.js

@@ -14,7 +14,8 @@ import { from } from "./from.js";
  * ```
  *
  * @param properties - An object containing property definitions where each value is a JsonSchema
- * @returns {JsonSchema} A new object model with the specified properties
+ * @returns A new object model with the specified properties
+ * @schemaFunctional
  */
 export function object(properties = {}) {
     return from(Object).properties(properties);

package/lib/esm/fn/string.js

@@ -3,6 +3,8 @@ import { from } from "./from.js";
  * Declare a new string model.
  *
  * See @@JsonSchema@@ to discover available methods.
+ *
+ * @schemaFunctional
  */
 export function string() {
     return from(String);

package/lib/esm/fn/url.js

@@ -4,6 +4,8 @@ import { string } from "./string.js";
  * Declare a new string model with `format: url`.
  *
  * See @@JsonSchema@@ to discover available methods.
+ *
+ * @schemaFunctional
  */
 export function url() {
     return string().format(JsonFormatTypes.URL);

package/lib/esm/index.js

@@ -134,6 +134,7 @@ export * from "./domain/JsonRequestBody.js";
 export * from "./domain/JsonResponse.js";
 export * from "./domain/JsonSchema.js";
 export * from "./domain/SpecTypes.js";
+export * from "./domain/types.js";
 export * from "./fn/allOf.js";
 export * from "./fn/any.js";
 export * from "./fn/anyOf.js";

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

@@ -1,4 +1,4 @@
-import type { JSONSchema6Type } from "json-schema";
+import type { JSONSchema7Type } from "json-schema";
 /**
  * There are no restrictions placed on the value of this keyword.
  *
@@ -39,4 +39,4 @@ import type { JSONSchema6Type } from "json-schema";
  * @schema
  * @input
  */
-export declare function Default(defaultValue: JSONSchema6Type | undefined | (() => JSONSchema6Type)): (...args: any[]) => any;
+export declare function Default(defaultValue: JSONSchema7Type | undefined | (() => JSONSchema7Type)): (...args: any[]) => any;

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

@@ -5,7 +5,7 @@ import { SpecTypes } from "../../domain/SpecTypes.js";
  *
  * ## Example
  *
- * ```typescript
+ * ```ts
  * @Schema({title: "test"})
  * class Model {
  *    @Schema({formatMinimum: "1987-10-24"})
@@ -38,9 +38,9 @@ import { SpecTypes } from "../../domain/SpecTypes.js";
  * @classDecorator
  * @input
  */
-export declare function Schema(partialSchema: Partial<JsonSchemaObject> | JsonSchema): (...args: any[]) => any;
+export declare function Schema<T>(partialSchema: Partial<JsonSchemaObject> | JsonSchema<T>): (...args: any[]) => any;
 /**
- * Apply specific schema depending on the spec version
+ * Apply a specific schema depending on the spec version
  * @param specType
  * @param schema
  * @decorator

package/lib/types/domain/JsonLazyRef.d.ts

@@ -4,6 +4,6 @@ export declare class JsonLazyRef {
     readonly isLazyRef = true;
     constructor(getType: () => Type<any>);
     get target(): Type<any>;
-    get schema(): import("./JsonSchema.js").JsonSchema;
+    get schema(): import("./JsonSchema.js").JsonSchema<import("json-schema").JSONSchema7Type>;
     get name(): string;
 }

package/lib/types/domain/JsonMedia.d.ts

@@ -4,7 +4,7 @@ import { JsonSchema } from "./JsonSchema.js";
 export declare class JsonMedia extends JsonMap<any> {
     $kind: string;
     constructor(obj?: Partial<OS3MediaType<JsonSchema>>);
-    schema(schema?: JsonSchema): JsonSchema;
+    schema(schema?: JsonSchema): JsonSchema<import("json-schema").JSONSchema7Type>;
     examples(examples?: any): this;
     type(type: any): this;
 }

package/lib/types/domain/JsonParameter.d.ts

@@ -14,6 +14,6 @@ export declare class JsonParameter extends JsonMap<OS3Parameter<JsonSchema>> {
     required(required: boolean): this;
     schema(): JsonSchema;
     schema(schema: JsonSchema): this;
-    itemSchema(schema?: JsonSchema): JsonSchema;
+    itemSchema(schema?: JsonSchema): JsonSchema<import("json-schema").JSONSchema7Type>;
     toJSON(options?: JsonSchemaOptions): any;
 }

package/lib/types/domain/JsonParameterStore.d.ts

@@ -31,7 +31,7 @@ export declare class JsonParameterStore extends JsonEntityStore {
     get required(): boolean;
     set required(value: boolean);
     get allowedRequiredValues(): any[];
-    get schema(): import("./JsonSchema.js").JsonSchema;
+    get schema(): import("./JsonSchema.js").JsonSchema<import("json-schema").JSONSchema7Type>;
     static getParams<T extends JsonParameterStore = JsonParameterStore>(target: Type<any>, propertyKey: string | symbol): T[];
     static get(target: Type<any>, propertyKey: string | symbol, index: number): JsonParameterStore;
     /**

package/lib/types/domain/JsonSchema.d.ts

@@ -9,16 +9,17 @@ import { AliasMap, AliasType } from "./JsonAliasMap.js";
 import { Discriminator } from "./JsonDiscriminator.js";
 import { JsonFormatTypes } from "./JsonFormatTypes.js";
 import { JsonLazyRef } from "./JsonLazyRef.js";
+import type { Infer, PropsToShape, UnionToIntersection } from "./types.js";
 export interface JsonSchemaObject extends Omit<JSONSchema7, "type" | "additionalProperties" | "items" | "pattern"> {
     type?: JSONSchema7["type"] | Type | null | (String | null | Date | Number | Object | Boolean)[];
     additionalProperties?: JsonSchemaObject | boolean | Type | JsonSchema;
     items?: JsonSchemaObject | boolean | Type | JsonSchema | (JsonSchemaObject | Type | JsonSchema)[];
     pattern?: string | RegExp;
 }
-export type AnyJsonSchema = JsonSchemaObject | JSONSchema7 | JsonSchema | JsonLazyRef | {
+export type AnyJsonSchema<T = any> = JsonSchemaObject | JSONSchema7 | JsonSchema<T> | JsonLazyRef | {
     label?: string;
 } | Type;
-export declare class JsonSchema extends Map<string, any> {
+export declare class JsonSchema<T = JSONSchema7Type> extends Map<string, any> {
     #private;
     readonly $kind: string;
     readonly $isJsonDocument = true;
@@ -28,7 +29,7 @@ export declare class JsonSchema extends Map<string, any> {
     $ignore: boolean | IgnoreCallback;
     isDiscriminatorKey: boolean;
     isDiscriminator: boolean;
-    constructor(obj?: JsonSchema | Partial<JsonSchemaObject>);
+    constructor(obj?: Partial<JSONSchema7> | JsonSchema | Record<string, unknown>);
     get alias(): AliasMap;
     get isClass(): boolean;
     /**
@@ -60,7 +61,7 @@ export declare class JsonSchema extends Map<string, any> {
     get isReadOnly(): any;
     get isWriteOnly(): any;
     get hasDiscriminator(): boolean;
-    static from(item?: Partial<JsonSchemaObject> | Type<any> | JsonSchema): JsonSchema;
+    static from(item: Partial<JsonSchemaObject> | Type<any> | JsonSchema | undefined): JsonSchema<JSONSchema7Type>;
     /**
      * Check if the schema as key, #key or x-key
      * @param key
@@ -88,8 +89,10 @@ export declare class JsonSchema extends Map<string, any> {
      * @param generics
      */
     genericOf(...generics: GenericValue[][]): this;
-    nullable(value: boolean): this;
-    itemSchema(obj?: AnyJsonSchema): JsonSchema;
+    nullable(): JsonSchema<T | null>;
+    nullable(value: true): JsonSchema<T | null>;
+    nullable(value: false): JsonSchema<Exclude<T, null>>;
+    itemSchema(obj?: AnyJsonSchema): JsonSchema<JSONSchema7Type>;
     getAliasOf(property: AliasType): AliasType | undefined;
     addAlias(property: AliasType, alias: AliasType): this;
     removeAlias(property: AliasType): this;
@@ -108,14 +111,14 @@ export declare class JsonSchema extends Map<string, any> {
      * It is RECOMMENDED that a default value be valid against the associated schema.
      * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-7.3
      */
-    default(value: JSONSchema7Type | undefined | (() => JSONSchema7Type)): this;
+    default(value: T | undefined | (() => T)): JsonSchema<T>;
     /**
-     * More readible form of a one-element "enum"
+     * More readable form of a one-element "enum"
      * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.24
      */
-    const(value: JSONSchema7Type): this;
+    const<V extends T>(value: V): JsonSchema<V>;
     /**
-     * This attribute is a string that provides a full description of the of purpose the instance property.
+     * This attribute is a string that provides a full description of the purpose of the instance property.
      *
      * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-7.2
      */
@@ -124,7 +127,7 @@ export declare class JsonSchema extends Map<string, any> {
     discriminatorKey(propertyName: string): this;
     discriminatorValue(...values: string[]): this;
     /**
-     * This keyword determines how child instances validate for arrays, and does not directly validate the immediate instance itself.
+     * This keyword determines how child instances validate for arrays and does not directly validate the immediate instance itself.
      * If "items" is an array of schemas, validation succeeds if every instance element
      * at a position greater than the size of "items" validates against "additionalItems".
      * Otherwise, "additionalItems" MUST be ignored, as the "items" schema
@@ -149,11 +152,15 @@ export declare class JsonSchema extends Map<string, any> {
      */
     example(...examples: JSONSchema7Type[]): this;
     /**
-     * This keyword determines how child instances validate for arrays, and does not directly validate the immediate instance itself.
+     * This keyword determines how child instances validate for arrays and does not directly validate the immediate instance itself.
      * Omitting this keyword has the same behavior as an empty schema.
      * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.9
      */
-    items(items: AnyJsonSchema | AnyJsonSchema[]): this;
+    /**
+     * Set the items' schema for array/set collections
+     * @param items The schema for array/set items
+     */
+    items<I = JSONSchema7Type>(items: JsonSchema<I> | AnyJsonSchema | AnyJsonSchema[]): JsonSchema<T extends Array<any> ? I[] : T extends Set<any> ? Set<I> : I>;
     $comment(comment: string): this;
     /**
      * Must be a non-negative integer.
@@ -169,7 +176,7 @@ export declare class JsonSchema extends Map<string, any> {
      */
     minItems(minItems: number): this;
     /**
-     * If this keyword has boolean value false, the instance validates successfully.
+     * If this keyword has a boolean value false, the instance validates successfully.
      * If it has boolean value true, the instance validates successfully if all of its elements are unique.
      * Omitting this keyword has the same behavior as a value of false.
      * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.13
@@ -190,6 +197,7 @@ export declare class JsonSchema extends Map<string, any> {
      */
     minProperties(minProperties: number): this;
     allow(...allow: any[]): this;
+    optional(): JsonSchema<T | undefined>;
     /**
      * Elements of this array must be unique.
      * An object instance is valid against this keyword if every item in the array is the name of a property in the instance.
@@ -197,19 +205,21 @@ export declare class JsonSchema extends Map<string, any> {
      *
      * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.17
      */
-    required(required?: boolean | string[]): JsonSchema;
+    required(): JsonSchema<Exclude<T, undefined>>;
+    required(required: true): JsonSchema<Exclude<T, undefined>>;
+    required(required: false): JsonSchema<T | undefined>;
     addRequired(property: string): this;
     removeRequired(property: string): this;
     isRequired(property: string): boolean;
     getRequiredFields(): string[];
     /**
-     * This keyword determines how child instances validate for objects, and does not directly validate the immediate instance itself.
+     * This keyword determines how child instances validate for objects and does not directly validate the immediate instance itself.
      * Validation succeeds if, for each name that appears in both the instance and as a name within this keyword's value,
      * the child instance for that name successfully validates against the corresponding schema.
      * Omitting this keyword has the same behavior as an empty object.
      * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.18
      */
-    properties(properties: AnyJsonSchema | Record<string, AnyJsonSchema>): this;
+    properties<P extends Record<string, JsonSchema<any>> = Record<string, JsonSchema<any>>>(properties: P): JsonSchema<PropsToShape<P>>;
     addProperty(key: string, schema: AnyJsonSchema): this;
     /**
      * This attribute is an object that defines the schema for a set of property names of an object instance.
@@ -219,25 +229,25 @@ export declare class JsonSchema extends Map<string, any> {
      * Omitting this keyword has the same behavior as an empty object.
      * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.19
      */
-    patternProperties(patternProperties: Record<string, AnyJsonSchema>): this;
+    patternProperties<P extends Record<string, JsonSchema<any>> = Record<string, JsonSchema<any>>>(patternProperties: P): JsonSchema<PropsToShape<P>>;
     /**
      * This attribute defines a schema for all properties that are not explicitly defined in an object type definition.
      * If specified, the value MUST be a schema or a boolean.
      * If false is provided, no additional properties are allowed beyond the properties defined in the schema.
-     * The default value is an empty schema which allows any value for additional properties.
+     * The default value is an empty schema that allows any value for additional properties.
      * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.20
      */
-    additionalProperties(additionalProperties: boolean | AnyJsonSchema): this;
+    additionalProperties<V>(additionalProperties: boolean | AnyJsonSchema | JsonSchema<V>): JsonSchema<Map<string, V>>;
     /**
      * This attribute defines a schema for all properties that are not explicitly defined in an object type definition.
      * If specified, the value MUST be a schema or a boolean.
      * If false is provided, no additional properties are allowed beyond the properties defined in the schema.
-     * The default value is an empty schema which allows any value for additional properties.
+     * The default value is an empty schema that allows any value for additional properties.
      * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.20
      * @alias additionalProperties
      * @param unknown
      */
-    unknown(unknown?: boolean): this;
+    unknown(unknown?: boolean): JsonSchema<T & Record<string, unknown>>;
     /**
      * This keyword specifies rules that are evaluated if the instance is an object and contains a certain property.
      * Each property specifies a dependency.
@@ -264,8 +274,9 @@ export declare class JsonSchema extends Map<string, any> {
      *
      * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.23
      */
-    enum(...enumValues: any[]): this;
-    enum(enumSchema: JsonSchema): this;
+    enum<E extends Record<string, string | number>>(e: E): JsonSchema<E[keyof E]>;
+    enum<E extends readonly T[]>(...e: E): JsonSchema<E[number]>;
+    enum<E extends readonly T[]>(e: E): JsonSchema<E[number]>;
     /**
      * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-7.1
      */
@@ -273,12 +284,12 @@ export declare class JsonSchema extends Map<string, any> {
     /**
      * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.26
      */
-    allOf(allOf: (AnyJsonSchema | null)[]): this;
+    allOf<S extends Array<AnyJsonSchema | null>>(allOf: S): JsonSchema<UnionToIntersection<Infer<S[number]>>>;
     /**
      * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.27
      */
-    anyOf(anyOf: (AnyJsonSchema | null)[]): this;
-    oneOf(oneOf: (AnyJsonSchema | null)[]): this;
+    anyOf<S extends Array<AnyJsonSchema | null>>(anyOf: S): JsonSchema<Infer<S[number]>>;
+    oneOf<S extends Array<AnyJsonSchema | null>>(oneOf: S): JsonSchema<Infer<S[number]>>;
     /**
      * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.29
      */
@@ -289,6 +300,12 @@ export declare class JsonSchema extends Map<string, any> {
      * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.1
      */
     multipleOf(multipleOf: number): this;
+    /**
+     * Representing an inclusive upper limit for a numeric instance.
+     * This keyword validates only if the instance is less than or exactly equal to "maximum".
+     * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.2
+     */
+    max(maximum: number): this;
     /**
      * Representing an inclusive upper limit for a numeric instance.
      * This keyword validates only if the instance is less than or exactly equal to "maximum".
@@ -301,6 +318,12 @@ export declare class JsonSchema extends Map<string, any> {
      * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.3
      */
     exclusiveMaximum(exclusiveMaximum: number): this;
+    /**
+     * Representing an inclusive lower limit for a numeric instance.
+     * This keyword validates only if the instance is greater than or exactly equal to "minimum".
+     * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.4
+     */
+    min(minimum: number): this;
     /**
      * Representing an inclusive lower limit for a numeric instance.
      * This keyword validates only if the instance is greater than or exactly equal to "minimum".
@@ -354,10 +377,10 @@ export declare class JsonSchema extends Map<string, any> {
     vendorKey(key: VendorKeys, value: any): this;
     toObject(options?: JsonSchemaOptions): any;
     toJSON(options?: JsonSchemaOptions): any;
-    assign(obj?: AnyJsonSchema): this;
+    assign(obj: Partial<JSONSchema7> | JsonSchema | Record<string, unknown>): this;
     set(key: string, value: any): this;
     /**
-     * Return the Json type as string
+     * Return the JSON type as string
      */
     getJsonType(): string | string[];
     getTarget(): Type<any>;
@@ -369,7 +392,7 @@ export declare class JsonSchema extends Map<string, any> {
      * Get the symbolic name of the entity
      */
     getName(): any;
-    clone(): JsonSchema;
+    clone(): JsonSchema<JSONSchema7Type>;
     getGenericLabels(): string[] | undefined;
     getGenericOf(): GenericsMap | undefined;
     /**
@@ -377,10 +400,14 @@ export declare class JsonSchema extends Map<string, any> {
      * Used to get the original schema definition when this schema is a local reference.
      * @returns The reference schema or undefined if not applicable
      */
-    getRefSchema(): JsonSchema | undefined;
+    getRefSchema(): JsonSchema<JSONSchema7Type> | undefined;
     propertyKey(s: string): this;
     getPropertyKey(): string | symbol | undefined;
     target(target: any): void;
     isRequiredValue(property: string, value: any): boolean;
     protected setManyOf(keyword: "oneOf" | "anyOf" | "allOf", value: (AnyJsonSchema | null)[]): this | undefined;
+    protected mapToJsonSchema(item: any[]): JsonSchema[];
+    protected mapToJsonSchema(item: any): JsonSchema;
+    protected mapGenerics(jsonSchema: JsonSchema, generics: GenericValue[][]): GenericsMap;
+    protected mapProperties(properties: Record<string, any>): any;
 }

package/lib/types/domain/types.d.ts

@@ -0,0 +1,7 @@
+import type { JsonSchema } from "./JsonSchema.js";
+export type Infer<S> = S extends JsonSchema<infer T> ? T : never;
+export type PropsToShape<P extends Record<string, JsonSchema<any>>> = {
+    [K in keyof P]: Infer<P[K]>;
+};
+export type CtorToType<C> = C extends StringConstructor ? string : C extends NumberConstructor ? number : C extends BooleanConstructor ? boolean : C extends DateConstructor ? Date : C extends ArrayConstructor ? any[] : C extends MapConstructor ? Record<string, any> : C extends SetConstructor ? Set<any> : C extends ObjectConstructor ? Record<string, any> : C extends abstract new (...args: any) => any ? InstanceType<C> : any;
+export type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (k: infer I) => void ? I : never;

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

@@ -1,9 +1,12 @@
-import type { JsonSchema } from "../domain/JsonSchema.js";
+import type { AnyJsonSchema, JsonSchema } from "../domain/JsonSchema.js";
+import type { Infer, UnionToIntersection } from "../domain/types.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
+ *
+ * @schemaFunctional
  */
-export declare function allOf(...allOf: Parameters<JsonSchema["allOf"]>[0]): JsonSchema;
+export declare function allOf<S extends Array<AnyJsonSchema | null>>(...allOf: S): JsonSchema<UnionToIntersection<Infer<S[number]>>>;

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

@@ -1,7 +1,13 @@
 import type { JsonSchema } from "../domain/JsonSchema.js";
+import type { Infer } from "../domain/types.js";
 /**
  * Declare a model with any type (By default: `integer`, `number`, `string`, `boolean`, `array`, `object`, `null`)
  *
  * See @@JsonSchema@@ to discover available methods.
+ *
+ * @schemaFunctional
  */
-export declare function any(...types: Parameters<JsonSchema["oneOf"]>[0]): JsonSchema;
+export declare function any(): JsonSchema<any>;
+export declare function any<S extends Array<JsonSchema<any>>>(...types: S): JsonSchema<{
+    [K in keyof S]: Infer<S[K]>;
+}>;

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

@@ -1,9 +1,11 @@
-import type { JsonSchema } from "../domain/JsonSchema.js";
+import type { AnyJsonSchema, JsonSchema } from "../domain/JsonSchema.js";
+import type { Infer } from "../domain/types.js";
 /**
  * See https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.27
  *
- *  * See @@JsonSchema@@ to discover available methods.
+ * See @@JsonSchema@@ to discover available methods.
  *
  * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-6.27
+ * @schemaFunctional
  */
-export declare function anyOf(...anyOf: Parameters<JsonSchema["allOf"]>[0]): JsonSchema;
+export declare function anyOf<S extends Array<AnyJsonSchema | null>>(...anyOf: S): JsonSchema<Infer<S[number]>>;