@tsed/schema 8.33.0 → 8.35.0

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

@@ -1,7 +1,6 @@
-import { decorateMethodsOf, DecoratorTypes, UnsupportedDecoratorType } from "@tsed/core";
-import { JsonEntityStore } from "../../domain/JsonEntityStore.js";
-import { JsonParameter } from "../../domain/JsonParameter.js";
-import { JsonSchema } from "../../domain/JsonSchema.js";
+import { DecoratorTypes, UnsupportedDecoratorType, decorateMethodsOf } from "@tsed/core";
+import { JsonParameter, JsonSchema } from "../../domain/index.js";
+import { s } from "../../fn/index.js";
 /**
  * Add a input parameter.
  *
@@ -31,7 +30,7 @@ export function In(inType) {
     const jsonParameter = new JsonParameter();
     const schema = {};
     const decorator = (target, propertyKey, index) => {
-        const store = JsonEntityStore.from(target, propertyKey, index);
+        const store = s.store(target, propertyKey, index);
         switch (store.decoratorType) {
             case DecoratorTypes.PARAM:
                 store.parameter.in(inType);
@@ -39,7 +38,7 @@ export function In(inType) {
             case DecoratorTypes.METHOD:
                 jsonParameter.in(inType);
                 store.operation.addParameter(-1, jsonParameter);
-                jsonParameter.schema(JsonSchema.from(schema));
+                jsonParameter.schema(new JsonSchema(schema));
                 break;
             case DecoratorTypes.CLASS:
                 decorateMethodsOf(target, decorator);

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

@@ -1,8 +1,8 @@
 import { Metadata, useDecorators, useMethodDecorators } from "@tsed/core";
-import { JsonParameterTypes } from "../../domain/JsonParameterTypes.js";
-import { Name } from "../common/name.js";
 import { Consumes } from "./consumes.js";
 import { In } from "./in.js";
+import { JsonParameterTypes } from "../../domain/JsonParameterTypes.js";
+import { Name } from "../common/name.js";
 import { Returns } from "./returns.js";
 /**
  * Add a input file parameter.

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

@@ -1,5 +1,5 @@
+import { DecoratorContext } from "../../domain/index.js";
 import { OperationVerbs } from "../../constants/OperationVerbs.js";
-import { DecoratorContext } from "../../domain/DecoratorContext.js";
 import { mapOperationOptions } from "../../utils/mapOperationOptions.js";
 class OperationDecoratorContext extends DecoratorContext {
     constructor() {

package/lib/esm/decorators/operations/produces.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 produces metadata on the decorated element.

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

@@ -1,5 +1,5 @@
-import { OperationVerbs } from "../../constants/OperationVerbs.js";
 import { Operation } from "./operation.js";
+import { OperationVerbs } from "../../constants/OperationVerbs.js";
 export function Publish(event) {
     return Operation(OperationVerbs.PUBLISH, event);
 }

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

@@ -1,9 +1,9 @@
-import { decorateMethodsOf, decoratorTypeOf, DecoratorTypes, isArray, isClass, isCollection, isPlainObject, isPrimitiveOrPrimitiveClass, isString } from "@tsed/core";
+import { DecoratorContext } from "../../domain/index.js";
+import { DecoratorTypes, decorateMethodsOf, decoratorTypeOf, isArray, isClass, isCollection, isPlainObject, isPrimitiveOrPrimitiveClass, isString } from "@tsed/core";
 import { getStatusMessage } from "../../constants/httpStatusMessages.js";
-import { DecoratorContext } from "../../domain/DecoratorContext.js";
-import { JsonEntityStore } from "../../domain/JsonEntityStore.js";
 import { getStatusModel } from "../../utils/defineStatusModel.js";
 import { mapHeaders } from "../../utils/mapHeaders.js";
+import { s } from "../../fn/index.js";
 /**
  * @ignore
  */
