Merge pull request #929 from BoltDoggy/patch-1

Fix route regex pattern in route name generation
acacode · Feb 12, 2025 · 6afe406 · 6afe406
2 parents bd12a16 + 1e2e00e
commit 6afe406
Show file tree

Hide file tree

Showing 13 changed files with 1,711 additions and 2,120 deletions.
diff --git a/.changeset/orange-dogs-lay.md b/.changeset/orange-dogs-lay.md
@@ -0,0 +1,5 @@
+---
+"swagger-typescript-api": patch
+---
+
+Fix route regex pattern in route name generation.
diff --git a/templates/base/route-name.ejs b/templates/base/route-name.ejs
@@ -23,7 +23,7 @@ const methodAliases = {
 };
 
 const createCustomOperationId = (method, route, moduleName) => {
-  const hasPathInserts = /\{(\w){1,}\}/g.test(route);
+  const hasPathInserts = /\{(\w){1,}\}$/g.test(route);
   const splittedRouteBySlash = _.compact(_.replace(route, /\{(\w){1,}\}/g, "").split("/"));
   const routeParts = (splittedRouteBySlash.length > 1
     ? splittedRouteBySlash.splice(1)

diff --git a/tests/__snapshots__/extended.test.ts.snap b/tests/__snapshots__/extended.test.ts.snap
@@ -59295,7 +59295,7 @@ export enum StepModeEnum {
   Other = "other",
 }
 
-export type StopDetailData = Step[];
+export type StopListData = Step[];
 
 export interface Trip {
   /**
@@ -59321,19 +59321,19 @@ export type TripListData = Trip[];
 export namespace Trip {
   /**
    * @description list stops for a trip identified by {trip_id}
-   * @name StopDetail
+   * @name StopList
    * @request GET:/trip/{trip_id}/stop
    * @secure
    */
-  export namespace StopDetail {
+  export namespace StopList {
     export type RequestParams = {
       /** id of the trip */
       tripId: string;
     };
     export type RequestQuery = {};
     export type RequestBody = never;
     export type RequestHeaders = {};
-    export type ResponseBody = StopDetailData;
+    export type ResponseBody = StopListData;
   }
 
   /**
@@ -59577,12 +59577,12 @@ export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDa
     /**
      * @description list stops for a trip identified by {trip_id}
      *
-     * @name StopDetail
+     * @name StopList
      * @request GET:/trip/{trip_id}/stop
      * @secure
      */
-    stopDetail: (tripId: string, params: RequestParams = {}) =>
-      this.request<StopDetailData, any>({
+    stopList: (tripId: string, params: RequestParams = {}) =>
+      this.request<StopListData, any>({
         path: \`/trip/\${tripId}/stop\`,
         method: "GET",
         secure: true,
@@ -69761,9 +69761,9 @@ export interface ListWebhooksResponse {
   };
 }
 
-export type LogsDetailData = ListWebhookDeliveryLogsResponse;
+export type LogsListData = ListWebhookDeliveryLogsResponse;
 
-export interface LogsDetailParams {
+export interface LogsListParams {
   /**
    * The number of records to return in each page.
    * @example 30
@@ -70016,7 +70016,9 @@ export enum TransactionStatusEnum {
 
 export type TransactionsDetailData = GetTransactionResponse;
 
-export interface TransactionsDetailParams1 {
+export type TransactionsListData = ListTransactionsResponse;
+
+export interface TransactionsListParams {
   /**
    * The category identifier for which to filter transactions.
    * Both parent and child categories can be filtered through
@@ -70060,18 +70062,11 @@ export interface TransactionsDetailParams1 {
    * @example 30
    */
   "page[size]"?: number;
-  /**
-   * The unique identifier for the account.
-   * @example "86150b64-feaa-4186-a7e4-e84eae764602"
-   */
-  accountId: string;
+  /** Blablabla bla */
+  someEnumName?: SomeEnumName;
 }
 
-export type TransactionsDetailResult = ListTransactionsResponse;
-
-export type TransactionsListData = ListTransactionsResponse;
-
-export interface TransactionsListParams {
+export interface TransactionsListParams2 {
   /**
    * The category identifier for which to filter transactions.
    * Both parent and child categories can be filtered through
@@ -70115,10 +70110,15 @@ export interface TransactionsListParams {
    * @example 30
    */
   "page[size]"?: number;
-  /** Blablabla bla */
-  someEnumName?: SomeEnumName;
+  /**
+   * The unique identifier for the account.
+   * @example "86150b64-feaa-4186-a7e4-e84eae764602"
+   */
+  accountId: string;
 }
 
+export type TransactionsListResult = ListTransactionsResponse;
+
 /** Request to add or remove tags associated with a transaction. */
 export interface UpdateTransactionTagsRequest {
   /** The tags to add to or remove from the transaction. */
@@ -70385,12 +70385,12 @@ export namespace Accounts {
   /**
    * @description Retrieve a list of all transactions for a specific account. The returned list is [paginated](#pagination) and can be scrolled by following the \`next\` and \`prev\` links where present. To narrow the results to a specific date range pass one or both of \`filter[since]\` and \`filter[until]\` in the query string. These filter parameters **should not** be used for pagination. Results are ordered newest first to oldest last.
    * @tags Transactions
-   * @name TransactionsDetail
+   * @name TransactionsList
    * @summary List transactions by account
    * @request GET:/accounts/{accountId}/transactions
    * @secure
    */
-  export namespace TransactionsDetail {
+  export namespace TransactionsList {
     export type RequestParams = {
       /**
        * The unique identifier for the account.
@@ -70445,7 +70445,7 @@ export namespace Accounts {
     };
     export type RequestBody = never;
     export type RequestHeaders = {};
-    export type ResponseBody = TransactionsDetailResult;
+    export type ResponseBody = TransactionsListResult;
   }
 }
 
@@ -70673,12 +70673,12 @@ export namespace Webhooks {
   /**
    * @description Retrieve a list of delivery logs for a webhook by providing its unique identifier. This is useful for analysis and debugging purposes. The returned list is [paginated](#pagination) and can be scrolled by following the \`next\` and \`prev\` links where present. Results are ordered newest first to oldest last. Logs may be automatically purged after a period of time.
    * @tags Webhooks
-   * @name LogsDetail
+   * @name LogsList
    * @summary List webhook logs
    * @request GET:/webhooks/{webhookId}/logs
    * @secure
    */
-  export namespace LogsDetail {
+  export namespace LogsList {
     export type RequestParams = {
       /**
        * The unique identifier for the webhook.
@@ -70695,7 +70695,7 @@ export namespace Webhooks {
     };
     export type RequestBody = never;
     export type RequestHeaders = {};
-    export type ResponseBody = LogsDetailData;
+    export type ResponseBody = LogsListData;
   }
 
   /**
@@ -71067,13 +71067,13 @@ export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDa
      * @description Retrieve a list of all transactions for a specific account. The returned list is [paginated](#pagination) and can be scrolled by following the \`next\` and \`prev\` links where present. To narrow the results to a specific date range pass one or both of \`filter[since]\` and \`filter[until]\` in the query string. These filter parameters **should not** be used for pagination. Results are ordered newest first to oldest last.
      *
      * @tags Transactions
-     * @name TransactionsDetail
+     * @name TransactionsList
      * @summary List transactions by account
      * @request GET:/accounts/{accountId}/transactions
      * @secure
      */
-    transactionsDetail: ({ accountId, ...query }: TransactionsDetailParams1, params: RequestParams = {}) =>
-      this.request<TransactionsDetailResult, any>({
+    transactionsList: ({ accountId, ...query }: TransactionsListParams2, params: RequestParams = {}) =>
+      this.request<TransactionsListResult, any>({
         path: \`/accounts/\${accountId}/transactions\`,
         method: "GET",
         query: query,
@@ -71240,13 +71240,13 @@ export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDa
      * @description Retrieve a list of delivery logs for a webhook by providing its unique identifier. This is useful for analysis and debugging purposes. The returned list is [paginated](#pagination) and can be scrolled by following the \`next\` and \`prev\` links where present. Results are ordered newest first to oldest last. Logs may be automatically purged after a period of time.
      *
      * @tags Webhooks
-     * @name LogsDetail
+     * @name LogsList
      * @summary List webhook logs
      * @request GET:/webhooks/{webhookId}/logs
      * @secure
      */
-    logsDetail: ({ webhookId, ...query }: LogsDetailParams, params: RequestParams = {}) =>
-      this.request<LogsDetailData, any>({
+    logsList: ({ webhookId, ...query }: LogsListParams, params: RequestParams = {}) =>
+      this.request<LogsListData, any>({
         path: \`/webhooks/\${webhookId}/logs\`,
         method: "GET",
         query: query,

diff --git a/tests/__snapshots__/simple.test.ts.snap b/tests/__snapshots__/simple.test.ts.snap
@@ -36145,11 +36145,11 @@ export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDa
     /**
      * @description list stops for a trip identified by {trip_id}
      *
-     * @name StopDetail
+     * @name StopList
      * @request GET:/trip/{trip_id}/stop
      * @secure
      */
-    stopDetail: (tripId: string, params: RequestParams = {}) =>
+    stopList: (tripId: string, params: RequestParams = {}) =>
       this.request<Step[], any>({
         path: \`/trip/\${tripId}/stop\`,
         method: "GET",
@@ -44828,12 +44828,12 @@ export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDa
      * @description Retrieve a list of all transactions for a specific account. The returned list is [paginated](#pagination) and can be scrolled by following the \`next\` and \`prev\` links where present. To narrow the results to a specific date range pass one or both of \`filter[since]\` and \`filter[until]\` in the query string. These filter parameters **should not** be used for pagination. Results are ordered newest first to oldest last.
      *
      * @tags Transactions
-     * @name TransactionsDetail
+     * @name TransactionsList
      * @summary List transactions by account
      * @request GET:/accounts/{accountId}/transactions
      * @secure
      */
-    transactionsDetail: (
+    transactionsList: (
       accountId: string,
       query?: {
         /**
@@ -45219,12 +45219,12 @@ export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDa
      * @description Retrieve a list of delivery logs for a webhook by providing its unique identifier. This is useful for analysis and debugging purposes. The returned list is [paginated](#pagination) and can be scrolled by following the \`next\` and \`prev\` links where present. Results are ordered newest first to oldest last. Logs may be automatically purged after a period of time.
      *
      * @tags Webhooks
-     * @name LogsDetail
+     * @name LogsList
      * @summary List webhook logs
      * @request GET:/webhooks/{webhookId}/logs
      * @secure
      */
-    logsDetail: (
+    logsList: (
       webhookId: string,
       query?: {
         /**