@puca/puca-core 11.8.22 → 12.0.1

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 (167) hide show
  1. package/dist/core/services/auth.service.d.ts +1 -0
  2. package/dist/core/services/auth.service.js +7 -1
  3. package/dist/core/services/auth.service.js.map +1 -1
  4. package/dist/core/services/bootstrap-commands.js +61 -0
  5. package/dist/core/services/bootstrap-commands.js.map +1 -1
  6. package/dist/core/services/comunication/comunication-http.service.js +5 -0
  7. package/dist/core/services/comunication/comunication-http.service.js.map +1 -1
  8. package/dist/core/services/comunication/comunication.service.d.ts +1 -3
  9. package/dist/core/services/comunication/comunication.service.js +2 -3
  10. package/dist/core/services/comunication/comunication.service.js.map +1 -1
  11. package/dist/core/services/crud-base-testable.service.d.ts +10 -4
  12. package/dist/core/services/crud-base-testable.service.js +19 -11
  13. package/dist/core/services/crud-base-testable.service.js.map +1 -1
  14. package/dist/core/services/crud-base.controller.d.ts +5 -4
  15. package/dist/core/services/crud-base.controller.js +44 -23
  16. package/dist/core/services/crud-base.controller.js.map +1 -1
  17. package/dist/core/services/crud-base.service.d.ts +1 -1
  18. package/dist/core/services/crud-base.service.js +1 -1
  19. package/dist/core/services/crud-base.service.js.map +1 -1
  20. package/dist/core/services/crud-front-base.service.d.ts +36 -11
  21. package/dist/core/services/crud-front-base.service.js +71 -52
  22. package/dist/core/services/crud-front-base.service.js.map +1 -1
  23. package/dist/core/services/{life-cycle.service.d.ts → domain-life-cycle.service.d.ts} +5 -19
  24. package/dist/core/services/{life-cycle.service.js → domain-life-cycle.service.js} +35 -82
  25. package/dist/core/services/domain-life-cycle.service.js.map +1 -0
  26. package/dist/core/services/eval.service.d.ts +2 -1
  27. package/dist/core/services/eval.service.js +10 -7
  28. package/dist/core/services/eval.service.js.map +1 -1
  29. package/dist/core/services/incremental-search.service.d.ts +4 -1
  30. package/dist/core/services/incremental-search.service.js +8 -2
  31. package/dist/core/services/incremental-search.service.js.map +1 -1
  32. package/dist/core/services/index.d.ts +33 -32
  33. package/dist/core/services/index.js +42 -37
  34. package/dist/core/services/index.js.map +1 -1
  35. package/dist/core/services/install.service.d.ts +7 -9
  36. package/dist/core/services/install.service.js +11 -13
  37. package/dist/core/services/install.service.js.map +1 -1
  38. package/dist/core/services/job/job.client.d.ts +1 -0
  39. package/dist/core/services/job/job.client.js +8 -2
  40. package/dist/core/services/job/job.client.js.map +1 -1
  41. package/dist/core/services/job/job.service.d.ts +1 -0
  42. package/dist/core/services/job/job.service.js +3 -0
  43. package/dist/core/services/job/job.service.js.map +1 -1
  44. package/dist/core/services/job-executor/job-executor.service.d.ts +10 -7
  45. package/dist/core/services/job-executor/job-executor.service.js +65 -30
  46. package/dist/core/services/job-executor/job-executor.service.js.map +1 -1
  47. package/dist/core/services/link-builder.d.ts +3 -3
  48. package/dist/core/services/link-builder.js +5 -4
  49. package/dist/core/services/link-builder.js.map +1 -1
  50. package/dist/core/services/migration/migration.service.d.ts +7 -7
  51. package/dist/core/services/migration/migration.service.js +31 -89
  52. package/dist/core/services/migration/migration.service.js.map +1 -1
  53. package/dist/core/services/module-especification.service.d.ts +3 -3
  54. package/dist/core/services/module-especification.service.js +6 -6
  55. package/dist/core/services/module-especification.service.js.map +1 -1
  56. package/dist/core/services/monitor.js +1 -1
  57. package/dist/core/services/monitor.js.map +1 -1
  58. package/dist/core/services/mq/mq.service.d.ts +3 -1
  59. package/dist/core/services/mq/mq.service.js +12 -5
  60. package/dist/core/services/mq/mq.service.js.map +1 -1
  61. package/dist/core/services/plugin.service.d.ts +7 -1
  62. package/dist/core/services/plugin.service.js +11 -10
  63. package/dist/core/services/plugin.service.js.map +1 -1
  64. package/dist/core/services/report.service.d.ts +3 -1
  65. package/dist/core/services/report.service.js +21 -51
  66. package/dist/core/services/report.service.js.map +1 -1
  67. package/dist/core/services/server-life-cycle.service.d.ts +23 -0
  68. package/dist/core/services/server-life-cycle.service.js +81 -0
  69. package/dist/core/services/server-life-cycle.service.js.map +1 -0
  70. package/dist/core/services/storage/implementation/s3-client.service.d.ts +3 -5
  71. package/dist/core/services/storage/implementation/s3-client.service.js +4 -7
  72. package/dist/core/services/storage/implementation/s3-client.service.js.map +1 -1
  73. package/dist/core/services/storage/storage.service.d.ts +3 -3
  74. package/dist/core/services/storage/storage.service.js +4 -5
  75. package/dist/core/services/storage/storage.service.js.map +1 -1
  76. package/dist/core/services/system-parameters-envs.service.d.ts +1 -0
  77. package/dist/core/services/system-parameters-envs.service.js +4 -1
  78. package/dist/core/services/system-parameters-envs.service.js.map +1 -1
  79. package/dist/core/services/table-permission.service.d.ts +1 -3
  80. package/dist/core/services/table-permission.service.js +1 -2
  81. package/dist/core/services/table-permission.service.js.map +1 -1
  82. package/dist/core/services/web-socket.service.d.ts +6 -9
  83. package/dist/core/services/web-socket.service.js +26 -20
  84. package/dist/core/services/web-socket.service.js.map +1 -1
  85. package/dist/essential/config.service.d.ts +5 -0
  86. package/dist/essential/config.service.js +27 -5
  87. package/dist/essential/config.service.js.map +1 -1
  88. package/dist/essential/envs-config.service.d.ts +1 -0
  89. package/dist/essential/envs-config.service.js +9 -6
  90. package/dist/essential/envs-config.service.js.map +1 -1
  91. package/dist/essential/index.d.ts +3 -4
  92. package/dist/essential/index.js +5 -6
  93. package/dist/essential/index.js.map +1 -1
  94. package/dist/essential/module-config.service.d.ts +3 -3
  95. package/dist/essential/module-config.service.js +4 -4
  96. package/dist/essential/module-config.service.js.map +1 -1
  97. package/dist/functions/index.d.ts +2 -1
  98. package/dist/functions/index.js +2 -1
  99. package/dist/functions/index.js.map +1 -1
  100. package/dist/models/secret.d.ts +1 -0
  101. package/dist/orm/cases/bo/ddl.service.js.map +1 -1
  102. package/dist/orm/cases/vanilla/sql-builder/select.service.d.ts +2 -1
  103. package/dist/orm/cases/vanilla/sql-builder/select.service.js +31 -10
  104. package/dist/orm/cases/vanilla/sql-builder/select.service.js.map +1 -1
  105. package/dist/orm/services/cache-repository/cache-repository-redis.d.ts +3 -3
  106. package/dist/orm/services/cache-repository/cache-repository-redis.js +7 -3
  107. package/dist/orm/services/cache-repository/cache-repository-redis.js.map +1 -1
  108. package/dist/orm/services/cache-repository/cache-repository.d.ts +3 -3
  109. package/dist/orm/services/cache-repository/cache-repository.js +3 -3
  110. package/dist/orm/services/cache-repository/cache-repository.js.map +1 -1
  111. package/dist/orm/services/cache.service.d.ts +5 -5
  112. package/dist/orm/services/cache.service.js +11 -15
  113. package/dist/orm/services/cache.service.js.map +1 -1
  114. package/dist/orm/services/index.d.ts +8 -7
  115. package/dist/orm/services/index.js +11 -8
  116. package/dist/orm/services/index.js.map +1 -1
  117. package/dist/orm/services/managers/database-manager.service.js +2 -2
  118. package/dist/orm/services/managers/database-manager.service.js.map +1 -1
  119. package/dist/orm/services/managers/puca-orm-client.service.d.ts +1 -0
  120. package/dist/orm/services/managers/puca-orm-client.service.js +3 -0
  121. package/dist/orm/services/managers/puca-orm-client.service.js.map +1 -1
  122. package/dist/orm/services/repository-factory.d.ts +3 -3
  123. package/dist/orm/services/repository-factory.js +4 -4
  124. package/dist/orm/services/repository-factory.js.map +1 -1
  125. package/dist/orm/services/repository.d.ts +3 -3
  126. package/dist/orm/services/repository.js +5 -5
  127. package/dist/orm/services/repository.js.map +1 -1
  128. package/dist/orm/services/secundary-database/secundary-database.service.d.ts +23 -0
  129. package/dist/orm/services/secundary-database/secundary-database.service.js +66 -0
  130. package/dist/orm/services/secundary-database/secundary-database.service.js.map +1 -0
  131. package/dist/orm/services/sql-executor.js +3 -3
  132. package/dist/orm/services/sql-executor.js.map +1 -1
  133. package/dist/orm/services/transaction.d.ts +2 -5
  134. package/dist/orm/services/transaction.js +4 -6
  135. package/dist/orm/services/transaction.js.map +1 -1
  136. package/dist/plugins/file-system/file-system.service.d.ts +6 -3
  137. package/dist/plugins/file-system/file-system.service.js +12 -5
  138. package/dist/plugins/file-system/file-system.service.js.map +1 -1
  139. package/dist/plugins/file-system/shared-file-system.service.d.ts +25 -0
  140. package/dist/plugins/file-system/shared-file-system.service.js +121 -0
  141. package/dist/plugins/file-system/shared-file-system.service.js.map +1 -0
  142. package/dist/plugins/index.d.ts +4 -1
  143. package/dist/plugins/index.js +5 -2
  144. package/dist/plugins/index.js.map +1 -1
  145. package/dist/plugins/multi-tenant/multi-tentant.adapter.d.ts +14 -0
  146. package/dist/plugins/multi-tenant/multi-tentant.adapter.js +58 -0
  147. package/dist/plugins/multi-tenant/multi-tentant.adapter.js.map +1 -0
  148. package/dist/plugins/multi-tenant/puca-hub.service.d.ts +54 -0
  149. package/dist/plugins/multi-tenant/puca-hub.service.js +210 -0
  150. package/dist/plugins/multi-tenant/puca-hub.service.js.map +1 -0
  151. package/dist/plugins/nestjs/puca-auth.decorators.js +1 -1
  152. package/dist/plugins/nestjs/puca-auth.decorators.js.map +1 -1
  153. package/dist/plugins/nestjs/puca-auth.guard.js +4 -1
  154. package/dist/plugins/nestjs/puca-auth.guard.js.map +1 -1
  155. package/dist/tsconfig.tsbuildinfo +1 -1
  156. package/get-view-dependencies.sql +18 -3
  157. package/package.json +1 -2
  158. package/dist/core/services/life-cycle.service.js.map +0 -1
  159. package/dist/core/services/single-instance-ensure.service.d.ts +0 -8
  160. package/dist/core/services/single-instance-ensure.service.js +0 -23
  161. package/dist/core/services/single-instance-ensure.service.js.map +0 -1
  162. package/dist/essential/audit.service.d.ts +0 -22
  163. package/dist/essential/audit.service.js +0 -52
  164. package/dist/essential/audit.service.js.map +0 -1
  165. package/dist/orm/services/managers/redis-manager.service.d.ts +0 -6
  166. package/dist/orm/services/managers/redis-manager.service.js +0 -16
  167. package/dist/orm/services/managers/redis-manager.service.js.map +0 -1
