@puca/puca-core 10.6.3 → 10.7.0
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.
- package/dist/core/services/bootstrap-commands.js +53 -0
- package/dist/core/services/bootstrap-commands.js.map +1 -1
- package/dist/core/services/comunication/comunication-http.service.d.ts +1 -1
- package/dist/core/services/comunication/comunication-http.service.js +3 -0
- package/dist/core/services/comunication/comunication-http.service.js.map +1 -1
- package/dist/core/services/comunication/comunication.service.d.ts +1 -1
- package/dist/core/services/crud-front-base.service.js +4 -2
- package/dist/core/services/crud-front-base.service.js.map +1 -1
- package/dist/core/services/index.js +2 -1
- package/dist/core/services/index.js.map +1 -1
- package/dist/core/services/install.service.d.ts +15 -1
- package/dist/core/services/install.service.js +329 -3
- package/dist/core/services/install.service.js.map +1 -1
- package/dist/core/services/migration/migration.service.js.map +1 -1
- package/dist/core/services/module-especification.service.js +4 -0
- package/dist/core/services/module-especification.service.js.map +1 -1
- package/dist/core/services/plugin.service.js +0 -1
- package/dist/core/services/plugin.service.js.map +1 -1
- package/dist/core/services/report.service.js +4 -2
- package/dist/core/services/report.service.js.map +1 -1
- package/dist/core/services/storage/implementation/s3-client.service.d.ts +2 -1
- package/dist/core/services/storage/implementation/s3-client.service.js +3 -5
- package/dist/core/services/storage/implementation/s3-client.service.js.map +1 -1
- package/dist/core/services/storage/storage.service.d.ts +1 -0
- package/dist/core/services/storage/storage.service.js.map +1 -1
- package/dist/core/services/system-parameters-envs.service.d.ts +1 -0
- package/dist/core/services/system-parameters-envs.service.js +13 -2
- package/dist/core/services/system-parameters-envs.service.js.map +1 -1
- package/dist/models/company.d.ts +5 -0
- package/dist/models/company.js +3 -0
- package/dist/models/company.js.map +1 -0
- package/dist/models/crud-controller-especification-environment.d.ts +4 -0
- package/dist/models/crud-controller-especification-environment.js.map +1 -1
- package/dist/models/field-dictionary.d.ts +2 -0
- package/dist/models/module-especification.d.ts +2 -0
- package/dist/models/system-parameters.d.ts +10 -1
- package/dist/models/system-parameters.js +6 -0
- package/dist/models/system-parameters.js.map +1 -1
- package/dist/orm/cases/bo/ddl.service.d.ts +1 -1
- package/dist/orm/cases/bo/ddl.service.js +4 -4
- package/dist/orm/cases/bo/ddl.service.js.map +1 -1
- package/dist/orm/cases/bo/interfaces.d.ts +7 -0
- package/dist/orm/cases/bo/interfaces.js.map +1 -1
- package/dist/orm/cases/vanilla/sql-builder/select.service.d.ts +7 -2
- package/dist/orm/cases/vanilla/sql-builder/select.service.js +34 -20
- package/dist/orm/cases/vanilla/sql-builder/select.service.js.map +1 -1
- package/dist/orm/services/repository-factory.d.ts +1 -1
- package/dist/orm/services/repository-factory.js +5 -2
- package/dist/orm/services/repository-factory.js.map +1 -1
- package/dist/orm/services/repository.d.ts +3 -1
- package/dist/orm/services/repository.js +25 -25
- package/dist/orm/services/repository.js.map +1 -1
- package/dist/orm/services/sql/sql-layer.service.d.ts +0 -1
- package/dist/orm/services/sql/sql-layer.service.js +0 -5
- package/dist/orm/services/sql/sql-layer.service.js.map +1 -1
- package/dist/orm/services/sql/sql-security-layer.service.js +0 -2
- package/dist/orm/services/sql/sql-security-layer.service.js.map +1 -1
- package/dist/orm/services/sql-executor.d.ts +13 -0
- package/dist/orm/services/sql-executor.js +262 -0
- package/dist/orm/services/sql-executor.js.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -2
|
@@ -76,7 +76,8 @@ class ReportService {
|
|
|
76
76
|
await storageService.writeFile({
|
|
77
77
|
path,
|
|
78
78
|
buffer: data,
|
|
79
|
-
cacheControl: null
|
|
79
|
+
cacheControl: null,
|
|
80
|
+
publicLink: false
|
|
80
81
|
});
|
|
81
82
|
const expires = 604800;
|
|
82
83
|
const link = await storageService.getDownloadLink({
|
|
@@ -92,7 +93,8 @@ class ReportService {
|
|
|
92
93
|
await storageService.writeFile({
|
|
93
94
|
path,
|
|
94
95
|
buffer: data,
|
|
95
|
-
cacheControl: null
|
|
96
|
+
cacheControl: null,
|
|
97
|
+
publicLink: true
|
|
96
98
|
});
|
|
97
99
|
const link = await storageService.getDownloadLink({
|
|
98
100
|
path,
|
|
@@ -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":"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"}
|
|
@@ -13,10 +13,11 @@ export declare class S3ClientService implements StorageService {
|
|
|
13
13
|
private readonly namespace;
|
|
14
14
|
private readonly s3Client;
|
|
15
15
|
constructor(s3Config: S3Config, namespace: string);
|
|
16
|
-
writeFile({ path, buffer, cacheControl }: {
|
|
16
|
+
writeFile({ path, buffer, cacheControl, publicLink }: {
|
|
17
17
|
path: string;
|
|
18
18
|
buffer: Buffer;
|
|
19
19
|
cacheControl: string;
|
|
20
|
+
publicLink?: boolean;
|
|
20
21
|
}): Promise<void>;
|
|
21
22
|
readFileResponse({ path, res, mode }: {
|
|
22
23
|
path: string;
|
|
@@ -8,7 +8,7 @@ class S3ClientService {
|
|
|
8
8
|
this.namespace = namespace;
|
|
9
9
|
this.s3Client = new aws_sdk_1.S3(s3Config);
|
|
10
10
|
}
|
|
11
|
-
async writeFile({ path, buffer, cacheControl }) {
|
|
11
|
+
async writeFile({ path, buffer, cacheControl, publicLink = false }) {
|
|
12
12
|
const uploadParams = {
|
|
13
13
|
Bucket: this.s3Config.bucket,
|
|
14
14
|
Key: await this.buildCompletePath({
|
|
@@ -16,6 +16,7 @@ class S3ClientService {
|
|
|
16
16
|
}),
|
|
17
17
|
CacheControl: cacheControl,
|
|
18
18
|
Body: buffer,
|
|
19
|
+
ACL: publicLink ? 'public-read' : 'private'
|
|
19
20
|
};
|
|
20
21
|
return new Promise((resolve, reject) => {
|
|
21
22
|
this.s3Client.upload(uploadParams, err => {
|
|
@@ -46,10 +47,7 @@ class S3ClientService {
|
|
|
46
47
|
path,
|
|
47
48
|
});
|
|
48
49
|
if (publicLink) {
|
|
49
|
-
const link =
|
|
50
|
-
Key: completePath,
|
|
51
|
-
Bucket: this.s3Config.bucket,
|
|
52
|
-
});
|
|
50
|
+
const link = `https://${this.s3Config.bucket}.s3.${this.s3Config.region}.amazonaws.com/${completePath}`;
|
|
53
51
|
return link;
|
|
54
52
|
}
|
|
55
53
|
const params = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"s3-client.service.js","sourceRoot":"","sources":["../../../../../src/core/services/storage/implementation/s3-client.service.ts"],"names":[],"mappings":";;;AAAA,qCAA6B;AAY7B,MAAa,eAAe;IAG1B,YAA6B,QAAkB,EAAmB,SAAiB;QAAtD,aAAQ,GAAR,QAAQ,CAAU;QAAmB,cAAS,GAAT,SAAS,CAAQ;QACjF,IAAI,CAAC,QAAQ,GAAG,IAAI,YAAE,CAAC,QAAQ,CAAC,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,EACd,IAAI,EACJ,MAAM,EACN,YAAY,
|
|
1
|
+
{"version":3,"file":"s3-client.service.js","sourceRoot":"","sources":["../../../../../src/core/services/storage/implementation/s3-client.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage.service.js","sourceRoot":"","sources":["../../../../src/core/services/storage/storage.service.ts"],"names":[],"mappings":";;;AACA,0EAAqE;AACrE,sCAAmC;AAGnC,MAAsB,cAAc;
|
|
1
|
+
{"version":3,"file":"storage.service.js","sourceRoot":"","sources":["../../../../src/core/services/storage/storage.service.ts"],"names":[],"mappings":";;;AACA,0EAAqE;AACrE,sCAAmC;AAGnC,MAAsB,cAAc;CAgBnC;AAhBD,wCAgBC;AAED,MAAa,qBAAqB;IAKhC,YAA6B,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;QAJxC,WAAM,GAAG,IAAI,eAAM,CAAC,uBAAuB,CAAC,CAAA;QACrD,WAAM,GAAgC,KAAK,CAAA;IAGU,CAAC;IAE9D,KAAK,CAAC,WAAW;QACf,OAAO,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE;YAChC,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAA;SAC3C;QACD,IAAI,IAAI,CAAC,MAAM,KAAK,KAAK,EAAE;YACzB,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,CAAA;YAEpE,MAAM,eAAe,GAAG;gBACtB;oBACE,KAAK,EAAE,GAAG,EAAE,CAAC,IAAI;oBACjB,KAAK,EAAE,GAAG,EAAE,CAAC,IAAI,mCAAe,CAAC,QAAQ,EAAE,SAAS,CAAC;oBACrD,IAAI,EAAE,iBAAiB;iBACxB;aACF,CAAC;YACF,MAAM,cAAc,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;YAC5D,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,4CAA4C,cAAc,CAAC,IAAI,EAAE,CAClE,CAAC;YACF,IAAI,CAAC,QAAQ,GAAG,cAAc,CAAC,KAAK,EAAE,CAAC;YACvC,IAAI,CAAC,MAAM,GAAG,OAAO,CAAA;SACtB;QACD,OAAO,IAAI,CAAC,QAAQ,CAAA;IACtB,CAAC;CACF;AA9BD,sDA8BC"}
|
|
@@ -7,6 +7,7 @@ export declare class SystemParametersEnvs extends EnvConfigService {
|
|
|
7
7
|
constructor(repositoryFactory: RepositoryFactory, configService: ConfigService);
|
|
8
8
|
init(): Promise<void>;
|
|
9
9
|
private getEnvSystemParameterValue;
|
|
10
|
+
getEnvByNameAndCompany<T = string>(envName: string, company: string, fallBack?: T): Promise<T>;
|
|
10
11
|
getEnvByName<T = string>(envName: string, fallBack?: T): Promise<T>;
|
|
11
12
|
getEnvByNameSync<T = string>(envName: string, fallBack?: T): T;
|
|
12
13
|
}
|
|
@@ -50,12 +50,23 @@ class SystemParametersEnvs extends envs_config_service_1.EnvConfigService {
|
|
|
50
50
|
}
|
|
51
51
|
});
|
|
52
52
|
}
|
|
53
|
-
async getEnvSystemParameterValue(envName) {
|
|
53
|
+
async getEnvSystemParameterValue(envName, company) {
|
|
54
|
+
if (company) {
|
|
55
|
+
envName = `${envName}-${company}`;
|
|
56
|
+
}
|
|
54
57
|
const systemParameter = this.systemParameters.get(envName);
|
|
55
58
|
return systemParameter === null || systemParameter === void 0 ? void 0 : systemParameter.value;
|
|
56
59
|
}
|
|
60
|
+
async getEnvByNameAndCompany(envName, company, fallBack = null) {
|
|
61
|
+
const paramenterValue = await this.getEnvSystemParameterValue(envName, company);
|
|
62
|
+
const result = _.get(paramenterValue, "value");
|
|
63
|
+
if (result !== undefined) {
|
|
64
|
+
return result;
|
|
65
|
+
}
|
|
66
|
+
return fallBack;
|
|
67
|
+
}
|
|
57
68
|
async getEnvByName(envName, fallBack = null) {
|
|
58
|
-
const paramenterValue = await this.getEnvSystemParameterValue(envName);
|
|
69
|
+
const paramenterValue = await this.getEnvSystemParameterValue(envName, null);
|
|
59
70
|
if ((paramenterValue === null || paramenterValue === void 0 ? void 0 : paramenterValue.value) !== undefined) {
|
|
60
71
|
return _.get(paramenterValue, "value");
|
|
61
72
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"system-parameters-envs.service.js","sourceRoot":"","sources":["../../../src/core/services/system-parameters-envs.service.ts"],"names":[],"mappings":";;;AAAA,6EAAuE;AAEvE,4BAA4B;AAK5B,MAAa,oBAAqB,SAAQ,sCAAgB;IAIxD,YACmB,iBAAoC,EACrD,aAA4B;QAE5B,KAAK,CAAC,aAAa,CAAC,CAAC;QAHJ,sBAAiB,GAAjB,iBAAiB,CAAmB;QAHtC,qBAAgB,GAAG,IAAI,GAAG,EAAgC,CAAA;IAO3E,CAAC;IAED,KAAK,CAAC,IAAI;QACR,MAAM,0BAA0B,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAuB;YAC1F,SAAS,EAAE,iCAAiC;YAC5C,WAAW,EAAE,IAAI;SAClB,CAAC,CAAA;QACF,MAAM,MAAM,GAAG,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;QAC5C,MAAM,EAAE,IAAI,EAAE,gBAAgB,EAAE,GAAG,MAAM,0BAA0B,CAAC,OAAO,CAAC;YAC1E,MAAM;YACN,IAAI,EAAE,IAAI;YACV,uBAAuB,EAAE,IAAI;SAC9B,CAAC,CAAA;QAEF,MAAM,eAAe,GAAG,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAuB;YACpF,SAAS,EAAE,iCAAiC;YAC5C,OAAO,EAAE,CAAC;SACX,CAAC,CAAA;QAEF,gBAAgB,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE;YACzC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,EAAE,eAAe,CAAC,CAAA;QAClE,CAAC,CAAC,CAAA;QAEF,eAAe,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE;YACjC,IAAI,KAAK,CAAC,OAAO,KAAK,CAAC,EAAE;gBACvB,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;aAC5D;YAED,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,KAAK,CAAA;YAErC,IAAI,IAAI,KAAK,QAAQ,EAAE;gBACrB,MAAM,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAA;gBAC1F,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,CAAA;gBACrC,OAAM;aACP;YAED,MAAM,EAAE,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;YAC9C,IAAI,EAAE,EAAE;gBACN,MAAM,CAAC,OAAO,CAAC,GAAG,IAAI,EAAE,CAAC;qBACtB,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;qBACnC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;oBAClB,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;gBACX,CAAC,CAAC,CAAA;aACL;iBAAM;gBACL,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;aACzC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;IAEO,KAAK,CAAC,0BAA0B,CAAE,OAAe;
|
|
1
|
+
{"version":3,"file":"system-parameters-envs.service.js","sourceRoot":"","sources":["../../../src/core/services/system-parameters-envs.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"company.js","sourceRoot":"","sources":["../../src/models/company.ts"],"names":[],"mappings":""}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crud-controller-especification-environment.js","sourceRoot":"","sources":["../../src/models/crud-controller-especification-environment.ts"],"names":[],"mappings":";;;AAIA,IAAY,wBAGX;AAHD,WAAY,wBAAwB;IAClC,yCAAa,CAAA;IACb,yCAAa,CAAA;AACf,CAAC,EAHW,wBAAwB,GAAxB,gCAAwB,KAAxB,gCAAwB,QAGnC;AAYA,CAAC;
|
|
1
|
+
{"version":3,"file":"crud-controller-especification-environment.js","sourceRoot":"","sources":["../../src/models/crud-controller-especification-environment.ts"],"names":[],"mappings":";;;AAIA,IAAY,wBAGX;AAHD,WAAY,wBAAwB;IAClC,yCAAa,CAAA;IACb,yCAAa,CAAA;AACf,CAAC,EAHW,wBAAwB,GAAxB,gCAAwB,KAAxB,gCAAwB,QAGnC;AAYA,CAAC;AAgJF,IAAY,uBAIX;AAJD,WAAY,uBAAuB;IACjC,gDAAqB,CAAA;IACrB,wCAAa,CAAA;IACb,wCAAa,CAAA;AACf,CAAC,EAJW,uBAAuB,GAAvB,+BAAuB,KAAvB,+BAAuB,QAIlC"}
|
|
@@ -2,6 +2,7 @@ import { MenuPlan } from './menu';
|
|
|
2
2
|
import { TypeDDlCommand } from '../core/services/migration/migration.service';
|
|
3
3
|
import { UserAccessControlMode } from '../models/user-access-control-mode';
|
|
4
4
|
import { SystemParametersPlan } from './system-parameters';
|
|
5
|
+
import { CreateSystemView } from '../orm/cases/bo/interfaces';
|
|
5
6
|
export interface ModuleEspecification {
|
|
6
7
|
module_name: string;
|
|
7
8
|
version: string;
|
|
@@ -11,4 +12,5 @@ export interface ModuleEspecification {
|
|
|
11
12
|
menu?: MenuPlan[];
|
|
12
13
|
parameters?: SystemParametersPlan[];
|
|
13
14
|
useAccessControl?: UserAccessControlMode;
|
|
15
|
+
moduleViews?: CreateSystemView[];
|
|
14
16
|
}
|
|
@@ -1,9 +1,18 @@
|
|
|
1
1
|
import { TableFieldType } from "../orm/interfaces";
|
|
2
|
+
export declare enum EnumScope {
|
|
3
|
+
System = "system",
|
|
4
|
+
Company = "company"
|
|
5
|
+
}
|
|
2
6
|
export interface SystemParametersPlan {
|
|
3
7
|
puca_pid?: string;
|
|
4
8
|
name?: string;
|
|
5
9
|
label?: string;
|
|
6
10
|
module?: string;
|
|
7
|
-
value?:
|
|
11
|
+
value?: {
|
|
12
|
+
value: any;
|
|
13
|
+
};
|
|
8
14
|
type?: TableFieldType;
|
|
15
|
+
scope?: EnumScope;
|
|
16
|
+
company?: string;
|
|
17
|
+
public?: boolean;
|
|
9
18
|
}
|
|
@@ -1,3 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.EnumScope = void 0;
|
|
4
|
+
var EnumScope;
|
|
5
|
+
(function (EnumScope) {
|
|
6
|
+
EnumScope["System"] = "system";
|
|
7
|
+
EnumScope["Company"] = "company";
|
|
8
|
+
})(EnumScope = exports.EnumScope || (exports.EnumScope = {}));
|
|
3
9
|
//# sourceMappingURL=system-parameters.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"system-parameters.js","sourceRoot":"","sources":["../../src/models/system-parameters.ts"],"names":[],"mappings":""}
|
|
1
|
+
{"version":3,"file":"system-parameters.js","sourceRoot":"","sources":["../../src/models/system-parameters.ts"],"names":[],"mappings":";;;AAEA,IAAY,SAGX;AAHD,WAAY,SAAS;IACnB,8BAAiB,CAAA;IACjB,gCAAmB,CAAA;AACrB,CAAC,EAHW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAGpB"}
|
|
@@ -10,7 +10,7 @@ export declare class DDLService {
|
|
|
10
10
|
private assertField;
|
|
11
11
|
createOrRecreateView({ viewName, select }: CreateView, user: User): SqlCommand[];
|
|
12
12
|
dropView(dropView: DropView, user: User): SqlCommand[];
|
|
13
|
-
private
|
|
13
|
+
private createOrRecreateDefaultView;
|
|
14
14
|
createTable(createTable: CreateTable & {
|
|
15
15
|
shouldGeneratePucaDicitonary?: boolean;
|
|
16
16
|
ignoreModuleNamePrefix?: boolean;
|
|
@@ -48,7 +48,7 @@ class DDLService {
|
|
|
48
48
|
}
|
|
49
49
|
];
|
|
50
50
|
}
|
|
51
|
-
|
|
51
|
+
createOrRecreateDefaultView(tableName, user) {
|
|
52
52
|
const pucaTableName = `puca_${tableName}`;
|
|
53
53
|
const userTableName = `user_${tableName}`;
|
|
54
54
|
return this.createOrRecreateView({
|
|
@@ -184,7 +184,7 @@ class DDLService {
|
|
|
184
184
|
args: [],
|
|
185
185
|
commandName: 'foreignKey',
|
|
186
186
|
},
|
|
187
|
-
...this.
|
|
187
|
+
...this.createOrRecreateDefaultView(createTable.tableName, user),
|
|
188
188
|
...(createTable.indices || [])
|
|
189
189
|
.map(index => this.createIndex({
|
|
190
190
|
tableName: createTable.tableName,
|
|
@@ -265,7 +265,7 @@ class DDLService {
|
|
|
265
265
|
},
|
|
266
266
|
user
|
|
267
267
|
}),
|
|
268
|
-
...this.
|
|
268
|
+
...this.createOrRecreateDefaultView(alterTable.tableName, user),
|
|
269
269
|
];
|
|
270
270
|
return retorno;
|
|
271
271
|
}
|
|
@@ -292,7 +292,7 @@ class DDLService {
|
|
|
292
292
|
args: [],
|
|
293
293
|
commandName: 'dropField'
|
|
294
294
|
},
|
|
295
|
-
...this.
|
|
295
|
+
...this.createOrRecreateDefaultView(a.tableName, user),
|
|
296
296
|
];
|
|
297
297
|
return retorno;
|
|
298
298
|
}
|
|
@@ -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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"}
|
|
@@ -24,6 +24,13 @@ export interface CreateView {
|
|
|
24
24
|
viewName: string;
|
|
25
25
|
select: Select;
|
|
26
26
|
}
|
|
27
|
+
export interface CreateSystemView extends CreateView {
|
|
28
|
+
autoGeneratePucaKeyFields: string[];
|
|
29
|
+
autoGeneratePucaPid: boolean;
|
|
30
|
+
fields: TableField[];
|
|
31
|
+
module: string;
|
|
32
|
+
crudApi: string;
|
|
33
|
+
}
|
|
27
34
|
export declare type AlterTableAddColumn = {
|
|
28
35
|
tableName: string;
|
|
29
36
|
} & TableField;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../../../src/orm/cases/bo/interfaces.ts"],"names":[],"mappings":";;;AACA,sDAc8B;
|
|
1
|
+
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../../../src/orm/cases/bo/interfaces.ts"],"names":[],"mappings":";;;AACA,sDAc8B;AA8DhB,QAAA,kBAAkB,GAAG,+BAAsB,CAAA;AAE3C,QAAA,mBAAmB,GAAG,gCAAuB,CAAA;AAE7C,QAAA,QAAQ,GAAG,qBAAY,CAAA;AAEvB,QAAA,OAAO,GAAG,oBAAW,CAAA"}
|
|
@@ -12,11 +12,16 @@ export declare class InvalidLimit extends Error {
|
|
|
12
12
|
export declare class InvalidOffset extends Error {
|
|
13
13
|
constructor();
|
|
14
14
|
}
|
|
15
|
+
export declare enum BuildFieldAliasConfig {
|
|
16
|
+
'default' = "default",
|
|
17
|
+
'force' = "force",
|
|
18
|
+
'remove' = "remove"
|
|
19
|
+
}
|
|
15
20
|
export declare class SelectService {
|
|
16
21
|
private readonly logger;
|
|
17
22
|
private processValue;
|
|
18
|
-
buildField(field: SelectField,
|
|
19
|
-
buildFields(fields: SelectField[],
|
|
23
|
+
buildField(field: SelectField, aliasConfig?: BuildFieldAliasConfig): string;
|
|
24
|
+
buildFields(fields: SelectField[], aliasConfig?: BuildFieldAliasConfig): string[];
|
|
20
25
|
buildWhere(where: Where): string;
|
|
21
26
|
private buildJoin;
|
|
22
27
|
private complementSelectWithFullTextSearchConfig;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.SelectService = exports.InvalidOffset = exports.InvalidLimit = exports.AscDescNotFound = exports.JoinModeNotFound = void 0;
|
|
3
|
+
exports.SelectService = exports.BuildFieldAliasConfig = exports.InvalidOffset = exports.InvalidLimit = exports.AscDescNotFound = exports.JoinModeNotFound = void 0;
|
|
4
4
|
const _ = require("lodash");
|
|
5
5
|
const interfaces_1 = require("../interfaces");
|
|
6
6
|
const list_as_string_1 = require("../../../../helpers/list-as-string");
|
|
@@ -122,6 +122,12 @@ const allowedFunction = {
|
|
|
122
122
|
any: (args) => `any( ${args[0]} )`,
|
|
123
123
|
nullif: (args) => `nullif( ${args[0]}, ${args[1]} )`,
|
|
124
124
|
};
|
|
125
|
+
var BuildFieldAliasConfig;
|
|
126
|
+
(function (BuildFieldAliasConfig) {
|
|
127
|
+
BuildFieldAliasConfig["default"] = "default";
|
|
128
|
+
BuildFieldAliasConfig["force"] = "force";
|
|
129
|
+
BuildFieldAliasConfig["remove"] = "remove";
|
|
130
|
+
})(BuildFieldAliasConfig = exports.BuildFieldAliasConfig || (exports.BuildFieldAliasConfig = {}));
|
|
125
131
|
class SelectService {
|
|
126
132
|
constructor() {
|
|
127
133
|
this.logger = new logger_1.Logger(SelectService.name);
|
|
@@ -152,11 +158,12 @@ class SelectService {
|
|
|
152
158
|
.find(({ apply }) => apply())
|
|
153
159
|
.exec();
|
|
154
160
|
}
|
|
155
|
-
buildField(field,
|
|
161
|
+
buildField(field, aliasConfig = BuildFieldAliasConfig.default) {
|
|
156
162
|
const resolveStr = (fStr) => {
|
|
157
163
|
if (fStr.startsWith('$')) {
|
|
158
164
|
return this.processValue(fStr);
|
|
159
165
|
}
|
|
166
|
+
const autoIncludeAlias = aliasConfig === BuildFieldAliasConfig.force;
|
|
160
167
|
if (fStr.includes('__')) {
|
|
161
168
|
return `${helpers_1.sqlEscape(fStr.split('__')[0])}.${helpers_1.sqlEscape(fStr.split('__')[1])} ${autoIncludeAlias ? `as ${helpers_1.sqlEscape(fStr)}` : ''}`;
|
|
162
169
|
}
|
|
@@ -174,14 +181,17 @@ class SelectService {
|
|
|
174
181
|
fieldStr = `( ${fieldStr} )::${helpers_1.sqlEscape(field.cast)}`;
|
|
175
182
|
}
|
|
176
183
|
if (field.over) {
|
|
177
|
-
const partitionBy = field.over.partitionBy ? `partition by ${this.buildFields(field.over.partitionBy || []).join(', ')}` : '';
|
|
178
|
-
const orderBy = field.over.orderBy ? `order by ${this.buildFields(field.over.orderBy || []).join(', ')}` : '';
|
|
184
|
+
const partitionBy = field.over.partitionBy ? `partition by ${this.buildFields(field.over.partitionBy || [], BuildFieldAliasConfig.remove).join(', ')}` : '';
|
|
185
|
+
const orderBy = field.over.orderBy ? `order by ${this.buildFields(field.over.orderBy || [], BuildFieldAliasConfig.remove).join(', ')}` : '';
|
|
179
186
|
fieldStr = `${fieldStr} over ( ${partitionBy} ${orderBy} )`;
|
|
180
187
|
}
|
|
181
188
|
let alias = field.alias;
|
|
182
|
-
if (!alias &&
|
|
189
|
+
if (!alias && aliasConfig === BuildFieldAliasConfig.default || alias === BuildFieldAliasConfig.force) {
|
|
183
190
|
alias = fallbackAlias;
|
|
184
191
|
}
|
|
192
|
+
else if (alias && aliasConfig === BuildFieldAliasConfig.remove) {
|
|
193
|
+
alias = null;
|
|
194
|
+
}
|
|
185
195
|
return alias ? `${fieldStr} as ${helpers_1.sqlEscape(alias)}` : fieldStr;
|
|
186
196
|
};
|
|
187
197
|
if (typeof field === 'number' || typeof field === 'boolean') {
|
|
@@ -193,33 +203,36 @@ class SelectService {
|
|
|
193
203
|
throw new Error(`invalid function ${field.function}`);
|
|
194
204
|
}
|
|
195
205
|
const functionName = helpers_1.sqlEscape(field.function);
|
|
196
|
-
const args = (field.args || []).map(a => this.buildField(a));
|
|
206
|
+
const args = (field.args || []).map(a => this.buildField(a, BuildFieldAliasConfig.remove));
|
|
197
207
|
const functionStr = f(args);
|
|
198
208
|
return addAliasAddCastAddOver(functionStr, functionName);
|
|
199
209
|
}
|
|
200
210
|
if ('field' in field) {
|
|
201
211
|
const table = field.table;
|
|
202
212
|
if (table) {
|
|
203
|
-
return addAliasAddCastAddOver(`${helpers_1.sqlEscape(table)}.${this.buildField(field.field,
|
|
213
|
+
return addAliasAddCastAddOver(`${helpers_1.sqlEscape(table)}.${this.buildField(field.field, BuildFieldAliasConfig.remove)}`, `${table}__${field.field}`);
|
|
204
214
|
}
|
|
205
215
|
else {
|
|
206
|
-
const bField = this.buildField(field.field,
|
|
216
|
+
const bField = this.buildField(field.field, BuildFieldAliasConfig.remove);
|
|
207
217
|
let alias = field.alias;
|
|
208
|
-
if (!alias &&
|
|
218
|
+
if (!alias && aliasConfig === BuildFieldAliasConfig.default || alias === BuildFieldAliasConfig.force) {
|
|
209
219
|
alias = bField;
|
|
210
220
|
}
|
|
221
|
+
else if (alias && aliasConfig === BuildFieldAliasConfig.remove) {
|
|
222
|
+
alias = null;
|
|
223
|
+
}
|
|
211
224
|
return addAliasAddCastAddOver(bField, bField);
|
|
212
225
|
}
|
|
213
226
|
}
|
|
214
227
|
if ('conditions' in field) {
|
|
215
228
|
return addAliasAddCastAddOver(`case ${field.conditions
|
|
216
229
|
.map(condition => {
|
|
217
|
-
return `when ${this.buildWhere(condition.when)} then ${this.buildField(condition.then,
|
|
230
|
+
return `when ${this.buildWhere(condition.when)} then ${this.buildField(condition.then, BuildFieldAliasConfig.remove)}`;
|
|
218
231
|
})
|
|
219
|
-
.join(' ')} ${field.else ? `else ${this.buildField(field.else)}` : ''} end`, null);
|
|
232
|
+
.join(' ')} ${field.else ? `else ${this.buildField(field.else, BuildFieldAliasConfig.remove)}` : ''} end`, null);
|
|
220
233
|
}
|
|
221
234
|
if ('exists' in field) {
|
|
222
|
-
return addAliasAddCastAddOver(`exists(${this.buildField(Object.assign(Object.assign({}, field.exists), { over: field.over }))})`, null);
|
|
235
|
+
return addAliasAddCastAddOver(`exists(${this.buildField(Object.assign(Object.assign({}, field.exists), { over: field.over }), BuildFieldAliasConfig.remove)})`, null);
|
|
223
236
|
}
|
|
224
237
|
const aliasFallback = typeof field.from === 'string' ?
|
|
225
238
|
field.from :
|
|
@@ -227,8 +240,8 @@ class SelectService {
|
|
|
227
240
|
const select = this.selectText(field);
|
|
228
241
|
return addAliasAddCastAddOver(`(${select})`, aliasFallback);
|
|
229
242
|
}
|
|
230
|
-
buildFields(fields,
|
|
231
|
-
return fields.map(f => this.buildField(f,
|
|
243
|
+
buildFields(fields, aliasConfig = BuildFieldAliasConfig.default) {
|
|
244
|
+
return fields.map(f => this.buildField(f, aliasConfig));
|
|
232
245
|
}
|
|
233
246
|
buildWhere(where) {
|
|
234
247
|
if (!where) {
|
|
@@ -259,8 +272,8 @@ class SelectService {
|
|
|
259
272
|
const select = this.selectText(where.exists);
|
|
260
273
|
return whereTemplates.exists(select);
|
|
261
274
|
}
|
|
262
|
-
const v1 = this.buildField(where.v1);
|
|
263
|
-
const v2 = where.v2 ? this.buildField(where.v2) :
|
|
275
|
+
const v1 = this.buildField(where.v1, BuildFieldAliasConfig.remove);
|
|
276
|
+
const v2 = where.v2 ? this.buildField(where.v2, BuildFieldAliasConfig.remove) : null;
|
|
264
277
|
const retorno = {
|
|
265
278
|
equals: () => `${v1} = ${v2}`,
|
|
266
279
|
less: () => `${v1} < ${v2}`,
|
|
@@ -364,7 +377,7 @@ class SelectService {
|
|
|
364
377
|
selectText(select) {
|
|
365
378
|
const fields = !select.fields || !select.fields.length
|
|
366
379
|
? ['*']
|
|
367
|
-
: this.buildFields(select.fields,
|
|
380
|
+
: this.buildFields(select.fields, BuildFieldAliasConfig.force);
|
|
368
381
|
const sqlJoin = select.join && select.join.length
|
|
369
382
|
? this.buildJoin(select.join)
|
|
370
383
|
: [];
|
|
@@ -373,8 +386,9 @@ class SelectService {
|
|
|
373
386
|
const unionAll = (select.unionAll || []).map(u => `union all ${this.selectText(u)}`).join(' ');
|
|
374
387
|
const orderBy = _.get(select, ['orderBy', 'length'])
|
|
375
388
|
? orderByTemplate(select.orderBy
|
|
376
|
-
.map(
|
|
377
|
-
const
|
|
389
|
+
.map(o1 => {
|
|
390
|
+
const o = typeof o1 === 'object' && 'field' in o1 && typeof o1.field === 'object' ? Object.assign(Object.assign({}, o1.field), { sort: o1.sort }) : o1;
|
|
391
|
+
const field = this.buildField(o, BuildFieldAliasConfig.remove);
|
|
378
392
|
const sort = _.get(o, 'sort') || interfaces_1.AscDesc.ASC;
|
|
379
393
|
if (!Object.values(interfaces_1.AscDesc).includes(sort)) {
|
|
380
394
|
throw new AscDescNotFound();
|
|
@@ -386,7 +400,7 @@ class SelectService {
|
|
|
386
400
|
const groupBy = _.get(select, ['groupBy', 'length'])
|
|
387
401
|
? groupByTemplate(select.groupBy
|
|
388
402
|
.map(g => {
|
|
389
|
-
return this.buildField(g);
|
|
403
|
+
return this.buildField(g, BuildFieldAliasConfig.remove);
|
|
390
404
|
})
|
|
391
405
|
.reduce((a, b) => `${a}, ${b}`))
|
|
392
406
|
: '';
|