@tsed/schema 7.86.2 → 7.87.0

package/lib/cjs/utils/ref.js

@@ -1,9 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toRef = exports.createRef = exports.createRefName = void 0;
+exports.toRef = exports.createRef = exports.createRefName = exports.getSchemaFromRef = void 0;
 const core_1 = require("@tsed/core");
 const change_case_1 = require("change-case");
 const SpecTypes_js_1 = require("../domain/SpecTypes.js");
+const mergeSchema_js_1 = require("./mergeSchema.js");
+function getSchemaFromRef($ref, options) {
+    const { components } = options;
+    if (components?.schemas && $ref) {
+        const host = getHost(options);
+        const refName = $ref.replace(`${host}/`, "");
+        return components.schemas[refName];
+    }
+}
+exports.getSchemaFromRef = getSchemaFromRef;
 /**
  * ignore
  * @param options
@@ -27,19 +37,11 @@ exports.createRefName = createRefName;
  */
 function createRef(name, schema, options) {
     const host = getHost(options);
-    const ref = {
+    return (0, mergeSchema_js_1.mergeSchema)({
         $ref: `${host}/${name}`
-    };
-    const readOnly = schema.isReadOnly;
-    const writeOnly = schema.isWriteOnly;
-    return (0, core_1.cleanObject)({
-        readOnly: readOnly ? true : undefined,
-        writeOnly: writeOnly ? true : undefined,
-        ...(readOnly || writeOnly
-            ? {
-                anyOf: [ref]
-            }
-            : ref)
+    }, {
+        ...(schema.isReadOnly ? { readOnly: true } : {}),
+        ...(schema.isWriteOnly ? { writeOnly: true } : {})
     });
 }
 exports.createRef = createRef;

package/lib/cjs/utils/ref.js.map

@@ -1 +1 @@
-{"version":3,"file":"ref.js","sourceRoot":"","sources":["../../../src/utils/ref.ts"],"names":[],"mappings":";;;AAAA,qCAAiD;AACjD,6CAAuC;AAEvC,yDAAiD;AAGjD;;;GAGG;AACH,SAAS,OAAO,CAAC,OAA0B;IACzC,MAAM,EAAC,IAAI,GAAG,KAAK,CAAC,wBAAS,CAAC,OAAO,EAAE,wBAAS,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAS,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,aAAa,EAAE,EAAC,GAC9H,OAAO,CAAC;IAEV,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;GAEG;AACH,SAAgB,aAAa,CAAC,IAAY,EAAE,OAA0B;IACpE,IAAI,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE;QAC3C,OAAO,IAAA,wBAAU,EAAC,GAAG,IAAI,IAAI,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;KAChF;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAND,sCAMC;AAED;;GAEG;AACH,SAAgB,SAAS,CAAC,IAAY,EAAE,MAAkB,EAAE,OAA0B;IACpF,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9B,MAAM,GAAG,GAAG;QACV,IAAI,EAAE,GAAG,IAAI,IAAI,IAAI,EAAE;KACxB,CAAC;IAEF,MAAM,QAAQ,GAAG,MAAM,CAAC,UAAU,CAAC;IACnC,MAAM,SAAS,GAAG,MAAM,CAAC,WAAW,CAAC;IAErC,OAAO,IAAA,kBAAW,EAAC;QACjB,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;QACrC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;QACvC,GAAG,CAAC,QAAQ,IAAI,SAAS;YACvB,CAAC,CAAC;gBACE,KAAK,EAAE,CAAC,GAAG,CAAC;aACb;YACH,CAAC,CAAC,GAAG,CAAC;KACT,CAAC,CAAC;AACL,CAAC;AAlBD,8BAkBC;AAED;;GAEG;AACH,SAAgB,KAAK,CAAC,KAAiB,EAAE,MAA2B,EAAE,OAA0B;IAC9F,MAAM,IAAI,GAAG,aAAa,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,OAAO,CAAC,CAAC;IAErD,IAAI,MAAM,EAAE;QACV,IAAA,eAAQ,EAAC,OAAO,EAAE,sBAAsB,IAAI,EAAE,EAAE,MAAM,CAAC,CAAC;KACzD;IAED,OAAO,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;AACzC,CAAC;AARD,sBAQC"}
+{"version":3,"file":"ref.js","sourceRoot":"","sources":["../../../src/utils/ref.ts"],"names":[],"mappings":";;;AAAA,qCAAoC;AACpC,6CAAuC;AAIvC,yDAAiD;AAEjD,qDAA6C;AAE7C,SAAgB,gBAAgB,CAAC,IAAwB,EAAE,OAA0B;IACnF,MAAM,EAAC,UAAU,EAAC,GAAG,OAAO,CAAC;IAE7B,IAAI,UAAU,EAAE,OAAO,IAAI,IAAI,EAAE;QAC/B,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;QAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,GAAG,EAAE,EAAE,CAAC,CAAC;QAE7C,OAAO,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;KACpC;AACH,CAAC;AATD,4CASC;AAED;;;GAGG;AACH,SAAS,OAAO,CAAC,OAA0B;IACzC,MAAM,EAAC,IAAI,GAAG,KAAK,CAAC,wBAAS,CAAC,OAAO,EAAE,wBAAS,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAS,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,aAAa,EAAE,EAAC,GAC9H,OAAO,CAAC;IAEV,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;GAEG;AACH,SAAgB,aAAa,CAAC,IAAY,EAAE,OAA0B;IACpE,IAAI,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE;QAC3C,OAAO,IAAA,wBAAU,EAAC,GAAG,IAAI,IAAI,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;KAChF;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAND,sCAMC;AAED;;GAEG;AACH,SAAgB,SAAS,CAAC,IAAY,EAAE,MAAkB,EAAE,OAA0B;IACpF,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAE9B,OAAO,IAAA,4BAAW,EAChB;QACE,IAAI,EAAE,GAAG,IAAI,IAAI,IAAI,EAAE;KACxB,EACD;QACE,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9C,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,EAAC,SAAS,EAAE,IAAI,EAAC,CAAC,CAAC,CAAC,EAAE,CAAC;KACjD,CACF,CAAC;AACJ,CAAC;AAZD,8BAYC;AAED;;GAEG;AACH,SAAgB,KAAK,CAAC,KAAiB,EAAE,MAAsC,EAAE,OAA0B;IACzG,MAAM,IAAI,GAAG,aAAa,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,OAAO,CAAC,CAAC;IAErD,IAAI,MAAM,EAAE;QACV,IAAA,eAAQ,EAAC,OAAO,EAAE,sBAAsB,IAAI,EAAE,EAAE,MAAM,CAAC,CAAC;KACzD;IAED,OAAO,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;AACzC,CAAC;AARD,sBAQC"}

package/lib/esm/components/default/anyMapper.js

@@ -1,7 +1,6 @@
 import { JsonLazyRef } from "../../domain/JsonLazyRef.js";
 import { JsonSchema } from "../../domain/JsonSchema.js";
 import { execMapper, execOneOfMapper, registerJsonSchemaMapper } from "../../registries/JsonSchemaMapperContainer.js";
-import { mapGenericsOptions } from "../../utils/generics.js";
 import { toRef } from "../../utils/ref.js";
 export function anyMapper(input, options = {}) {
     if (typeof input !== "object" || input === null) {
@@ -16,7 +15,7 @@ export function anyMapper(input, options = {}) {
     }
     if (input.$kind && input.$isJsonDocument) {
         const kind = execOneOfMapper([input.$kind, "map"], options);
-        const schema = execMapper(kind, [input], mapGenericsOptions(options));
+        const schema = execMapper(kind, [input], options);
         return input.canRef ? toRef(input, schema, options) : schema;
     }
     return execMapper("object", [input], options);

package/lib/esm/components/default/anyMapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"anyMapper.js","sourceRoot":"","sources":["../../../../src/components/default/anyMapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAC,UAAU,EAAC,MAAM,4BAA4B,CAAC;AAEtD,OAAO,EAAC,UAAU,EAAE,eAAe,EAAE,wBAAwB,EAAC,MAAM,+CAA+C,CAAC;AACpH,OAAO,EAAC,kBAAkB,EAAC,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAC,KAAK,EAAC,MAAM,oBAAoB,CAAC;AAEzC,MAAM,UAAU,SAAS,CAAC,KAAU,EAAE,UAA6B,EAAE;IACnE,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE;QAC/C,OAAO,KAAK,CAAC;KACd;IAED,IAAI,KAAK,YAAY,WAAW,EAAE;QAChC,OAAO,UAAU,CAAC,SAAS,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,CAAC;KAChD;IAED,IAAI,KAAK,YAAY,UAAU,IAAI,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,UAAU,EAAE;QAC1E,MAAM,UAAU,GAAe,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAEjD,OAAO,KAAK,CAAC,UAAU,EAAE,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC;KAC/D;IAED,IAAI,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,eAAe,EAAE;QACxC,MAAM,IAAI,GAAG,eAAe,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,OAAO,CAAC,CAAC;QAC5D,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,EAAE,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;QAEtE,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;KAC9D;IAED,OAAO,UAAU,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,CAAC;AAChD,CAAC;AAED,wBAAwB,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC"}
+{"version":3,"file":"anyMapper.js","sourceRoot":"","sources":["../../../../src/components/default/anyMapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAC,UAAU,EAAC,MAAM,4BAA4B,CAAC;AAEtD,OAAO,EAAC,UAAU,EAAE,eAAe,EAAE,wBAAwB,EAAC,MAAM,+CAA+C,CAAC;AACpH,OAAO,EAAC,KAAK,EAAC,MAAM,oBAAoB,CAAC;AAEzC,MAAM,UAAU,SAAS,CAAC,KAAU,EAAE,UAA6B,EAAE;IACnE,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE;QAC/C,OAAO,KAAK,CAAC;KACd;IAED,IAAI,KAAK,YAAY,WAAW,EAAE;QAChC,OAAO,UAAU,CAAC,SAAS,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,CAAC;KAChD;IAED,IAAI,KAAK,YAAY,UAAU,IAAI,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,UAAU,EAAE;QAC1E,MAAM,UAAU,GAAe,KAAK,CAAC,GAAG,CAAC,MAAM,CAAE,CAAC;QAElD,OAAO,KAAK,CAAC,UAAU,EAAE,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC;KAC/D;IAED,IAAI,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,eAAe,EAAE;QACxC,MAAM,IAAI,GAAG,eAAe,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,OAAO,CAAC,CAAC;QAC5D,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,CAAC;QAElD,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;KAC9D;IAED,OAAO,UAAU,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,CAAC;AAChD,CAAC;AAED,wBAAwB,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC"}

package/lib/esm/components/default/classMapper.js

@@ -1,37 +1,17 @@
 import { getValue, setValue } from "@tsed/core";
 import { JsonEntityStore } from "../../domain/JsonEntityStore.js";
 import { execMapper, registerJsonSchemaMapper } from "../../registries/JsonSchemaMapperContainer.js";
-import { mapGenericsOptions, popGenerics } from "../../utils/generics.js";
 import { createRef, createRefName } from "../../utils/ref.js";
 export function classMapper(value, options) {
     const store = JsonEntityStore.from(value.class);
     const name = createRefName(store.schema.getName() || value.getName(), options);
-    if (value.hasGenerics) {
-        // Inline generic
-        const { type, properties, additionalProperties, items, ...props } = value.toJSON(options);
-        const schema = {
-            ...execMapper("any", [store.schema], {
-                ...options,
-                ...popGenerics(value),
-                root: false
-            }),
-            ...props
-        };
-        if (schema.title) {
-            const name = createRefName(schema.title, options);
-            setValue(options.components, `schemas.${name}`, schema);
-            delete schema.title;
-            return createRef(name, value, options);
-        }
-        return schema;
-    }
     if (!getValue(options, `components.schemas.${name}`)) {
         // avoid infinite calls
         setValue(options, `components.schemas.${name}`, {});
-        options.components.schemas[name] = execMapper("any", [store.schema], mapGenericsOptions({
+        options.components.schemas[name] = execMapper("any", [store.schema], {
             ...options,
             root: false
-        }));
+        });
     }
     return createRef(name, value, options);
 }

package/lib/esm/components/default/classMapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"classMapper.js","sourceRoot":"","sources":["../../../../src/components/default/classMapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAE,QAAQ,EAAC,MAAM,YAAY,CAAC;AAC9C,OAAO,EAAC,eAAe,EAAC,MAAM,iCAAiC,CAAC;AAGhE,OAAO,EAAC,UAAU,EAAE,wBAAwB,EAAC,MAAM,+CAA+C,CAAC;AACnG,OAAO,EAAC,kBAAkB,EAAE,WAAW,EAAC,MAAM,yBAAyB,CAAC;AACxE,OAAO,EAAC,SAAS,EAAE,aAAa,EAAC,MAAM,oBAAoB,CAAC;AAE5D,MAAM,UAAU,WAAW,CAAC,KAAiB,EAAE,OAA0B;IACvE,MAAM,KAAK,GAAG,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAChD,MAAM,IAAI,GAAG,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,KAAK,CAAC,OAAO,EAAE,EAAE,OAAO,CAAC,CAAC;IAE/E,IAAI,KAAK,CAAC,WAAW,EAAE;QACrB,iBAAiB;QACjB,MAAM,EAAC,IAAI,EAAE,UAAU,EAAE,oBAAoB,EAAE,KAAK,EAAE,GAAG,KAAK,EAAC,GAAG,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACxF,MAAM,MAAM,GAAG;YACb,GAAG,UAAU,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE;gBACnC,GAAG,OAAO;gBACV,GAAG,WAAW,CAAC,KAAK,CAAC;gBACrB,IAAI,EAAE,KAAK;aACZ,CAAC;YACF,GAAG,KAAK;SACT,CAAC;QAEF,IAAI,MAAM,CAAC,KAAK,EAAE;YAChB,MAAM,IAAI,GAAG,aAAa,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YAClD,QAAQ,CAAC,OAAO,CAAC,UAAU,EAAE,WAAW,IAAI,EAAE,EAAE,MAAM,CAAC,CAAC;YAExD,OAAO,MAAM,CAAC,KAAK,CAAC;YAEpB,OAAO,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;SACxC;QAED,OAAO,MAAM,CAAC;KACf;IAED,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,sBAAsB,IAAI,EAAE,CAAC,EAAE;QACpD,uBAAuB;QACvB,QAAQ,CAAC,OAAO,EAAE,sBAAsB,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;QAEpD,OAAO,CAAC,UAAW,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,UAAU,CAC5C,KAAK,EACL,CAAC,KAAK,CAAC,MAAM,CAAC,EACd,kBAAkB,CAAC;YACjB,GAAG,OAAO;YACV,IAAI,EAAE,KAAK;SACZ,CAAC,CACH,CAAC;KACH;IAED,OAAO,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;AACzC,CAAC;AAED,wBAAwB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC"}
+{"version":3,"file":"classMapper.js","sourceRoot":"","sources":["../../../../src/components/default/classMapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAE,QAAQ,EAAC,MAAM,YAAY,CAAC;AAE9C,OAAO,EAAC,eAAe,EAAC,MAAM,iCAAiC,CAAC;AAGhE,OAAO,EAAC,UAAU,EAAE,wBAAwB,EAAC,MAAM,+CAA+C,CAAC;AACnG,OAAO,EAAC,SAAS,EAAE,aAAa,EAAC,MAAM,oBAAoB,CAAC;AAE5D,MAAM,UAAU,WAAW,CAAC,KAAiB,EAAE,OAA0B;IACvE,MAAM,KAAK,GAAG,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAChD,MAAM,IAAI,GAAG,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,KAAK,CAAC,OAAO,EAAE,EAAE,OAAO,CAAC,CAAC;IAE/E,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,sBAAsB,IAAI,EAAE,CAAC,EAAE;QACpD,uBAAuB;QACvB,QAAQ,CAAC,OAAO,EAAE,sBAAsB,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;QAEpD,OAAO,CAAC,UAAW,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE;YACpE,GAAG,OAAO;YACV,IAAI,EAAE,KAAK;SACZ,CAAC,CAAC;KACJ;IAED,OAAO,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;AACzC,CAAC;AAED,wBAAwB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC"}

package/lib/esm/components/default/discriminatorMappingMapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"discriminatorMappingMapper.js","sourceRoot":"","sources":["../../../../src/components/default/discriminatorMappingMapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AAIpC,OAAO,EAAC,wBAAwB,EAAC,MAAM,+CAA+C,CAAC;AACvF,OAAO,EAAC,KAAK,EAAC,MAAM,oBAAoB,CAAC;AAMzC,MAAM,UAAU,0BAA0B,CAAC,GAA4B,EAAE,CAAa,EAAE,OAA0B;IAChH,IAAI,GAAG,CAAC,aAAa,EAAE,OAAO,EAAE;QAC9B,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QAC1D,MAAM,UAAU,GAA2B,EAAE,CAAC;QAE9C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,OAAO,EAAE;YAClC,UAAU,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC;SAC9E;QAED,GAAG,CAAC,aAAa,CAAC,OAAO,GAAG,UAAU,CAAC;KACxC;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,iCAAiC,CAAC,GAA4B;IACrE,IAAI,GAAG,CAAC,aAAa,EAAE,OAAO,EAAE;QAC9B,OAAO,GAAG,CAAC,aAAa,CAAC,OAAO,CAAC;KAClC;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAGD,wBAAwB,CAAC,sBAAsB,EAAE,iCAAiC,CAAC,CAAC"}
+{"version":3,"file":"discriminatorMappingMapper.js","sourceRoot":"","sources":["../../../../src/components/default/discriminatorMappingMapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AAIpC,OAAO,EAAC,wBAAwB,EAAC,MAAM,+CAA+C,CAAC;AACvF,OAAO,EAAC,KAAK,EAAC,MAAM,oBAAoB,CAAC;AAMzC,MAAM,UAAU,0BAA0B,CAAC,GAA4B,EAAE,CAAa,EAAE,OAA0B;IAChH,IAAI,GAAG,CAAC,aAAa,EAAE,OAAO,EAAE;QAC9B,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QAC1D,MAAM,UAAU,GAA2B,EAAE,CAAC;QAE9C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,OAAO,EAAE;YAClC,UAAU,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,IAAK,CAAC;SAC/E;QAED,GAAG,CAAC,aAAa,CAAC,OAAO,GAAG,UAAU,CAAC;KACxC;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,iCAAiC,CAAC,GAA4B;IACrE,IAAI,GAAG,CAAC,aAAa,EAAE,OAAO,EAAE;QAC9B,OAAO,GAAG,CAAC,aAAa,CAAC,OAAO,CAAC;KAClC;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAED,wBAAwB,CAAC,sBAAsB,EAAE,iCAAiC,CAAC,CAAC"}

package/lib/esm/components/default/genericsMapper.js

@@ -1,58 +1,72 @@
-import { isClass, isPrimitiveClass } from "@tsed/core";
-import { JsonEntityStore } from "../../domain/JsonEntityStore.js";
+import { isObject } from "@tsed/core";
+import { VendorKeys } from "../../constants/VendorKeys.js";
+import { JsonSchema } from "../../domain/JsonSchema.js";
 import { execMapper, registerJsonSchemaMapper } from "../../registries/JsonSchemaMapperContainer.js";
-import { popGenerics } from "../../utils/generics.js";
-import { getJsonType } from "../../utils/getJsonType.js";
+import { toRef } from "../../utils/ref.js";
+function getNestedSchema(propertyKey, schema, options) {
+    if ("isLazyRef" in schema) {
+        return null;
+    }
+    if (schema.isGeneric) {
+        const genericLabel = schema.get(VendorKeys.GENERIC_LABEL);
+        const genericValue = options.generics?.[genericLabel];
+        if (!genericValue) {
+            return null;
+        }
+        const [model, next] = genericValue;
+        const refSchema = JsonSchema.from(model);
+        const modelSchema = execMapper("schema", [refSchema], {
+            ...options,
+            generics: next
+        });
+        if (next || !refSchema.isClass) {
+            return modelSchema;
+        }
+        return toRef(refSchema, modelSchema, options);
+    }
+    if (schema?.has("items")) {
+        const nestedSchema = getNestedSchema(propertyKey, schema.get("items"), options);
+        if (nestedSchema) {
+            return {
+                type: "array",
+                items: nestedSchema
+            };
+        }
+    }
+    if (schema.has("additionalProperties") && isObject(schema.get("additionalProperties"))) {
+        const nestedSchema = getNestedSchema(propertyKey, schema.get("additionalProperties"), options);
+        if (nestedSchema) {
+            return {
+                type: "object",
+                additionalProperties: nestedSchema
+            };
+        }
+    }
+    return null;
+}
 /**
  * @ignore
  */
-export function genericsMapper(obj, options) {
-    const { generics } = options;
-    if (generics && obj.$ref) {
-        if (generics.has(obj.$ref)) {
-            let type = generics.get(obj.$ref);
-            if (isPrimitiveClass(type)) {
-                return {
-                    type: getJsonType(type)
-                };
-            }
-            if (type === Date) {
-                return {
-                    type: "string",
-                    format: "date-time"
-                };
-            }
-            if (type.toJSON) {
-                return type.toJSON({
-                    ...options,
-                    generics: undefined
-                });
-            }
-            if (type === Object) {
-                return {
-                    type: "object"
-                };
-            }
-            if (isClass(type)) {
-                const model = {
-                    class: type
-                };
-                if (options.nestedGenerics.length === 0) {
-                    return execMapper("class", [model], {
-                        ...options,
-                        generics: undefined
-                    });
-                }
-                const store = JsonEntityStore.from(model.class);
-                return execMapper("schema", [store.schema], {
-                    ...options,
-                    ...popGenerics(options),
-                    root: false
-                });
+export function genericsMapper(baseObj, schema, options) {
+    if (schema.genericLabels?.length && schema.has("properties")) {
+        const properties = schema.get("properties");
+        let hasProps = false;
+        const additionalObj = Object.entries(properties || {}).reduce((obj, [propertyKey, jsonSchema]) => {
+            const nestedSchema = getNestedSchema(propertyKey, jsonSchema, options);
+            if (nestedSchema) {
+                obj[propertyKey] = nestedSchema;
+                hasProps = true;
             }
+            return obj;
+        }, {});
+        if (hasProps) {
+            return {
+                allOf: [toRef(schema, baseObj, options), { properties: additionalObj, type: "object" }]
+            };
         }
+        return baseObj;
     }
-    return obj;
+    return baseObj;
 }
 registerJsonSchemaMapper("generics", genericsMapper);
 //# sourceMappingURL=genericsMapper.js.map

package/lib/esm/components/default/genericsMapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"genericsMapper.js","sourceRoot":"","sources":["../../../../src/components/default/genericsMapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,gBAAgB,EAAC,MAAM,YAAY,CAAC;AACrD,OAAO,EAAC,eAAe,EAAC,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAC,UAAU,EAAE,wBAAwB,EAAC,MAAM,+CAA+C,CAAC;AACnG,OAAO,EAAkB,WAAW,EAAC,MAAM,yBAAyB,CAAC;AACrE,OAAO,EAAC,WAAW,EAAC,MAAM,4BAA4B,CAAC;AAEvD;;GAEG;AACH,MAAM,UAAU,cAAc,CAAC,GAAQ,EAAE,OAAwB;IAC/D,MAAM,EAAC,QAAQ,EAAC,GAAG,OAAO,CAAC;IAE3B,IAAI,QAAQ,IAAI,GAAG,CAAC,IAAI,EAAE;QACxB,IAAI,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YAC1B,IAAI,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAElC,IAAI,gBAAgB,CAAC,IAAI,CAAC,EAAE;gBAC1B,OAAO;oBACL,IAAI,EAAE,WAAW,CAAC,IAAI,CAAC;iBACxB,CAAC;aACH;YAED,IAAI,IAAI,KAAK,IAAI,EAAE;gBACjB,OAAO;oBACL,IAAI,EAAE,QAAQ;oBACd,MAAM,EAAE,WAAW;iBACpB,CAAC;aACH;YAED,IAAI,IAAI,CAAC,MAAM,EAAE;gBACf,OAAO,IAAI,CAAC,MAAM,CAAC;oBACjB,GAAG,OAAO;oBACV,QAAQ,EAAE,SAAS;iBACpB,CAAC,CAAC;aACJ;YAED,IAAI,IAAI,KAAK,MAAM,EAAE;gBACnB,OAAO;oBACL,IAAI,EAAE,QAAQ;iBACf,CAAC;aACH;YAED,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE;gBACjB,MAAM,KAAK,GAAG;oBACZ,KAAK,EAAE,IAAI;iBACZ,CAAC;gBAEF,IAAI,OAAO,CAAC,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE;oBACvC,OAAO,UAAU,CAAC,OAAO,EAAE,CAAC,KAAY,CAAC,EAAE;wBACzC,GAAG,OAAO;wBACV,QAAQ,EAAE,SAAS;qBACpB,CAAC,CAAC;iBACJ;gBAED,MAAM,KAAK,GAAG,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBAEhD,OAAO,UAAU,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE;oBAC1C,GAAG,OAAO;oBACV,GAAG,WAAW,CAAC,OAAO,CAAC;oBACvB,IAAI,EAAE,KAAK;iBACZ,CAAC,CAAC;aACJ;SACF;KACF;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAED,wBAAwB,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC"}
+{"version":3,"file":"genericsMapper.js","sourceRoot":"","sources":["../../../../src/components/default/genericsMapper.ts"],"names":[],"mappings":"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"}

package/lib/esm/components/default/inheritedClassMapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"inheritedClassMapper.js","sourceRoot":"","sources":["../../../../src/components/default/inheritedClassMapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,SAAS,EAAC,MAAM,YAAY,CAAC;AAE9C,OAAO,EAAC,UAAU,EAAE,wBAAwB,EAAC,MAAM,+CAA+C,CAAC;AACnG,OAAO,EAAC,kBAAkB,EAAC,MAAM,mCAAmC,CAAC;AAErE,SAAS,UAAU,CAAC,CAAS,EAAE,GAAQ;IACrC,IAAI,GAAG,EAAE,IAAI,IAAI,GAAG,EAAE,IAAI,EAAE;QAC1B,MAAM,EAAC,IAAI,EAAE,GAAG,MAAM,EAAC,GAAG,GAAG,CAAC;QAE9B,GAAG,GAAG;YACJ,KAAK,EAAE;gBACL;oBACE,IAAI;iBACL;gBACD,MAAM;aACP;SACF,CAAC;KACH;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,oBAAoB,CAAC,GAAQ,EAAE,EAAC,MAAM,EAAE,GAAG,OAAO,EAAoB;IACpF,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;IAExH,IAAI,MAAM,CAAC,MAAM,EAAE;QACjB,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE;YAC9C,OAAO,SAAS,CAAC,GAAG,EAAE,UAAU,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,EAAE,EAAC,KAAK,EAAE,UAAU,EAAC,CAAC,CAAC;QAC5F,CAAC,EAAE,EAAE,CAAC,CAAC;QAEP,OAAO,SAAS,CAAC,MAAM,EAAE,GAAG,EAAE,EAAC,KAAK,EAAE,UAAU,EAAC,CAAC,CAAC;KACpD;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAED,wBAAwB,CAAC,gBAAgB,EAAE,oBAAoB,CAAC,CAAC"}
+{"version":3,"file":"inheritedClassMapper.js","sourceRoot":"","sources":["../../../../src/components/default/inheritedClassMapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,SAAS,EAAC,MAAM,YAAY,CAAC;AAG9C,OAAO,EAAC,UAAU,EAAE,wBAAwB,EAAC,MAAM,+CAA+C,CAAC;AACnG,OAAO,EAAC,kBAAkB,EAAC,MAAM,mCAAmC,CAAC;AAErE,SAAS,UAAU,CAAC,CAAS,EAAE,GAAQ;IACrC,IAAI,GAAG,EAAE,IAAI,IAAI,GAAG,EAAE,IAAI,EAAE;QAC1B,MAAM,EAAC,IAAI,EAAE,GAAG,MAAM,EAAC,GAAG,GAAG,CAAC;QAE9B,GAAG,GAAG;YACJ,KAAK,EAAE;gBACL;oBACE,IAAI;iBACL;gBACD,MAAM;aACP;SACF,CAAC;KACH;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,oBAAoB,CAAC,GAAQ,EAAE,EAAC,MAAM,EAAE,GAAG,OAAO,EAAoB;IACpF,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;IAExH,IAAI,MAAM,CAAC,MAAM,EAAE;QACjB,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE;YAC9C,OAAO,SAAS,CAAC,GAAG,EAAE,UAAU,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,EAAE,EAAC,KAAK,EAAE,UAAU,EAAC,CAAC,CAAC;QAC5F,CAAC,EAAE,EAAE,CAAC,CAAC;QAEP,OAAO,SAAS,CAAC,MAAM,EAAE,GAAG,EAAE,EAAC,KAAK,EAAE,UAAU,EAAC,CAAC,CAAC;KACpD;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAED,wBAAwB,CAAC,gBAAgB,EAAE,oBAAoB,CAAC,CAAC"}

package/lib/esm/components/default/lazyRefMapper.js

@@ -1,5 +1,4 @@
 import { execMapper, registerJsonSchemaMapper } from "../../registries/JsonSchemaMapperContainer.js";
-import { mapGenericsOptions } from "../../utils/generics.js";
 import { createRef, toRef } from "../../utils/ref.js";
 export function lazyRefMapper(jsonLazyRef, options) {
     const name = jsonLazyRef.name;
@@ -7,7 +6,7 @@ export function lazyRefMapper(jsonLazyRef, options) {
         return createRef(name, jsonLazyRef.schema, options);
     }
     options.$refs = [...(options.$refs || []), jsonLazyRef.target];
-    const schema = jsonLazyRef.getType() && execMapper("schema", [jsonLazyRef.schema], mapGenericsOptions(options));
+    const schema = jsonLazyRef.getType() && execMapper("schema", [jsonLazyRef.schema], options);
     return toRef(jsonLazyRef.schema, schema, options);
 }
 registerJsonSchemaMapper("lazyRef", lazyRefMapper);

package/lib/esm/components/default/lazyRefMapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"lazyRefMapper.js","sourceRoot":"","sources":["../../../../src/components/default/lazyRefMapper.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,UAAU,EAAE,wBAAwB,EAAC,MAAM,+CAA+C,CAAC;AACnG,OAAO,EAAC,kBAAkB,EAAC,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAC,SAAS,EAAE,KAAK,EAAC,MAAM,oBAAoB,CAAC;AAEpD,MAAM,UAAU,aAAa,CAAC,WAAwB,EAAE,OAA0B;IAChF,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC;IAE9B,IAAI,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,KAAK,WAAW,CAAC,MAAM,CAAC,EAAE;QAC7D,OAAO,SAAS,CAAC,IAAI,EAAE,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KACrD;IAED,OAAO,CAAC,KAAK,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAE/D,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,EAAE,IAAI,UAAU,CAAC,QAAQ,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;IAEhH,OAAO,KAAK,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;AACpD,CAAC;AAED,wBAAwB,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC"}
+{"version":3,"file":"lazyRefMapper.js","sourceRoot":"","sources":["../../../../src/components/default/lazyRefMapper.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,UAAU,EAAE,wBAAwB,EAAC,MAAM,+CAA+C,CAAC;AACnG,OAAO,EAAC,SAAS,EAAE,KAAK,EAAC,MAAM,oBAAoB,CAAC;AAEpD,MAAM,UAAU,aAAa,CAAC,WAAwB,EAAE,OAA0B;IAChF,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC;IAE9B,IAAI,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,KAAK,WAAW,CAAC,MAAM,CAAC,EAAE;QAC7D,OAAO,SAAS,CAAC,IAAI,EAAE,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KACrD;IAED,OAAO,CAAC,KAAK,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAE/D,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,EAAE,IAAI,UAAU,CAAC,QAAQ,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAE5F,OAAO,KAAK,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;AACpD,CAAC;AAED,wBAAwB,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC"}

package/lib/esm/components/default/mapMapper.js

@@ -1,4 +1,3 @@
-import { mapGenericsOptions } from "../../utils/generics.js";
 import { execMapper, registerJsonSchemaMapper } from "../../registries/JsonSchemaMapperContainer.js";
 /**
  * Serialize class which inherit from Map like JsonMap, JsonOperation, JsonParameter.
@@ -8,7 +7,6 @@ import { execMapper, registerJsonSchemaMapper } from "../../registries/JsonSchem
  * @ignore
  */
 export function mapMapper(input, { ignore = [], ...options } = {}) {
-    options = mapGenericsOptions(options);
     return Array.from(input.entries()).reduce((obj, [key, value]) => {
         if (ignore.includes(key)) {
             return obj;

package/lib/esm/components/default/mapMapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"mapMapper.js","sourceRoot":"","sources":["../../../../src/components/default/mapMapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,kBAAkB,EAAC,MAAM,yBAAyB,CAAC;AAE3D,OAAO,EAAC,UAAU,EAAE,wBAAwB,EAAC,MAAM,+CAA+C,CAAC;AAEnG;;;;;;GAMG;AACH,MAAM,UAAU,SAAS,CAAC,KAAuB,EAAE,EAAC,MAAM,GAAG,EAAE,EAAE,GAAG,OAAO,KAAuB,EAAE;IAClG,OAAO,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAEtC,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,GAAQ,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QACnE,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACxB,OAAO,GAAG,CAAC;SACZ;QAED,GAAG,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,CAAC;QAChD,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC;AAED,wBAAwB,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC"}
+{"version":3,"file":"mapMapper.js","sourceRoot":"","sources":["../../../../src/components/default/mapMapper.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,UAAU,EAAE,wBAAwB,EAAC,MAAM,+CAA+C,CAAC;AAEnG;;;;;;GAMG;AACH,MAAM,UAAU,SAAS,CAAC,KAAuB,EAAE,EAAC,MAAM,GAAG,EAAE,EAAE,GAAG,OAAO,KAAuB,EAAE;IAClG,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,GAAQ,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QACnE,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACxB,OAAO,GAAG,CAAC;SACZ;QAED,GAAG,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,CAAC;QAChD,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC;AAED,wBAAwB,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC"}

package/lib/esm/components/default/nextMapper.js

@@ -0,0 +1,75 @@
+import { JsonSchema } from "../../domain/JsonSchema.js";
+import { execMapper, registerJsonSchemaMapper } from "../../registries/JsonSchemaMapperContainer.js";
+import { getGenericsOptions } from "../../utils/generics.js";
+import { mergeSchema } from "../../utils/mergeSchema.js";
+function getMapper(input, mapper, root) {
+    if (input.isClass && !input.isLocalSchema && !root) {
+        return mapper || "class";
+    }
+    return "any";
+}
+function buildAndMergeSchemas(mapper, schema1, schema2, options) {
+    const schema = execMapper(getMapper(schema2, mapper, options.root), [schema2], {
+        ...options,
+        root: false,
+        mapper: mapper === "next" ? options.mapper : undefined
+    });
+    let extraSchema = execMapper(options.root ? "any" : mapper, [schema1], {
+        ...options,
+        root: false,
+        generics: undefined,
+        mapper: mapper === "next" ? options.mapper : undefined
+    });
+    if ((schema.$ref || schema.allOf) && extraSchema.type && Object.keys(extraSchema).length === 1) {
+        extraSchema = {};
+    }
+    if (schema1.canRef) {
+        const name = extraSchema.$ref.split("/").pop();
+        const titleSchema = options.components.schemas[name];
+        options.components.schemas[name] = mergeSchema(schema, titleSchema);
+        return extraSchema;
+    }
+    return mergeSchema(schema, extraSchema);
+}
+export function itemMapper(input, options) {
+    if (input && input instanceof JsonSchema) {
+        if (!input.isCollection && input?.itemSchema?.()) {
+            const { generics, mapper } = getGenericsOptions(input, options);
+            const schema1 = input;
+            const schema2 = input.itemSchema();
+            return buildAndMergeSchemas("next", schema1, schema2, { ...options, generics, mapper });
+        }
+    }
+    return execMapper("next", [input], options);
+}
+export function nextMapper(input, options) {
+    if (input && input instanceof JsonSchema && !input.isLocalSchema) {
+        const refSchema = input.getRefSchema();
+        if (refSchema) {
+            let { generics, mapper } = getGenericsOptions(input, options);
+            mapper = getMapper(input, mapper);
+            return buildAndMergeSchemas(mapper, input, refSchema, {
+                ...options,
+                generics
+            });
+        }
+    }
+    return execMapper(getMapper(input, options.mapper), [input], {
+        ...options,
+        root: false,
+        mapper: undefined
+    });
+}
+registerJsonSchemaMapper("item", itemMapper);
+registerJsonSchemaMapper("next", nextMapper);
+registerJsonSchemaMapper("properties", nextMapper);
+registerJsonSchemaMapper("items", nextMapper);
+registerJsonSchemaMapper("additionalProperties", nextMapper);
+registerJsonSchemaMapper("propertyNames", nextMapper);
+registerJsonSchemaMapper("contains", nextMapper);
+registerJsonSchemaMapper("dependencies", nextMapper);
+registerJsonSchemaMapper("patternProperties", nextMapper);
+registerJsonSchemaMapper("additionalItems", nextMapper);
+registerJsonSchemaMapper("not", nextMapper);
+registerJsonSchemaMapper("definitions", nextMapper);
+//# sourceMappingURL=nextMapper.js.map

package/lib/esm/components/default/nextMapper.js.map

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

package/lib/esm/components/default/nullableMapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"nullableMapper.js","sourceRoot":"","sources":["../../../../src/components/default/nullableMapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,YAAY,CAAC;AACvC,OAAO,EAAC,kBAAkB,EAAC,MAAM,yCAAyC,CAAC;AAE3E,OAAO,EAAC,wBAAwB,EAAC,MAAM,+CAA+C,CAAC;AAEvF,MAAM,UAAU,cAAc,CAAC,GAAQ,EAAE,MAAyB;IAChE,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE;QACvB,OAAO,GAAG,CAAC;KACZ;IAED,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE;QACtB,IAAI,GAAG,CAAC,IAAI,EAAE;YACZ,GAAG,GAAG,WAAW,CAAC;gBAChB,GAAG,GAAG;gBACN,IAAI,EAAE,SAAS;gBACf,KAAK,EAAE;oBACL,EAAC,IAAI,EAAE,MAAM,EAAC;oBACd;wBACE,IAAI,EAAE,GAAG,CAAC,IAAI;qBACf;iBACF;aACF,CAAC,CAAC;SACJ;aAAM;YACL,kBAAkB,CAAC,IAAI,CAAC,CAAC,OAAe,EAAE,EAAE;gBAC1C,IAAI,GAAG,CAAC,OAAO,CAAC,EAAE;oBAChB,GAAG,CAAC,OAAO,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC;oBAExE,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;wBAC7B,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,CAAC;wBAE1B,GAAG,GAAG,WAAW,CAAC;4BAChB,GAAG,GAAG;4BACN,GAAG,IAAI,CAAC,CAAC,CAAC;4BACV,CAAC,OAAO,CAAC,EAAE,SAAS;4BACpB,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;yBAC5E,CAAC,CAAC;qBACJ;yBAAM;wBACL,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,EAAC,IAAI,EAAE,MAAM,EAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE;4BACrE,IAAI,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;gCACrC,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC;6BACvB;4BACD,OAAO,IAAI,CAAC;wBACd,CAAC,CAAC,CAAC;wBACH,OAAO,GAAG,CAAC,IAAI,CAAC;qBACjB;iBACF;YACH,CAAC,CAAC,CAAC;SACJ;KACF;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAED,wBAAwB,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC"}
+{"version":3,"file":"nullableMapper.js","sourceRoot":"","sources":["../../../../src/components/default/nullableMapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAC,kBAAkB,EAAC,MAAM,yCAAyC,CAAC;AAE3E,OAAO,EAAC,wBAAwB,EAAC,MAAM,+CAA+C,CAAC;AAEvF,MAAM,UAAU,cAAc,CAAC,GAAQ,EAAE,MAAyB;IAChE,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE;QACvB,OAAO,GAAG,CAAC;KACZ;IAED,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE;QACtB,IAAI,GAAG,CAAC,IAAI,EAAE;YACZ,GAAG,GAAG,WAAW,CAAC;gBAChB,GAAG,GAAG;gBACN,IAAI,EAAE,SAAS;gBACf,KAAK,EAAE;oBACL,EAAC,IAAI,EAAE,MAAM,EAAC;oBACd;wBACE,IAAI,EAAE,GAAG,CAAC,IAAI;qBACf;iBACF;aACF,CAAC,CAAC;SACJ;aAAM;YACL,kBAAkB,CAAC,IAAI,CAAC,CAAC,OAAe,EAAE,EAAE;gBAC1C,IAAI,GAAG,CAAC,OAAO,CAAC,EAAE;oBAChB,GAAG,CAAC,OAAO,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC;oBAExE,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;wBAC7B,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,CAAC;wBAE1B,GAAG,GAAG,WAAW,CAAC;4BAChB,GAAG,GAAG;4BACN,GAAG,IAAI,CAAC,CAAC,CAAC;4BACV,CAAC,OAAO,CAAC,EAAE,SAAS;4BACpB,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;yBAC5E,CAAC,CAAC;qBACJ;yBAAM;wBACL,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,EAAC,IAAI,EAAE,MAAM,EAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE;4BACrE,IAAI,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;gCACrC,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC;6BACvB;4BACD,OAAO,IAAI,CAAC;wBACd,CAAC,CAAC,CAAC;wBACH,OAAO,GAAG,CAAC,IAAI,CAAC;qBACjB;iBACF;YACH,CAAC,CAAC,CAAC;SACJ;KACF;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAED,wBAAwB,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC"}

package/lib/esm/components/default/objectMapper.js

@@ -1,4 +1,5 @@
 import { isArray } from "@tsed/core";
+import { VendorKeys } from "../../constants/VendorKeys.js";
 import { alterIgnore } from "../../hooks/alterIgnore.js";
 import { execMapper, registerJsonSchemaMapper } from "../../registries/JsonSchemaMapperContainer.js";
 /**
@@ -8,16 +9,20 @@ import { execMapper, registerJsonSchemaMapper } from "../../registries/JsonSchem
  * @ignore
  */
 export function objectMapper(input, options) {
-    const { specType, operationIdFormatter, root, components, genericTypes, nestedGenerics, useAlias, genericLabels, ...ctx } = options;
+    const { specType, operationIdFormatter, root, components, useAlias, ...ctx } = options;
     return Object.entries(input).reduce((obj, [key, value]) => {
         if (options.withIgnoredProps !== false && !alterIgnore(value, ctx)) {
             const opts = {
                 ...options,
-                groups: input?.$forwardGroups || value?.$forwardGroups ? options.groups : undefined
+                parent: value,
+                groups: input?.get?.(VendorKeys.FORWARD_GROUPS) || value?.get?.(VendorKeys.FORWARD_GROUPS) ? options.groups : undefined
             };
-            // remove groups to avoid bad schema generation over children models
             obj[key] = execMapper("item", [value], opts);
             obj[key] = execMapper("nullable", [obj[key], value], opts);
+            if (value.isGeneric && obj[key]?.type) {
+                const { type, ...rest } = obj[key];
+                obj[key] = rest;
+            }
         }
         return obj;
     }, isArray(input) ? [] : {});

package/lib/esm/components/default/objectMapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"objectMapper.js","sourceRoot":"","sources":["../../../../src/components/default/objectMapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,YAAY,CAAC;AAEnC,OAAO,EAAC,WAAW,EAAC,MAAM,4BAA4B,CAAC;AAEvD,OAAO,EAAC,UAAU,EAAE,wBAAwB,EAAC,MAAM,+CAA+C,CAAC;AAEnG;;;;;GAKG;AACH,MAAM,UAAU,YAAY,CAAC,KAAU,EAAE,OAA0B;IACjE,MAAM,EAAC,QAAQ,EAAE,oBAAoB,EAAE,IAAI,EAAE,UAAU,EAAE,YAAY,EAAE,cAAc,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,GAAG,EAAC,GAAG,OAAO,CAAC;IAElI,OAAO,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,CACjC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAA6B,EAAE,EAAE;QAChD,IAAI,OAAO,CAAC,gBAAgB,KAAK,KAAK,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE;YAClE,MAAM,IAAI,GAAG;gBACX,GAAG,OAAO;gBACV,MAAM,EAAE,KAAK,EAAE,cAAc,IAAI,KAAK,EAAE,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;aACpF,CAAC;YAEF,oEAAoE;YACpE,GAAG,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,CAAC;YAC7C,GAAG,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,UAAU,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,EAAE,IAAI,CAAC,CAAC;SAC5D;QAED,OAAO,GAAG,CAAC;IACb,CAAC,EACD,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CACzB,CAAC;AACJ,CAAC;AAED,wBAAwB,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC"}
+{"version":3,"file":"objectMapper.js","sourceRoot":"","sources":["../../../../src/components/default/objectMapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,YAAY,CAAC;AAEnC,OAAO,EAAC,UAAU,EAAC,MAAM,+BAA+B,CAAC;AAEzD,OAAO,EAAC,WAAW,EAAC,MAAM,4BAA4B,CAAC;AAEvD,OAAO,EAAC,UAAU,EAAE,wBAAwB,EAAC,MAAM,+CAA+C,CAAC;AAEnG;;;;;GAKG;AACH,MAAM,UAAU,YAAY,CAAC,KAAU,EAAE,OAA0B;IACjE,MAAM,EAAC,QAAQ,EAAE,oBAAoB,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,GAAG,EAAC,GAAG,OAAO,CAAC;IAErF,OAAO,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,CACjC,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAA6B,EAAE,EAAE;QAChD,IAAI,OAAO,CAAC,gBAAgB,KAAK,KAAK,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE;YAClE,MAAM,IAAI,GAAG;gBACX,GAAG,OAAO;gBACV,MAAM,EAAE,KAAK;gBACb,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,IAAI,KAAK,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;aACxH,CAAC;YAEF,GAAG,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,CAAC;YAC7C,GAAG,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,UAAU,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,EAAE,IAAI,CAAC,CAAC;YAE3D,IAAI,KAAK,CAAC,SAAS,IAAI,GAAG,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE;gBACrC,MAAM,EAAC,IAAI,EAAE,GAAG,IAAI,EAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;gBACjC,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;aACjB;SACF;QAED,OAAO,GAAG,CAAC;IACb,CAAC,EACD,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CACzB,CAAC;AACJ,CAAC;AAED,wBAAwB,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC"}

package/lib/esm/components/default/ofMapper.js

@@ -1,10 +1,7 @@
 import { execMapper, registerJsonSchemaMapper } from "../../registries/JsonSchemaMapperContainer.js";
-export function ofMapper(input, options, parent) {
+export function ofMapper(input, options) {
     return input.map((value) => {
-        return execMapper("item", [value], {
-            ...options,
-            genericLabels: parent.genericLabels
-        });
+        return execMapper("item", [value], options);
     });
 }
 registerJsonSchemaMapper("anyOf", ofMapper);

package/lib/esm/components/default/ofMapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"ofMapper.js","sourceRoot":"","sources":["../../../../src/components/default/ofMapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,wBAAwB,EAAC,MAAM,+CAA+C,CAAC;AAInG,MAAM,UAAU,QAAQ,CAAC,KAA2B,EAAE,OAA0B,EAAE,MAAkB;IAClG,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,KAAuB,EAAE,EAAE;QAC3C,OAAO,UAAU,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,EAAE;YACjC,GAAG,OAAO;YACV,aAAa,EAAE,MAAM,CAAC,aAAa;SACpC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,wBAAwB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;AAC5C,wBAAwB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;AAC5C,wBAAwB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC"}
+{"version":3,"file":"ofMapper.js","sourceRoot":"","sources":["../../../../src/components/default/ofMapper.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,UAAU,EAAE,wBAAwB,EAAC,MAAM,+CAA+C,CAAC;AAEnG,MAAM,UAAU,QAAQ,CAAC,KAA2B,EAAE,OAA0B;IAC9E,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,KAAuB,EAAE,EAAE;QAC3C,OAAO,UAAU,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;AACL,CAAC;AAED,wBAAwB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;AAC5C,wBAAwB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;AAC5C,wBAAwB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC"}

package/lib/esm/components/default/requiredMapper.js

@@ -14,7 +14,7 @@ function mapRequiredProps(obj, schema, options = {}) {
 }
 function extractRequiredProps(obj, schema, options) {
     let required = obj.required || [];
-    required = [...required, ...schema.$required];
+    required = [...required, ...schema.getRequiredFields()];
     if (schema.get("properties")) {
         required = Object.entries(schema.get("properties")).reduce((required, [key, prop]) => {
             if (prop && prop.$selfRequired !== undefined) {
@@ -26,7 +26,7 @@ function extractRequiredProps(obj, schema, options) {
     return alterRequiredGroups(uniq(required), schema, options);
 }
 export function requiredMapper(obj, schema, options) {
-    if (options.groups && options.groups.includes("partial")) {
+    if (options.groups && options.groups?.includes("partial")) {
         if (obj.discriminator) {
             return {
                 ...obj,

package/lib/esm/components/default/requiredMapper.js.map

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

package/lib/esm/components/default/schemaMapper.js

@@ -1,4 +1,4 @@
-import { getValue, isObject, isFunction } from "@tsed/core";
+import { getValue, isFunction, isObject } from "@tsed/core";
 import { mapAliasedProperties } from "../../domain/JsonAliasMap.js";
 import { SpecTypes } from "../../domain/SpecTypes.js";
 import { alterOneOf } from "../../hooks/alterOneOf.js";
@@ -13,6 +13,7 @@ const IGNORES = ["name", "$required", "$hooks", "_nestedGenerics", SpecTypes.OPE
 const IGNORES_OPENSPEC = [];
 /**
  * @ignore
+ * TODO check if we can remove this
  */
 function isEmptyProperties(key, value) {
     return typeof value === "object" && ["items", "properties", "additionalProperties"].includes(key) && Object.keys(value).length === 0;
@@ -28,7 +29,8 @@ function shouldMapAlias(key, value, useAlias) {
  */
 function shouldSkipKey(key, { specType = SpecTypes.JSON, customKeys = false }) {
     return (IGNORES.includes(key) ||
-        (key.startsWith("#") && (customKeys === false || specType !== SpecTypes.JSON)) ||
+        key.startsWith("x-") ||
+        (key.startsWith("#") && (!customKeys || specType !== SpecTypes.JSON)) ||
         (specType !== SpecTypes.JSON && IGNORES_OPENSPEC.includes(key)));
 }
 function isExample(key, value, options) {
@@ -81,17 +83,13 @@ function mapKeys(schema, options) {
 }
 function serializeSchema(schema, options) {
     let obj = mapKeys(schema, options);
-    if (schema.isClass) {
+    if (schema.isClass && !schema.isLocalSchema) {
         obj = execMapper("inheritedClass", [obj], {
             ...options,
             root: false,
-            target: schema.getComputedType()
+            target: schema.class
         });
     }
-    obj = execMapper("generics", [obj], {
-        ...options,
-        root: false
-    });
     if (schema.has(options.specType)) {
         obj = {
             ...obj,
@@ -106,6 +104,7 @@ function serializeSchema(schema, options) {
     obj = alterOneOf(obj, schema, options);
     obj = execMapper("enums", [obj, schema], options);
     obj = execMapper("discriminatorMapping", [obj, schema], options);
+    obj = execMapper("generics", [obj, schema], options);
     return obj;
 }
 export function schemaMapper(schema, opts) {

package/lib/esm/components/default/schemaMapper.js.map

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