@asapjs/core 0.0.4 → 0.0.7

package/dist/application.d.ts

@@ -1,13 +1,8 @@
-import express from 'express';
-import { Sequelize } from 'sequelize-typescript';
 export default class Application {
-    app: express.Application;
-    sequelize: Promise<Sequelize>;
     private config;
+    private app;
     constructor(dirname: string, projectConfig: any);
-    private initRouter;
-    private initMiddlewares;
-    private initSequelizeConnection;
+    private initMoudles;
     run: (port: number) => void;
 }
 //# sourceMappingURL=application.d.ts.map

package/dist/application.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../src/application.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAG9B,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAMjD,MAAM,CAAC,OAAO,OAAO,WAAW;IACvB,GAAG,EAAE,OAAO,CAAC,WAAW,CAAC;IAEzB,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IAErC,OAAO,CAAC,MAAM,CAAM;gBAER,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG;IAY/C,OAAO,CAAC,UAAU;IAmBlB,OAAO,CAAC,eAAe;YAMT,uBAAuB;IAS9B,GAAG,SAAU,MAAM,UAIxB;CACH"}
+{"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../src/application.ts"],"names":[],"mappings":"AAQA,MAAM,CAAC,OAAO,OAAO,WAAW;IAC9B,OAAO,CAAC,MAAM,CAAM;IAEpB,OAAO,CAAC,GAAG,CAAsB;gBAErB,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG;IAM/C,OAAO,CAAC,WAAW,CASjB;IAEK,GAAG,SAAU,MAAM,UAIxB;CACH"}

package/dist/application.js

@@ -12,14 +12,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const express_1 = __importDefault(require("express"));
-const body_parser_1 = __importDefault(require("body-parser"));
-const cors_1 = __importDefault(require("cors"));
-const errorHandler_1 = __importDefault(require("./middleware/errorHandler"));
+const sequelize_1 = require("@asapjs/sequelize");
+const router_1 = require("@asapjs/router");
 const logger_1 = __importDefault(require("./util/logger"));
 const config_1 = require("./config");
 class Application {
     constructor(dirname, projectConfig) {
+        this.initMoudles = (dirname) => __awaiter(this, void 0, void 0, function* () {
+            // init @asapjs/router module
+            const { app } = new router_1.RouterModule(dirname);
+            this.app = app;
+            // init @asapjs/sequelize module
+            if (this.config.extensions.includes('@asapjs/sequelize')) {
+                yield (0, sequelize_1.initSequelizeModule)(dirname);
+            }
+        });
         this.run = (port) => {
             this.app
                 .listen(port, () => logger_1.default.info(`@express :: Server is listening at ${port}`))
@@ -27,44 +34,7 @@ class Application {
         };
         (0, config_1.setConfig)(projectConfig);
         this.config = projectConfig;
-        this.app = (0, express_1.default)();
-        this.initMiddlewares();
-        this.initRouter(dirname);
-        this.app.use(errorHandler_1.default);
-        this.sequelize = this.initSequelizeConnection(dirname);
-        console.log((0, config_1.getConfig)());
-    }
-    initRouter(dirname) {
-        const router = express_1.default.Router();
-        const routes = require(`${dirname}/route`).default;
-        routes.forEach((route) => {
-            this.app.use(`/shop${route.basePath}`, route.expressRouter || route.router);
-        });
-        this.app.use(router);
-        this.app.get('/shop', (req, res) => {
-            res.send('pangaia-b4c-ms-shop server is working');
-        });
-        this.app.get('/health-check', (req, res) => {
-            res.send('pangaia-b4c-ms-shop server is working');
-        });
-        // this.app.get('/sync', async (req: any, res: any) => {
-        //   const result = await modelsSync();
-        //   res.send(result);
-        // });
-    }
-    initMiddlewares() {
-        this.app.use((0, cors_1.default)());
-        this.app.use(body_parser_1.default.json());
-        this.app.use(body_parser_1.default.urlencoded({ extended: true }));
-    }
-    initSequelizeConnection(dirname) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { addModelsToSequelize, dbInit, loadPath, modelsSync } = require('@asapjs/sequelize');
-            const dbContainer = yield dbInit(this.config.DB);
-            yield loadPath(dirname, '');
-            yield addModelsToSequelize();
-            return dbContainer;
-        });
+        this.initMoudles(dirname);
     }
 }
 exports.default = Application;

package/dist/application.js.map

