@tsed/schema 7.87.1 → 7.87.3

package/lib/esm/domain/JsonMethodStore.js

@@ -1,6 +1,7 @@
 import { __decorate, __metadata } from "tslib";
-import { DecoratorTypes, deepMerge, descriptorOf, isClass, isCollection, isFunction, isPromise, Metadata, prototypeOf, Store } from "@tsed/core";
+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";
@@ -49,6 +50,34 @@ let JsonMethodStore = class JsonMethodStore extends JsonEntityStore {
     get operationPaths() {
         return this.operation.operationPaths;
     }
+    get collectionType() {
+        return this.schema.getTarget();
+    }
+    set collectionType(type) {
+        console.trace("collectionType is deprecated, use schema.collectionClass instead");
+    }
+    get isCollection() {
+        return this.schema.isCollection;
+    }
+    get schema() {
+        if (this._schema) {
+            return this._schema;
+        }
+        const responses = this.operation.getResponses();
+        const [, response] = [...responses.entries()].find(([key, response]) => {
+            return isSuccessStatus(key);
+        }) || [];
+        if (response) {
+            const firstMediaType = response.getContent().values().next().value;
+            if (firstMediaType) {
+                this._schema = firstMediaType.schema();
+            }
+        }
+        else {
+            this._schema = new JsonSchema();
+        }
+        return this._schema;
+    }
     /**
      * Get an endpoint.
      * @param target
@@ -75,7 +104,7 @@ let JsonMethodStore = class JsonMethodStore extends JsonEntityStore {
             }
             return { type: media.schema().collectionClass, groups };
         }
-        return { type: this.type };
+        return { type: this.type || Object };
     }
     /**
      * Append middlewares to the beforeMiddlewares list.
@@ -120,38 +149,7 @@ let JsonMethodStore = class JsonMethodStore extends JsonEntityStore {
         }), {});
     }
     build() {
-        if (!this._type) {
-            let type = Metadata.getReturnType(this.target, this.propertyKey);
-            type = isPromise(type) ? undefined : type;
-            this.buildType(type);
-        }
-        this._type = this._type || Object;
         this.parent.children.set(this.propertyName, this);
-        if (isCollection(this._type)) {
-            this.collectionType = this._type;
-            // @ts-ignore
-            delete this._type;
-        }
-        // TODO est-ce que c'est tjrs d'actualité car on doit utiliser le decorator @Returns pour affecter correctement les data
-        // peut etre que c'est pour les get/setter ou méthod n'étant pas un endpoint?
-        if (this.collectionType) {
-            this._schema = JsonSchema.from({
-                type: this.collectionType
-            });
-            this._schema.itemSchema(this.type);
-        }
-        else if (isClass(this.type)) {
-            this._schema = JsonSchema.from({
-                type: "object"
-            });
-            this._schema.itemSchema(this.type);
-        }
-        else {
-            this._schema = JsonSchema.from({
-                type: this.type
-            });
-        }
-        this.parent.schema.addProperty(this.propertyName, this.schema);
     }
 };
 JsonMethodStore = __decorate([

package/lib/esm/domain/JsonMethodStore.js.map

@@ -1 +1 @@
-{"version":3,"file":"JsonMethodStore.js","sourceRoot":"","sources":["../../../src/domain/JsonMethodStore.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"JsonMethodStore.js","sourceRoot":"","sources":["../../../src/domain/JsonMethodStore.ts"],"names":[],"mappings":"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"}

package/lib/esm/utils/mergeSchema.js

@@ -1,4 +1,4 @@
-import { isObject, uniq } from "@tsed/core";
+import { cleanObject, isObject, uniq } from "@tsed/core";
 function mergeProps(properties1, properties2) {
     if (!properties1 || !properties2) {
         return properties1 || properties2 || {};
@@ -17,40 +17,58 @@ function mergeProps(properties1, properties2) {
         return acc;
     }, {});
 }
+function getSchemaType(schema) {
+    return schema.type || (schema.items && "array") || ((schema.properties || schema.additionalProperties) && "object") || "$any";
+}
 function mergeManyOf(kind, schema1, schema2) {
-    const refs = new Set();
-    if (schema1.$ref && schema2.type && (schema2.readOnly || schema2.writeOnly) && kind === "allOf") {
-        const { type, ...rest } = schema2;
-        schema2 = rest;
-    }
-    let of = [...(schema1[kind] || [schema1]), ...(schema2[kind] || [schema2])].filter((schema) => {
-        if ("$ref" in schema) {
-            if (refs.has(schema.$ref)) {
-                return false;
-            }
-            refs.add(schema.$ref);
-            return true;
+    const { [kind]: kind1, ...$rest1 } = schema1;
+    const { [kind]: kind2, ...$rest2 } = schema2;
+    let hasRef = false;
+    const map = [kind1, $rest1, kind2, $rest2]
+        .flat()
+        .filter(Boolean)
+        .reduce((map, schema, index) => {
+        schema = cleanObject(schema);
+        if (schema.$ref) {
+            hasRef = true;
+            return map.set(schema.$ref, schema);
+        }
+        if (Object.keys(schema).length === 0) {
+            return map;
         }
-        return Object.keys(schema).length > 0;
-    });
-    if (of.length > 2) {
-        of = of.reduce((current, item, index) => {
-            if (item.$ref) {
-                return current.concat(item);
+        if (schema.type === "object" && Object.keys(schema).length === 2) {
+            if ("writeOnly" in schema || "readOnly" in schema || "deprecated" in schema) {
+                schema = { ...schema, type: undefined };
             }
-            if (current.at(-1)?.type === item.type && item.type !== "array") {
-                current[current.length - 1] = mergeSchema(current.at(-1), item);
-                return current;
+        }
+        const type = getSchemaType(schema);
+        if (type === "array") {
+            map.set("array_" + index, schema);
+            return map;
+        }
+        if (map.has(type)) {
+            if (kind === "allOf") {
+                // we can merge allOf schemas to optimize the schema
+                map.set(type, mergeSchema(map.get(type), schema));
+                return map;
             }
-            return current.concat(item);
-        }, []);
-    }
-    return of.length > 1
+            map.set(type + "_" + index, schema);
+            return map;
+        }
+        return map.set(type, schema);
+    }, new Map());
+    const rest = map.get("$any");
+    map.delete("$any");
+    const of = Array.from(map.values());
+    return cleanObject(of.length > 1 || (hasRef && rest)
         ? {
-            [kind]: of,
-            ...(schema1.nullable || schema2.nullable ? { nullable: true } : {})
+            ...rest,
+            [kind]: of
         }
-        : of[0];
+        : {
+            ...rest,
+            ...of[0]
+        });
 }
 export function mergeSchema(schema1, schema2) {
     if (schema1.$ref && schema2.$ref && schema1.$ref === schema2.$ref) {

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

@@ -1 +1 @@
-{"version":3,"file":"mergeSchema.js","sourceRoot":"","sources":["../../../src/utils/mergeSchema.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mergeSchema.js","sourceRoot":"","sources":["../../../src/utils/mergeSchema.ts"],"names":[],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"toJsonMapCollection.js","sourceRoot":"","sources":["../../../src/utils/toJsonMapCollection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,sBAAsB,CAAC;AAE7C;;GAEG;AACH,MAAM,UAAU,mBAAmB,CAAC,OAA6B,EAAE,KAAK,GAAG,OAAO;IAChF,OAAO,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QAC9D,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;QAEnC,OAAO,OAAO,CAAC;IACjB,CAAC,EAAE,IAAI,OAAO,EAAO,CAAC,CAAC;AACzB,CAAC"}
+{"version":3,"file":"toJsonMapCollection.js","sourceRoot":"","sources":["../../../src/utils/toJsonMapCollection.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,OAAO,EAAC,MAAM,sBAAsB,CAAC;AAE7C;;GAEG;AACH,MAAM,UAAU,mBAAmB,CAAC,OAA6B,EAAE,QAA4B,OAAO;IACpG,OAAO,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QAC9D,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;QAEnC,OAAO,OAAO,CAAC;IACjB,CAAC,EAAE,IAAI,OAAO,EAAO,CAAC,CAAC;AACzB,CAAC"}

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

@@ -42,21 +42,23 @@ export declare abstract class JsonEntityStore implements JsonEntityStoreOptions
      * Decorator type used to declare the JsonSchemaStore.
      */
     readonly decoratorType: DecoratorTypes;
-    /**
-     * Type of the collection (Array, Map, Set, etc...)
-     */
-    collectionType: Type<any>;
     token: Type<any>;
     readonly store: Store;
     readonly isStore = true;
     readonly parent: JsonEntityStore;
     readonly target: Type<any>;
+    [key: string]: any;
     constructor(options: JsonEntityStoreOptions);
+    /**
+     * Type of the collection (Array, Map, Set, etc...)
+     */
+    private _collectionType;
+    get collectionType(): Type<any>;
+    set collectionType(value: Type<any>);
     /**
      *
      */
     protected _type: Type<any>;
-    [key: string]: any;
     get type(): Type<any> | any;
     /**
      * Get original type without transformation

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

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

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

@@ -1,8 +1,9 @@
 import { Type } from "@tsed/core";
-import type { JsonClassStore } from "./JsonClassStore.js";
+import { type JsonClassStore } from "./JsonClassStore.js";
 import { JsonEntityStore, JsonEntityStoreOptions } from "./JsonEntityStore.js";
 import { JsonOperation } from "./JsonOperation.js";
-import type { JsonParameterStore } from "./JsonParameterStore.js";
+import { type JsonParameterStore } from "./JsonParameterStore.js";
+import { JsonSchema } from "./JsonSchema.js";
 export interface JsonViewOptions {
     path: string;
     options: any;
@@ -32,6 +33,10 @@ export declare class JsonMethodStore extends JsonEntityStore {
     set acceptMimes(mimes: string[]);
     get parameters(): JsonParameterStore[];
     get operationPaths(): Map<string, import("./JsonOperation.js").JsonMethodPath>;
+    get collectionType(): Type<any>;
+    set collectionType(type: Type<any>);
+    get isCollection(): boolean;
+    get schema(): JsonSchema;
     /**
      * Get an endpoint.
      * @param target

package/lib/types/utils/toJsonMapCollection.d.ts

@@ -1,7 +1,8 @@
+import type { Type } from "@tsed/core";
 import { JsonMap } from "../domain/JsonMap.js";
 /**
  * @ignore
  */
 export declare function toJsonMapCollection(content: {
     [key: string]: any;
-}, klass?: typeof JsonMap): JsonMap<any>;
+}, klass?: Type<JsonMap<any>>): JsonMap<any>;

