fix(schema): use allOf when $ref and type exists on the same schema l…

…evel
tsedio · Dec 6, 2024 · 9af17c3 · 9af17c3
1 parent 35a5ff7
commit 9af17c3
Show file tree

Hide file tree

Showing 3 changed files with 2,034 additions and 3 deletions.
diff --git a/packages/specs/schema/src/components/default/inheritedClassMapper.ts b/packages/specs/schema/src/components/default/inheritedClassMapper.ts
@@ -4,6 +4,23 @@ import {JsonSchemaOptions} from "../../interfaces/JsonSchemaOptions.js";
 import {execMapper, registerJsonSchemaMapper} from "../../registries/JsonSchemaMapperContainer.js";
 import {getInheritedStores} from "../../utils/getInheritedStores.js";
 
+function alterMerge(_: string, obj: any) {
+  if (obj?.type && obj?.$ref) {
+    const {$ref, ...schema} = obj;
+
+    obj = {
+      allOf: [
+        {
+          $ref
+        },
+        schema
+      ]
+    };
+  }
+
+  return obj;
+}
+
 /**
  * @ignore
  */
@@ -12,10 +29,9 @@ export function inheritedClassMapper(obj: any, {target, ...options}: JsonSchemaO
 
   if (stores.length) {
     const schema = stores.reduce((obj, [, store]) => {
-      return deepMerge(obj, execMapper("schema", [store.schema], options));
+      return deepMerge(obj, execMapper("schema", [store.schema], options), {alter: alterMerge});
     }, {});
-
-    obj = deepMerge(schema, obj);
+    obj = deepMerge(schema, obj, {alter: alterMerge});
   }
 
   return obj;