@gustavo-valsechi/node 1.0.36 → 1.0.38

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 (9) hide show
  1. package/dist/index.js +8 -14
  2. package/dist/index.mjs +8 -14
  3. package/dist/src/database/index.d.mts +2 -2
  4. package/dist/src/database/index.d.ts +2 -2
  5. package/dist/src/database/index.js +6 -5
  6. package/dist/src/database/index.mjs +6 -5
  7. package/dist/src/services/index.js +2 -9
  8. package/dist/src/services/index.mjs +2 -9
  9. package/package.json +1 -1
package/dist/index.js CHANGED
@@ -51,7 +51,7 @@ module.exports = __toCommonJS(index_exports);
51
51
  var import_config = require("dotenv/config");
52
52
  var import_os = require("os");
53
53
  var import_typeorm = require("typeorm");
54
- var databaseInit = (entities) => {
54
+ var databaseInit = (entities, options) => {
55
55
  const type = process.env.DB_TYPE;
56
56
  const host = process.env.DB_HOST;
57
57
  const port = process.env.DB_PORT;
@@ -64,6 +64,11 @@ var databaseInit = (entities) => {
64
64
  if (!password) throw new Error("DB_PASSWORD is required!");
65
65
  if (!database) throw new Error("DB_DATABASE is required!");
66
66
  const DB = new import_typeorm.DataSource({
67
+ migrationsRun: false,
68
+ logging: "all",
69
+ logger: "advanced-console",
70
+ migrations: ["src/database/migrations/*.ts"],
71
+ ...options || {},
67
72
  type: type || "postgres",
68
73
  host,
69
74
  port: Number(port),
@@ -71,10 +76,6 @@ var databaseInit = (entities) => {
71
76
  password,
72
77
  database,
73
78
  synchronize: false,
74
- migrationsRun: false,
75
- logging: "all",
76
- logger: "advanced-console",
77
- migrations: ["src/database/typeorm-migrations/*.ts"],
78
79
  applicationName: (0, import_os.hostname)(),
79
80
  entities
80
81
  });
@@ -320,14 +321,7 @@ var TenantService = class {
320
321
  this.idTenant = idTenant;
321
322
  }
322
323
  async getTenantQueryRunner() {
323
- var _a, _b;
324
- if (this.runner && !this.runner.isReleased) {
325
- await this.runner.query(`SET search_path TO "${this.idTenant}"`);
326
- return this.runner;
327
- }
328
- if ((_a = this.runner) == null ? void 0 : _a.isReleased) {
329
- this.runner = void 0;
330
- }
324
+ var _a;
331
325
  const runner = this.db.createQueryRunner();
332
326
  await runner.connect();
333
327
  const result = await runner.query(`
@@ -339,7 +333,7 @@ var TenantService = class {
339
333
  `, [this.idTenant]);
340
334
  await runner.query(`CREATE SCHEMA IF NOT EXISTS "${this.idTenant}"`);
341
335
  await runner.query(`SET search_path TO "${this.idTenant}"`);
342
- if (!((_b = result == null ? void 0 : result[0]) == null ? void 0 : _b.exists)) await runner.query(this.migrations);
336
+ if (!((_a = result == null ? void 0 : result[0]) == null ? void 0 : _a.exists)) await runner.query(this.migrations);
343
337
  this.runner = runner;
344
338
  return runner;
345
339
  }
package/dist/index.mjs CHANGED
@@ -9,7 +9,7 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
9
9
  import "dotenv/config";
10
10
  import { hostname } from "os";
11
11
  import { DataSource } from "typeorm";
12
- var databaseInit = (entities) => {
12
+ var databaseInit = (entities, options) => {
13
13
  const type = process.env.DB_TYPE;
14
14
  const host = process.env.DB_HOST;
15
15
  const port = process.env.DB_PORT;
@@ -22,6 +22,11 @@ var databaseInit = (entities) => {
22
22
  if (!password) throw new Error("DB_PASSWORD is required!");
23
23
  if (!database) throw new Error("DB_DATABASE is required!");
24
24
  const DB = new DataSource({
25
+ migrationsRun: false,
26
+ logging: "all",
27
+ logger: "advanced-console",
28
+ migrations: ["src/database/migrations/*.ts"],
29
+ ...options || {},
25
30
  type: type || "postgres",
26
31
  host,
27
32
  port: Number(port),
@@ -29,10 +34,6 @@ var databaseInit = (entities) => {
29
34
  password,
30
35
  database,
31
36
  synchronize: false,
32
- migrationsRun: false,
33
- logging: "all",
34
- logger: "advanced-console",
35
- migrations: ["src/database/typeorm-migrations/*.ts"],
36
37
  applicationName: hostname(),
37
38
  entities
38
39
  });
@@ -289,14 +290,7 @@ var TenantService = class {
289
290
  this.idTenant = idTenant;
290
291
  }
291
292
  async getTenantQueryRunner() {
292
- var _a, _b;
293
- if (this.runner && !this.runner.isReleased) {
294
- await this.runner.query(`SET search_path TO "${this.idTenant}"`);
295
- return this.runner;
296
- }
297
- if ((_a = this.runner) == null ? void 0 : _a.isReleased) {
298
- this.runner = void 0;
299
- }
293
+ var _a;
300
294
  const runner = this.db.createQueryRunner();
301
295
  await runner.connect();
302
296
  const result = await runner.query(`
@@ -308,7 +302,7 @@ var TenantService = class {
308
302
  `, [this.idTenant]);
309
303
  await runner.query(`CREATE SCHEMA IF NOT EXISTS "${this.idTenant}"`);
310
304
  await runner.query(`SET search_path TO "${this.idTenant}"`);
311
- if (!((_b = result == null ? void 0 : result[0]) == null ? void 0 : _b.exists)) await runner.query(this.migrations);
305
+ if (!((_a = result == null ? void 0 : result[0]) == null ? void 0 : _a.exists)) await runner.query(this.migrations);
312
306
  this.runner = runner;
313
307
  return runner;
314
308
  }
package/dist/src/database/index.d.mts CHANGED
@@ -1,5 +1,5 @@
1
- import { DataSource } from 'typeorm';
1
+ import { DataSourceOptions, DataSource } from 'typeorm';
2
2
 
3
- declare const databaseInit: (entities: Array<any>) => DataSource;
3
+ declare const databaseInit: (entities: Array<any>, options?: DataSourceOptions) => DataSource;
4
4
 
5
5
  export { databaseInit };
package/dist/src/database/index.d.ts CHANGED
@@ -1,5 +1,5 @@
1
- import { DataSource } from 'typeorm';
1
+ import { DataSourceOptions, DataSource } from 'typeorm';
2
2
 
3
- declare const databaseInit: (entities: Array<any>) => DataSource;
3
+ declare const databaseInit: (entities: Array<any>, options?: DataSourceOptions) => DataSource;
4
4
 
5
5
  export { databaseInit };
package/dist/src/database/index.js CHANGED
@@ -26,7 +26,7 @@ module.exports = __toCommonJS(database_exports);
26
26
  var import_config = require("dotenv/config");
27
27
  var import_os = require("os");
28
28
  var import_typeorm = require("typeorm");
29
- var databaseInit = (entities) => {
29
+ var databaseInit = (entities, options) => {
30
30
  const type = process.env.DB_TYPE;
31
31
  const host = process.env.DB_HOST;
32
32
  const port = process.env.DB_PORT;
@@ -39,6 +39,11 @@ var databaseInit = (entities) => {
39
39
  if (!password) throw new Error("DB_PASSWORD is required!");
40
40
  if (!database) throw new Error("DB_DATABASE is required!");
41
41
  const DB = new import_typeorm.DataSource({
42
+ migrationsRun: false,
43
+ logging: "all",
44
+ logger: "advanced-console",
45
+ migrations: ["src/database/migrations/*.ts"],
46
+ ...options || {},
42
47
  type: type || "postgres",
43
48
  host,
44
49
  port: Number(port),
@@ -46,10 +51,6 @@ var databaseInit = (entities) => {
46
51
  password,
47
52
  database,
48
53
  synchronize: false,
49
- migrationsRun: false,
50
- logging: "all",
51
- logger: "advanced-console",
52
- migrations: ["src/database/typeorm-migrations/*.ts"],
53
54
  applicationName: (0, import_os.hostname)(),
54
55
  entities
55
56
  });
package/dist/src/database/index.mjs CHANGED
@@ -2,7 +2,7 @@
2
2
  import "dotenv/config";
3
3
  import { hostname } from "os";
4
4
  import { DataSource } from "typeorm";
5
- var databaseInit = (entities) => {
5
+ var databaseInit = (entities, options) => {
6
6
  const type = process.env.DB_TYPE;
7
7
  const host = process.env.DB_HOST;
8
8
  const port = process.env.DB_PORT;
@@ -15,6 +15,11 @@ var databaseInit = (entities) => {
15
15
  if (!password) throw new Error("DB_PASSWORD is required!");
16
16
  if (!database) throw new Error("DB_DATABASE is required!");
17
17
  const DB = new DataSource({
18
+ migrationsRun: false,
19
+ logging: "all",
20
+ logger: "advanced-console",
21
+ migrations: ["src/database/migrations/*.ts"],
22
+ ...options || {},
18
23
  type: type || "postgres",
19
24
  host,
20
25
  port: Number(port),
@@ -22,10 +27,6 @@ var databaseInit = (entities) => {
22
27
  password,
23
28
  database,
24
29
  synchronize: false,
25
- migrationsRun: false,
26
- logging: "all",
27
- logger: "advanced-console",
28
- migrations: ["src/database/typeorm-migrations/*.ts"],
29
30
  applicationName: hostname(),
30
31
  entities
31
32
  });
package/dist/src/services/index.js CHANGED
@@ -33,14 +33,7 @@ var TenantService = class {
33
33
  this.idTenant = idTenant;
34
34
  }
35
35
  async getTenantQueryRunner() {
36
- var _a, _b;
37
- if (this.runner && !this.runner.isReleased) {
38
- await this.runner.query(`SET search_path TO "${this.idTenant}"`);
39
- return this.runner;
40
- }
41
- if ((_a = this.runner) == null ? void 0 : _a.isReleased) {
42
- this.runner = void 0;
43
- }
36
+ var _a;
44
37
  const runner = this.db.createQueryRunner();
45
38
  await runner.connect();
46
39
  const result = await runner.query(`
@@ -52,7 +45,7 @@ var TenantService = class {
52
45
  `, [this.idTenant]);
53
46
  await runner.query(`CREATE SCHEMA IF NOT EXISTS "${this.idTenant}"`);
54
47
  await runner.query(`SET search_path TO "${this.idTenant}"`);
55
- if (!((_b = result == null ? void 0 : result[0]) == null ? void 0 : _b.exists)) await runner.query(this.migrations);
48
+ if (!((_a = result == null ? void 0 : result[0]) == null ? void 0 : _a.exists)) await runner.query(this.migrations);
56
49
  this.runner = runner;
57
50
  return runner;
58
51
  }
package/dist/src/services/index.mjs CHANGED
@@ -7,14 +7,7 @@ var TenantService = class {
7
7
  this.idTenant = idTenant;
8
8
  }
9
9
  async getTenantQueryRunner() {
10
- var _a, _b;
11
- if (this.runner && !this.runner.isReleased) {
12
- await this.runner.query(`SET search_path TO "${this.idTenant}"`);
13
- return this.runner;
14
- }
15
- if ((_a = this.runner) == null ? void 0 : _a.isReleased) {
16
- this.runner = void 0;
17
- }
10
+ var _a;
18
11
  const runner = this.db.createQueryRunner();
19
12
  await runner.connect();
20
13
  const result = await runner.query(`
@@ -26,7 +19,7 @@ var TenantService = class {
26
19
  `, [this.idTenant]);
27
20
  await runner.query(`CREATE SCHEMA IF NOT EXISTS "${this.idTenant}"`);
28
21
  await runner.query(`SET search_path TO "${this.idTenant}"`);
29
- if (!((_b = result == null ? void 0 : result[0]) == null ? void 0 : _b.exists)) await runner.query(this.migrations);
22
+ if (!((_a = result == null ? void 0 : result[0]) == null ? void 0 : _a.exists)) await runner.query(this.migrations);
30
23
  this.runner = runner;
31
24
  return runner;
32
25
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gustavo-valsechi/node",
3
- "version": "1.0.36",
3
+ "version": "1.0.38",
4
4
  "main": "dist/index.js",
5
5
  "module": "dist/index.js",
6
6
  "types": "dist/index.d.ts",