@puca/puca-core 8.3.3 → 8.4.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 (41) hide show
  1. package/dist/core/services/comunication/comunication.service.js +10 -9
  2. package/dist/core/services/comunication/comunication.service.js.map +1 -1
  3. package/dist/core/services/index.js +1 -1
  4. package/dist/core/services/index.js.map +1 -1
  5. package/dist/core/services/report.service.d.ts +7 -2
  6. package/dist/core/services/report.service.js +44 -34
  7. package/dist/core/services/report.service.js.map +1 -1
  8. package/dist/core/services/user-config.service.js +29 -23
  9. package/dist/core/services/user-config.service.js.map +1 -1
  10. package/dist/orm/cases/vanilla/interfaces.d.ts +22 -11
  11. package/dist/orm/cases/vanilla/interfaces.js.map +1 -1
  12. package/dist/orm/cases/vanilla/sql-builder/helpers.d.ts +0 -8
  13. package/dist/orm/cases/vanilla/sql-builder/helpers.js +1 -66
  14. package/dist/orm/cases/vanilla/sql-builder/helpers.js.map +1 -1
  15. package/dist/orm/cases/vanilla/sql-builder/mutation.service.js +6 -5
  16. package/dist/orm/cases/vanilla/sql-builder/mutation.service.js.map +1 -1
  17. package/dist/orm/cases/vanilla/sql-builder/select.service.d.ts +4 -1
  18. package/dist/orm/cases/vanilla/sql-builder/select.service.js +110 -6
  19. package/dist/orm/cases/vanilla/sql-builder/select.service.js.map +1 -1
  20. package/dist/orm/plugins/pgsql-parser/pgsql-parser.service.d.ts +3 -2
  21. package/dist/orm/plugins/pgsql-parser/pgsql-parser.service.js +4 -4
  22. package/dist/orm/plugins/pgsql-parser/pgsql-parser.service.js.map +1 -1
  23. package/dist/orm/services/cache-repository/cache-repository.d.ts +1 -3
  24. package/dist/orm/services/cache-repository/cache-repository.js +2 -9
  25. package/dist/orm/services/cache-repository/cache-repository.js.map +1 -1
  26. package/dist/orm/services/cache.service.js.map +1 -1
  27. package/dist/orm/services/index.js +1 -2
  28. package/dist/orm/services/index.js.map +1 -1
  29. package/dist/orm/services/repository-factory.d.ts +1 -3
  30. package/dist/orm/services/repository-factory.js +2 -3
  31. package/dist/orm/services/repository-factory.js.map +1 -1
  32. package/dist/orm/services/sql/sql-layer.service.js +44 -19
  33. package/dist/orm/services/sql/sql-layer.service.js.map +1 -1
  34. package/dist/orm/services/sql-parser/sql-parser-model.d.ts +78 -0
  35. package/dist/orm/services/sql-parser/sql-parser-model.js +4 -0
  36. package/dist/orm/services/sql-parser/sql-parser-model.js.map +1 -0
  37. package/dist/orm/services/sql-parser/sql-parser.service.d.ts +9 -0
  38. package/dist/orm/services/sql-parser/sql-parser.service.js +197 -0
  39. package/dist/orm/services/sql-parser/sql-parser.service.js.map +1 -0
  40. package/dist/tsconfig.tsbuildinfo +1 -1
  41. package/package.json +1 -1
@@ -2,6 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.ComunicationService = void 0;
4
4
  const moment = require("moment");
5
+ const _ = require("lodash");
5
6
  const jsonwebtoken_1 = require("jsonwebtoken");