@@ -1 +1 @@
-{"version":3,"file":"application.js","sourceRoot":"","sources":["../src/application.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"application.js","sourceRoot":"","sources":["../src/application.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,iDAAwD;AACxD,2CAA8C;AAI9C,2DAAmC;AACnC,qCAAqC;AAErC,MAAqB,WAAW;IAK9B,YAAY,OAAe,EAAE,aAAkB;QAMvC,gBAAW,GAAG,CAAO,OAAe,EAAE,EAAE;YAC9C,6BAA6B;YAC7B,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,qBAAY,CAAC,OAAO,CAAC,CAAC;YAC1C,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;YAEf,gCAAgC;YAChC,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,mBAAmB,CAAC,EAAE;gBACxD,MAAM,IAAA,+BAAmB,EAAC,OAAO,CAAC,CAAC;aACpC;QACH,CAAC,CAAA,CAAC;QAEK,QAAG,GAAG,CAAC,IAAY,EAAE,EAAE;YAC5B,IAAI,CAAC,GAAG;iBACL,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,gBAAM,CAAC,IAAI,CAAC,sCAAsC,IAAI,EAAE,CAAC,CAAC;iBAC7E,EAAE,CAAC,OAAO,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,gBAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;QACzD,CAAC,CAAC;QApBA,IAAA,kBAAS,EAAC,aAAa,CAAC,CAAC;QACzB,IAAI,CAAC,MAAM,GAAG,aAAa,CAAC;QAC5B,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAC5B,CAAC;CAkBF;AA3BD,8BA2BC"}

package/package.json

@@ -1,12 +1,11 @@
 {
   "name": "@asapjs/core",
-  "version": "0.0.4",
+  "version": "0.0.7",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
     "build": "./node_modules/typescript/bin/tsc",
-    "localinstall": "yarn build && cp -r ./dist /Users/seungmin/projects/pangaia/pangaia-b4c-ms-shop/node_modules/@asapjs/core/",
-    "prepublish": "yarn build"
+    "localinstall": "yarn build && cp -r ./dist /Users/seungmin/projects/pangaia/pangaia-b4c-ms-shop/node_modules/@asapjs/core/"
   },
   "author": "",
   "license": "ISC",
@@ -20,6 +19,8 @@
     "winston": "^3.6.0"
   },
   "devDependencies": {
+    "@asapjs/router": "0.0.2",
+    "@asapjs/sequelize": "^0.0.2",
     "@types/body-parser": "^1.19.2",
     "@types/cors": "^2.8.12",
     "@types/express": "^4.17.13",

package/src/application.ts

@@ -1,64 +1,32 @@
+import { initSequelizeModule } from '@asapjs/sequelize';
+import { RouterModule } from '@asapjs/router';
+
 import express from 'express';
-import bodyParser from 'body-parser';
-import cors from 'cors';
-import { Sequelize } from 'sequelize-typescript';
 
-import errorHandler from './middleware/errorHandler';
 import logger from './util/logger';
-import { getConfig, setConfig } from './config';
+import { setConfig } from './config';
 
 export default class Application {
-  public app: express.Application;
-
-  public sequelize: Promise<Sequelize>;
-
   private config: any;
 
+  private app: express.Application;
+
   constructor(dirname: string, projectConfig: any) {
     setConfig(projectConfig);
     this.config = projectConfig;
-    this.app = express();
-    this.initMiddlewares();
-    this.initRouter(dirname);
-    this.app.use(errorHandler);
-    this.sequelize = this.initSequelizeConnection(dirname);
-
-    console.log(getConfig());
+    this.initMoudles(dirname);
   }
 
-  private initRouter(dirname: string) {
-    const router: express.Router = express.Router();
-    const routes = require(`${dirname}/route`).default;
-    routes.forEach((route: any) => {
-      this.app.use(`/shop${route.basePath}`, route.expressRouter || route.router);
-    });
-    this.app.use(router);
-    this.app.get('/shop', (req: any, res: any) => {
-      res.send('pangaia-b4c-ms-shop server is working');
-    });
-    this.app.get('/health-check', (req: any, res: any) => {
-      res.send('pangaia-b4c-ms-shop server is working');
-    });
-    // this.app.get('/sync', async (req: any, res: any) => {
-    //   const result = await modelsSync();
-    //   res.send(result);
-    // });
-  }
+  private initMoudles = async (dirname: string) => {
+    // init @asapjs/router module
+    const { app } = new RouterModule(dirname);
+    this.app = app;
 
-  private initMiddlewares() {
-    this.app.use(cors());
-    this.app.use(bodyParser.json());
-    this.app.use(bodyParser.urlencoded({ extended: true }));
-  }
-
-  private async initSequelizeConnection(dirname: string): Promise<Sequelize> {
-    const { addModelsToSequelize, dbInit, loadPath, modelsSync } = require('@asapjs/sequelize');
-
-    const dbContainer = await dbInit(this.config.DB);
-    await loadPath(dirname, '');
-    await addModelsToSequelize();
-    return dbContainer;
-  }
+    // init @asapjs/sequelize module
+    if (this.config.extensions.includes('@asapjs/sequelize')) {
+      await initSequelizeModule(dirname);
+    }
+  };
 
   public run = (port: number) => {
     this.app

package/src/middleware/errorHandler.ts

@@ -1,20 +0,0 @@
-import { NextFunction, Request, Response } from 'express';
-
-export class HttpException extends Error {
-  public status: number;
-
-  public message: string;
-
-  constructor(status: number = 500, message: string = '알 수 없는 서버 오류가 발생했습니다.') {
-    super(message);
-    this.status = status;
-    this.message = message;
-  }
-}
-
-const errorHandler = (error: HttpException, req: Request, res: Response, next: NextFunction) => {
-  const { status = 500, message } = error;
-  res.status(status).json({ status, message });
-};
-
-export default errorHandler;