Merge pull request #561 from acacode/next

Release 13.0.2

Author: js2me

CHANGELOG.md

@@ -1,5 +1,11 @@
 # next release  
 
+## 13.0.2  
+
+fix: problem with incorrect settings type suffix for internal discriminator mappings
+
+## 13.0.1  
+
 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`

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "swagger-typescript-api",
-  "version": "13.0.0",
+  "version": "13.0.2",
   "description": "Generate typescript/javascript api from swagger schema",
   "scripts": {
     "update-deps-to-latest": "npx --yes npm-check-updates && npm i",

package.json

@@ -74,36 +74,36 @@ class DiscriminatorSchemaParser extends MonoSchemaParser {
       });
 
     if (ableToCreateMappingType) {
-      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 rawTypeName = `${abstractSchemaStruct.typeName}_${discriminator.propertyName}`;
+      const generatedTypeName = this.schemaUtils.resolveTypeName(rawTypeName, {
+        suffixes: this.config.extractingOptions.discriminatorMappingSuffix,
+        resolver:
+          this.config.extractingOptions.discriminatorMappingNameResolver,
+      });
+
+      const content = ts.IntersectionType([
+        ts.ObjectWrapper(
+          ts.TypeField({
+            key: ts.StringValue(discriminator.propertyName),
+            value: 'Key',
+          }),
         ),
+        'Type',
       ]);
-      const mappingTypeNameComponent =
-        this.schemaComponentsMap.createComponent(mappingTypeNameRef);
-      const mappingTypeNameSchema = this.schemaParserFabric.createSchema({
-        linkedComponent: mappingTypeNameComponent,
-        content: ts.IntersectionType([
-          ts.ObjectWrapper(
-            ts.TypeField({
-              key: ts.StringValue(discriminator.propertyName),
-              value: 'Key',
-            }),
-          ),
-          'Type',
-        ]),
-        genericArgs: [{ name: 'Key' }, { name: 'Type' }],
-        internal: true,
+
+      const component = this.schemaParserFabric.createParsedComponent({
+        typeName: generatedTypeName,
+        schema: {
+          type: 'object',
+          properties: {},
+          genericArgs: [{ name: 'Key' }, { name: 'Type' }],
+          internal: true,
+        },
       });
 
-      mappingTypeName = mappingTypeNameSchema.typeData.name;
+      component.typeData.content = content;
+
+      mappingTypeName = this.typeNameFormatter.format(component.typeName);
     }
 
     /** returns (GenericType<"mapping_key", MappingType>) or ({ discriminatorProperty: "mapping_key" } & MappingType) */

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

@@ -79,6 +79,7 @@ class SchemaParserFabric {
       schemaCopy,
     );
     const parsed = this.parseSchema(schemaCopy, null, schemaPath);
+
     parsed.name = typeName;
     customComponent.typeData = parsed;
 

src/schema-parser/schema-parser-fabric.js

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