fix: bug with kebab-case path params (issue #184, thanks @Mr-sgreen)

Author: js2me

CHANGELOG.md

@@ -1,5 +1,9 @@
 # next release  
 
+
+Fixes:  
+- Bug with `kebab-case` path params (issue #184, thanks @Mr-sgreen)  
+
 # 6.0.0  
 
 BREAKING_CHANGES:  

src/routes.js

@@ -139,7 +139,7 @@ const parseRoute = (route) => {
         ...pathParams,
         {
           $match: match,
-          name: paramName,
+          name: _.camelCase(paramName),
           required: true,
           type: "string",
           description: "",
@@ -162,6 +162,7 @@ const parseRoute = (route) => {
   );
 
   return {
+    originalRoute: route || "",
     route: fixedRoute,
     pathParams,
   };
@@ -206,6 +207,10 @@ const getRouteParams = (routeInfo, pathParams) => {
       };
     }
 
+    if (routeParam.in === "path" && routeParam.name) {
+      routeParam.name = _.camelCase(routeParam.name);
+    }
+
     if (routeParam) {
       routeParams[routeParam.in].push(routeParam);
     }

tests/generated/v2.0/adafruit.ts

@@ -269,13 +269,13 @@ export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDa
      */
     wrongPathParams1: (
       pathParam1: string,
-      path_param2: string,
-      path_param3: string,
+      pathParam2: string,
+      pathParam3: string,
       pathParam4: string,
       params: RequestParams = {},
     ) =>
       this.request<void, any>({
-        path: `/wrong-path-params1/${pathParam1}/${path_param2}/${path_param3}/${pathParam4}`,
+        path: `/wrong-path-params1/${pathParam1}/${pathParam2}/${pathParam3}/${pathParam4}`,
         method: "DELETE",
         ...params,
       }),
@@ -288,7 +288,7 @@ export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDa
      * @name WrongPathParams2
      * @request DELETE:/wrong-path-params2
      */
-    wrongPathParams2: (path_param1: string, params: RequestParams = {}) =>
+    wrongPathParams2: (pathParam1: string, params: RequestParams = {}) =>
       this.request<void, any>({
         path: `/wrong-path-params2`,
         method: "DELETE",
@@ -335,9 +335,9 @@ export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDa
      * @name KeyRevoke
      * @request DELETE:/key/{PK}
      */
-    keyRevoke: (PK: string, query: { secret: string }, params: RequestParams = {}) =>
+    keyRevoke: (pk: string, query: { secret: string }, params: RequestParams = {}) =>
       this.request<{ status?: string }, Error>({
-        path: `/key/${PK}`,
+        path: `/key/${pk}`,
         method: "DELETE",
         query: query,
         format: "json",
@@ -351,9 +351,9 @@ export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDa
      * @name GetKey
      * @request GET:/key/{PK}
      */
-    getKey: (PK: string, params: RequestParams = {}) =>
+    getKey: (pk: string, params: RequestParams = {}) =>
       this.request<{ since?: string; status?: string; sub?: string }, Error>({
-        path: `/key/${PK}`,
+        path: `/key/${pk}`,
         method: "GET",
         format: "json",
         ...params,
@@ -366,9 +366,9 @@ export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDa
      * @name HeadKey
      * @request HEAD:/key/{PK}
      */
-    headKey: (PK: string, params: RequestParams = {}) =>
+    headKey: (pk: string, params: RequestParams = {}) =>
       this.request<void, Error>({
-        path: `/key/${PK}`,
+        path: `/key/${pk}`,
         method: "HEAD",
         ...params,
       }),
@@ -380,9 +380,9 @@ export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDa
      * @name KeyUpdate
      * @request POST:/key/{PK}
      */
-    keyUpdate: (PK: string, body: AuthentiqID, params: RequestParams = {}) =>
+    keyUpdate: (pk: string, body: AuthentiqID, params: RequestParams = {}) =>
       this.request<{ status?: string }, Error>({
-        path: `/key/${PK}`,
+        path: `/key/${pk}`,
         method: "POST",
         body: body,
         format: "json",
@@ -396,9 +396,9 @@ export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDa
      * @name KeyBind
      * @request PUT:/key/{PK}
      */
-    keyBind: (PK: string, body: AuthentiqID, params: RequestParams = {}) =>
+    keyBind: (pk: string, body: AuthentiqID, params: RequestParams = {}) =>
       this.request<{ status?: string }, Error>({
-        path: `/key/${PK}`,
+        path: `/key/${pk}`,
         method: "PUT",
         body: body,
         format: "json",

tests/generated/v2.0/authentiq.ts

@@ -296,9 +296,9 @@ export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDa
      * @request GET:/trip/{trip_id}/stop
      * @secure
      */
-    stopDetail: (trip_id: string, params: RequestParams = {}) =>
+    stopDetail: (tripId: string, params: RequestParams = {}) =>
       this.request<Step[], any>({
-        path: `/trip/${trip_id}/stop`,
+        path: `/trip/${tripId}/stop`,
         method: "GET",
         secure: true,
         format: "json",

tests/generated/v2.0/furkot-example.ts

@@ -4527,12 +4527,12 @@ export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDa
     reposDetail2: (
       owner: string,
       repo: string,
-      archive_format: "tarball" | "zipball",
+      archiveFormat: "tarball" | "zipball",
       path: string,
       params: RequestParams = {},
     ) =>
       this.request<any, void>({
-        path: `/repos/${owner}/${repo}/${archive_format}/${path}`,
+        path: `/repos/${owner}/${repo}/${archiveFormat}/${path}`,
         method: "GET",
         ...params,
       }),

tests/generated/v2.0/github-swagger.ts

@@ -244,6 +244,20 @@ export class HttpClient<SecurityDataType = unknown> {
  * A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification
  */
 export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDataType> {
+  pathParams = {
+    /**
+     * No description
+     *
+     * @name PathParamFooBarBazList
+     * @request GET:/path-params/{path-param}/{foo-bar-baz}
+     */
+    pathParamFooBarBazList: (pathParam: string, fooBarBaz: string, params: RequestParams = {}) =>
+      this.request<any, void>({
+        path: `/path-params/${pathParam}/${fooBarBaz}`,
+        method: "GET",
+        ...params,
+      }),
+  };
   pets = {
     /**
      * @description Returns all pets from the system that the user has access to Nam sed condimentum est. Maecenas tempor sagittis sapien, nec rhoncus sem sagittis sit amet. Aenean at gravida augue, ac iaculis sem. Curabitur odio lorem, ornare eget elementum nec, cursus id lectus. Duis mi turpis, pulvinar ac eros ac, tincidunt varius justo. In hac habitasse platea dictumst. Integer at adipiscing ante, a sagittis ligula. Aenean pharetra tempor ante molestie imperdiet. Vivamus id aliquam diam. Cras quis velit non tortor eleifend sagittis. Praesent at enim pharetra urna volutpat venenatis eget eget mauris. In eleifend fermentum facilisis. Praesent enim enim, gravida ac sodales sed, placerat id erat. Suspendisse lacus dolor, consectetur non augue vel, vehicula interdum libero. Morbi euismod sagittis libero sed lacinia. Sed tempus felis lobortis leo pulvinar rutrum. Nam mattis velit nisl, eu condimentum ligula luctus nec. Phasellus semper velit eget aliquet faucibus. In a mattis elit. Phasellus vel urna viverra, condimentum lorem id, rhoncus nibh. Ut pellentesque posuere elementum. Sed a varius odio. Morbi rhoncus ligula libero, vel eleifend nunc tristique vitae. Fusce et sem dui. Aenean nec scelerisque tortor. Fusce malesuada accumsan magna vel tempus. Quisque mollis felis eu dolor tristique, sit amet auctor felis gravida. Sed libero lorem, molestie sed nisl in, accumsan tempor nisi. Fusce sollicitudin massa ut lacinia mattis. Sed vel eleifend lorem. Pellentesque vitae felis pretium, pulvinar elit eu, euismod sapien.