package/lib/types-esm/domain/JsonEntityStore.d.ts

@@ -42,21 +42,23 @@ export declare abstract class JsonEntityStore implements JsonEntityStoreOptions
      * Decorator type used to declare the JsonSchemaStore.
      */
     readonly decoratorType: DecoratorTypes;
-    /**
-     * Type of the collection (Array, Map, Set, etc...)
-     */
-    collectionType: Type<any>;
     token: Type<any>;
     readonly store: Store;
     readonly isStore = true;
     readonly parent: JsonEntityStore;
     readonly target: Type<any>;
+    [key: string]: any;
     constructor(options: JsonEntityStoreOptions);
+    /**
+     * Type of the collection (Array, Map, Set, etc...)
+     */
+    private _collectionType;
+    get collectionType(): Type<any>;
+    set collectionType(value: Type<any>);
     /**
      *
      */
     protected _type: Type<any>;
-    [key: string]: any;
     get type(): Type<any> | any;
     /**
      * Get original type without transformation

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

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

package/lib/types-esm/domain/JsonMethodStore.d.ts

@@ -1,8 +1,9 @@
 import { Type } from "@tsed/core";
-import type { JsonClassStore } from "./JsonClassStore.js";
+import { type JsonClassStore } from "./JsonClassStore.js";
 import { JsonEntityStore, JsonEntityStoreOptions } from "./JsonEntityStore.js";
 import { JsonOperation } from "./JsonOperation.js";
-import type { JsonParameterStore } from "./JsonParameterStore.js";
+import { type JsonParameterStore } from "./JsonParameterStore.js";
+import { JsonSchema } from "./JsonSchema.js";
 export interface JsonViewOptions {
     path: string;
     options: any;
@@ -32,6 +33,10 @@ export declare class JsonMethodStore extends JsonEntityStore {
     set acceptMimes(mimes: string[]);
     get parameters(): JsonParameterStore[];
     get operationPaths(): Map<string, import("./JsonOperation.js").JsonMethodPath>;
+    get collectionType(): Type<any>;
+    set collectionType(type: Type<any>);
+    get isCollection(): boolean;
+    get schema(): JsonSchema;
     /**
      * Get an endpoint.
      * @param target

package/lib/types-esm/utils/toJsonMapCollection.d.ts

@@ -1,7 +1,8 @@
+import type { Type } from "@tsed/core";
 import { JsonMap } from "../domain/JsonMap.js";
 /**
  * @ignore
  */
 export declare function toJsonMapCollection(content: {
     [key: string]: any;
-}, klass?: typeof JsonMap): JsonMap<any>;
+}, klass?: Type<JsonMap<any>>): JsonMap<any>;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@tsed/schema",
   "description": "JsonSchema module for Ts.ED Framework",
   "type": "commonjs",
-  "version": "7.87.1",
+  "version": "7.87.3",
   "source": "./src/index.ts",
   "main": "./lib/cjs/index.js",
   "module": "./lib/esm/index.js",
@@ -37,7 +37,7 @@
     "tsed"
   ],
   "dependencies": {
-    "@tsed/openspec": "7.87.1",
+    "@tsed/openspec": "7.87.3",
     "change-case": "^4.1.2",
     "fs-extra": "^11.2.0",
     "json-schema": "0.4.0",
@@ -47,10 +47,10 @@
   },
   "devDependencies": {
     "@apidevtools/swagger-parser": "10.1.0",
-    "@tsed/barrels": "7.87.1",
-    "@tsed/core": "7.87.1",
-    "@tsed/openspec": "7.87.1",
-    "@tsed/typescript": "7.87.1",
+    "@tsed/barrels": "7.87.3",
+    "@tsed/core": "7.87.3",
+    "@tsed/openspec": "7.87.3",
+    "@tsed/typescript": "7.87.3",
     "@types/fs-extra": "11.0.4",
     "@types/json-schema": "7.0.15",
     "@types/picomatch": "2.3.3",