@asapjs/core 0.0.5 → 0.0.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,13 +1,11 @@
1
1
  import express from 'express';
2
- import { Sequelize } from 'sequelize-typescript';
3
2
  export default class Application {
4
3
  app: express.Application;
5
- sequelize: Promise<Sequelize>;
6
4
  private config;
7
5
  constructor(dirname: string, projectConfig: any);
8
6
  private initRouter;
9
7
  private initMiddlewares;
10
- private initSequelizeConnection;
8
+ private initMoudles;
11
9
  run: (port: number) => void;
12
10
  }
13
11
  //# sourceMappingURL=application.d.ts.map
@@ -1 +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"}
1
+ {"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../src/application.ts"],"names":[],"mappings":"AAEA,OAAO,OAAO,MAAM,SAAS,CAAC;AAQ9B,MAAM,CAAC,OAAO,OAAO,WAAW;IACvB,GAAG,EAAE,OAAO,CAAC,WAAW,CAAC;IAEhC,OAAO,CAAC,MAAM,CAAM;gBAER,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG;IAU/C,OAAO,CAAC,UAAU;IAmBlB,OAAO,CAAC,eAAe;IAMvB,OAAO,CAAC,WAAW,CAIjB;IAEK,GAAG,SAAU,MAAM,UAIxB;CACH"}
@@ -12,6 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
12
12
  return (mod && mod.__esModule) ? mod : { "default": mod };
13
13
  };
14
14
  Object.defineProperty(exports, "__esModule", { value: true });
15
+ const sequelize_1 = require("@asapjs/sequelize");
15
16
  const express_1 = __importDefault(require("express"));
16
17
  const body_parser_1 = __importDefault(require("body-parser"));
17
18
  const cors_1 = __importDefault(require("cors"));
@@ -20,6 +21,11 @@ const logger_1 = __importDefault(require("./util/logger"));
20
21
  const config_1 = require("./config");
