@puca/puca-core 9.0.0 → 9.1.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.
- package/dist/core/services/job/job.service.js +3 -2
- package/dist/core/services/job/job.service.js.map +1 -1
- package/dist/orm/cases/bo/sql.service.js +46 -16
- package/dist/orm/cases/bo/sql.service.js.map +1 -1
- package/dist/plugins/eval/eval.service.d.ts +2 -0
- package/dist/plugins/eval/eval.service.js +15 -3
- package/dist/plugins/eval/eval.service.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -13,7 +13,8 @@ class JobService {
|
|
|
13
13
|
return await jobClient.list();
|
|
14
14
|
}
|
|
15
15
|
async update(job) {
|
|
16
|
-
job.headers
|
|
16
|
+
const headers = job.headers || {};
|
|
17
|
+
headers.key = (await this.configService.getSecret()).pucaTriggerConfig.key;
|
|
17
18
|
const jobClient = await this.jobClientManager.get();
|
|
18
19
|
if (!job.url.startsWith('http')) {
|
|
19
20
|
const { name: moduleName } = await this.moduleConfigService.getModuleConfig();
|
|
@@ -23,7 +24,7 @@ class JobService {
|
|
|
23
24
|
.value();
|
|
24
25
|
job.url = `${address}/${job.url}`;
|
|
25
26
|
}
|
|
26
|
-
return await jobClient.update(Object.assign(Object.assign({}, job), { headers: typeof
|
|
27
|
+
return await jobClient.update(Object.assign(Object.assign({}, job), { headers: typeof headers === 'object' ? JSON.stringify(headers) : headers, body: typeof job.body === 'object' ? JSON.stringify(job.body) : job.body }));
|
|
27
28
|
}
|
|
28
29
|
async delete(args) {
|
|
29
30
|
const jobClient = await this.jobClientManager.get();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"job.service.js","sourceRoot":"","sources":["../../../../src/core/services/job/job.service.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAc5B,MAAa,UAAU;IACrB,YACmB,gBAAkC,EAClC,aAA6B,EAC7B,mBAAwC;QAFxC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,kBAAa,GAAb,aAAa,CAAgB;QAC7B,wBAAmB,GAAnB,mBAAmB,CAAqB;IAAI,CAAC;IAEhE,KAAK,CAAC,IAAI;QACR,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAA;QACnD,OAAO,MAAM,SAAS,CAAC,IAAI,EAAE,CAAA;IAC/B,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAQ;QACnB,GAAG,CAAC,OAAO,CAAC,GAAG,GAAG,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAA;
|
|
1
|
+
{"version":3,"file":"job.service.js","sourceRoot":"","sources":["../../../../src/core/services/job/job.service.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAc5B,MAAa,UAAU;IACrB,YACmB,gBAAkC,EAClC,aAA6B,EAC7B,mBAAwC;QAFxC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,kBAAa,GAAb,aAAa,CAAgB;QAC7B,wBAAmB,GAAnB,mBAAmB,CAAqB;IAAI,CAAC;IAEhE,KAAK,CAAC,IAAI;QACR,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAA;QACnD,OAAO,MAAM,SAAS,CAAC,IAAI,EAAE,CAAA;IAC/B,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAQ;QACnB,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,IAAI,EAAE,CAAA;QACjC,OAAO,CAAC,GAAG,GAAG,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAA;QAC1E,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAA;QACnD,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;YAC/B,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,eAAe,EAAE,CAAA;YAC7E,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,uBAAuB,EAAE,CAAA;YAC/E,MAAM,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC;iBACrF,GAAG,CAAC,SAAS,CAAC;iBACd,KAAK,EAAE,CAAC;YACX,GAAG,CAAC,GAAG,GAAG,GAAG,OAAO,IAAI,GAAG,CAAC,GAAG,EAAE,CAAA;SAClC;QAED,OAAO,MAAM,SAAS,CAAC,MAAM,iCACxB,GAAG,KACJ,OAAO,EAAE,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,EACxE,IAAI,EAAE,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,IAC1E,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,IAAU;QACrB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAA;QACnD,OAAO,MAAM,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IACrC,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAU;QACvB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAA;QACnD,OAAO,MAAM,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;IACvC,CAAC;CACF;AAxCD,gCAwCC"}
|
|
@@ -1,43 +1,71 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.CSqlService = void 0;
|
|
4
|
+
const moment = require("moment");
|
|
4
5
|
const _ = require("lodash");
|
|
5
6
|
const interfaces_1 = require("./interfaces");
|
|
7
|
+
const eval_service_1 = require("../../../plugins/eval/eval.service");
|
|
6
8
|
const computePucaTable = (table) => `puca_${table}`;
|
|
7
9
|
const computeUserTable = (table) => `user_${table}`;
|
|
10
|
+
const evalService = new eval_service_1.EvalService({
|
|
11
|
+
now: new Date().toISOString()
|
|
12
|
+
}, {
|
|
13
|
+
overrideDefaultTransforms: true,
|
|
14
|
+
token: '@',
|
|
15
|
+
throwErrors: true,
|
|
16
|
+
transforms: [
|
|
17
|
+
'add',
|
|
18
|
+
'subtract',
|
|
19
|
+
'startOf',
|
|
20
|
+
'endOf',
|
|
21
|
+
]
|
|
22
|
+
.reduce((r, fName) => {
|
|
23
|
+
r[fName] = ([dateStr, args]) => {
|
|
24
|
+
return moment(dateStr)[fName](...args).toISOString();
|
|
25
|
+
};
|
|
26
|
+
return r;
|
|
27
|
+
}, {}),
|
|
28
|
+
});
|
|
8
29
|
const wildCardStrategies = ({ v, user }) => {
|
|
9
30
|
return [
|
|
10
31
|
{
|
|
11
32
|
apply: () => {
|
|
12
|
-
return v
|
|
13
|
-
},
|
|
14
|
-
value: () => {
|
|
15
|
-
return _.get(user, 'puca_pid');
|
|
33
|
+
return typeof v !== 'string';
|
|
16
34
|
},
|
|
35
|
+
value: () => v,
|
|
17
36
|
},
|
|
18
37
|
{
|
|
19
38
|
apply: () => {
|
|
20
|
-
return v
|
|
21
|
-
},
|
|
22
|
-
value: () => {
|
|
23
|
-
return _.get(user, 'username');
|
|
39
|
+
return v.startsWith(`\\@`);
|
|
24
40
|
},
|
|
41
|
+
value: () => v.replace('\\@', '@'),
|
|
25
42
|
},
|
|
26
43
|
{
|
|
27
44
|
apply: () => {
|
|
28
|
-
return v
|
|
45
|
+
return !v.startsWith(`@`);
|
|
29
46
|
},
|
|
30
|
-
value: () =>
|
|
31
|
-
return _.get(user, 'rules') || [];
|
|
32
|
-
}
|
|
47
|
+
value: () => v,
|
|
33
48
|
},
|
|
34
49
|
{
|
|
35
50
|
apply: () => {
|
|
36
|
-
return
|
|
51
|
+
return v === '@currentUser';
|
|
37
52
|
},
|
|
53
|
+
value: () => _.get(user, 'puca_pid'),
|
|
54
|
+
},
|
|
55
|
+
{
|
|
56
|
+
apply: () => v === '@currentUserName',
|
|
57
|
+
value: () => _.get(user, 'username'),
|
|
58
|
+
},
|
|
59
|
+
{
|
|
60
|
+
apply: () => v === '@userRules',
|
|
61
|
+
value: () => _.get(user, 'rules') || []
|
|
62
|
+
},
|
|
63
|
+
{
|
|
64
|
+
apply: () => true,
|
|
38
65
|
value: () => {
|
|
39
|
-
|
|
40
|
-
|
|
66
|
+
const rv = evalService.evalSync(v);
|
|
67
|
+
return rv;
|
|
68
|
+
}
|
|
41
69
|
},
|
|
42
70
|
];
|
|
43
71
|
};
|
|
@@ -53,7 +81,9 @@ const applyWildCardStrategies = ({ args, user }) => {
|
|
|
53
81
|
user,
|
|
54
82
|
v,
|
|
55
83
|
})
|
|
56
|
-
.find(s =>
|
|
84
|
+
.find(s => {
|
|
85
|
+
return s.apply();
|
|
86
|
+
})
|
|
57
87
|
.value(),
|
|
58
88
|
];
|
|
59
89
|
})
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sql.service.js","sourceRoot":"","sources":["../../../../src/orm/cases/bo/sql.service.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAI5B,
|
|
1
|
+
{"version":3,"file":"sql.service.js","sourceRoot":"","sources":["../../../../src/orm/cases/bo/sql.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,13 +12,19 @@ class EvalService {
|
|
|
12
12
|
const toDate = (str) => {
|
|
13
13
|
return new Date(str);
|
|
14
14
|
};
|
|
15
|
-
this.jexl.addTransforms(Object.assign({
|
|
15
|
+
this.jexl.addTransforms(Object.assign(Object.assign({}, (!_.get(opt, 'overrideDefaultTransforms') ? {
|
|
16
|
+
length: array => array.length,
|
|
17
|
+
map: (array, key) => {
|
|
16
18
|
return array.map(e => e[key]);
|
|
17
|
-
},
|
|
19
|
+
},
|
|
20
|
+
sum: array => (array.length ? array.reduce((a, b) => a + b) : 0),
|
|
21
|
+
startsWith: (str, arg) => (str || '').startsWith(arg),
|
|
22
|
+
toDate,
|
|
18
23
|
dateFormat(date, mask) {
|
|
19
24
|
const d = typeof date === 'string' ? toDate(date) : date;
|
|
20
25
|
return format(mask, d);
|
|
21
|
-
}
|
|
26
|
+
}
|
|
27
|
+
} : {})), (_.get(opt, 'transforms') || {})));
|
|
22
28
|
}
|
|
23
29
|
prepare(str) {
|
|
24
30
|
const asString = () => {
|
|
@@ -41,6 +47,9 @@ class EvalService {
|
|
|
41
47
|
return await this.jexl.eval(this.prepare(str), this.context);
|
|
42
48
|
}
|
|
43
49
|
catch (e) {
|
|
50
|
+
if (_.get(this.opt, 'throwErrors')) {
|
|
51
|
+
throw e;
|
|
52
|
+
}
|
|
44
53
|
console.error(e);
|
|
45
54
|
return str;
|
|
46
55
|
}
|
|
@@ -53,6 +62,9 @@ class EvalService {
|
|
|
53
62
|
return this.jexl.evalSync(this.prepare(str), this.context);
|
|
54
63
|
}
|
|
55
64
|
catch (e) {
|
|
65
|
+
if (_.get(this.opt, 'throwErrors')) {
|
|
66
|
+
throw e;
|
|
67
|
+
}
|
|
56
68
|
console.error(e);
|
|
57
69
|
return str;
|
|
58
70
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eval.service.js","sourceRoot":"","sources":["../../../src/plugins/eval/eval.service.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAC5B,+BAA4B;AAC5B,MAAM,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"eval.service.js","sourceRoot":"","sources":["../../../src/plugins/eval/eval.service.ts"],"names":[],"mappings":"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"}
|