@tsed/schema 8.15.0 → 8.15.2

package/lib/esm/utils/mergeSchema.js

@@ -1,4 +1,6 @@
-import { isObject, uniq } from "@tsed/core";
+import { cleanObject } from "@tsed/core/utils/cleanObject.js";
+import { isObject } from "@tsed/core/utils/isObject.js";
+import { uniq } from "@tsed/core/utils/uniq.js";
 function mergeProps(properties1, properties2) {
     if (!properties1 || !properties2) {
         return properties1 || properties2 || {};
@@ -17,40 +19,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/package.json

@@ -2,7 +2,7 @@
   "name": "@tsed/schema",
   "description": "JsonSchema module for Ts.ED Framework",
   "type": "module",
-  "version": "8.15.0",
+  "version": "8.15.2",
   "source": "./src/index.ts",
   "main": "./lib/esm/index.js",
   "module": "./lib/esm/index.js",
@@ -34,7 +34,7 @@
     "tsed"
   ],
   "dependencies": {
-    "@tsed/openspec": "8.15.0",
+    "@tsed/openspec": "8.15.2",
     "change-case": "^5.4.4",
     "json-schema": "0.4.0",
     "picomatch": "4.0.2",
@@ -43,11 +43,11 @@
   },
   "devDependencies": {
     "@apidevtools/swagger-parser": "10.1.0",
-    "@tsed/barrels": "8.15.0",
-    "@tsed/core": "8.15.0",
-    "@tsed/hooks": "8.15.0",
-    "@tsed/openspec": "8.15.0",
-    "@tsed/typescript": "8.15.0",
+    "@tsed/barrels": "8.15.2",
+    "@tsed/core": "8.15.2",
+    "@tsed/hooks": "8.15.2",
+    "@tsed/openspec": "8.15.2",
+    "@tsed/typescript": "8.15.2",
     "@types/fs-extra": "11.0.4",
     "@types/json-schema": "7.0.15",
     "@types/picomatch": "3.0.2",