From 012132097be60739e19099eba6a9e8c4eb7de8fc Mon Sep 17 00:00:00 2001
From: Many0nne <ptitesaile@gmail.com>
Date: Tue, 3 Mar 2026 22:25:57 +0100
Subject: [PATCH] fix: user-defined plural interfaces now take priority over
 auto-generated plural routes

---
 src/core/swagger.ts      | 11 ++++++++++-
 src/utils/typeMapping.ts | 18 ++++++++++++++++--
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/core/swagger.ts b/src/core/swagger.ts
index 8dc6d47..e23519c 100644
--- a/src/core/swagger.ts
+++ b/src/core/swagger.ts
@@ -2,6 +2,7 @@ import * as fs from 'fs';
 import { ServerConfig } from '../types/config';
 import { buildTypeMap } from '../utils/typeMapping';
 import pluralize from 'pluralize';
+import { toPascalCase } from '../utils/pluralize';
 
 interface OpenAPISchema {
   type: string;
@@ -147,8 +148,15 @@ export function generateOpenAPISpec(config: ServerConfig): Record<string, unknow
       properties,
     };
 
-    // Generate path for array endpoint
+    // Generate path for array endpoint — skip if the user explicitly defined a
+    // plural interface for this path (e.g. skip auto-plural for `User` when `Users` exists).
     const arrayPath = interfaceNameToPath(interfaceName);
+    const pluralSegment = arrayPath.slice(1); // e.g. "users"
+    const explicitPluralTypeName = toPascalCase(pluralSegment); // e.g. "Users"
+    const hasExplicitPlural =
+      explicitPluralTypeName !== interfaceName && typeMap.has(explicitPluralTypeName);
+
+    if (!hasExplicitPlural) {
     paths[arrayPath] = {
       get: {
         summary: `Get all ${pluralize(interfaceName)}`,
@@ -184,6 +192,7 @@ export function generateOpenAPISpec(config: ServerConfig): Record<string, unknow
         },
       },
     };
+    }
 
     // Generate path for single item endpoint
     const singularPath = `/${interfaceName.toLowerCase()}`;
diff --git a/src/utils/typeMapping.ts b/src/utils/typeMapping.ts
index 0988acc..ddaee8b 100644
--- a/src/utils/typeMapping.ts
+++ b/src/utils/typeMapping.ts
@@ -1,7 +1,7 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import { RouteTypeMapping, InterfaceMetadata } from '../types/config';
-import { parseUrlToType } from './pluralize';
+import { parseUrlToType, toPascalCase, extractLastSegment } from './pluralize';
 
 /**
  * Recursively scans a directory to find all .ts files
@@ -137,9 +137,23 @@ export function findTypeForUrl(
   url: string,
   directory: string
 ): RouteTypeMapping | null {
-  const { typeName, isArray } = parseUrlToType(url);
   const typeMap = buildTypeMap(directory);
+  const lastSegment = extractLastSegment(url);
+
+  // If the user explicitly defined an interface matching this URL segment (e.g. `Users`
+  // for `/users`), prefer it over the auto-plural route derived from a singular interface.
+  const directTypeName = toPascalCase(lastSegment);
+  const directFilePath = typeMap.get(directTypeName);
+  if (directFilePath) {
+    return {
+      typeName: directTypeName,
+      isArray: false,
+      filePath: directFilePath,
+    };
+  }
 
+  // Fall back to singularization (e.g. `/users` → `User` with isArray: true)
+  const { typeName, isArray } = parseUrlToType(url);
   const filePath = typeMap.get(typeName);
 
   if (!filePath) {