6
7
  class ComunicationService {
7
8
  constructor(comunicationHttpService, moduleConfigService, configsService, uuidService) {
@@ -18,9 +19,16 @@ class ComunicationService {
18
19
  args.headers['Authorization'] = await this.computeToken({
19
20
  user: args.user
20
21
  });
21
- return this.comunicationHttpService.call(Object.assign(Object.assign({}, args), { method: args.method || 'post' }));
22
+ return await this.comunicationHttpService.call(Object.assign(Object.assign({}, args), { method: args.method || 'post' }));
22
23
  }
23
24
  async computeToken({ user }) {
25
+ const { privateKey } = await this.configsService.getSecret();
26
+ if (!privateKey) {
27
+ if (!user.token) {
28
+ throw new Error('computeToken error 1');
29
+ }
30
+ return user.token;
31
+ }
24
32
  const moduleConfig = await this.moduleConfigService.getModuleConfig();
25
33
  const pucaAuth = {
26
34
  exp: moment(new Date()).add(1, 'days').unix(),
@@ -30,16 +38,9 @@ class ComunicationService {
30
38
  name: moduleConfig.name,
31
39
  version: moduleConfig.version,
32
40
  },
33
- user,
41
+ user: _.omit(user, 'token'),
34
42
  version: 1
35
43
  };
36
- const { privateKey } = await this.configsService.getSecret();
37
- if (!privateKey) {
38
- if (!pucaAuth.user.token) {
39
- throw new Error('computeToken error 1');
40
- }
41
- return pucaAuth.user.token;
42
- }
43
44
  return jsonwebtoken_1.sign(pucaAuth, privateKey, {
44
45
  algorithm: 'RS256'
45
46
  });
@@ -1 +1 @@
1
- {"version":3,"file":"comunication.service.js","sourceRoot":"","sources":["../../../../src/core/services/comunication/comunication.service.ts"],"names":[],"mappings":";;;AAAA,iCAAgC;AAEhC,+CAAoC;AAUpC,MAAa,mBAAmB;IAC9B,YACmB,uBAAgD,EAChD,mBAAwC,EACxC,cAA8B,EAC9B,WAAwB;QAHxB,4BAAuB,GAAvB,uBAAuB,CAAyB;QAChD,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,mBAAc,GAAd,cAAc,CAAgB;QAC9B,gBAAW,GAAX,WAAW,CAAa;IACvC,CAAC;IAEL,KAAK,CAAC,IAAI,CAAI,IASb;QACC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;SACnB;QAED,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC;QAC/E,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC;YACtD,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB,CAAC,CAAA;QAEF,OAAO,IAAI,CAAC,uBAAuB,CAAC,IAAI,iCACnC,IAAI,KACP,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,MAAM,IAC7B,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,EAAE,IAAI,EAAkB;QACzC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,eAAe,EAAE,CAAA;QACrE,MAAM,QAAQ,GAAa;YACzB,GAAG,EAAE,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,IAAI,EAAE;YAC7C,OAAO,EAAE,IAAI;YACb,aAAa,EAAE,IAAI;YACnB,MAAM,EAAE;gBACN,IAAI,EAAE,YAAY,CAAC,IAAI;gBACvB,OAAO,EAAE,YAAY,CAAC,OAAO;aAC9B;YACD,IAAI;YACJ,OAAO,EAAE,CAAC;SACX,CAAA;QAED,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,CAAA;QAC5D,IAAI,CAAC,UAAU,EAAE;YACf,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE;gBACxB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;aACxC;YAED,OAAO,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAA;SAC3B;QAED,OAAO,mBAAI,CAAC,QAAQ,EAAE,UAAU,EAAE;YAChC,SAAS,EAAE,OAAO;SACnB,CAAC,CAAA;IACJ,CAAC;CACF;AA5DD,kDA4DC"}
1
+ {"version":3,"file":"comunication.service.js","sourceRoot":"","sources":["../../../../src/core/services/comunication/comunication.service.ts"],"names":[],"mappings":";;;AAAA,iCAAgC;AAChC,4BAA4B;AAC5B,+CAAoC;AAUpC,MAAa,mBAAmB;IAC9B,YACmB,uBAAgD,EAChD,mBAAwC,EACxC,cAA8B,EAC9B,WAAwB;QAHxB,4BAAuB,GAAvB,uBAAuB,CAAyB;QAChD,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,mBAAc,GAAd,cAAc,CAAgB;QAC9B,gBAAW,GAAX,WAAW,CAAa;IACvC,CAAC;IAEL,KAAK,CAAC,IAAI,CAAI,IASb;QACC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;SACnB;QAED,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC;QAC/E,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC;YACtD,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB,CAAC,CAAA;QAEF,OAAO,MAAM,IAAI,CAAC,uBAAuB,CAAC,IAAI,iCACzC,IAAI,KACP,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,MAAM,IAC7B,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,EAAE,IAAI,EAAkB;QACzC,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,CAAA;QAC5D,IAAI,CAAC,UAAU,EAAE;YACf,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;gBACf,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAA;aACxC;YAED,OAAO,IAAI,CAAC,KAAK,CAAA;SAClB;QACD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,eAAe,EAAE,CAAA;QACrE,MAAM,QAAQ,GAAa;YACzB,GAAG,EAAE,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,IAAI,EAAE;YAC7C,OAAO,EAAE,IAAI;YACb,aAAa,EAAE,IAAI;YACnB,MAAM,EAAE;gBACN,IAAI,EAAE,YAAY,CAAC,IAAI;gBACvB,OAAO,EAAE,YAAY,CAAC,OAAO;aAC9B;YACD,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC;YAC3B,OAAO,EAAE,CAAC;SACX,CAAA;QAED,OAAO,mBAAI,CAAC,QAAQ,EAAE,UAAU,EAAE;YAChC,SAAS,EAAE,OAAO;SACnB,CAAC,CAAA;IACJ,CAAC;CACF;AA3DD,kDA2DC"}
@@ -56,6 +56,6 @@ exports.tablePermissionService = new table_permission_service_1.TablePermissionS
56
56
  exports.installService = new install_service_1.InstallService(exports.migrationService, services_1.repositoryFactory, plugins_1.fileSystemService, exports.moduleEspecificationService, exports.jobService, exports.tablePermissionService);
57
57
  exports.webSocketService = new web_socket_service_1.WebSocketService(services_1.redisManagerService, exports.authService);
58
58
  exports.notificationService = new notification_service_1.NotificationService(exports.comunicationService);
59
- exports.reportService = new report_service_1.ReportService(plugins_1.uuidService, exports.notificationService, services_1.repositoryFactory, exports.storageServiceManager, essential_1.configService, exports.jobExecutorFactory);
59
+ exports.reportService = new report_service_1.ReportService(plugins_1.uuidService, exports.notificationService, services_1.repositoryFactory, exports.storageServiceManager, essential_1.configService, exports.jobExecutorFactory, exports.cacheServiceFactory);
60
60
  exports.lifeCycleService = new life_cycle_service_1.LifeCycleService(services_1.databaseManagerService, services_1.redisManagerService, exports.bootstrapService, essential_1.envConfigService, exports.installService, services_1.repositoryFactory, exports.webSocketService, exports.configsService, services_1.sqlService, exports.reportService, exports.jobExecutorFactory, exports.evalServiceFactory);
61
61
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/services/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/services/index.ts"],"names":[],"mappings":";;;AAAA,2CAA+D;AAC/D,+CAAkE;AAClE,iDAAoI;AACpI,2DAAuD;AACvD,8EAA0E;AAC1E,6DAAwD;AACxD,mEAA8D;AAC9D,2DAAuD;AACvD,uDAAmD;AACnD,+DAA0D;AAC1D,6DAAwD;AACxD,iDAA6C;AAC7C,+DAAkE;AAClE,oFAAkH;AAClH,0FAA4H;AAC5H,4DAAwD;AACxD,qEAAiE;AACjE,wFAAmF;AACnF,oEAAuE;AACvE,qDAAiD;AACjD,iEAA6D;AAC7D,iDAAoD;AACpD,mDAA+C;AAC/C,qFAA+E;AAC/E,iDAAoD;AACpD,8EAAyE;AACzE,yEAAoE;AACpE,mFAA8E;AAC9E,uEAAkI;AAClI,6EAAyD;AAE5C,QAAA,kBAAkB,GAAG,IAAI,yCAAkB,CACtD,yBAAa,EACb,4BAAgB,EAEhB,qBAAW,CACZ,CAAA;AACY,QAAA,2BAA2B,GAAG,IAAI,4DAA2B,CAAC,0BAAkB,CAAC,CAAA;AACjF,QAAA,cAAc,GAAG,IAAI,gCAAc,CAAC,2BAAiB,CAAC,CAAA;AACtD,QAAA,mBAAmB,GAAG,IAAI,2CAAmB,CAAC,2BAAiB,CAAC,CAAC;AACjE,QAAA,kBAAkB,GAAG,IAAI,iCAAkB,CAAC,4BAAiB,EAAE,qBAAW,CAAC,CAAA;AAC3E,QAAA,UAAU,GAAG,IAAI,wBAAU,CACtC,IAAI,6BAAgB,CAAC,yBAAa,CAAC,EACnC,yBAAa,EACb,2BAAmB,CACpB,CAAA;AACY,QAAA,qBAAqB,GAAG,IAAI,uCAAqB,CAAC,sBAAc,CAAC,CAAA;AACjE,QAAA,WAAW,GAAG,IAAI,0BAAW,CACxC,sBAAc,EACd,4BAAiB,EACjB,2BAAmB,EACnB,qBAAW,CACZ,CAAA;AACY,QAAA,mBAAmB,GAAG,IAAI,mCAAmB,CAAC,8BAAmB,CAAC,CAAA;AAClE,QAAA,iBAAiB,GAAG,IAAI,uCAAiB,CACpD,2BAAmB,EACnB,4BAAiB,EACjB,sBAAc,CACf,CAAC;AACW,QAAA,uBAAuB,GAAG,IAAI,mDAAuB,CAChE,sBAAc,CACf,CAAA;AACY,QAAA,mBAAmB,GAAG,IAAI,0CAAmB,CACxD,+BAAuB,EACvB,2BAAmB,EACnB,yBAAa,EACb,qBAAW,CACZ,CAAC;AACF,MAAM,8BAA8B,GAAG,IAAI,wCAA8B,CACvE,GAAG,OAAO,CAAC,GAAG,EAAE,6DAA6D,EAC7E,2BAAiB,EACjB,2BAAmB,EACnB,qBAAW,EACX,6BAAqB,CACtB,CAAA;AAED,MAAM,kCAAkC,GAAG,IAAI,wCAAkC,CAAC,2BAAmB,CAAC,CAAA;AAEzF,QAAA,aAAa,GAAG,IAAI,8BAAa,CAC5C,4BAAiB,EACjB;IACE,8BAA8B;IAC9B,kCAAkC;CACnC,CACF,CAAA;AAEY,QAAA,gBAAgB,GAAG,IAAI,oCAAgB,CAClD,6BAAkB,EAClB,4BAAiB,EACjB,2BAAmB,EACnB,8BAAmB,CACpB,CAAC;AACW,QAAA,gBAAgB,GAAG,IAAI,oCAAgB,CAClD,wBAAgB,CACjB,CAAC;AACW,QAAA,2BAA2B,GAAG,IAAI,2DAA2B,CAAC,2BAAiB,EAAE,2BAAmB,CAAC,CAAA;AACrG,QAAA,sBAAsB,GAAG,IAAI,iDAAsB,CAC9D,KAAK,IAAI,EAAE,CAAC,MAAM,+GAAqF,EAAE,EACzG,mCAA2B,EAC3B,KAAK,IAAI,EAAE,CAAC,sCAAS,CACtB,CAAA;AACY,QAAA,cAAc,GAAG,IAAI,gCAAc,CAC9C,wBAAgB,EAChB,4BAAiB,EACjB,2BAAiB,EACjB,mCAA2B,EAC3B,kBAAU,EACV,8BAAsB,CACvB,CAAC;AACW,QAAA,gBAAgB,GAAG,IAAI,qCAAgB,CAClD,8BAAmB,EACnB,mBAAW,CACZ,CAAA;AACY,QAAA,mBAAmB,GAAG,IAAI,0CAAmB,CAAC,2BAAmB,CAAC,CAAA;AAClE,QAAA,aAAa,GAAG,IAAI,8BAAa,CAC5C,qBAAW,EACX,2BAAmB,EACnB,4BAAiB,EACjB,6BAAqB,EACrB,yBAAa,EACb,0BAAkB,EAClB,2BAAmB,CACpB,CAAA;AACY,QAAA,gBAAgB,GAAG,IAAI,qCAAgB,CAClD,iCAAsB,EACtB,8BAAmB,EACnB,wBAAgB,EAChB,4BAAgB,EAChB,sBAAc,EACd,4BAAiB,EACjB,wBAAgB,EAChB,sBAAc,EACd,qBAAU,EACV,qBAAa,EACb,0BAAkB,EAClB,0BAAkB,CACnB,CAAC"}
@@ -5,6 +5,7 @@ import { StorageServiceManager } from "./storage/storage.service";
5
5
  import { ConfigsService } from "../../essential/configs.service";
6
6
  import { JobExecutorFactory } from "./job-executor/job-executor.service";
7
7
  import { RepositoryFactory } from '../../orm/services/repository-factory';
8
+ import { CacheServiceFactory } from '../../orm/services/cache.service';
8
9
  export interface ReportConfig {
9
10
  puca_pid?: string;
10
11
  shortid?: string;
@@ -29,11 +30,15 @@ export declare class ReportService {
29
30
  private readonly storageServiceManager;
30
31
  private readonly configService;
31
32
  private readonly jobExecutorFactory;
33
+ private readonly cacheServiceFactory;
32
34
  private jobReportExecutor;
33
- constructor(uuidService: UuidService, notificationService: NotificationService, repositoryFactory: RepositoryFactory, storageServiceManager: StorageServiceManager, configService: ConfigsService, jobExecutorFactory: JobExecutorFactory);
35
+ private cacheAxiosGetTemplates;
36
+ private cacheGetFolderByName;
37
+ private cacheGetFoldersByShortId;
38
+ constructor(uuidService: UuidService, notificationService: NotificationService, repositoryFactory: RepositoryFactory, storageServiceManager: StorageServiceManager, configService: ConfigsService, jobExecutorFactory: JobExecutorFactory, cacheServiceFactory: CacheServiceFactory);
34
39
  prepare({ activateReportJobProcessator }: {
35
40
  activateReportJobProcessator: Boolean;
36
- }): void;
41
+ }): Promise<void>;
37
42
  private getDefaultHeaders;
38
43
  renderData(args: RenderDataArgs): Promise<void>;
39
44
  private getFolderByName;
@@ -4,15 +4,16 @@ exports.ReportService = void 0;
4
4
  const axios_1 = require("axios");
5
5
  const _ = require("lodash");
6
6
  class ReportService {
7
- constructor(uuidService, notificationService, repositoryFactory, storageServiceManager, configService, jobExecutorFactory) {
7
+ constructor(uuidService, notificationService, repositoryFactory, storageServiceManager, configService, jobExecutorFactory, cacheServiceFactory) {
8
8
  this.uuidService = uuidService;
9
9
  this.notificationService = notificationService;
10
10
  this.repositoryFactory = repositoryFactory;
11
11
  this.storageServiceManager = storageServiceManager;
12
12
  this.configService = configService;
13
13
  this.jobExecutorFactory = jobExecutorFactory;
14
+ this.cacheServiceFactory = cacheServiceFactory;
14
15
  }
15
- prepare({ activateReportJobProcessator }) {
16
+ async prepare({ activateReportJobProcessator }) {
16
17
  this.jobReportExecutor = this.jobExecutorFactory.get('ReportService');
17
18
  if (activateReportJobProcessator) {
18
19
  this.jobReportExecutor.process(async ({ data: { args, user, data } }) => {
@@ -60,6 +61,41 @@ class ReportService {
60
61
  });
61
62
  });
62
63
  }
64
+ this.cacheAxiosGetTemplates = await this.cacheServiceFactory.get('ReportService.AxiosGetTemplates', async (filter) => {
65
+ const secret = await this.configService.getSecret();
66
+ const url = `${secret.jsReport.url}/odata/templates`;
67
+ const select = `$select=name,shortid`;
68
+ const response = await axios_1.default.get(`${url}?${select}&${filter}`, {
69
+ headers: await this.getDefaultHeaders()
70
+ });
71
+ return response.data.value;
72
+ }, 600);
73
+ this.cacheGetFolderByName = await this.cacheServiceFactory.get('ReportService.getFolderByName', async (name) => {
74
+ const secret = await this.configService.getSecret();
75
+ const url = `${secret.jsReport.url}/odata/folders`;
76
+ const select = `$select=name,shortid`;
77
+ const filter = `$filter=name eq '${name}'`;
78
+ const response = await axios_1.default.get(`${url}?${select}&${filter}`, {
79
+ headers: await this.getDefaultHeaders()
80
+ });
81
+ return _.get(response.data.value, 0);
82
+ }, 600);
83
+ this.cacheGetFoldersByShortId = await this.cacheServiceFactory.get('ReportService.getFoldersByShortId', async ({ parentShortId, prefix }) => {
84
+ const secret = await this.configService.getSecret();
85
+ const url = `${secret.jsReport.url}/odata/folders`;
86
+ const select = `$select=name,shortid`;
87
+ const filter = `$filter=folder/shortid eq '${parentShortId}'`;
88
+ const response = await axios_1.default.get(`${url}?${select}&${filter}`, {
89
+ headers: await this.getDefaultHeaders()
90
+ });
91
+ const retorno = [];
92
+ for (let i = 0; i < response.data.value.length; i++) {
93
+ const subfolder = response.data.value[i];
94
+ const sf = Object.assign(Object.assign({}, subfolder), { path: prefix ? `${prefix}/${subfolder.name}` : subfolder.name });
95
+ retorno.push(sf, ...await this.getFoldersByShortId({ parentShortId: subfolder.shortid, prefix: sf.path }));
96
+ }
97
+ return retorno;
98
+ }, 600);
63
99
  }
64
100
  async getDefaultHeaders() {
65
101
  const secret = await this.configService.getSecret();
@@ -69,49 +105,23 @@ class ReportService {
69
105
  }
70
106
  async renderData(args) {
71
107
  this.jobReportExecutor.add(args, {
72
- timeout: 30000
108
+ timeout: 1000 * 60 * 10
73
109
  });
74
110
  }
75
111
  async getFolderByName({ user, name }) {
76
- const secret = await this.configService.getSecret();
77
- const url = `${secret.jsReport.url}/odata/folders`;
78
- const select = `$select=name,shortid`;
79
- const filter = `$filter=name eq '${name}'`;
80
- const response = await axios_1.default.get(`${url}?${select}&${filter}`, {
81
- headers: await this.getDefaultHeaders()
82
- });
83
- return _.get(response.data.value, 0);
112
+ return await this.cacheGetFolderByName.get(name);
84
113
  }
85
- async getFoldersByShortId({ user, parentShortId, prefix }) {
86
- const secret = await this.configService.getSecret();
87
- const url = `${secret.jsReport.url}/odata/folders`;
88
- const select = `$select=name,shortid`;
89
- const filter = `$filter=folder/shortid eq '${parentShortId}'`;
90
- const response = await axios_1.default.get(`${url}?${select}&${filter}`, {
91
- headers: await this.getDefaultHeaders()
92
- });
93
- const retorno = [];
94
- for (let i = 0; i < response.data.value.length; i++) {
95
- const subfolder = response.data.value[i];
96
- const sf = Object.assign(Object.assign({}, subfolder), { path: prefix ? `${prefix}/${subfolder.name}` : subfolder.name });
97
- retorno.push(sf, ...await this.getFoldersByShortId({ user, parentShortId: subfolder.shortid, prefix: sf.path }));
98
- }
99
- return retorno;
114
+ async getFoldersByShortId(args) {
115
+ return await this.cacheGetFoldersByShortId.get(args);
100
116
  }
101
117
  async computeFolderList({ user }) {
102
118
  const secret = await this.configService.getSecret();
103
119
  const companyFolder = await this.getFolderByName({ user, name: secret.namespace });
104
- return await this.getFoldersByShortId({ user, parentShortId: companyFolder.shortid });
120
+ return await this.getFoldersByShortId({ parentShortId: companyFolder.shortid });
105
121
  }
106
122
  async getTemplates({ user, parentFolderShortId }) {
107
- const secret = await this.configService.getSecret();
108
- const url = `${secret.jsReport.url}/odata/templates`;
109
- const select = `$select=name,shortid`;
110
123
  const filter = `$filter=folder/shortid eq '${parentFolderShortId}'`;
111
- const response = await axios_1.default.get(`${url}?${select}&${filter}`, {
112
- headers: await this.getDefaultHeaders()
113
- });
114
- const reportTemplateList = response.data.value;
124
+ const reportTemplateList = await this.cacheAxiosGetTemplates.get(filter);
115
125
  const repository = this.repositoryFactory.getInstance({
116
126
  tableName: 'puca_base_api_report',
117
127
  });
@@ -1 +1 @@
1
- {"version":3,"file":"report.service.js","sourceRoot":"","sources":["../../../src/core/services/report.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"report.service.js","sourceRoot":"","sources":["../../../src/core/services/report.service.ts"],"names":[],"mappings":";;;AAAA,iCAA4C;AAC5C,4BAA4B;AAuC5B,MAAa,aAAa;IAMxB,YACmB,WAAwB,EACxB,mBAAwC,EACxC,iBAAoC,EACpC,qBAA4C,EAC5C,aAA6B,EAC7B,kBAAsC,EACtC,mBAAwC;QANxC,gBAAW,GAAX,WAAW,CAAa;QACxB,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,kBAAa,GAAb,aAAa,CAAgB;QAC7B,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,wBAAmB,GAAnB,mBAAmB,CAAqB;IACvD,CAAC;IAEL,KAAK,CAAC,OAAO,CAAC,EAAE,4BAA4B,EAA6C;QACvF,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAiB,eAAe,CAAC,CAAC;QACtF,IAAI,4BAA4B,EAAE;YAChC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE;gBACtE,MAAM,IAAI,GAAG;oBACX,QAAQ,EAAE;wBACR,OAAO,EAAE,IAAI,CAAC,OAAO;qBACtB;oBACD,IAAI;iBACL,CAAA;gBAED,MAAM,UAAU,GAAG,KAAK,IAAI,EAAE;oBAC5B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,CAAA;oBACnD,MAAM,QAAQ,GAAG,MAAM,eAAK,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,aAAa,EAAE,IAAI,EAAE;wBAC3E,OAAO,oBACF,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAClC;wBACD,YAAY,EAAE,aAAa;qBAC5B,CAAC,CAAC;oBAEH,MAAM,CAAC,YAAY,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC;yBAC3D,GAAG,CAAC,qBAAqB,EAAE,EAAE,CAAC;yBAC9B,KAAK,CAAC,GAAG,CAAC;yBACV,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;yBACxB,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC;yBAC7B,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,UAAU,CAAC;yBACjC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;yBAClB,GAAG,CAAC,CAAC,CAAC;yBACN,KAAK,CAAC,GAAG,CAAC;yBACV,KAAK,EAAE,CAAC;oBAEX,MAAM,IAAI,GAAG,SAAS,IAAI,CAAC,QAAQ,IAAI,YAAY,IAAI,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,IAAI,YAAY,EAAE,CAAC;oBAE/F,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,WAAW,EAAE,CAAC;oBAEtE,MAAM,cAAc,CAAC,SAAS,CAAC;wBAC7B,IAAI;wBACJ,MAAM,EAAE,QAAQ,CAAC,IAAI;qBACtB,CAAC,CAAC;oBACH,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,YAAY,EAAE,YAAY,EAAE,CAAC;gBAC9D,CAAC,CAAA;gBAED,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,YAAY,EAAE,YAAY,EAAE,GAAG,MAAM,UAAU,EAAE,CAAC;gBAEhF,MAAM,IAAI,GAAG,MAAM,cAAc,CAAC,eAAe,CAAC;oBAChD,IAAI;oBACJ,OAAO,EAAE,MAAM;iBAChB,CAAC,CAAA;gBAEF,MAAM,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC;oBAClC,MAAM,EAAE,SAAS;oBACjB,OAAO,EAAE,gBAAgB,YAAY,mBAAmB;oBACxD,WAAW,EAAE,IAAI,CAAC,QAAQ;oBAC1B,IAAI,EAAE,qBAAqB,kBAAkB,CAAC,IAAI,CAAC,SAAS,YAAY,SAAS,YAAY,EAAE;oBAC/F,IAAI;iBACL,CAAC,CAAA;YACJ,CAAC,CAAC,CAAA;SACH;QAED,IAAI,CAAC,sBAAsB,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,iCAAiC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;YACnH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,CAAA;YACnD,MAAM,GAAG,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,kBAAkB,CAAA;YACpD,MAAM,MAAM,GAAG,sBAAsB,CAAA;YACrC,MAAM,QAAQ,GAAG,MAAM,eAAK,CAAC,GAAG,CAAC,GAAG,GAAG,IAAI,MAAM,IAAI,MAAM,EAAE,EAAE;gBAC7D,OAAO,EAAE,MAAM,IAAI,CAAC,iBAAiB,EAAE;aACxC,CAAC,CAAA;YACF,OAAO,QAAQ,CAAC,IAAI,CAAC,KAAyB,CAAA;QAChD,CAAC,EAAE,GAAG,CAAC,CAAA;QAEP,IAAI,CAAC,oBAAoB,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,+BAA+B,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YAC7G,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,CAAA;YACnD,MAAM,GAAG,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,gBAAgB,CAAA;YAClD,MAAM,MAAM,GAAG,sBAAsB,CAAA;YACrC,MAAM,MAAM,GAAG,oBAAoB,IAAI,GAAG,CAAA;YAC1C,MAAM,QAAQ,GAAG,MAAM,eAAK,CAAC,GAAG,CAC9B,GAAG,GAAG,IAAI,MAAM,IAAI,MAAM,EAAE,EAC5B;gBACE,OAAO,EAAE,MAAM,IAAI,CAAC,iBAAiB,EAAE;aACxC,CACF,CAAA;YACD,OAAO,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAA;QACtC,CAAC,EAAE,GAAG,CAAC,CAAA;QAGP,IAAI,CAAC,wBAAwB,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,mCAAmC,EAAE,KAAK,EAAE,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE,EAAE;YAC1I,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,CAAA;YACnD,MAAM,GAAG,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,gBAAgB,CAAA;YAClD,MAAM,MAAM,GAAG,sBAAsB,CAAA;YACrC,MAAM,MAAM,GAAG,8BAA8B,aAAa,GAAG,CAAA;YAC7D,MAAM,QAAQ,GAAG,MAAM,eAAK,CAAC,GAAG,CAC9B,GAAG,GAAG,IAAI,MAAM,IAAI,MAAM,EAAE,EAC5B;gBACE,OAAO,EAAE,MAAM,IAAI,CAAC,iBAAiB,EAAE;aACxC,CACF,CAAA;YAED,MAAM,OAAO,GAAG,EAAE,CAAA;YAClB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACnD,MAAM,SAAS,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;gBACxC,MAAM,EAAE,GAAG,gCACN,SAAS,KACZ,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,GAC5C,CAAA;gBACnB,OAAO,CAAC,IAAI,CACV,EAAE,EACF,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,EAAE,aAAa,EAAE,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,CACzF,CAAA;aACF;YACD,OAAO,OAAO,CAAA;QAChB,CAAC,EAAE,GAAG,CAAC,CAAA;IACT,CAAC;IAEO,KAAK,CAAC,iBAAiB;QAC7B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,CAAA;QACnD,OAAO;YACL,eAAe,EAAE,SAAS,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;SACtH,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,IAAoB;QACnC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,EAAE;YAE/B,OAAO,EAAE,IAAI,GAAC,EAAE,GAAC,EAAE;SACpB,CAAC,CAAA;IACJ,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,IAAI,EAAgC;QACxE,OAAO,MAAM,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IAClD,CAAC;IAEO,KAAK,CAAC,mBAAmB,CAAC,IAA4B;QAC5D,OAAO,MAAM,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IACtD,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAAC,EAAE,IAAI,EAAkB;QAKtD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,CAAA;QACnD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,SAAS,EAAE,CAAC,CAAA;QAClF,OAAO,MAAM,IAAI,CAAC,mBAAmB,CAAC,EAAE,aAAa,EAAE,aAAa,CAAC,OAAO,EAAE,CAAC,CAAA;IACjF,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,mBAAmB,EAA+C;QAC3F,MAAM,MAAM,GAAG,8BAA8B,mBAAmB,GAAG,CAAA;QACnE,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;QAExE,MAAM,UAAU,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAe;YAClE,SAAS,EAAE,sBAAsB;SAClC,CAAC,CAAA;QAEF,MAAM,eAAe,GAAG,MAAM,UAAU,CAAC,QAAQ,CAAC;YAChD,MAAM,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC;YAC7B,GAAG,EAAE,SAAS;YACd,MAAM,EAAE,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;YAC9C,IAAI;SACL,CAAC,CAAA;QAEF,OAAO,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;YACvC,uCACK,QAAQ,GACR,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,QAAQ,CAAC,OAAO,CAAC,EAC7D;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,EAAE,IAAI,EAAE,MAAM,EAA6C;QAK1E,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,EAAE,IAAI,EAAE,CAAC,CAAA;QACtD,MAAM,UAAU,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAA;QAEzD,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,CAAA;IACxF,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,IAAI,EAAgC;QAC7D,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,EAAE,IAAI,EAAE,CAAC,CAAA;QACtD,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAA;IAC7C,CAAC;CACF;AAtMD,sCAsMC"}
@@ -69,15 +69,39 @@ class UserConfigService {
69
69
  },
70
70
  {
71
71
  alias: 'r_boolean_value',
72
- field: 'boolean_value',
73
- table: 'r'
72
+ exists: {
73
+ from: {
74
+ table: 'puca_base_api_rule_config',
75
+ alias: 'r',
76
+ },
77
+ where: {
78
+ and: [
79
+ {
80
+ v1: 'd.puca_pid',
81
+ operator: interfaces_1.ConditionalOpertator.equals,
82
+ v2: 'r.system_user_config_definition'
83
+ },
84
+ {
85
+ v1: 'r.rule',
86
+ operator: interfaces_1.ConditionalOpertator.anyOf,
87
+ v2: '$user_rules'
88
+ },
89
+ {
90
+ v1: 'r.boolean_value',
91
+ operator: interfaces_1.ConditionalOpertator.equals,
92
+ v2: '$true'
93
+ }
94
+ ]
95
+ }
96
+ }
74
97
  }
75
98
  ],
76
99
  args: {
77
100
  name: accessCondition,
78
101
  system_user: '@currentUser',
79
102
  user_rules: '@userRules',
80
- modules
103
+ modules,
104
+ true: true
81
105
  },
82
106
  join: [
83
107
  {
@@ -99,25 +123,6 @@ class UserConfigService {
99
123
  ]
100
124
  },
101
125
  },
102
- {
103
- tableName: 'puca_base_api_rule_config',
104
- mode: interfaces_1.JoinMode.Left,
105
- alias: 'r',
106
- on: {
107
- and: [
108
- {
109
- v1: 'd.puca_pid',
110
- operator: interfaces_1.ConditionalOpertator.equals,
111
- v2: 'r.system_user_config_definition'
112
- },
113
- {
114
- v1: 'r.rule',
115
- operator: interfaces_1.ConditionalOpertator.anyOf,
116
- v2: '$user_rules'
117
- },
118
- ]
119
- },
120
- }
121
126
  ],
122
127
  where: {
123
128
  and: [
@@ -138,7 +143,8 @@ class UserConfigService {
138
143
  r.fields.push({
139
144
  alias: 'use_access_control',
140
145
  field: 'use_access_control',
141
- table: 'td'
146
+ table: 'td',
147
+ cast: null
142
148
  });
143
149
  r.args['table_name'] = tableName;
144
150
  r.join.push({
@@ -1 +1 @@
1
- {"version":3,"file":"user-config.service.js","sourceRoot":"","sources":["../../../src/core/services/user-config.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"user-config.service.js","sourceRoot":"","sources":["../../../src/core/services/user-config.service.ts"],"names":[],"mappings":"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"}
@@ -97,15 +97,25 @@ export interface Delete {
97
97
  returning?: SelectField[];
98
98
  }
99
99
  export declare type MutationCommand = Insert | Update | Delete;
100
- export declare type SelectField = {
101
- table?: string;
102
- field: string | number | boolean;
103
- alias?: string;
104
- } | string | number | boolean | {
100
+ export interface Case {
101
+ conditions: {
102
+ when: Where;
103
+ then: SelectField;
104
+ }[];
105
+ else?: SelectField;
106
+ }
107
+ export interface FunctionField {
105
108
  function: string;
106
- args: string[];
109
+ args: SelectField[];
110
+ }
111
+ export interface DetailedSelectField {
112
+ table?: string;
113
+ field: SelectField;
114
+ }
115
+ export declare type SelectField = string | ({
107
116
  alias?: string;
108
- };
117
+ cast?: TableFieldTypeEnum;
118
+ } & (DetailedSelectField | FunctionField | Case | Select | WhereExists));
109
119
  export declare enum JoinMode {
110
120
  Inner = "inner",
111
121
  Left = "left",
@@ -131,7 +141,7 @@ export declare type From = {
131
141
  } | string;
132
142
  export interface Select {
133
143
  fields?: SelectField[];
134
- from?: From;
144
+ from: From;
135
145
  join?: Join[];
136
146
  where?: Where;
137
147
  args?: Object;
@@ -146,13 +156,14 @@ export interface WhereOperator {
146
156
  operator: ConditionalOpertator;
147
157
  v2?: SelectField;
148
158
  }
159
+ export interface WhereExists {
160
+ exists: Select;
161
+ }
149
162
  export declare type Where = WhereOperator | {
150
163
  or: Where[];
151
164
  } | {
152
165
  and: Where[];
153
- } | {
154
- exists: Select;
155
- } | {
166
+ } | WhereExists | {
156
167
  not: Where;
157
168
  };
158
169
  export declare type Statement = Select | MutationCommand | DDlCommand;
@@ -1 +1 @@
1
- {"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../../../src/orm/cases/vanilla/interfaces.ts"],"names":[],"mappings":";;;AAKA,IAAY,kBAWX;AAXD,WAAY,kBAAkB;IAC5B,yCAAmB,CAAA;IACnB,yCAAmB,CAAA;IACnB,yCAAmB,CAAA;IACnB,mCAAa,CAAA;IACb,qCAAe,CAAA;IACf,+CAAyB,CAAA;IACzB,mCAAa,CAAA;IACb,oCAAc,CAAA;IACd,mCAAa,CAAA;IACb,6CAAuB,CAAA;AACzB,CAAC,EAXW,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAW7B;AAID,IAAY,oBAgBX;AAhBD,WAAY,oBAAoB;IAC9B,yCAAiB,CAAA;IACjB,qCAAa,CAAA;IACb,qDAA6B,CAAA;IAC7B,2CAAmB,CAAA;IACnB,2DAAmC,CAAA;IAEnC,2CAAmB,CAAA;IACnB,6CAAqB,CAAA;IACrB,+CAAuB,CAAA;IAEvB,iDAAyB,CAAA;IACzB,6CAAqB,CAAA;IAErB,yCAAiB,CAAA;IACjB,uCAAe,CAAA;AACjB,CAAC,EAhBW,oBAAoB,GAApB,4BAAoB,KAApB,4BAAoB,QAgB/B;AAiGD,IAAY,QAKX;AALD,WAAY,QAAQ;IAClB,2BAAe,CAAA;IACf,yBAAa,CAAA;IACb,2BAAe,CAAA;IACf,yBAAa,CAAA;AACf,CAAC,EALW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAKnB;AAQD,IAAY,OAGX;AAHD,WAAY,OAAO;IACjB,sBAAW,CAAA;IACX,wBAAa,CAAA;AACf,CAAC,EAHW,OAAO,GAAP,eAAO,KAAP,eAAO,QAGlB"}
1
+ {"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../../../src/orm/cases/vanilla/interfaces.ts"],"names":[],"mappings":";;;AAKA,IAAY,kBAWX;AAXD,WAAY,kBAAkB;IAC5B,yCAAmB,CAAA;IACnB,yCAAmB,CAAA;IACnB,yCAAmB,CAAA;IACnB,mCAAa,CAAA;IACb,qCAAe,CAAA;IACf,+CAAyB,CAAA;IACzB,mCAAa,CAAA;IACb,oCAAc,CAAA;IACd,mCAAa,CAAA;IACb,6CAAuB,CAAA;AACzB,CAAC,EAXW,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAW7B;AAID,IAAY,oBAgBX;AAhBD,WAAY,oBAAoB;IAC9B,yCAAiB,CAAA;IACjB,qCAAa,CAAA;IACb,qDAA6B,CAAA;IAC7B,2CAAmB,CAAA;IACnB,2DAAmC,CAAA;IAEnC,2CAAmB,CAAA;IACnB,6CAAqB,CAAA;IACrB,+CAAuB,CAAA;IAEvB,iDAAyB,CAAA;IACzB,6CAAqB,CAAA;IAErB,yCAAiB,CAAA;IACjB,uCAAe,CAAA;AACjB,CAAC,EAhBW,oBAAoB,GAApB,4BAAoB,KAApB,4BAAoB,QAgB/B;AA+GD,IAAY,QAKX;AALD,WAAY,QAAQ;IAClB,2BAAe,CAAA;IACf,yBAAa,CAAA;IACb,2BAAe,CAAA;IACf,yBAAa,CAAA;AACf,CAAC,EALW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAKnB;AAQD,IAAY,OAGX;AAHD,WAAY,OAAO;IACjB,sBAAW,CAAA;IACX,wBAAa,CAAA;AACf,CAAC,EAHW,OAAO,GAAP,eAAO,KAAP,eAAO,QAGlB"}
@@ -1,10 +1,2 @@
1
- import { SelectField } from '../interfaces';
2
1
  export declare function normalizeArgs(args: any): any;
3
2
  export declare const sqlEscape: (str: string) => string;
4
- declare class SharedSqlBuilder {
5
- private processValue;
6
- buildField(field: SelectField, autoIncludeAlias?: boolean): string;
7
- buildFields(fields: SelectField[], autoIncludeAlias?: boolean): string[];
8
- }
9
- export declare const sharedSqlBuilder: SharedSqlBuilder;
10
- export {};
@@ -1,9 +1,8 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.sharedSqlBuilder = exports.sqlEscape = exports.normalizeArgs = void 0;
3
+ exports.sqlEscape = exports.normalizeArgs = void 0;
4
4
  const _ = require("lodash");
5
5
  const pgEscape = require("pg-escape");
6
- const list_as_string_1 = require("../../../../helpers/list-as-string");
7
6
  function normalizeArgs(args) {
8
7
  if (!args) {
9
8
  return args;
@@ -27,68 +26,4 @@ const sqlEscape = (str) => {
27
26
  return pgEscape.ident(str);
28
27
  };
29
28
  exports.sqlEscape = sqlEscape;
30
- const i = exports.sqlEscape;
31
- class SharedSqlBuilder {
32
- processValue(v) {
33
- const estrategies = [
34
- {
35
- apply: () => !v,
36
- exec: () => v,
37
- },
38
- {
39
- apply: () => v.startsWith('$'),
40
- exec: () => {
41
- const nv = i(v.replace('$', 'var_'));
42
- return nv.replace('var_', '$');
43
- },
44
- },
45
- {
46
- apply: () => v.includes('__'),
47
- exec: () => i(`${v.split('__')[0]}.${v.split('__')[1]}`),
48
- },
49
- {
50
- apply: () => true,
51
- exec: () => i(v),
52
- },
53
- ];
54
- return estrategies
55
- .find(({ apply }) => apply())
56
- .exec();
57
- }
58
- buildField(field, autoIncludeAlias = false) {
59
- if (_.get(field, 'function')) {
60
- const func = i(_.get(field, 'function'));
61
- const args = (_.get(field, 'args') || []).map(a => this.buildField(a));
62
- let alias = i(_.get(field, 'alias'));
63
- if (!alias && autoIncludeAlias) {
64
- alias = func;
65
- }
66
- const retorno = `${func} ( ${list_as_string_1.default(args, ', ')} ) ${alias ? `as ${alias} ` : ''}`;
67
- return retorno;
68
- }
69
- if (_.get(field, 'table')) {
70
- let alias = _.get(field, 'alias');
71
- if (!alias && autoIncludeAlias) {
72
- alias = `${_.get(field, 'table')}__${_.get(field, 'field')}`;
73
- }
74
- return `${i(_.get(field, 'table'))}.${i(_.get(field, 'field'))} ${alias ? `as ${i(alias)} ` : ''}`;
75
- }
76
- const fStr = (_.get(field, 'field') || field);
77
- if (fStr.startsWith('$')) {
78
- return this.processValue(fStr);
79
- }
80
- if (fStr.includes('__')) {
81
- return `${i(fStr.split('__')[0])}.${i(fStr.split('__')[1])} ${autoIncludeAlias ? `as ${i(fStr)}` : ''}`;
82
- }
83
- if (fStr.includes('.')) {
84
- const [table, field] = fStr.split('.');
85
- return `${i(table)}.${i(field)} ${autoIncludeAlias ? `${i(table)}__${i(field)}` : ''} `;
86
- }
87
- return i(fStr);
88
- }
89
- buildFields(fields, autoIncludeAlias = false) {
90
- return fields.map(f => this.buildField(f, autoIncludeAlias));
91
- }
92
- }
93
- exports.sharedSqlBuilder = new SharedSqlBuilder();
94
29
  //# sourceMappingURL=helpers.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../src/orm/cases/vanilla/sql-builder/helpers.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../../../src/orm/cases/vanilla/sql-builder/helpers.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAC5B,sCAAqC;AAErC,SAAgB,aAAa,CAAC,IAAI;IAChC,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,IAAI,CAAC;KACb;IACD,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;QACxD,MAAM,OAAO,GAAG;YAKd,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE;SACrC;aACE,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,EAAE,CAAC;aAC9B,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;QAC9B,OAAO,CAAC,CAAC;IACX,CAAC,EAAE,EAAE,CAAC,CAAC;IACP,OAAO,OAAO,CAAC;AACjB,CAAC;AAlBD,sCAkBC;AAEM,MAAM,SAAS,GAAG,CAAC,GAAW,EAAU,EAAE;IAC/C,IAAI,CAAC,GAAG,EAAE;QACR,OAAO,GAAG,CAAA;KACX;IACD,OAAO,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;AAC5B,CAAC,CAAA;AALY,QAAA,SAAS,aAKrB"}
@@ -18,27 +18,28 @@ class MutationService {
18
18
  }
19
19
  insert(insert) {
20
20
  const keys = Object.keys(insert.values);
21
- const sql = insertTemplate(helpers_1.sqlEscape(insert.tableName), list_as_string_1.default(helpers_1.sharedSqlBuilder.buildFields(keys), ', '), this.selectService.selectText({
21
+ const sql = insertTemplate(helpers_1.sqlEscape(insert.tableName), list_as_string_1.default(this.selectService.buildFields(keys), ', '), this.selectService.selectText({
22
22
  fields: keys.map(k => `$${k}`),
23
+ from: null,
23
24
  where: insert.where
24
- }), list_as_string_1.default(helpers_1.sharedSqlBuilder.buildFields(insert.returning), ', '));
25
+ }), list_as_string_1.default(this.selectService.buildFields(insert.returning), ', '));
25
26
  const normalizedValues = helpers_1.normalizeArgs(Object.assign(Object.assign({}, insert.values), insert.args));
26
27
  const retorno = numeric_sql_format_from_named_1.default(sql, normalizedValues);
27
28
  return retorno;
28
29
  }
29
30
  updateBuildSet(set) {
30
- const fields = Object.entries(set).map(([k, v]) => updateTemplate.set(helpers_1.sqlEscape(k), helpers_1.sharedSqlBuilder.buildField(v)));
31
+ const fields = Object.entries(set).map(([k, v]) => updateTemplate.set(helpers_1.sqlEscape(k), this.selectService.buildField(v)));
31
32
  return fields;
32
33
  }
33
34
  update(update) {
34
35
  const set = this.updateBuildSet(update.set);
35
36
  const where = this.selectService.buildWhere(update.where);
36
- const sql = updateTemplate.full(helpers_1.sqlEscape(update.tableName), list_as_string_1.default(set, ', '), where, list_as_string_1.default(helpers_1.sharedSqlBuilder.buildFields(update.returning), ', '));
37
+ const sql = updateTemplate.full(helpers_1.sqlEscape(update.tableName), list_as_string_1.default(set, ', '), where, list_as_string_1.default(this.selectService.buildFields(update.returning), ', '));
37
38
  const retorno = numeric_sql_format_from_named_1.default(sql, helpers_1.normalizeArgs(update.args));
38
39
  return retorno;
39
40
  }
40
41
  delete(d) {
41
- const sql = deleteTemplate(helpers_1.sqlEscape(d.tableName), this.selectService.buildWhere(d.where), list_as_string_1.default(helpers_1.sharedSqlBuilder.buildFields(d.returning), ', '));
42
+ const sql = deleteTemplate(helpers_1.sqlEscape(d.tableName), this.selectService.buildWhere(d.where), list_as_string_1.default(this.selectService.buildFields(d.returning), ', '));
42
43
  const retorno = numeric_sql_format_from_named_1.default(sql, helpers_1.normalizeArgs(d.args));
43
44
  return retorno;
44
45
  }
@@ -1 +1 @@
1
- {"version":3,"file":"mutation.service.js","sourceRoot":"","sources":["../../../../../src/orm/cases/vanilla/sql-builder/mutation.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mutation.service.js","sourceRoot":"","sources":["../../../../../src/orm/cases/vanilla/sql-builder/mutation.service.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import { Select, Where } from '../interfaces';
1
+ import { Select, Where, SelectField } from '../interfaces';
2
2
  import { SqlCommand } from '../interfaces';
3
3
  export declare class JoinModeNotFound extends Error {
4
4
  constructor();
@@ -13,6 +13,9 @@ export declare class InvalidOffset extends Error {
13
13
  constructor();
14
14
  }
15
15
  export declare class SelectService {
16
+ private processValue;
17
+ buildField(field: SelectField, autoIncludeAlias?: boolean): string;
18
+ buildFields(fields: SelectField[], autoIncludeAlias?: boolean): string[];
16
19
  buildWhere(where: Where): string;
17
20
  private buildJoin;
18
21
  selectText(select: Select): string;