Fix Duplicated declaration.

LzpTec · Aug 14, 2020 · ceee1a9 · ceee1a9
1 parent edab77b
commit ceee1a9
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/dist/server/server-container.d.ts b/dist/server/server-container.d.ts
@@ -21,6 +21,7 @@ export declare class ServerContainer {
     serviceFactory: ServiceFactory;
     paramConverters: Map<Function, ParameterConverter>;
     router: express.Router;
+    resolvedPaths: Map<string, express.Router>;
     private debugger;
     private upload;
     private serverClasses;

diff --git a/dist/server/server-container.js b/dist/server/server-container.js
diff --git a/dist/server/server-container.js.map b/dist/server/server-container.js.map
diff --git a/src/server/server-container.ts b/src/server/server-container.ts
@@ -42,6 +42,7 @@ export class ServerContainer {
     public serviceFactory: ServiceFactory = new DefaultServiceFactory();
     public paramConverters: Map<Function, ParameterConverter> = new Map<Function, ParameterConverter>();
     public router: express.Router;
+    public resolvedPaths: Map<string, express.Router> = new Map<string, express.Router>();
 
     private debugger = {
         build: debug('typescript-rest:server-container:build'),
@@ -66,6 +67,7 @@ export class ServerContainer {
         return serviceClass;
     }
 
+    // HERE
     public registerServiceMethod(target: Function, methodName: string): ServiceMethod {
         if (methodName) {
             this.pathsResolved = false;
@@ -257,8 +259,10 @@ export class ServerContainer {
             declaredHttpMethods = new Set<HttpMethod>();
             this.paths.set(resolvedPath, declaredHttpMethods);
         }
-        if (declaredHttpMethods.has(serviceMethod.httpMethod)) {
+        if (declaredHttpMethods.has(serviceMethod.httpMethod) && this.resolvedPaths.get(resolvedPath) === this.router) {
             throw Error(`Duplicated declaration for path [${resolvedPath}], method [${serviceMethod.httpMethod}].`);
+        } else {
+            this.resolvedPaths.set(resolvedPath, this.router);
         }
         declaredHttpMethods.add(serviceMethod.httpMethod);
         serviceMethod.resolvedPath = resolvedPath;