21
22
  class Application {
22
23
  constructor(dirname, projectConfig) {
24
+ this.initMoudles = (dirname) => __awaiter(this, void 0, void 0, function* () {
25
+ if (this.config.extensions.includes('@asapjs/sequelize')) {
26
+ yield (0, sequelize_1.initSequelizeModule)(dirname);
27
+ }
28
+ });
23
29
  this.run = (port) => {
24
30
  this.app
25
31
  .listen(port, () => logger_1.default.info(`@express :: Server is listening at ${port}`))
@@ -31,8 +37,7 @@ class Application {
31
37
  this.initMiddlewares();
32
38
  this.initRouter(dirname);
33
39
  this.app.use(errorHandler_1.default);
34
- this.sequelize = this.initSequelizeConnection(dirname);
35
- console.log((0, config_1.getConfig)());
40
+ this.initMoudles(dirname);
36
41
  }
37
42
  initRouter(dirname) {
38
43
  const router = express_1.default.Router();
@@ -57,15 +62,6 @@ class Application {
57
62
  this.app.use(body_parser_1.default.json());
58
63
  this.app.use(body_parser_1.default.urlencoded({ extended: true }));
59
64
  }
60
- initSequelizeConnection(dirname) {
61
- return __awaiter(this, void 0, void 0, function* () {
62
- const { addModelsToSequelize, dbInit, loadPath, modelsSync } = require('@asapjs/sequelize');
63
- const dbContainer = yield dbInit(this.config.DB);
64
- yield loadPath(dirname, '');
65
- yield addModelsToSequelize();
66
- return dbContainer;
67
- });
68
- }
69
65
  }
70
66
  exports.default = Application;
71
67
  //# sourceMappingURL=application.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"application.js","sourceRoot":"","sources":["../src/application.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"application.js","sourceRoot":"","sources":["../src/application.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,iDAAwD;AAExD,sDAA8B;AAC9B,8DAAqC;AACrC,gDAAwB;AAExB,6EAAqD;AACrD,2DAAmC;AACnC,qCAAqC;AAErC,MAAqB,WAAW;IAK9B,YAAY,OAAe,EAAE,aAAkB;QAmCvC,gBAAW,GAAG,CAAO,OAAe,EAAE,EAAE;YAC9C,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;QA5CA,IAAA,kBAAS,EAAC,aAAa,CAAC,CAAC;QACzB,IAAI,CAAC,MAAM,GAAG,aAAa,CAAC;QAC5B,IAAI,CAAC,GAAG,GAAG,IAAA,iBAAO,GAAE,CAAC;QACrB,IAAI,CAAC,eAAe,EAAE,CAAC;QACvB,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QACzB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,sBAAY,CAAC,CAAC;QAC3B,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAC5B,CAAC;IAEO,UAAU,CAAC,OAAe;QAChC,MAAM,MAAM,GAAmB,iBAAO,CAAC,MAAM,EAAE,CAAC;QAChD,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,OAAO,QAAQ,CAAC,CAAC,OAAO,CAAC;QACnD,MAAM,CAAC,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;YAC5B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,KAAK,CAAC,QAAQ,EAAE,EAAE,KAAK,CAAC,aAAa,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC;QAC9E,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACrB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,GAAQ,EAAE,GAAQ,EAAE,EAAE;YAC3C,GAAG,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAC;QACpD,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,eAAe,EAAE,CAAC,GAAQ,EAAE,GAAQ,EAAE,EAAE;YACnD,GAAG,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAC;QACpD,CAAC,CAAC,CAAC;QACH,wDAAwD;QACxD,uCAAuC;QACvC,sBAAsB;QACtB,MAAM;IACR,CAAC;IAEO,eAAe;QACrB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAA,cAAI,GAAE,CAAC,CAAC;QACrB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,qBAAU,CAAC,IAAI,EAAE,CAAC,CAAC;QAChC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,qBAAU,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAC1D,CAAC;CAaF;AAnDD,8BAmDC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@asapjs/core",
3
- "version": "0.0.5",
3
+ "version": "0.0.6",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "scripts": {
@@ -19,6 +19,7 @@
19
19
  "winston": "^3.6.0"
20
20
  },
21
21
  "devDependencies": {
22
+ "@asapjs/sequelize": "^0.0.2",
22
23
  "@types/body-parser": "^1.19.2",
23
24
  "@types/cors": "^2.8.12",
24
25
  "@types/express": "^4.17.13",
@@ -1,17 +1,16 @@
1
+ import { initSequelizeModule } from '@asapjs/sequelize';
2
+
1
3
  import express from 'express';
2
4
  import bodyParser from 'body-parser';
3
5
  import cors from 'cors';
4
- import { Sequelize } from 'sequelize-typescript';
5
6
 
6
7
  import errorHandler from './middleware/errorHandler';
7
8
  import logger from './util/logger';
8
- import { getConfig, setConfig } from './config';
9
+ import { setConfig } from './config';
9
10
 
10
11
  export default class Application {
11
12
  public app: express.Application;
12
13
 
13
- public sequelize: Promise<Sequelize>;
14
-
15
14
  private config: any;
16
15
 
17
16
  constructor(dirname: string, projectConfig: any) {
@@ -21,9 +20,7 @@ export default class Application {
21
20
  this.initMiddlewares();
22
21
  this.initRouter(dirname);
23
22
  this.app.use(errorHandler);
24
- this.sequelize = this.initSequelizeConnection(dirname);
25
-
26
- console.log(getConfig());
23
+ this.initMoudles(dirname);
27
24
  }
28
25
 
29
26
  private initRouter(dirname: string) {
@@ -51,14 +48,11 @@ export default class Application {
51
48
  this.app.use(bodyParser.urlencoded({ extended: true }));
52
49
  }
53
50
 
54
- private async initSequelizeConnection(dirname: string): Promise<Sequelize> {
55
- const { addModelsToSequelize, dbInit, loadPath, modelsSync } = require('@asapjs/sequelize');
56
-
57
- const dbContainer = await dbInit(this.config.DB);
58
- await loadPath(dirname, '');
59
- await addModelsToSequelize();
60
- return dbContainer;
61
- }
51
+ private initMoudles = async (dirname: string) => {
52
+ if (this.config.extensions.includes('@asapjs/sequelize')) {
53
+ await initSequelizeModule(dirname);
54
+ }
55
+ };
62
56
 
63
57
  public run = (port: number) => {
64
58
  this.app