@tsed/schema 8.34.0 → 8.35.0

package/lib/esm/{domain → components/stores}/JsonMethodStore.js

@@ -1,10 +1,9 @@
-import { __decorate, __metadata } from "tslib";
-import { DecoratorTypes, deepMerge, descriptorOf, isFunction, prototypeOf, Store } from "@tsed/core";
-import { JsonEntityComponent } from "../decorators/config/jsonEntityComponent.js";
-import { isSuccessStatus } from "../utils/isSuccessStatus.js";
-import { JsonEntityStore } from "./JsonEntityStore.js";
-import { JsonOperation } from "./JsonOperation.js";
-import { JsonSchema } from "./JsonSchema.js";
+import { DecoratorTypes, Store, deepMerge, descriptorOf, isFunction } from "@tsed/core";
+import { JsonEntityStore } from "../../domain/JsonEntityStore.js";
+import { defineStore, getJsonEntityStore } from "../../registries/JsonEntitiesContainer.js";
+import { JsonOperation } from "../../domain/JsonOperation.js";
+import { JsonSchema } from "../../domain/JsonSchema.js";
+import { isSuccessStatus } from "../../utils/isSuccessStatus.js";
 /**
  * Store for method metadata, operations, and parameter information.
  *
@@ -24,7 +23,7 @@ import { JsonSchema } from "./JsonSchema.js";
  *
  * ```typescript
  * // Get method store
- * const methodStore = JsonEntityStore.from(MyController, "myMethod");
+ * const methodStore = getJsonEntityStore(MyController, "myMethod");
  *
  * // Access operation for OpenAPI
  * const operation = methodStore.operation;
@@ -61,14 +60,14 @@ import { JsonSchema } from "./JsonSchema.js";
  *
  * @public
  */
-let JsonMethodStore = class JsonMethodStore extends JsonEntityStore {
+export class JsonMethodStore extends JsonEntityStore {
     constructor(options) {
         super({
             store: Store.fromMethod(options.target, options.propertyKey),
             descriptor: descriptorOf(options.target, options.propertyKey),
             ...options
         });
-        this.parent = JsonEntityStore.from(this.target);
+        this.parent = getJsonEntityStore(this.target);
         this.middlewares = [];
         this.beforeMiddlewares = [];
         this.afterMiddlewares = [];
@@ -134,16 +133,6 @@ let JsonMethodStore = class JsonMethodStore extends JsonEntityStore {
         }
         return this._schema;
     }
-    /**
-     * Get an endpoint.
-     * @param target
-     * @param propertyKey
-     * @param descriptor
-     */
-    static get(target, propertyKey, descriptor) {
-        descriptor = descriptor || descriptorOf(prototypeOf(target), propertyKey);
-        return JsonEntityStore.from(prototypeOf(target), propertyKey, descriptor);
-    }
     /**
      * TODO must be located on JsonOperation level directly
      * @param status
@@ -165,7 +154,7 @@ let JsonMethodStore = class JsonMethodStore extends JsonEntityStore {
     /**
      * Append middlewares to the beforeMiddlewares list.
      * @param args
-     * @returns {EndpointMetadata}
+     * @returns {JsonMethodStore}
      */
     before(args) {
         this.beforeMiddlewares = this.beforeMiddlewares.concat(args).filter(isFunction);
@@ -174,7 +163,7 @@ let JsonMethodStore = class JsonMethodStore extends JsonEntityStore {
     /**
      * Append middlewares to the afterMiddlewares list.
      * @param args
-     * @returns {EndpointMetadata}
+     * @returns {JsonMethodStore}
      */
     after(args) {
         this.afterMiddlewares = this.afterMiddlewares.concat(args).filter(isFunction);
@@ -209,10 +198,26 @@ let JsonMethodStore = class JsonMethodStore extends JsonEntityStore {
     build() {
         this.parent.children.set(this.propertyName, this);
     }
-};
-JsonMethodStore = __decorate([
-    JsonEntityComponent(DecoratorTypes.METHOD),
-    __metadata("design:paramtypes", [Object])
-], JsonMethodStore);
-export { JsonMethodStore };
+}
+/**
+ * JsonMethodStore contains metadata about a controller and his method.
+ * Each annotation (@Get, @Body...) attached to a method are stored into endpoint.
+ * JsonMethodStore converts this metadata to an array which contain arguments to call an Express method.
+ *
+ * Example :
+ *
+ *```ts
+ * @Controller("/my-path")
+ * provide MyClass {
+ *
+ *     @Get("/")
+ *     @Authenticated()
+ *     public myMethod(){}
+ * }
+ *```
+ *
+ * @alias JsonMethodStore
+ * @deprecated use s.store.method() to retrieve endpoint metadata or JsonMethodStore instead
+ */
 export const EndpointMetadata = JsonMethodStore;
+defineStore(DecoratorTypes.METHOD, JsonMethodStore);

package/lib/esm/{domain → components/stores}/JsonParameterStore.js

@@ -1,8 +1,7 @@
-import { __decorate, __metadata } from "tslib";
-import { ancestorsOf, DecoratorTypes, isClass, isMethodDescriptor, Metadata, prototypeOf } from "@tsed/core";
-import { JsonEntityComponent } from "../decorators/config/jsonEntityComponent.js";
-import { JsonEntityStore } from "./JsonEntityStore.js";
-import { JsonParameter } from "./JsonParameter.js";
+import { DecoratorTypes, Metadata, ancestorsOf, isClass, isMethodDescriptor, prototypeOf } from "@tsed/core";
+import { JsonEntityStore } from "../../domain/JsonEntityStore.js";
+import { defineStore, getJsonMethodStore } from "../../registries/JsonEntitiesContainer.js";
+import { JsonParameter } from "../../domain/JsonParameter.js";
 /**
  * Store for method parameter metadata and schema information.
  *
@@ -74,14 +73,14 @@ import { JsonParameter } from "./JsonParameter.js";
  *
  * @public
  */
-let JsonParameterStore = class JsonParameterStore extends JsonEntityStore {
+export class JsonParameterStore extends JsonEntityStore {
     constructor(options) {
         super(options);
         /**
          * Ref to JsonParameter when the decorated object is a parameter.
          */
         this.parameter = new JsonParameter();
-        this.parent = JsonEntityStore.fromMethod(this.target, this.propertyKey);
+        this.parent = getJsonMethodStore(this.target, this.propertyKey);
         this.pipes = options.pipes || [];
         this.paramType = options.paramType || this.paramType;
         this.expression = options.expression || this.expression;
@@ -108,19 +107,16 @@ let JsonParameterStore = class JsonParameterStore extends JsonEntityStore {
         const klass = ancestorsOf(target)
             .reverse()
             .find((target) => {
-            return isMethodDescriptor(target, propertyKey) && JsonEntityStore.fromMethod(target, propertyKey).children.size;
+            return isMethodDescriptor(target, propertyKey) && getJsonMethodStore(target, propertyKey).children.size;
         });
         if (klass) {
-            JsonEntityStore.fromMethod(klass, propertyKey).children.forEach((param, index) => {
+            getJsonMethodStore(klass, propertyKey).children.forEach((param, index) => {
                 params[+index] = param;
             });
             return params;
         }
         return [];
     }
-    static get(target, propertyKey, index) {
-        return JsonEntityStore.from(prototypeOf(target), propertyKey, index);
-    }
     /**
      * Check precondition between value, required and allowedRequiredValues to know if the entity is required.
      * @param value
@@ -147,10 +143,10 @@ let JsonParameterStore = class JsonParameterStore extends JsonEntityStore {
             this.parameter.itemSchema().type(this._type);
         }
     }
-};
-JsonParameterStore = __decorate([
-    JsonEntityComponent(DecoratorTypes.PARAM),
-    __metadata("design:paramtypes", [Object])
-], JsonParameterStore);
-export { JsonParameterStore };
+}
+/**
+ * @alias JsonParameterStore
+ * @deprecated
+ */
 export const ParamMetadata = JsonParameterStore;
+defineStore(DecoratorTypes.PARAM, JsonParameterStore);

package/lib/esm/{domain → components/stores}/JsonPropertyStore.js

@@ -1,8 +1,7 @@
-import { __decorate } from "tslib";
-import { DecoratorTypes, isClass, Metadata, prototypeOf } from "@tsed/core";
-import { JsonEntityComponent } from "../decorators/config/jsonEntityComponent.js";
-import { JsonEntityStore } from "./JsonEntityStore.js";
-import { JsonSchema } from "./JsonSchema.js";
+import { DecoratorTypes, Metadata, isClass, prototypeOf } from "@tsed/core";
+import { defineStore, getJsonEntityStore } from "../../registries/JsonEntitiesContainer.js";
+import { JsonEntityStore } from "../../domain/JsonEntityStore.js";
+import { JsonSchema } from "../../domain/JsonSchema.js";
 /**
  * Store for property metadata and schema information.
  *
@@ -47,13 +46,10 @@ import { JsonSchema } from "./JsonSchema.js";
  *
  * @public
  */
-let JsonPropertyStore = class JsonPropertyStore extends JsonEntityStore {
+export class JsonPropertyStore extends JsonEntityStore {
     constructor() {
         super(...arguments);
-        this.parent = JsonEntityStore.from(this.target);
-    }
-    static get(target, propertyKey) {
-        return JsonEntityStore.from(prototypeOf(target), propertyKey);
+        this.parent = getJsonEntityStore(this.target);
     }
     build() {
         if (!this._type) {
@@ -65,25 +61,26 @@ let JsonPropertyStore = class JsonPropertyStore extends JsonEntityStore {
         if (!schema) {
             this.parent.children.set(this.propertyName, this);
             if (this.isCollection) {
-                schema = JsonSchema.from({
+                schema = new JsonSchema({
                     type: this.collectionType
                 });
                 schema.itemSchema(this.type);
             }
             else if (isClass(this.type)) {
-                schema = JsonSchema.from({ type: "object" });
+                schema = new JsonSchema({ type: "object" });
                 schema.itemSchema(this.type);
             }
             else {
-                schema = JsonSchema.from({ type: this.type });
+                schema = new JsonSchema({ type: this.type });
             }
         }
         this.parent.schema.addProperty(this.propertyName, schema);
         this._schema = schema;
     }
-};
-JsonPropertyStore = __decorate([
-    JsonEntityComponent(DecoratorTypes.PROP)
-], JsonPropertyStore);
-export { JsonPropertyStore };
+}
+/**
+ * @alias JsonPropertyStore
+ * @deprecated
+ */
 export const PropertyMetadata = JsonPropertyStore;
+defineStore(DecoratorTypes.PROP, JsonPropertyStore);

package/lib/esm/components/types/arrayType.js

@@ -0,0 +1,15 @@
+import { defineType } from "../../registries/JsonTypesContainer.js";
+export default defineType({
+    name: "array",
+    priority: 1000,
+    isCollection: true,
+    match(type) {
+        return [Array, "array"].includes(type);
+    },
+    jsonType() {
+        return "array";
+    },
+    init(schema) {
+        return schema.toCollection().target(Array).items(schema.itemSchema({}), true);
+    }
+});

package/lib/esm/components/types/classType.js

@@ -0,0 +1,8 @@
+import { defineType } from "../../registries/JsonTypesContainer.js";
+import { isClass, isFunction } from "@tsed/core";
+export default defineType({
+    name: "class",
+    priority: 20,
+    match: (type) => isClass(type) || isFunction(type),
+    init: (schema, type) => schema.unsetType().target(type).properties({})
+});

package/lib/esm/components/types/genericType.js

@@ -0,0 +1,8 @@
+import { defineType } from "../../registries/JsonTypesContainer.js";
+import { getJsonType } from "../../utils/getJsonType.js";
+export default defineType({
+    name: "generic",
+    priority: 10,
+    match: (type) => getJsonType(type) === "generic",
+    init: (schema, type) => schema.genericLabel(type)
+});

package/lib/esm/components/types/mapType.js

@@ -0,0 +1,15 @@
+import { defineType } from "../../registries/JsonTypesContainer.js";
+export default defineType({
+    name: "map",
+    priority: 1000,
+    isCollection: true,
+    match(type) {
+        return [Map, this.name].includes(type);
+    },
+    jsonType() {
+        return "object";
+    },
+    init(schema) {
+        return schema.toCollection().target(Map).additionalProperties({}, true);
+    }
+});

package/lib/esm/components/types/primitiveType.js

@@ -0,0 +1,21 @@
+import { defineType } from "../../registries/JsonTypesContainer.js";
+import { getJsonType } from "../../utils/getJsonType.js";
+import { isTemporal } from "@tsed/core";
+export default defineType({
+    name: "primitive",
+    priority: 500,
+    jsonType: getJsonType,
+    match(type) {
+        return ["number", "string", "boolean", "object", "integer", Object, Date, Boolean, Number, String].includes(type) || isTemporal(type);
+    },
+    init(schema, type) {
+        schema.target(type);
+        if (type === "integer") {
+            schema.integer();
+        }
+        if (!schema.has("properties") && [Object, "object"].includes(type)) {
+            schema.properties({});
+        }
+        return schema;
+    }
+});

package/lib/esm/components/types/setType.js

@@ -0,0 +1,12 @@
+import { defineType } from "../../registries/JsonTypesContainer.js";
+export default defineType({
+    name: "set",
+    priority: 1000,
+    match(type) {
+        return [Set, "set"].includes(type);
+    },
+    jsonType() {
+        return "array";
+    },
+    init: (schema) => schema.toCollection().target(Set).uniqueItems(true).items({}, true)
+});

package/lib/esm/decorators/class/discriminatorValue.js

@@ -1,5 +1,5 @@
-import { snakeCase } from "change-case";
 import { JsonEntityFn } from "../common/jsonEntityFn.js";
+import { snakeCase } from "change-case";
 /**
  * Declares the discriminator value for a subclass in a polymorphic hierarchy.
  *

package/lib/esm/decorators/collections/collectionOf.js

@@ -1,5 +1,5 @@
 import { DecoratorTypes } from "@tsed/core";
-import { JsonEntityStore } from "../../domain/JsonEntityStore.js";
+import { s } from "../../fn/index.js";
 /**
  * Set the type of the item collection. The possible value is String, Boolean, Number, Date, Object, Class, etc...
  *
@@ -40,7 +40,7 @@ export function CollectionOf(type, collectionType) {
     let contains = false;
     const nestedGenerics = [];
     const decorator = (...args) => {
-        const store = JsonEntityStore.from(...args);
+        const store = s.store(...args);
         if (collectionType) {
             store.collectionType = collectionType;
             store.schema.type(collectionType);

package/lib/esm/decorators/collections/maxItems.js

@@ -1,5 +1,5 @@
-import { withErrorMsg } from "../../utils/withErrorMsg.js";
 import { JsonEntityFn } from "../common/jsonEntityFn.js";
+import { withErrorMsg } from "../../utils/withErrorMsg.js";
 /**
  * Sets the maximum number of items allowed in an array.
  *

package/lib/esm/decorators/collections/maxProperties.js

@@ -1,5 +1,5 @@
-import { withErrorMsg } from "../../utils/withErrorMsg.js";
 import { JsonEntityFn } from "../common/jsonEntityFn.js";
+import { withErrorMsg } from "../../utils/withErrorMsg.js";
 /**
  * Sets the maximum number of properties allowed on an object.
  *

package/lib/esm/decorators/collections/minItems.js

@@ -1,5 +1,5 @@
-import { withErrorMsg } from "../../utils/withErrorMsg.js";
 import { JsonEntityFn } from "../common/jsonEntityFn.js";
+import { withErrorMsg } from "../../utils/withErrorMsg.js";
 /**
  * Sets the minimum number of items required in an array.
  *

package/lib/esm/decorators/collections/minProperties.js

@@ -1,5 +1,5 @@
-import { withErrorMsg } from "../../utils/withErrorMsg.js";
 import { JsonEntityFn } from "../common/jsonEntityFn.js";
+import { withErrorMsg } from "../../utils/withErrorMsg.js";
 /**
  * Sets the minimum number of properties required on an object.
  *

package/lib/esm/decorators/collections/uniqueItems.js

@@ -1,5 +1,5 @@
-import { withErrorMsg } from "../../utils/withErrorMsg.js";
 import { JsonEntityFn } from "../common/jsonEntityFn.js";
+import { withErrorMsg } from "../../utils/withErrorMsg.js";
 /**
  * If this keyword has boolean value false, the instance validates successfully. If it has boolean value true, the instance validates successfully if all of its elements are unique.
  *

package/lib/esm/decorators/common/defaultMsg.js

@@ -1,5 +1,5 @@
-import { useDecorators } from "@tsed/core";
 import { ErrorMsg } from "./errorMsg.js";
+import { useDecorators } from "@tsed/core";
 /**
  * Set default error message.
  *

package/lib/esm/decorators/common/discriminatorKey.js

@@ -1,6 +1,6 @@
-import { useDecorators } from "@tsed/core";
 import { JsonEntityFn } from "./jsonEntityFn.js";
 import { Property } from "./property.js";
+import { useDecorators } from "@tsed/core";
 /**
  * Marks a property as the discriminator key for polymorphic type resolution.
  *

package/lib/esm/decorators/common/enum.js

@@ -1,5 +1,5 @@
-import { withErrorMsg } from "../../utils/withErrorMsg.js";
 import { JsonEntityFn } from "./jsonEntityFn.js";
+import { withErrorMsg } from "../../utils/withErrorMsg.js";
 function EnumFn(enumValue, ...enumValues) {
     return JsonEntityFn((store) => {
         store.itemSchema.enum(enumValue, ...enumValues);

package/lib/esm/decorators/common/exclusiveMaximum.js

@@ -1,5 +1,5 @@
-import { withErrorMsg } from "../../utils/withErrorMsg.js";
 import { Maximum } from "./maximum.js";
+import { withErrorMsg } from "../../utils/withErrorMsg.js";
 /**
  * The value of `exclusiveMaximum` MUST be number, representing an exclusive upper limit for a numeric instance.
  *

package/lib/esm/decorators/common/exclusiveMinimum.js

@@ -1,5 +1,5 @@
-import { withErrorMsg } from "../../utils/withErrorMsg.js";
 import { Minimum } from "./minimum.js";
+import { withErrorMsg } from "../../utils/withErrorMsg.js";
 /**
  * The value of `exclusiveMinimum` MUST be number, representing an exclusive upper limit for a numeric instance.
  *

package/lib/esm/decorators/common/format.js

@@ -1,6 +1,6 @@
+import { JsonEntityFn } from "./jsonEntityFn.js";
 import { JsonFormatTypes } from "../../domain/JsonFormatTypes.js";
 import { withErrorMsg } from "../../utils/withErrorMsg.js";
-import { JsonEntityFn } from "./jsonEntityFn.js";
 /**
  * Applies a format validation to string properties using JSON Schema's `format` keyword.
  *

package/lib/esm/decorators/common/jsonEntityFn.js

@@ -1,4 +1,4 @@
-import { getJsonEntityStore } from "../../utils/getJsonEntityStore.js";
+import { s } from "../../fn/index.js";
 /**
  * Decorator util to compose another decorator. See @@Description@@ decorator implementation for more details.
  *
@@ -19,7 +19,7 @@ import { getJsonEntityStore } from "../../utils/getJsonEntityStore.js";
  */
 export function JsonEntityFn(fn) {
     return (...parameters) => {
-        const result = fn(getJsonEntityStore(...parameters), parameters);
+        const result = fn(s.store(...parameters), parameters);
         if (typeof result === "function") {
             result(...parameters);
         }

package/lib/esm/decorators/common/maxLength.js

@@ -1,5 +1,5 @@
-import { withErrorMsg } from "../../utils/withErrorMsg.js";
 import { JsonEntityFn } from "./jsonEntityFn.js";
+import { withErrorMsg } from "../../utils/withErrorMsg.js";
 /**
  * A string instance is valid against this keyword if its length is greater than, or equal to, the value of this keyword.
  *

package/lib/esm/decorators/common/maximum.js

@@ -1,5 +1,5 @@
-import { withErrorMsg } from "../../utils/withErrorMsg.js";
 import { JsonEntityFn } from "./jsonEntityFn.js";
+import { withErrorMsg } from "../../utils/withErrorMsg.js";
 /**
  * The value of `maximum` MUST be a number, representing an inclusive upper limit for a numeric instance.
  *

package/lib/esm/decorators/common/minLength.js

@@ -1,5 +1,5 @@
-import { withErrorMsg } from "../../utils/withErrorMsg.js";
 import { JsonEntityFn } from "./jsonEntityFn.js";
+import { withErrorMsg } from "../../utils/withErrorMsg.js";
 /**
  *
  * A string instance is valid against this keyword if its length is greater than, or equal to, the value of this keyword.

package/lib/esm/decorators/common/minimum.js

@@ -1,5 +1,5 @@
-import { withErrorMsg } from "../../utils/withErrorMsg.js";
 import { JsonEntityFn } from "./jsonEntityFn.js";
+import { withErrorMsg } from "../../utils/withErrorMsg.js";
 /**
  * The value of `minimum` MUST be a number, representing an inclusive upper limit for a numeric instance.
  *

package/lib/esm/decorators/common/multipleOf.js

@@ -1,5 +1,5 @@
-import { withErrorMsg } from "../../utils/withErrorMsg.js";
 import { JsonEntityFn } from "./jsonEntityFn.js";
+import { withErrorMsg } from "../../utils/withErrorMsg.js";
 /**
  * A numeric instance is valid only if division by this keyword's value results in an integer.
  *

package/lib/esm/decorators/common/name.js

@@ -1,4 +1,4 @@
-import { decoratorTypeOf, DecoratorTypes } from "@tsed/core";
+import { DecoratorTypes, decoratorTypeOf } from "@tsed/core";
 import { JsonEntityFn } from "../common/jsonEntityFn.js";
 /**
  * Add a name metadata on the decorated element.

package/lib/esm/decorators/common/nullable.js

@@ -1,9 +1,9 @@
 import { useDecorators } from "@tsed/core";
-import { JsonSchema } from "../../domain/JsonSchema.js";
-import { array } from "../../fn/collection.js";
 import { JsonEntityFn } from "./jsonEntityFn.js";
+import { JsonSchema } from "../../domain/JsonSchema.js";
 import { OneOf } from "./oneOf.js";
 import { Property } from "./property.js";
+import { array } from "../../fn/collection.js";
 /**
  * Marks a property as nullable, allowing it to accept `null` in addition to its base type.
  *

package/lib/esm/decorators/common/pattern.js

@@ -1,5 +1,5 @@
-import { withErrorMsg } from "../../utils/withErrorMsg.js";
 import { JsonEntityFn } from "./jsonEntityFn.js";
+import { withErrorMsg } from "../../utils/withErrorMsg.js";
 /**
  * The pattern and Pattern Properties keywords use regular expressions to express constraints.
  * The regular expression syntax used is from JavaScript (ECMA 262, specifically). However, that complete syntax is not widely supported, therefore it is recommended that you stick to the subset of that syntax described below.

package/lib/esm/decorators/common/required.js

@@ -1,6 +1,6 @@
-import { withErrorMsg } from "../../utils/withErrorMsg.js";
 import { Allow } from "./allow.js";
 import { Optional } from "./optional.js";
+import { withErrorMsg } from "../../utils/withErrorMsg.js";
 /**
  * Mark a property or parameter as required.
  *

package/lib/esm/decorators/common/requiredGroups.js

@@ -1,5 +1,5 @@
-import { matchGroups } from "../../utils/matchGroups.js";
 import { JsonEntityFn } from "./jsonEntityFn.js";
+import { matchGroups } from "../../utils/matchGroups.js";
 /**
  * Apply groups validation strategy for required property.
  *

package/lib/esm/decorators/common/typeError.js

@@ -1,6 +1,6 @@
-import { useDecorators } from "@tsed/core";
 import { ErrorMsg } from "./errorMsg.js";
 import { JsonEntityFn } from "./jsonEntityFn.js";
+import { useDecorators } from "@tsed/core";
 /**
  * Create a new custom formats validator
  * @param name

package/lib/esm/decorators/config/jsonEntityComponent.js

@@ -1,13 +1,14 @@
-import { JsonEntitiesContainer } from "../../domain/JsonEntityStore.js";
+import { defineStore } from "../../registries/JsonEntitiesContainer.js";
 /**
  * Declare a new JsonEntityStore class for a specific decorator type.
  *
  * @ignore
  * @param type
  * @decorator
+ * @deprecated
  */
 export function JsonEntityComponent(type) {
     return (target) => {
-        JsonEntitiesContainer.set(type, target);
+        defineStore(type, target);
     };
 }

package/lib/esm/decorators/generics/genericOf.js

@@ -1,5 +1,5 @@
 import { DecoratorTypes } from "@tsed/core";
-import { JsonEntityStore } from "../../domain/JsonEntityStore.js";
+import { s } from "../../fn/index.js";
 /**
  * Set the types of a Generic class.
  *
@@ -69,7 +69,7 @@ import { JsonEntityStore } from "../../domain/JsonEntityStore.js";
 export function GenericOf(...generics) {
     const nestedGenerics = [generics];
     const decorator = (...args) => {
-        const store = JsonEntityStore.from(...args);
+        const store = s.store(...args);
         if (store.is(DecoratorTypes.PARAM)) {
             store.parameter.schema().genericOf(...nestedGenerics);
         }

package/lib/esm/decorators/generics/generics.js

@@ -1,4 +1,4 @@
-import { JsonEntityStore } from "../../domain/JsonEntityStore.js";
+import { s } from "../../fn/index.js";
 /**
  * Define generics list. This list is used by @@GenericOf@@ and the @@compile@@ function to build the correct JsonSchema.
  *
@@ -14,7 +14,6 @@ import { JsonEntityStore } from "../../domain/JsonEntityStore.js";
  */
 export function Generics(...genericLabels) {
     return (target) => {
-        const storedSchema = JsonEntityStore.from(target);
-        storedSchema.schema.genericLabels(genericLabels);
+        s.get(target).genericLabels(genericLabels);
     };
 }

package/lib/esm/decorators/operations/consumes.js

@@ -1,4 +1,4 @@
-import { decorateMethodsOf, DecoratorTypes, UnsupportedDecoratorType } from "@tsed/core";
+import { DecoratorTypes, UnsupportedDecoratorType, decorateMethodsOf } from "@tsed/core";
 import { JsonEntityFn } from "../common/jsonEntityFn.js";
 /**
  * Add consumes metadata on the decorated element.

package/lib/esm/decorators/operations/deprecated.js

@@ -1,4 +1,4 @@
-import { decorateMethodsOf, decoratorTypeOf, DecoratorTypes, UnsupportedDecoratorType } from "@tsed/core";
+import { DecoratorTypes, UnsupportedDecoratorType, decorateMethodsOf, decoratorTypeOf } from "@tsed/core";
 import { JsonEntityFn } from "../common/jsonEntityFn.js";
 /**
  * Add deprecated metadata on the decorated element.

package/lib/esm/decorators/operations/header.js

@@ -1,5 +1,5 @@
-import { isString } from "@tsed/core";
 import { Returns } from "./returns.js";
+import { isString } from "@tsed/core";
 /**
  * Sets the response’s HTTP header field to value. To set multiple fields at once, pass an object as the parameter.
  *