Merge pull request #508 from AGrigorii/fix-enums-extracting

fix: extracting enums along with extracting request params [#506]

Author: js2me

README.md

@@ -130,6 +130,7 @@ generateApi({
   toJS: false,
   extractRequestParams: false,
   extractRequestBody: false,
+  extractEnums: false,
   unwrapResponseData: false,
   prettier: { // By default prettier config is load from your project
     printWidth: 120,

src/schema-parser/schema-parser.js

@@ -92,7 +92,7 @@ class SchemaParser {
   baseSchemaParsers = {
     [SCHEMA_TYPES.ENUM]: (schema, typeName) => {
       if (this.config.extractEnums && !typeName) {
-        const generatedTypeName = this.config.componentTypeNameResolver.resolve([this.buildTypeNameFromPath()]);
+        const generatedTypeName = this.config.componentTypeNameResolver.resolve([this.buildTypeNameFromPath()], false);
         const schemaComponent = this.schemaComponentsMap.createComponent("schemas", generatedTypeName, { ...schema });
         return this.parseSchema(schemaComponent, generatedTypeName);
       }
@@ -391,9 +391,9 @@ class SchemaParser {
       _.merge(schema, this.config.hooks.onPreParseSchema(schema, typeName, schemaType));
       parsedSchema = this.baseSchemaParsers[schemaType](schema, typeName);
       schema.$parsed = this.config.hooks.onParseSchema(schema, parsedSchema) || parsedSchema;
-    }
 
-    this.$processingSchemaPath.pop();
+      this.$processingSchemaPath.pop();
+    }
 
     return schema.$parsed;
   };

src/schema-parser/schema-routes.js

@@ -767,7 +767,16 @@ class SchemaRoutes {
       this.extractResponseErrorIfItNeeded(routeInfo, responseBodyInfo, routeName);
     }
 
-    const queryType = routeParams.query.length ? this.schemaParser.getInlineParseContent(queryObjectSchema) : null;
+    const typeName = this.schemaUtils.resolveTypeName(
+      routeName.usage,
+      this.config.extractingOptions.requestParamsSuffix,
+      this.config.extractingOptions.requestParamsNameResolver,
+      false,
+    );
+
+    const queryType = routeParams.query.length
+      ? this.schemaParser.getInlineParseContent(queryObjectSchema, typeName)
+      : null;
     const pathType = routeParams.path.length ? this.schemaParser.getInlineParseContent(pathObjectSchema) : null;
     const headersType = routeParams.header.length ? this.schemaParser.getInlineParseContent(headersObjectSchema) : null;
 

src/schema-parser/schema-utils.js

@@ -145,7 +145,7 @@ class SchemaUtils {
     return _.uniq(_.filter(contents, (type) => filterFn(type)));
   };
 
-  resolveTypeName = (typeName, suffixes, resolver) => {
+  resolveTypeName = (typeName, suffixes, resolver, shouldReserve = true) => {
     if (resolver) {
       return this.config.componentTypeNameResolver.resolve((reserved) => {
         const variant = resolver(pascalCase(typeName), reserved);
@@ -155,6 +155,7 @@ class SchemaUtils {
     } else {
       return this.config.componentTypeNameResolver.resolve(
         suffixes.map((suffix) => pascalCase(`${typeName} ${suffix}`)),
+        shouldReserve,
       );
     }
   };

src/util/name-resolver.js

@@ -40,21 +40,21 @@ class NameResolver {
    * @param {(string[]) | ((reserved: string[]) => string)} variantsOrResolver
    * @returns {string | null}
    */
-  resolve(variantsOrResolver) {
+  resolve(variantsOrResolver, shouldReserve = true) {
     this.logger.debug("resolving name with using", variantsOrResolver);
     if (Array.isArray(variantsOrResolver)) {
       const variants = variantsOrResolver;
       let usageName = null;
       const uniqVariants = _.uniq(_.compact(variants));
 
       _.forEach(uniqVariants, (variant) => {
-        if (!usageName && !this.isReserved(variant)) {
+        if (!usageName && (!shouldReserve || !this.isReserved(variant))) {
           usageName = variant;
         }
       });
 
       if (usageName) {
-        this.reserve([usageName]);
+        shouldReserve && this.reserve([usageName]);
         return usageName;
       }
 
@@ -74,7 +74,7 @@ class NameResolver {
         }
       }
 
-      this.reserve([usageName]);
+      shouldReserve && this.reserve([usageName]);
       return usageName;
     }