Merge branch 'master' into beta

Author: ggurkal

lib/internals/findRoute.spec.ts

@@ -9,10 +9,20 @@ class Handler {
     return { list: true };
   }
 
-  @Get('/:id')
+  @Get('/:id(\\d+)')
   public details() {
     return { details: true };
   }
+
+  @Get('/item')
+  public item() {
+    return { item: true };
+  }
+
+  @Get('/item/child-item')
+  public childItem() {
+    return { childItem: true };
+  }
 }
 
 describe('findRoute', () => {
@@ -21,13 +31,35 @@ describe('findRoute', () => {
 
     expect(keys).toHaveLength(1);
     expect(method).toMatchObject({
-      path: '/:id',
+      path: expect.stringContaining('/:id'),
       propertyKey: 'details',
       verb: 'GET'
     });
   });
 
-  it('Should return the main / route when "path-to-regexp" is not installed.', () => {
+  it('Should return the "item" method', () => {
+    const [keys, , method] = findRoute(Handler, 'GET', '/item');
+
+    expect(keys).toHaveLength(0);
+    expect(method).toMatchObject({
+      path: '/item',
+      propertyKey: 'item',
+      verb: 'GET'
+    });
+  });
+
+  it('Should return the "childItem" method', () => {
+    const [keys, , method] = findRoute(Handler, 'GET', '/item/child-item');
+
+    expect(keys).toHaveLength(0);
+    expect(method).toMatchObject({
+      path: '/item/child-item',
+      propertyKey: 'childItem',
+      verb: 'GET'
+    });
+  });
+
+  it('Should return the main / route instead of "details" method when "path-to-regexp" is not installed.', () => {
     const spy = jest
       .spyOn(lp, 'loadPackage')
       .mockImplementation((name: string) => (name === 'path-to-regexp' ? false : require(name)));
@@ -42,4 +74,38 @@ describe('findRoute', () => {
       verb: 'GET'
     });
   });
+
+  it('Should return the "item" method when "path-to-regexp" is not installed.', () => {
+    const spy = jest
+      .spyOn(lp, 'loadPackage')
+      .mockImplementation((name: string) => (name === 'path-to-regexp' ? false : require(name)));
+
+    const [keys, , method] = findRoute(Handler, 'GET', '/item');
+
+    spy.mockRestore();
+
+    expect(keys).toHaveLength(0);
+    expect(method).toMatchObject({
+      path: '/item',
+      propertyKey: 'item',
+      verb: 'GET'
+    });
+  });
+
+  it('Should return the "child-item" method when "path-to-regexp" is not installed.', () => {
+    const spy = jest
+      .spyOn(lp, 'loadPackage')
+      .mockImplementation((name: string) => (name === 'path-to-regexp' ? false : require(name)));
+
+    const [keys, , method] = findRoute(Handler, 'GET', '/item/child-item');
+
+    spy.mockRestore();
+
+    expect(keys).toHaveLength(0);
+    expect(method).toMatchObject({
+      path: '/item/child-item',
+      propertyKey: 'childItem',
+      verb: 'GET'
+    });
+  });
 });

lib/internals/findRoute.ts

@@ -10,8 +10,9 @@ export function findRoute(
   const methods: Array<HandlerMethod> = Reflect.getMetadata(HTTP_METHOD_TOKEN, cls);
 
   const { pathToRegexp } = loadPackage('path-to-regexp');
-  if (path !== '/' && !pathToRegexp) {
-    return [[], undefined, methods.find(f => f.path === '/' && f.verb === verb)];
+  if (!pathToRegexp) {
+    const method = methods.find(f => f.path === path && f.verb === verb);
+    return [[], undefined, method ?? methods.find(f => f.path === '/' && f.verb === verb)];
   }
 
   const keys: Key[] = [];

test/e2e-basic-routing.test.ts

@@ -0,0 +1,82 @@
+import 'reflect-metadata';
+import request from 'supertest';
+import { createHandler, Get, Param, ParseNumberPipe } from '../lib';
+import * as lp from '../lib/internals/loadPackage';
+import { setupServer } from './setupServer';
+
+const ARTICLES = [
+  { id: 1, title: 'Article 1' },
+  { id: 2, title: 'Article 2' }
+];
+const COMMENTS = [{ text: 'Comment 1' }, { text: 'Comment 2' }];
+
+class ArticleHandler {
+  @Get('/')
+  public articles(): Record<string, any>[] {
+    return ARTICLES;
+  }
+
+  @Get('/:id(\\d+)')
+  public article(@Param('id', ParseNumberPipe) id: number) {
+    return ARTICLES.find(article => article.id === id);
+  }
+
+  @Get('/comments')
+  public articleComments(): Record<string, any>[] {
+    return COMMENTS;
+  }
+
+  @Get('/comments/favorites')
+  public favoriteArticleComments(): Record<string, any>[] {
+    return [COMMENTS[0]];
+  }
+}
+
+describe('E2E - Basic routing', () => {
+  let server: ReturnType<typeof setupServer>;
+  beforeAll(() => (server = setupServer(createHandler(ArticleHandler))));
+  afterAll(() => {
+    if ('close' in server && typeof server.close === 'function') {
+      server.close();
+    }
+  });
+
+  it('Should execute "articles".', () => request(server).get('/api/articles').expect(200, ARTICLES));
+
+  it('Should execute "article".', () => request(server).get('/api/articles/1').expect(200, ARTICLES[0]));
+
+  it('Should execute "articleComments".', () => request(server).get('/api/articles/comments').expect(200, COMMENTS));
+
+  it('Should execute "favoriteArticleComments".', () =>
+    request(server).get('/api/articles/comments/favorites').expect(200, [COMMENTS[0]]));
+});
+
+describe('E2E - Basic routing (without "path-to-regexp")', () => {
+  let server: ReturnType<typeof setupServer>;
+  beforeAll(() => {
+    jest
+      .spyOn(lp, 'loadPackage')
+      .mockImplementation((name: string) => (name === 'path-to-regexp' ? false : require(name)));
+
+    server = setupServer(createHandler(ArticleHandler));
+  });
+  afterAll(() => {
+    jest.restoreAllMocks();
+
+    if ('close' in server && typeof server.close === 'function') {
+      server.close();
+    }
+  });
+
+  it('Should execute "articles" when "path-to-regexp" is not installed.', () =>
+    request(server).get('/api/articles').expect(200, ARTICLES));
+
+  it('Should execute "articles" instead of "article" method when "path-to-regexp" is not installed.', () =>
+    request(server).get('/api/articles/1').expect(200, ARTICLES));
+
+  it('Should execute "articleComments" when "path-to-regexp" is not installed.', () =>
+    request(server).get('/api/articles/comments').expect(200, COMMENTS));
+
+  it('Should execute "favoriteArticleComments" when "path-to-regexp" is not installed.', () =>
+    request(server).get('/api/articles/comments/favorites').expect(200, [COMMENTS[0]]));
+});

website/yarn.lock

@@ -5741,10 +5741,10 @@ nan@^2.12.1:
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19"
   integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==
 
-nanoid@^3.1.20, nanoid@^3.1.22:
-  version "3.1.22"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.22.tgz#b35f8fb7d151990a8aebd5aa5015c03cf726f844"
-  integrity sha512-/2ZUaJX2ANuLtTvqTlgqBQNJoQO398KyJgZloL0PZkC0dpysjncRUPsFe3DUPzz/y3h+u7C46np8RMuvF3jsSQ==
+nanoid@^3.1.23:
+  version "3.1.23"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz#f744086ce7c2bc47ee0a8472574d5c78e4183a81"
+  integrity sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==
 
 nanomatch@^1.2.9:
   version "1.2.13"
@@ -6579,22 +6579,13 @@ postcss-zindex@^5.0.0:
     has "^1.0.3"
     uniqs "^2.0.0"
 
-postcss@^8.2.10, postcss@^8.2.4, postcss@^8.2.9:
-  version "8.2.13"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.13.tgz#dbe043e26e3c068e45113b1ed6375d2d37e2129f"
-  integrity sha512-FCE5xLH+hjbzRdpbRb1IMCvPv9yZx2QnDarBEYSN0N0HYk+TcXsEhwdFcFb+SRWOKzKGErhIEbBK2ogyLdTtfQ==
+postcss@^8.2.10, postcss@^8.2.4, postcss@^8.2.8, postcss@^8.2.9:
+  version "8.2.15"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.15.tgz#9e66ccf07292817d226fc315cbbf9bc148fbca65"
+  integrity sha512-2zO3b26eJD/8rb106Qu2o7Qgg52ND5HPjcyQiK2B98O388h43A448LCslC0dI2P97wCAQRJsFvwTRcXxTKds+Q==
   dependencies:
     colorette "^1.2.2"
-    nanoid "^3.1.22"
-    source-map "^0.6.1"
-
-postcss@^8.2.8:
-  version "8.2.8"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.8.tgz#0b90f9382efda424c4f0f69a2ead6f6830d08ece"
-  integrity sha512-1F0Xb2T21xET7oQV9eKuctbM9S7BC0fetoHCc4H13z0PT6haiRLP4T0ZY4XWh7iLP0usgqykT6p9B2RtOf4FPw==
-  dependencies:
-    colorette "^1.2.2"
-    nanoid "^3.1.20"
+    nanoid "^3.1.23"
     source-map "^0.6.1"
 
 prepend-http@^2.0.0: