Refactor: remaining default exports

x249 · Sep 11, 2019 · 2a6f587 · 2a6f587
1 parent d5773b6
commit 2a6f587
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 15 deletions.
diff --git a/lib/app.ts b/lib/app.ts
@@ -3,7 +3,7 @@ import http from 'http';
 import express from 'express';
 import { applyMiddleware, applyRoutes } from './utils';
 import { middlewareHandler } from './middleware';
-import errorHandlers from './middleware/errorHandler';
+import { errorHandlers } from './middleware/errorHandler';
 import { routeHandler } from './routes';
 import chalk from 'chalk';
 import consola from 'consola';

diff --git a/lib/middleware/errorHandler.ts b/lib/middleware/errorHandler.ts
@@ -25,4 +25,6 @@ const handleServerError: (router: Router) => void = (router: Router) => {
     });
 };
 
-export default [handle404Error, handle401Error, handleClientError, handleServerError];
+const errorHandlers = [handle404Error, handle401Error, handleClientError, handleServerError];
+
+export { errorHandlers };
diff --git a/lib/routes/index.ts b/lib/routes/index.ts
@@ -1,8 +1,4 @@
-import mainRoutes from './main/index';
-import userRoutes from './users/index';
+import { mainRoutes } from './main/index';
+import { userRoutes } from './users/index';
 
-const routeHandler = [...mainRoutes, ...userRoutes];
-
-export { routeHandler };
-
-// export default [...mainRoutes, ...userRoutes];
+export const routeHandler = [...mainRoutes, ...userRoutes];
diff --git a/lib/routes/main/index.ts b/lib/routes/main/index.ts
@@ -1,7 +1,7 @@
 import { Request, Response } from 'express';
 import { API_VER } from '../../config/index';
 
-export default [
+export const mainRoutes = [
     {
         handler: async (req: Request, res: Response) => {
             res.send('Node Backend API');

diff --git a/lib/routes/users/index.ts b/lib/routes/users/index.ts
@@ -2,7 +2,7 @@ import { Request, Response, NextFunction } from 'express';
 import { authenticateUser, newUser } from '../../controllers/users';
 import { authUserCheck, newUserCheck } from '../../middleware/checks/users';
 
-export default [
+export const userRoutes = [
     {
         handler: [
             newUserCheck,

diff --git a/lib/tests/errors.test.ts b/lib/tests/errors.test.ts
@@ -1,7 +1,7 @@
 import { HTTP400Error, HTTP401Error, HTTP404Error } from '../utils/httpErrors';
 import express, { Router } from 'express';
 import { applyMiddleware } from '../utils';
-import errorHandlers from '../middleware/errorHandler';
+import { errorHandlers } from '../middleware/errorHandler';
 
 describe('errors', () => {
     test('throws http 400 error', async done => {

diff --git a/lib/tests/routes.test.ts b/lib/tests/routes.test.ts
@@ -2,8 +2,8 @@ import express, { Router } from 'express';
 import request from 'supertest';
 import { applyMiddleware, applyRoutes } from '../utils';
 import { middlewareHandler } from '../middleware';
-import errorHandlers from '../middleware/errorHandler';
-import routes from '../routes/main';
+import { errorHandlers } from '../middleware/errorHandler';
+import { mainRoutes } from '../routes/main';
 import mongoose from 'mongoose';
 
 const status200 = 200;
@@ -15,7 +15,7 @@ describe('routes', () => {
     beforeEach(() => {
         router = express();
         applyMiddleware(middlewareHandler, router);
-        applyRoutes(routes, router);
+        applyRoutes(mainRoutes, router);
         applyMiddleware(errorHandlers, router);
     });