@@ -184,7 +184,7 @@ class ReturnDecoratorContext extends DecoratorContext {
         const type = decoratorTypeOf(args);
         switch (type) {
             case DecoratorTypes.METHOD:
-                this.entity = JsonEntityStore.from(...args);
+                this.entity = s.store(...args);
                 if (this.entity.operation) {
                     this.map();
                 }

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

@@ -1,5 +1,5 @@
-import { OperationVerbs } from "../../constants/OperationVerbs.js";
 import { Operation } from "./operation.js";
+import { OperationVerbs } from "../../constants/OperationVerbs.js";
 /**
  * This method is just like the `router.METHOD()` methods, except that it matches all HTTP methods (verbs).
  *

package/lib/esm/decorators/operations/security.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";
 export function Security(nameOrSecurity, ...scopes) {
     return JsonEntityFn((store, args) => {

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

@@ -1,5 +1,5 @@
-import { OperationVerbs } from "../../constants/OperationVerbs.js";
 import { Operation } from "./operation.js";
+import { OperationVerbs } from "../../constants/OperationVerbs.js";
 export function Subscribe(event) {
     return Operation(OperationVerbs.SUBSCRIBE, event);
 }

package/lib/esm/decorators/operations/tags.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";
 function mapTags(tags) {
     return tags.map((tag) => {

package/lib/esm/domain/DecoratorContext.js

@@ -1,6 +1,6 @@
 import { DecoratorTypes } from "@tsed/core";
+import { getJsonEntityStore } from "../registries/JsonEntitiesContainer.js";
 import { pascalCase } from "change-case";
-import { JsonEntityStore } from "./JsonEntityStore.js";
 /**
  * @ignore
  */
@@ -59,7 +59,7 @@ export class DecoratorContext extends Map {
         };
     }
     bind(args, decorator) {
-        this.entity = JsonEntityStore.from(...args);
+        this.entity = getJsonEntityStore(...args);
         this.beforeInit();
         this.onInit(args, decorator);
         this.afterInit();

package/lib/esm/domain/JsonEntityStore.js

@@ -1,8 +1,5 @@
-import { ancestorsOf, classOf, decoratorTypeOf, descriptorOf, isArrayOrArrayClass, isArrowFn, isClass, isClassObject, isCollection, isDate, isObject, isPlainObject, isPrimitiveOrPrimitiveClass, nameOf, prototypeOf, Store } from "@tsed/core";
-/**
- * @ignore
- */
-export const JsonEntitiesContainer = new Map();
+import { ancestorsOf, isArrayOrArrayClass, isArrowFn, isClass, isClassObject, isCollection, isDate, isObject, isPlainObject, isPrimitiveOrPrimitiveClass, nameOf } from "@tsed/core";
+import { getJsonEntityStore } from "../registries/JsonEntitiesContainer.js";
 /**
  * Base class for storing metadata about decorated entities (classes, properties, methods, parameters).
  *
@@ -31,13 +28,13 @@ export const JsonEntitiesContainer = new Map();
  *
  * ```typescript
  * // Get store for a class
- * const classStore = JsonEntityStore.from(MyClass);
+ * const classStore = getJsonEntityStore(MyClass);
  *
  * // Get store for a property
- * const propStore = JsonEntityStore.from(MyClass, "propertyName");
+ * const propStore = getJsonEntityStore(MyClass, "propertyName");
  *
  * // Get store for a method parameter
- * const paramStore = JsonEntityStore.from(MyClass, "methodName", 0);
+ * const paramStore = getJsonEntityStore(MyClass, "methodName", 0);
  * ```
  *
  * ### Architecture
@@ -103,8 +100,8 @@ export class JsonEntityStore {
     }
     get discriminatorAncestor() {
         const ancestors = ancestorsOf(this.target);
-        const ancestor = ancestors.find((ancestor) => JsonEntityStore.from(ancestor).schema.isDiscriminator);
-        return ancestor && JsonEntityStore.from(ancestor);
+        const ancestor = ancestors.find((ancestor) => getJsonEntityStore(ancestor).schema.isDiscriminator);
+        return ancestor && getJsonEntityStore(ancestor);
     }
     get isPrimitive() {
         return isPrimitiveOrPrimitiveClass(this.type);
@@ -140,37 +137,6 @@ export class JsonEntityStore {
     set path(path) {
         this.store.set("path", path);
     }
-    static from(...args) {
-        if (args[0].isStore) {
-            return args[0];
-        }
-        const target = args[0];
-        if (args.length > 1) {
-            args[0] = prototypeOf(args[0]);
-        }
-        const store = Store.from(...args);
-        if (!store.has("JsonEntityStore")) {
-            const decoratorType = decoratorTypeOf(args);
-            const entityStore = JsonEntitiesContainer.get(decoratorType);
-            const jsonSchemaStore = new entityStore({
-                store,
-                decoratorType,
-                target: classOf(target),
-                propertyKey: args[1],
-                index: typeof args[2] === "number" ? args[2] : undefined,
-                descriptor: typeof args[2] === "object" ? args[2] : undefined
-            });
-            jsonSchemaStore.build();
-            store.set("JsonEntityStore", jsonSchemaStore);
-        }
-        return store.get("JsonEntityStore");
-    }
-    static fromMethod(target, propertyKey) {
-        return this.from(target, propertyKey, descriptorOf(target, propertyKey));
-    }
-    static get(target, propertyKey, descriptor) {
-        return JsonEntityStore.from(prototypeOf(target), propertyKey, descriptor);
-    }
     isGetterOnly() {
         return isObject(this.descriptor) && !this.descriptor.value && this.descriptor.get && !this.descriptor.set;
     }

package/lib/esm/domain/JsonLazyRef.js

@@ -1,5 +1,5 @@
 import { nameOf } from "@tsed/core";
-import { getJsonEntityStore } from "../utils/getJsonEntityStore.js";
+import { getJsonEntityStore } from "../registries/JsonEntitiesContainer.js";
 /**
  * Lazy reference to a schema type for handling circular dependencies.
  *

package/lib/esm/domain/JsonMap.js

@@ -1,5 +1,5 @@
-import { isFunction } from "@tsed/core";
 import { execMapper } from "../registries/JsonSchemaMapperContainer.js";
+import { isFunction } from "@tsed/core";
 /**
  * Base class for JSON document representations using a Map structure.
  *

package/lib/esm/domain/JsonOperation.js

@@ -176,7 +176,7 @@ export class JsonOperation extends JsonMap {
     addAllowedGroupsParameter(allowedGroups) {
         const jsonParameter = new JsonParameter();
         jsonParameter.in("query").name("includes");
-        jsonParameter.schema(JsonSchema.from({
+        jsonParameter.schema(new JsonSchema({
             type: "array",
             items: {
                 type: "string",

package/lib/esm/domain/JsonParameter.js

@@ -1,7 +1,7 @@
-import { execMapper } from "../registries/JsonSchemaMapperContainer.js";
 import { JsonMap } from "./JsonMap.js";
-import { formatParameterType } from "./JsonParameterTypes.js";
 import { JsonSchema } from "./JsonSchema.js";
+import { execMapper } from "../registries/JsonSchemaMapperContainer.js";
+import { formatParameterType } from "./JsonParameterTypes.js";
 /**
  * Represents an HTTP operation parameter for OpenAPI specifications.
  *
@@ -25,7 +25,7 @@ import { JsonSchema } from "./JsonSchema.js";
  *   .in("path")
  *   .required(true)
  *   .description("The user identifier")
- *   .schema(JsonSchema.from(String));
+ *   .schema(s.string());
  * ```
  *
  * ### Key Features

package/lib/esm/domain/JsonRequestBody.js

@@ -1,5 +1,5 @@
-import { toJsonMapCollection } from "../utils/toJsonMapCollection.js";
 import { JsonMap } from "./JsonMap.js";
+import { toJsonMapCollection } from "../utils/toJsonMapCollection.js";
 /**
  * Represents an HTTP request body definition for OpenAPI specifications.
  *

package/lib/esm/domain/JsonResponse.js

@@ -1,7 +1,7 @@
-import { mapHeaders } from "../utils/mapHeaders.js";
-import { toJsonMapCollection } from "../utils/toJsonMapCollection.js";
 import { JsonMap } from "./JsonMap.js";
 import { JsonMedia } from "./JsonMedia.js";
+import { mapHeaders } from "../utils/mapHeaders.js";
+import { toJsonMapCollection } from "../utils/toJsonMapCollection.js";
 /**
  * Represents an HTTP response definition for OpenAPI specifications.
  *