fix: problem with incorrect resolving type name of discriminator mapping types data contracts

Author: js2me

CHANGELOG.md

@@ -4,6 +4,7 @@ feat: `const` keyword OpenAPI 3.0 draft
 fix: problem with using `anyOf`  
 feat: `--extract-responses` (nodejs: `extractResponses`) option to extract all schemas from `/components/responses`
 fix: discriminator and mapping with invalid discriminator property name (#551)  
+fix: problem with incorrect resolving type name of discriminator mapping types data contracts
 
 ## 13.0.0  
 

src/schema-parser/base-schema-parsers/discriminator.js

@@ -74,22 +74,22 @@ class DiscriminatorSchemaParser extends MonoSchemaParser {
       });
 
     if (ableToCreateMappingType) {
-      mappingTypeName = this.schemaUtils.resolveTypeName(
-        `${abstractSchemaStruct.typeName} ${discriminator.propertyName}`,
-        {
-          suffixes: this.config.extractingOptions.discriminatorMappingSuffix,
-          resolver:
-            this.config.extractingOptions.discriminatorMappingNameResolver,
-        },
-      );
-      this.schemaParserFabric.createSchema({
-        linkedComponent: this.schemaComponentsMap.createComponent(
-          this.schemaComponentsMap.createRef([
-            'components',
-            'schemas',
-            mappingTypeName,
-          ]),
+      const mappingTypeNameRef = this.schemaComponentsMap.createRef([
+        'components',
+        'schemas',
+        this.schemaUtils.resolveTypeName(
+          `${abstractSchemaStruct.typeName} ${discriminator.propertyName}`,
+          {
+            suffixes: this.config.extractingOptions.discriminatorMappingSuffix,
+            resolver:
+              this.config.extractingOptions.discriminatorMappingNameResolver,
+          },
         ),
+      ]);
+      const mappingTypeNameComponent =
+        this.schemaComponentsMap.createComponent(mappingTypeNameRef);
+      const mappingTypeNameSchema = this.schemaParserFabric.createSchema({
+        linkedComponent: mappingTypeNameComponent,
         content: ts.IntersectionType([
           ts.ObjectWrapper(
             ts.TypeField({
@@ -102,6 +102,8 @@ class DiscriminatorSchemaParser extends MonoSchemaParser {
         genericArgs: [{ name: 'Key' }, { name: 'Type' }],
         internal: true,
       });
+
+      mappingTypeName = mappingTypeNameSchema.typeData.name;
     }
 
     /** returns (GenericType<"mapping_key", MappingType>) or ({ discriminatorProperty: "mapping_key" } & MappingType) */

src/type-name-formatter.js

@@ -41,7 +41,13 @@ class TypeNameFormatter {
         ? this.config.enumKeySuffix
         : this.config.typeSuffix;
 
-    const hashKey = `${typePrefix}_${name}_${typeSuffix}`;
+    const existedFormattedEntry = Array.from(
+      this.formattedModelNamesMap.entries(),
+    ).find((entry) => entry[1] === name);
+
+    const hashKey = existedFormattedEntry
+      ? existedFormattedEntry[0]
+      : `${typePrefix}_${name}_${typeSuffix}`;
 
     if (typeof name !== 'string') {
       this.logger.warn('wrong name of the model name', name);