fix(generator): add prefix to es5keyword parameters (#356)

* fix(types): remove generic from axios query function generator (#284)

* fix(generator): add prefix to es5keyword parameters

src/core/generators/verbsOptions.ts

@@ -30,6 +30,7 @@ import { getProps } from '../getters/props';
 import { getQueryParams } from '../getters/queryParams';
 import { getResponse } from '../getters/response';
 import { generateMutator } from './mutator';
+import { sanitize } from '../../utils/string';
 
 const generateVerbOptions = async ({
   verb,
@@ -79,9 +80,7 @@ const generateVerbOptions = async ({
   const overriddenOperationName = overrideOperationName
     ? overrideOperationName(operation, route, verb)
     : camel(operationId);
-  const operationName = keyword.isKeywordES5(overriddenOperationName, true)
-    ? `_${overriddenOperationName}`
-    : overriddenOperationName;
+  const operationName = sanitize(overriddenOperationName, { es5keyword: true })
 
   const response = await getResponse(responses, operationName, context);
 

src/core/getters/params.ts

@@ -42,7 +42,7 @@ export const getParams = ({
     params.map(async (p) => {
       const pathParam = pathParams.find(
         ({ parameter }) =>
-          camel(sanitize(parameter.name, { underscore: true, dash: true })) ===
+          sanitize(camel(parameter.name), { es5keyword: true, underscore: true, dash: true }) ===
           p,
       );
 
@@ -58,7 +58,7 @@ export const getParams = ({
         schema,
       } = pathParam.parameter;
 
-      const name = sanitize(camel(nameWithoutSanitize));
+      const name = sanitize(camel(nameWithoutSanitize), { es5keyword:true });
 
       if (!schema) {
         return {

src/core/getters/route.ts

@@ -7,7 +7,7 @@ const getRoutePath = (path: string) => {
   const matches = path.match(/([^{]*){?([\w_-]*)}?(.*)/)
   if (!matches?.length) return path // impossible due to regexp grouping here, but for TS
   const prev = matches[1]
-  const param = camel(sanitize(matches[2], { underscore: true, dash: true, dot: true }))
+  const param = sanitize(camel(matches[2]), { es5keyword: true, underscore: true, dash: true, dot: true })
   const next: string = hasParam(matches[3]) ? getRoutePath(matches[3]) : matches[3]
   if (hasParam(path)) {
     return `${prev}\${${param}}${next}`

src/utils/string.ts

@@ -1,3 +1,4 @@
+import { keyword } from 'esutils';
 import get from 'lodash.get';
 import {
   isBoolean,
@@ -52,13 +53,15 @@ export const sanitize = (
     underscore?: string | true;
     dot?: string | true;
     dash?: string | true;
+    es5keyword?: boolean
   },
 ) => {
   const {
     whitespace = '',
     underscore = '',
     dot = '',
     dash = '',
+    es5keyword = false
   } = options || {};
   let newValue = value.replace(/[^\w\s.-]/g, '');
 
@@ -78,6 +81,10 @@ export const sanitize = (
     newValue = newValue.replace(/[-]/g, dash);
   }
 
+  if (es5keyword) {
+    newValue = keyword.isKeywordES5(newValue, true) ? `_${newValue}` : newValue
+  }
+
   return newValue;
 };