skyeye-svc-common-utils 2.0.0-dev0.10 → 2.0.0-dev0.2

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.
Files changed (4) hide show
  1. package/dist/utils/baseClass/dataSourceManager.js +4 -8
  2. package/dist/utils/baseClass/dataSourceManager.js.map +1 -1
  3. package/package.json +1 -1
  4. package/src/utils/baseClass/dataSourceManager.ts +5 -9
package/dist/utils/baseClass/dataSourceManager.js CHANGED
@@ -11,7 +11,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
11
11
  Object.defineProperty(exports, "__esModule", { value: true });
12
12
  exports.createDataSource = exports.getDataSource = exports.DataSourceManager = void 0;
13
13
  const typeorm_1 = require("typeorm");
14
- const logger_1 = require("../logger/logger");
15
14
  // to be used instead of getConnectionManager()
16
15
  class DataSourceManager {
17
16
  constructor() {
@@ -19,7 +18,6 @@ class DataSourceManager {
19
18
  }
20
19
  static getInstance() {
21
20
  if (!DataSourceManager.instance) {
22
- logger_1.logger.info(`##### No DataSource manager instance`);
23
21
  DataSourceManager.instance = new DataSourceManager();
24
22
  }
25
23
  return DataSourceManager.instance;
@@ -30,9 +28,8 @@ class DataSourceManager {
30
28
  return new Promise((resolve, reject) => {
31
29
  new typeorm_1.DataSource(_options).initialize()
32
30
  .then((dataSource) => {
33
- this.dataSources.set(name, dataSource);
34
- const retrievedData = this.dataSources.get(name);
35
- resolve(retrievedData);
31
+ this.dataSources.set(name, dataSource).get(name);
32
+ resolve(dataSource);
36
33
  })
37
34
  .catch((e) => {
38
35
  reject(e);
@@ -41,7 +38,6 @@ class DataSourceManager {
41
38
  });
42
39
  }
43
40
  getDataSource(dataSourceName) {
44
- logger_1.logger.info(`Retrieve data source with name ${dataSourceName}`);
45
41
  return this.dataSources.get(dataSourceName || 'default');
46
42
  }
47
43
  }
@@ -51,8 +47,8 @@ function getDataSource(dataSourceName) {
51
47
  return DataSourceManager.getInstance().getDataSource(dataSourceName || 'default');
52
48
  }
53
49
  exports.getDataSource = getDataSource;
54
- function createDataSource(options, name) {
55
- return DataSourceManager.getInstance().createDataSource(name || 'default', options);
50
+ function createDataSource(options, name = 'default') {
51
+ return DataSourceManager.getInstance().createDataSource(name, options);
56
52
  }
57
53
  exports.createDataSource = createDataSource;
58
54
  //# sourceMappingURL=dataSourceManager.js.map
package/dist/utils/baseClass/dataSourceManager.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"dataSourceManager.js","sourceRoot":"","sources":["../../../src/utils/baseClass/dataSourceManager.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAiG;AACjG,6CAA0C;AAE1C,+CAA+C;AAC/C,MAAa,iBAAiB;IAI1B;QAFQ,gBAAW,GAA4B,IAAI,GAAG,EAAE,CAAC;IAElC,CAAC;IAEjB,MAAM,CAAC,WAAW;QACrB,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC;YAC9B,eAAM,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;YACpD,iBAAiB,CAAC,QAAQ,GAAG,IAAI,iBAAiB,EAAE,CAAC;QACzD,CAAC;QACD,OAAO,iBAAiB,CAAC,QAAQ,CAAC;IACtC,CAAC;IAEY,gBAAgB,CAAC,IAAY,EAAE,OAA2B;;YACnE,MAAM,QAAQ,GAAG,OAAO,CAAC;YACzB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACnC,IAAI,oBAAU,CAAC,QAAQ,CAAC,CAAC,UAAU,EAAE;qBACpC,IAAI,CAAC,CAAC,UAAsB,EAAE,EAAE;oBAC7B,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;oBACvC,MAAM,aAAa,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;oBACjD,OAAO,CAAC,aAAa,CAAC,CAAC;gBAC3B,CAAC,CAAC;qBACD,KAAK,CAAC,CAAC,CAAM,EAAE,EAAE;oBACd,MAAM,CAAC,CAAC,CAAC,CAAC;gBACd,CAAC,CAAC,CAAA;YACN,CAAC,CAAC,CAAC;QACP,CAAC;KAAA;IAEM,aAAa,CAAC,cAAsB;QACvC,eAAM,CAAC,IAAI,CAAC,kCAAkC,cAAc,EAAE,CAAC,CAAC;QAChE,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,cAAc,IAAI,SAAS,CAAC,CAAC;IAC7D,CAAC;CAEJ;AAlCD,8CAkCC;AAED,wCAAwC;AACxC,SAAgB,aAAa,CAAC,cAAuB;IACjD,OAAO,iBAAiB,CAAC,WAAW,EAAE,CAAC,aAAa,CAAC,cAAc,IAAI,SAAS,CAAC,CAAC;AACtF,CAAC;AAFD,sCAEC;AAED,SAAgB,gBAAgB,CAAC,OAA2B,EAAE,IAAa;IACvE,OAAO,iBAAiB,CAAC,WAAW,EAAE,CAAC,gBAAgB,CAAC,IAAI,IAAI,SAAS,EAAE,OAAO,CAAC,CAAC;AACxF,CAAC;AAFD,4CAEC"}
1
+ {"version":3,"file":"dataSourceManager.js","sourceRoot":"","sources":["../../../src/utils/baseClass/dataSourceManager.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAiG;AAEjG,+CAA+C;AAC/C,MAAa,iBAAiB;IAI1B;QAFQ,gBAAW,GAA4B,IAAI,GAAG,EAAE,CAAC;IAElC,CAAC;IAEjB,MAAM,CAAC,WAAW;QACrB,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC;YAClC,iBAAiB,CAAC,QAAQ,GAAG,IAAI,iBAAiB,EAAE,CAAC;QACrD,CAAC;QACD,OAAO,iBAAiB,CAAC,QAAQ,CAAC;IACtC,CAAC;IAEY,gBAAgB,CAAC,IAAY,EAAE,OAA2B;;YACnE,MAAM,QAAQ,GAAG,OAAO,CAAC;YACzB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACnC,IAAI,oBAAU,CAAC,QAAQ,CAAC,CAAC,UAAU,EAAE;qBACpC,IAAI,CAAC,CAAC,UAAsB,EAAE,EAAE;oBAC7B,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;oBACjD,OAAO,CAAC,UAAU,CAAC,CAAC;gBACxB,CAAC,CAAC;qBACD,KAAK,CAAC,CAAC,CAAM,EAAE,EAAE;oBACd,MAAM,CAAC,CAAC,CAAC,CAAC;gBACd,CAAC,CAAC,CAAA;YACN,CAAC,CAAC,CAAC;QACP,CAAC;KAAA;IAEM,aAAa,CAAC,cAAsB;QACvC,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,cAAc,IAAI,SAAS,CAAC,CAAC;IAC7D,CAAC;CAEJ;AA/BD,8CA+BC;AAED,wCAAwC;AACxC,SAAgB,aAAa,CAAC,cAAuB;IACjD,OAAO,iBAAiB,CAAC,WAAW,EAAE,CAAC,aAAa,CAAC,cAAc,IAAI,SAAS,CAAC,CAAC;AACtF,CAAC;AAFD,sCAEC;AAED,SAAgB,gBAAgB,CAAC,OAA2B,EAAE,OAAe,SAAS;IAClF,OAAO,iBAAiB,CAAC,WAAW,EAAE,CAAC,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AAC3E,CAAC;AAFD,4CAEC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "skyeye-svc-common-utils",
3
- "version": "2.0.0-dev0.10",
3
+ "version": "2.0.0-dev0.2",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
package/src/utils/baseClass/dataSourceManager.ts CHANGED
@@ -1,5 +1,4 @@
1
1
  import { DataSource, DataSourceOptions, EntityTarget, ObjectLiteral, Repository } from 'typeorm';
2
- import { logger } from '../logger/logger';
3
2
 
4
3
  // to be used instead of getConnectionManager()
5
4
  export class DataSourceManager {
@@ -10,8 +9,7 @@ export class DataSourceManager {
10
9
 
11
10
  public static getInstance(): DataSourceManager {
12
11
  if (!DataSourceManager.instance) {
13
- logger.info(`##### No DataSource manager instance`);
14
- DataSourceManager.instance = new DataSourceManager();
12
+ DataSourceManager.instance = new DataSourceManager();
15
13
  }
16
14
  return DataSourceManager.instance;
17
15
  }
@@ -21,9 +19,8 @@ export class DataSourceManager {
21
19
  return new Promise((resolve, reject) => {
22
20
  new DataSource(_options).initialize()
23
21
  .then((dataSource: DataSource) => {
24
- this.dataSources.set(name, dataSource);
25
- const retrievedData = this.dataSources.get(name);
26
- resolve(retrievedData);
22
+ this.dataSources.set(name, dataSource).get(name);
23
+ resolve(dataSource);
27
24
  })
28
25
  .catch((e: any) => {
29
26
  reject(e);
@@ -32,7 +29,6 @@ export class DataSourceManager {
32
29
  }
33
30
 
34
31
  public getDataSource(dataSourceName: string): DataSource {
35
- logger.info(`Retrieve data source with name ${dataSourceName}`);
36
32
  return this.dataSources.get(dataSourceName || 'default');
37
33
  }
38
34
 
@@ -43,6 +39,6 @@ export function getDataSource(dataSourceName?: string): DataSource {
43
39
  return DataSourceManager.getInstance().getDataSource(dataSourceName || 'default');
44
40
  }
45
41
 
46
- export function createDataSource(options?: DataSourceOptions, name?: string) {
47
- return DataSourceManager.getInstance().createDataSource(name || 'default', options);
42
+ export function createDataSource(options?: DataSourceOptions, name: string = 'default') {
43
+ return DataSourceManager.getInstance().createDataSource(name, options);
48
44
  }