@@ -3,15 +3,20 @@ import { ExternalModuleConfig } from "../models/external-module-config";
3
3
  import { FrontEndToBackEndMap } from "../models/front-end-to-back-end-map";
4
4
  import { Secret } from "../models/secret";
5
5
  import { FileSystemService } from "../plugins/file-system/file-system.service";
6
+ import { DomainConfig } from "../plugins/multi-tenant//puca-hub.service";
6
7
  export declare class ConfigService {
7
8
  private readonly fileSystemService;
9
+ private readonly logger;
8
10
  private readonly MODULE;
9
11
  private readonly SHARED_ENV;
10
12
  private readonly ENV;
11
13
  private readonly FRONT_END_TO_BACK_END_MAP;
12
14
  private readonly SHARED_SECRET;
13
15
  private readonly SECRET;
16
+ private shouldCheckRequredSecretVars;
14
17
  constructor(fileSystemService: FileSystemService);
18
+ private checkRequredSecretVars;
19
+ init(domain: string, config: DomainConfig): Promise<void>;
15
20
  getExternalModuleConfig(): Promise<ExternalModuleConfig[]>;
16
21
  getSecret(): Promise<Secret>;
17
22
  getEnv(): Promise<EnvsConfig>;
@@ -1,15 +1,32 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.ConfigService = void 0;
4
+ const logger_1 = require("../core/services/logger");
4
5
  class ConfigService {
5
6
  constructor(fileSystemService) {
6
7
  this.fileSystemService = fileSystemService;
8
+ this.logger = new logger_1.Logger(ConfigService.name);
7
9
  this.MODULE = process.env.MODULE_PATH || 'config/modules.json';
8
10
  this.SHARED_ENV = process.env.SHARED_ENV_PATH || '';
9
11
  this.ENV = process.env.ENV_PATH || 'config/env.json';
10
12
  this.FRONT_END_TO_BACK_END_MAP = process.env.FRONT_END_TO_BACK_END_MAP_PATH || 'config/front-end-to-back-end-map.json';
11
13
  this.SHARED_SECRET = process.env.SHARED_SECRET_PATH || '';
12
14
  this.SECRET = process.env.SECRET_PATH || 'config/secret.json';
15
+ this.shouldCheckRequredSecretVars = true;
16
+ }
17
+ checkRequredSecretVars(secret) {
18
+ if (!this.shouldCheckRequredSecretVars) {
19
+ return;
20
+ }
21
+ this.shouldCheckRequredSecretVars = false;
22
+ }
23
+ async init(domain, config) {
24
+ const toBuffer = (data) => Buffer.from(JSON.stringify(data, null, 2));
25
+ await this.fileSystemService.writeBufferFile(this.MODULE, toBuffer(config.modules));
26
+ await this.fileSystemService.writeBufferFile(this.ENV, toBuffer(config.env));
27
+ await this.fileSystemService.writeBufferFile(this.FRONT_END_TO_BACK_END_MAP, toBuffer(config.frontEndToBackEndMap));
28
+ await this.fileSystemService.writeBufferFile(this.SECRET, toBuffer(config.secret));
29
+ this.checkRequredSecretVars(config.secret);
13
30
  }
14
31
  async getExternalModuleConfig() {
15
32
  return await this.fileSystemService.readJSONFile(this.MODULE, {
@@ -17,28 +34,33 @@ class ConfigService {
17
34
  });
18
35
  }
19
36
  async getSecret() {
20
- return Object.assign(Object.assign({}, await this.fileSystemService.readJSONFile(this.SHARED_SECRET, {
37
+ const sharedSecret = await this.fileSystemService.readJSONFile(this.SHARED_SECRET, {
21
38
  throwErrors: false,
22
39
  useCache: true
23
- })), await this.fileSystemService.readJSONFile(this.SECRET, {
40
+ });
41
+ const secret = await this.fileSystemService.readJSONFile(this.SECRET, {
24
42
  throwErrors: false,
25
43
  useCache: true
26
- }));
44
+ });
45
+ const resultSecret = Object.assign(Object.assign({}, sharedSecret), secret);
46
+ return resultSecret;
27
47
  }
28
48
  async getEnv() {
29
- return Object.assign(Object.assign({}, await this.fileSystemService.readJSONFile(this.SHARED_ENV, {
49
+ const result = Object.assign(Object.assign({}, await this.fileSystemService.readJSONFile(this.SHARED_ENV, {
30
50
  throwErrors: false,
31
51
  useCache: true
32
52
  })), await this.fileSystemService.readJSONFile(this.ENV, {
33
53
  throwErrors: false,
34
54
  useCache: true
35
55
  }));
56
+ return result;
36
57
  }
37
58
  async getFrontEndToBackEndMap() {
38
- return await this.fileSystemService.readJSONFile(this.FRONT_END_TO_BACK_END_MAP, {
59
+ const result = await this.fileSystemService.readJSONFile(this.FRONT_END_TO_BACK_END_MAP, {
39
60
  throwErrors: false,
40
61
  useCache: true
41
62
  }) || [];
63
+ return result;
42
64
  }
43
65
  }
44
66
  exports.ConfigService = ConfigService;
@@ -1 +1 @@
1
- {"version":3,"file":"config.service.js","sourceRoot":"","sources":["../../src/essential/config.service.ts"],"names":[],"mappings":";;;AAMA,MAAa,aAAa;IAQxB,YAA6B,iBAAoC;QAApC,sBAAiB,GAAjB,iBAAiB,CAAmB;QAPhD,WAAM,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,qBAAqB,CAAC;QAC1D,eAAU,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,EAAE,CAAC;QAC/C,QAAG,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,iBAAiB,CAAC;QAChD,8BAAyB,GAAG,OAAO,CAAC,GAAG,CAAC,8BAA8B,IAAI,uCAAuC,CAAC;QAClH,kBAAa,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,EAAE,CAAC;QACrD,WAAM,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,oBAAoB,CAAC;IAEL,CAAC;IAEtE,KAAK,CAAC,uBAAuB;QAC3B,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAyB,IAAI,CAAC,MAAM,EAAE;YACpF,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,SAAS;QACb,uCACK,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAS,IAAI,CAAC,aAAa,EAAE;YACvE,WAAW,EAAE,KAAK;YAClB,QAAQ,EAAE,IAAI;SACf,CAAC,GACC,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAS,IAAI,CAAC,MAAM,EAAE;YAChE,WAAW,EAAE,KAAK;YAClB,QAAQ,EAAE,IAAI;SACf,CAAC,EACH;IACH,CAAC;IAGD,KAAK,CAAC,MAAM;QACV,uCACK,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAa,IAAI,CAAC,UAAU,EAAE;YACxE,WAAW,EAAE,KAAK;YAClB,QAAQ,EAAE,IAAI;SACf,CAAC,GACC,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAa,IAAI,CAAC,GAAG,EAAE;YACjE,WAAW,EAAE,KAAK;YAClB,QAAQ,EAAE,IAAI;SACf,CAAC,EACH;IACH,CAAC;IAED,KAAK,CAAC,uBAAuB;QAC3B,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAyB,IAAI,CAAC,yBAAyB,EAAE;YACvG,WAAW,EAAE,KAAK;YAClB,QAAQ,EAAE,IAAI;SACf,CAAC,IAAI,EAAE,CAAA;IACV,CAAC;CACF;AAjDD,sCAiDC"}
1
+ {"version":3,"file":"config.service.js","sourceRoot":"","sources":["../../src/essential/config.service.ts"],"names":[],"mappings":"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"}
@@ -3,6 +3,7 @@ export declare class EnvConfigService {
3
3
  private readonly configService;
4
4
  private envConfig;
5
5
  constructor(configService: ConfigService);
6
+ init(): Promise<void>;
6
7
  private getEnvConfig;
7
8
  getEnvByName<T = string>(envName: string, fallBack?: T): Promise<T>;
8
9
  getEnvByNameSync<T = string>(envName: string, fallBack?: T): T;
@@ -6,24 +6,27 @@ class EnvConfigService {
6
6
  constructor(configService) {
7
7
  this.configService = configService;
8
8
  }
9
+ async init() {
10
+ this.envConfig = await this.configService.getEnv();
11
+ }
9
12
  async getEnvConfig() {
10
- if (!this.envConfig) {
11
- this.envConfig = await this.configService.getEnv();
12
- }
13
13
  return this.envConfig;
14
14
  }
15
15
  async getEnvByName(envName, fallBack = null) {
16
+ if (envName === 'ENVIRONMENT') {
17
+ throw new Error('Use process.env.ENVIRONMENT instead of this method');
18
+ }
16
19
  const envJSONName = _.kebabCase(envName);
17
20
  const envCONFIGName = _.snakeCase(envName).toUpperCase();
18
21
  const envConfig = await this.getEnvConfig();
19
22
  return (_.get(envConfig, envJSONName) || process.env[envCONFIGName] || fallBack);
20
23
  }
21
24
  getEnvByNameSync(envName, fallBack = null) {
25
+ if (envName === 'ENVIRONMENT') {
26
+ throw new Error('Use process.env.ENVIRONMENT instead of this method');
27
+ }
22
28
  const envJSONName = _.kebabCase(envName);
23
29
  const envCONFIGName = _.snakeCase(envName).toUpperCase();
24
- if (!this.envConfig) {
25
- throw new Error('Env config not loaded yet');
26
- }
27
30
  const envConfig = this.envConfig;
28
31
  return (_.get(envConfig, envJSONName) || process.env[envCONFIGName] || fallBack);
29
32
  }
@@ -1 +1 @@
1
- {"version":3,"file":"envs-config.service.js","sourceRoot":"","sources":["../../src/essential/envs-config.service.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAG5B,MAAa,gBAAgB;IAG3B,YAA6B,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;IAAE,CAAC;IAEpD,KAAK,CAAC,YAAY;QACxB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACnB,IAAI,CAAC,SAAS,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAA;SACnD;QACD,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IACD,KAAK,CAAC,YAAY,CAChB,OAAe,EACf,WAAc,IAAI;QAElB,MAAM,WAAW,GAAG,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACzC,MAAM,aAAa,GAAG,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,CAAC;QACzD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAC5C,OAAO,CACL,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,WAAW,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,QAAQ,CACnE,CAAC;IACT,CAAC;IAED,gBAAgB,CACd,OAAe,EACf,WAAc,IAAI;QAElB,MAAM,WAAW,GAAG,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACzC,MAAM,aAAa,GAAG,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,CAAC;QAEzD,IAAG,CAAC,IAAI,CAAC,SAAS,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAA;SAC7C;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QACjC,OAAO,CACL,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,WAAW,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,QAAQ,CACnE,CAAC;IACT,CAAC;CACF;AAvCD,4CAuCC"}
1
+ {"version":3,"file":"envs-config.service.js","sourceRoot":"","sources":["../../src/essential/envs-config.service.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAG5B,MAAa,gBAAgB;IAG3B,YAA6B,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;IAAE,CAAC;IAE5D,KAAK,CAAC,IAAI;QACR,IAAI,CAAC,SAAS,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAA;IACpD,CAAC;IAEO,KAAK,CAAC,YAAY;QACxB,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IACD,KAAK,CAAC,YAAY,CAChB,OAAe,EACf,WAAc,IAAI;QAElB,IAAG,OAAO,KAAK,aAAa,EAAE;YAC5B,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAA;SACtE;QAED,MAAM,WAAW,GAAG,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACzC,MAAM,aAAa,GAAG,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,CAAC;QACzD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAC5C,OAAO,CACL,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,WAAW,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,QAAQ,CACnE,CAAC;IACT,CAAC;IAED,gBAAgB,CACd,OAAe,EACf,WAAc,IAAI;QAElB,IAAG,OAAO,KAAK,aAAa,EAAE;YAC5B,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAA;SACtE;QAED,MAAM,WAAW,GAAG,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACzC,MAAM,aAAa,GAAG,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,CAAC;QAEzD,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QACjC,OAAO,CACL,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,WAAW,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,QAAQ,CACnE,CAAC;IACT,CAAC;CACF;AA5CD,4CA4CC"}
@@ -1,8 +1,7 @@
1
- import { AuditService } from "./audit.service";
1
+ import { MultiTenantAdapter } from "../plugins/multi-tenant/multi-tentant.adapter";
2
2
  import { ConfigService } from "./config.service";
3
3
  import { EnvConfigService } from "./envs-config.service";
4
4
  import { ModuleConfigService } from "./module-config.service";
5
- export declare const configService: ConfigService;
6
- export declare const envConfigService: EnvConfigService;
5
+ export declare const configService: MultiTenantAdapter<ConfigService>;
6
+ export declare const envConfigService: MultiTenantAdapter<EnvConfigService>;
7
7
  export declare const moduleConfigService: ModuleConfigService;
8
- export declare const auditService: AuditService;
@@ -1,13 +1,12 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.auditService = exports.moduleConfigService = exports.envConfigService = exports.configService = void 0;
3
+ exports.moduleConfigService = exports.envConfigService = exports.configService = void 0;
4
4
  const plugins_1 = require("../plugins");
5
- const audit_service_1 = require("./audit.service");
5
+ const multi_tentant_adapter_1 = require("../plugins/multi-tenant/multi-tentant.adapter");
6
6
  const config_service_1 = require("./config.service");
7
7
  const envs_config_service_1 = require("./envs-config.service");
8
8
  const module_config_service_1 = require("./module-config.service");
9
- exports.configService = new config_service_1.ConfigService(plugins_1.fileSystemService);
10
- exports.envConfigService = new envs_config_service_1.EnvConfigService(exports.configService);
11
- exports.moduleConfigService = new module_config_service_1.ModuleConfigService(plugins_1.fileSystemService);
12
- exports.auditService = new audit_service_1.AuditService(exports.moduleConfigService, exports.envConfigService, exports.configService);
9
+ exports.configService = new multi_tentant_adapter_1.MultiTenantAdapter(domain => new config_service_1.ConfigService(plugins_1.fileSystemService.get(domain)), async (domain, instance, config) => await instance.init(domain, config));
10
+ exports.envConfigService = new multi_tentant_adapter_1.MultiTenantAdapter(domain => new envs_config_service_1.EnvConfigService(exports.configService.get(domain)), async (domain, instance) => await instance.init());
11
+ exports.moduleConfigService = new module_config_service_1.ModuleConfigService(plugins_1.sharedFileSystemService);
13
12
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/essential/index.ts"],"names":[],"mappings":";;;AAAA,wCAA+C;AAC/C,mDAA+C;AAC/C,qDAAiD;AACjD,+DAAyD;AACzD,mEAA8D;AAEjD,QAAA,aAAa,GAAG,IAAI,8BAAa,CAAC,2BAAiB,CAAC,CAAA;AACpD,QAAA,gBAAgB,GAAG,IAAI,sCAAgB,CAAC,qBAAa,CAAC,CAAA;AACtD,QAAA,mBAAmB,GAAG,IAAI,2CAAmB,CAAC,2BAAiB,CAAC,CAAC;AACjE,QAAA,YAAY,GAAG,IAAI,4BAAY,CAC1C,2BAAmB,EACnB,wBAAgB,EAChB,qBAAa,CACd,CAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/essential/index.ts"],"names":[],"mappings":";;;AAAA,wCAAwE;AACxE,yFAAmF;AACnF,qDAAiD;AACjD,+DAAyD;AACzD,mEAA8D;AAEjD,QAAA,aAAa,GAAG,IAAI,0CAAkB,CACjD,MAAM,CAAC,EAAE,CAAC,IAAI,8BAAa,CAAC,2BAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,EAC1D,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CACxE,CAAA;AACY,QAAA,gBAAgB,GAAG,IAAI,0CAAkB,CACpD,MAAM,CAAC,EAAE,CAAC,IAAI,sCAAgB,CAAC,qBAAa,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,EACzD,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAClD,CAAA;AACY,QAAA,mBAAmB,GAAG,IAAI,2CAAmB,CAAC,iCAAuB,CAAC,CAAA"}
@@ -1,9 +1,9 @@
1
1
  import { ModuleConfig } from '../models/module-config';
2
- import { FileSystemService } from '../plugins/file-system/file-system.service';
2
+ import { SharedFileSystemService } from '../plugins/file-system/shared-file-system.service';
3
3
  export declare class ModuleConfigService {
4
- private readonly fileSystemService;
4
+ private readonly sharedFileSystemService;
5
5
  private readonly logger;
6
6
  private moduleConfig;
7
- constructor(fileSystemService: FileSystemService);
7
+ constructor(sharedFileSystemService: SharedFileSystemService);
8
8
  getModuleConfig(): Promise<ModuleConfig>;
9
9
  }
@@ -4,8 +4,8 @@ exports.ModuleConfigService = void 0;
4
4
  const _ = require("lodash");
5
5
  const logger_1 = require("../core/services/logger");
6
6
  class ModuleConfigService {
7
- constructor(fileSystemService) {
8
- this.fileSystemService = fileSystemService;
7
+ constructor(sharedFileSystemService) {
8
+ this.sharedFileSystemService = sharedFileSystemService;
9
9
  this.logger = new logger_1.Logger('ModuleConfigService');
10
10
  this.getModuleConfig().then(config => {
11
11
  if (config.name !== _.kebabCase(config.name)) {
@@ -14,13 +14,13 @@ class ModuleConfigService {
14
14
  }
15
15
  if (!config.label) {
16
16
  this.logger.error('package.json must contain atributte "label"');
17
- process.exit(1);
17
+ throw new Error('package.json must contain atributte "label"');
18
18
  }
19
19
  });
20
20
  }
21
21
  async getModuleConfig() {
22
22
  if (!this.moduleConfig) {
23
- const packageJson = await this.fileSystemService.readJSONFile('./package.json');
23
+ const packageJson = await this.sharedFileSystemService.readJSONFile('./package.json');
24
24
  this.moduleConfig = {
25
25
  name: packageJson.name,
26
26
  version: packageJson.version,
@@ -1 +1 @@
1
- {"version":3,"file":"module-config.service.js","sourceRoot":"","sources":["../../src/essential/module-config.service.ts"],"names":[],"mappings":";;;AAEA,4BAA4B;AAC5B,oDAAiD;AAEjD,MAAa,mBAAmB;IAG9B,YAA6B,iBAAoC;QAApC,sBAAiB,GAAjB,iBAAiB,CAAmB;QAFhD,WAAM,GAAG,IAAI,eAAM,CAAC,qBAAqB,CAAC,CAAC;QAG1D,IAAI,CAAC,eAAe,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YACnC,IAAI,MAAM,CAAC,IAAI,KAAK,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;gBAC5C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC;gBACpD,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;aACnD;YACD,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;gBACjB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6CAA6C,CAAC,CAAC;gBACjE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aACjB;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IACD,KAAK,CAAC,eAAe;QACnB,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE;YACtB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAC3D,gBAAgB,CACjB,CAAC;YACF,IAAI,CAAC,YAAY,GAAG;gBAClB,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,OAAO,EAAE,WAAW,CAAC,OAAO;gBAC5B,KAAK,EAAE,WAAW,CAAC,KAAK;gBACxB,gBAAgB,EAAE,WAAW,CAAC,gBAAgB;aAC/C,CAAC;SACH;QACD,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;CACF;AA7BD,kDA6BC"}
1
+ {"version":3,"file":"module-config.service.js","sourceRoot":"","sources":["../../src/essential/module-config.service.ts"],"names":[],"mappings":";;;AACA,4BAA4B;AAC5B,oDAAiD;AAGjD,MAAa,mBAAmB;IAG9B,YAA6B,uBAAgD;QAAhD,4BAAuB,GAAvB,uBAAuB,CAAyB;QAF5D,WAAM,GAAG,IAAI,eAAM,CAAC,qBAAqB,CAAC,CAAC;QAG1D,IAAI,CAAC,eAAe,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YACnC,IAAI,MAAM,CAAC,IAAI,KAAK,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;gBAC5C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC;gBACpD,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;aACnD;YACD,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;gBACjB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6CAA6C,CAAC,CAAC;gBACjE,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;aAChE;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IACD,KAAK,CAAC,eAAe;QACnB,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE;YACtB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,YAAY,CACjE,gBAAgB,CACjB,CAAC;YACF,IAAI,CAAC,YAAY,GAAG;gBAClB,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,OAAO,EAAE,WAAW,CAAC,OAAO;gBAC5B,KAAK,EAAE,WAAW,CAAC,KAAK;gBACxB,gBAAgB,EAAE,WAAW,CAAC,gBAAgB;aAC/C,CAAC;SACH;QACD,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;CACF;AA7BD,kDA6BC"}
@@ -1,2 +1,3 @@
1
+ import { MultiTenantAdapter } from "../plugins/multi-tenant/multi-tentant.adapter";
1
2
  import FunctionService from "./function.service";
2
- export declare const functionService: FunctionService;
3
+ export declare const functionService: MultiTenantAdapter<FunctionService>;
@@ -2,6 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.functionService = void 0;
4
4
  const services_1 = require("../core/services");
5
+ const multi_tentant_adapter_1 = require("../plugins/multi-tenant/multi-tentant.adapter");
5
6
  const function_service_1 = require("./function.service");
6
- exports.functionService = new function_service_1.default(services_1.comunicationService);
7
+ exports.functionService = new multi_tentant_adapter_1.MultiTenantAdapter(domain => new function_service_1.default(services_1.comunicationService.get(domain)));
7
8
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/functions/index.ts"],"names":[],"mappings":";;;AAAA,+CAAuD;AACvD,yDAAiD;AAEpC,QAAA,eAAe,GAAG,IAAI,0BAAe,CAAC,8BAAmB,CAAC,CAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/functions/index.ts"],"names":[],"mappings":";;;AAAA,+CAAuD;AACvD,yFAAmF;AACnF,yDAAiD;AAEpC,QAAA,eAAe,GAAG,IAAI,0CAAkB,CACnD,MAAM,CAAC,EAAE,CAAC,IAAI,0BAAe,CAAC,8BAAmB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAC/D,CAAC"}
@@ -2,6 +2,7 @@ import { S3Config } from "../core/services/storage/implementation/s3-client.serv
2
2
  import { RedisConfig } from "./redis-config";
3
3
  export interface Secret {
4
4
  namespace: string;
5
+ legacyNamespace: string;
5
6
  pucaOrmConfig: {
6
7
  key: string;
7
8
  address: string;
@@ -1 +1 @@
1
- {"version":3,"file":"ddl.service.js","sourceRoot":"","sources":["../../../../src/orm/cases/bo/ddl.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ddl.service.js","sourceRoot":"","sources":["../../../../src/orm/cases/bo/ddl.service.ts"],"names":[],"mappings":"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"}
@@ -19,7 +19,8 @@ export declare enum BuildFieldAliasConfig {
19
19
  }
20
20
  export declare class SelectService {
21
21
  private readonly logger;
22
- buildField(field: SelectField, aliasConfig?: BuildFieldAliasConfig, resolve__?: boolean): string;
22
+ private processValue;
23
+ buildField(field: SelectField, aliasConfig?: BuildFieldAliasConfig): string;
23
24
  buildFields(fields: SelectField[], aliasConfig?: BuildFieldAliasConfig): string[];
24
25
  buildWhere(where: Where): string;
25
26
  private buildJoin;
@@ -101,8 +101,6 @@ const allowedFunction = {
101
101
  greatest: (args) => defaultFunctionTemplate('greatest', args),
102
102
  least: (args) => defaultFunctionTemplate('least', args),
103
103
  unaccent: (args) => defaultFunctionTemplate('unaccent', args),
104
- upper: (args) => defaultFunctionTemplate('upper', args),
105
- lower: (args) => defaultFunctionTemplate('lower', args),
106
104
  default_ts_vector: (args) => `to_tsvector('portuguese', ${args[0]})`,
107
105
  default_ts_query: (args) => `to_tsquery('portuguese', ${args[0]})`,
108
106
  default_ts_rank: (args) => `ts_rank( ${args[0]}, ${args[1]})`,
@@ -142,14 +140,39 @@ class SelectService {
142
140
  constructor() {
143
141
  this.logger = new logger_1.Logger(SelectService.name);
144
142
  }
145
- buildField(field, aliasConfig = BuildFieldAliasConfig.default, resolve__ = true) {
143
+ processValue(v) {
144
+ const estrategies = [
145
+ {
146
+ apply: () => !v,
147
+ exec: () => v,
148
+ },
149
+ {
150
+ apply: () => v.startsWith('$'),
151
+ exec: () => {
152
+ const nv = helpers_1.sqlEscape(v.replace('$', 'var_'));
153
+ return nv.replace('var_', '$');
154
+ },
155
+ },
156
+ {
157
+ apply: () => v.includes('__'),
158
+ exec: () => helpers_1.sqlEscape(`${v.split('__')[0]}.${v.split('__')[1]}`),
159
+ },
160
+ {
161
+ apply: () => true,
162
+ exec: () => helpers_1.sqlEscape(v),
163
+ },
164
+ ];
165
+ return estrategies
166
+ .find(({ apply }) => apply())
167
+ .exec();
168
+ }
169
+ buildField(field, aliasConfig = BuildFieldAliasConfig.default) {
146
170
  const resolveStr = (fStr) => {
147
171
  if (fStr.startsWith('$')) {
148
- const nv = helpers_1.sqlEscape(fStr.replace('$', 'var_'));
149
- return nv.replace('var_', '$');
172
+ return this.processValue(fStr);
150
173
  }
151
174
  const autoIncludeAlias = aliasConfig === BuildFieldAliasConfig.force;
152
- if (resolve__ && fStr.includes('__')) {
175
+ if (fStr.includes('__')) {
153
176
  return `${helpers_1.sqlEscape(fStr.split('__')[0])}.${helpers_1.sqlEscape(fStr.split('__')[1])} ${autoIncludeAlias ? `as ${helpers_1.sqlEscape(fStr)}` : ''}`;
154
177
  }
155
178
  if (fStr.includes('.')) {
@@ -194,10 +217,8 @@ class SelectService {
194
217
  }
195
218
  if ('field' in field) {
196
219
  const table = field.table;
197
- const fieldIsString = typeof field.field === 'string';
198
- const fieldStartsWith$ = fieldIsString && field.field.startsWith('$');
199
- if (table && !fieldStartsWith$) {
200
- return addAliasAddCastAddOver(`${helpers_1.sqlEscape(table)}.${this.buildField(field.field, BuildFieldAliasConfig.remove, false)}`, `${table}__${field.field}`);
220
+ if (table) {
221
+ return addAliasAddCastAddOver(`${helpers_1.sqlEscape(table)}.${this.buildField(field.field, BuildFieldAliasConfig.remove)}`, `${table}__${field.field}`);
201
222
  }
202
223
  else {
203
224
  const bField = this.buildField(field.field, BuildFieldAliasConfig.remove);
@@ -1 +1 @@
1
- {"version":3,"file":"select.service.js","sourceRoot":"","sources":["../../../../../src/orm/cases/vanilla/sql-builder/select.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"select.service.js","sourceRoot":"","sources":["../../../../../src/orm/cases/vanilla/sql-builder/select.service.ts"],"names":[],"mappings":"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"}
@@ -1,13 +1,13 @@
1
1
  import { Database } from '../managers/database-manager.service';
2
- import { RedisClient } from 'redis';
3
2
  import { Observable } from 'rxjs';
4
3
  import { CacheRepositoryI, ChangeEventHandler, ChangeEventHandlerArgs } from './interfaces';
4
+ import { SecundaryDatabase } from '../secundary-database/secundary-database.service';
5
5
  export declare type CallBack = (message: string) => void;
6
6
  export declare class CacheRepositoryRedis<T extends {
7
7
  puca_pid?: string;
8
8
  }> implements CacheRepositoryI<T> {
9
9
  private readonly database;
10
- private readonly redisClient;
10
+ private readonly secundaryDatabase;
11
11
  private readonly table;
12
12
  private readonly version;
13
13
  private readonly logger;
@@ -16,7 +16,7 @@ export declare class CacheRepositoryRedis<T extends {
16
16
  private readonly intervals;
17
17
  private readonly queue;
18
18
  private subscribe;
19
- constructor(database: Database, redisClient: RedisClient, table: string, version: number);
19
+ constructor(database: Database, secundaryDatabase: SecundaryDatabase, table: string, version: number);
20
20
  private subscribeOnChange;
21
21
  private emitChange;
22
22
  onChange(handler: ChangeEventHandler<T>): Promise<void>;
@@ -6,9 +6,9 @@ const logger_1 = require("../../../core/services/logger");
6
6
  const rxjs_1 = require("rxjs");
7
7
  const plugins_1 = require("../../../plugins");
8
8
  class CacheRepositoryRedis {
9
- constructor(database, redisClient, table, version) {
9
+ constructor(database, secundaryDatabase, table, version) {
10
10
  this.database = database;
11
- this.redisClient = redisClient;
11
+ this.secundaryDatabase = secundaryDatabase;
12
12
  this.table = table;
13
13
  this.version = version;
14
14
  this.logger = new logger_1.Logger('CacheRepositoryRedis');
@@ -22,7 +22,7 @@ class CacheRepositoryRedis {
22
22
  this.subscribeOnChange();
23
23
  }
24
24
  subscribe(topic, callback) {
25
- const subscriber = this.redisClient.duplicate();
25
+ const subscriber = this.secundaryDatabase.duplicate();
26
26
  subscriber.on("message", function (channel, message) {
27
27
  callback(message);
28
28
  });
@@ -85,6 +85,10 @@ class CacheRepositoryRedis {
85
85
  return observable;
86
86
  }
87
87
  async shutdown() {
88
+ await new Promise((resolve) => {
89
+ this.queue.once('end', resolve);
90
+ this.queue.end();
91
+ });
88
92
  this.events.splice(0, this.events.length);
89
93
  this.intervals.forEach(clearInterval);
90
94
  }
@@ -1 +1 @@
1
- {"version":3,"file":"cache-repository-redis.js","sourceRoot":"","sources":["../../../../src/orm/services/cache-repository/cache-repository-redis.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cache-repository-redis.js","sourceRoot":"","sources":["../../../../src/orm/services/cache-repository/cache-repository-redis.ts"],"names":[],"mappings":"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"}
@@ -1,17 +1,17 @@
1
- import { RedisClient } from "redis";
2
1
  import { Observable } from "rxjs";
3
2
  import { Database } from "../managers/database-manager.service";
4
3
  import { CacheRepositoryI, ChangeEventHandler, ChangeEventHandlerArgs, Opts } from "./interfaces";
4
+ import { SecundaryDatabase } from "../secundary-database/secundary-database.service";
5
5
  export declare class CacheRepository<T extends {
6
6
  puca_pid?: string;
7
7
  }> implements CacheRepositoryI<T> {
8
8
  private readonly database;
9
- private readonly redisClient;
9
+ private readonly secundaryDatabase;
10
10
  private readonly table;
11
11
  private readonly opts;
12
12
  private status;
13
13
  private instance;
14
- constructor(database: Database, redisClient: RedisClient, table: string, opts: Opts);
14
+ constructor(database: Database, secundaryDatabase: SecundaryDatabase, table: string, opts: Opts);
15
15
  private getInstance;
16
16
  onChange(handler: ChangeEventHandler<T>): Promise<void>;
17
17
  getObservable(args: {