@freelog/freelog-cg-collection 1.2.5 → 1.2.6
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/function-executor/DynamicFunctionExecutor.js +7 -1
- package/index.js +2 -0
- package/package.json +1 -1
- package/resources/zhaojn2.json +7 -3
- package/src/function-executor/DynamicFunctionExecutor.ts +6 -0
- package/test/function-executor/query/QueryEchoServiceLabels.ts +2 -3
- package/test/state-machine/ContractStateMachineTest.test.ts +1 -1
|
@@ -31,6 +31,12 @@ class DynamicFunctionExecutor extends DefaultFunctionExecutor_1.DefaultFunctionE
|
|
|
31
31
|
throw new Error("该函数未实现");
|
|
32
32
|
}
|
|
33
33
|
addExecutor(functionName, executor) {
|
|
34
|
+
if (executor instanceof DefaultFunctionExecutor_1.DefaultFunctionExecutor) {
|
|
35
|
+
executor.setOutsideApiService(this.outsideApiService);
|
|
36
|
+
}
|
|
37
|
+
if (executor instanceof DynamicFunctionExecutor) {
|
|
38
|
+
executor.setVarContextProxy(this.varContextProxy);
|
|
39
|
+
}
|
|
34
40
|
this.executorsMap.set(functionName, executor);
|
|
35
41
|
}
|
|
36
42
|
getFunctionCodeMap() {
|
|
@@ -49,4 +55,4 @@ class DynamicFunctionExecutor extends DefaultFunctionExecutor_1.DefaultFunctionE
|
|
|
49
55
|
}
|
|
50
56
|
}
|
|
51
57
|
exports.DynamicFunctionExecutor = DynamicFunctionExecutor;
|
|
52
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
58
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRHluYW1pY0Z1bmN0aW9uRXhlY3V0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZnVuY3Rpb24tZXhlY3V0b3IvRHluYW1pY0Z1bmN0aW9uRXhlY3V0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsdUVBQWtFO0FBSWxFLE1BQWEsdUJBQXdCLFNBQVEsaURBQXVCO0lBQXBFOztRQUVjLGlCQUFZLEdBQUcsSUFBSSxHQUFHLEVBQTBCLENBQUM7SUF5RC9ELENBQUM7SUFyREcsWUFBWSxDQUFDLFlBQW9CO1FBQzdCLE9BQU8sSUFBSSxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsWUFBWSxDQUFDLElBQUksSUFBSSxDQUFDLGtCQUFrQixFQUFFLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQyxDQUFDO0lBQzlGLENBQUM7SUFFRCxLQUFLLENBQUMsTUFBTSxDQUFDLFlBQW9CLEVBQUUsSUFBVztRQUMxQyxJQUFJLElBQUksQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQyxFQUFFLENBQUM7WUFDdEMsT0FBTyxJQUFJLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUMsQ0FBQyxNQUFNLENBQUMsWUFBWSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQzFFLENBQUM7UUFDRCxJQUFJLElBQUksQ0FBQyxrQkFBa0IsRUFBRSxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUMsRUFBRSxDQUFDO1lBQzlDLElBQUksWUFBWSxHQUFHLElBQUksQ0FBQyxrQkFBa0IsRUFBRSxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUMsQ0FBQztZQUMvRCxvQkFBb0I7WUFDcEIsMENBQTBDO1lBQzFDLG9CQUFvQjtZQUNwQiw2Q0FBNkM7WUFDN0MsZUFBZTtZQUNmLDZEQUE2RDtZQUM3RCxRQUFRO1lBQ1IsSUFBSTtZQUNKLG1EQUFtRDtZQUVuRCxPQUFPLE9BQU8sQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxFQUFFLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQztZQUVyRCx1QkFBdUI7UUFDM0IsQ0FBQztRQUVELE1BQU0sSUFBSSxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDOUIsQ0FBQztJQUVELFdBQVcsQ0FBQyxZQUFvQixFQUFFLFFBQXdCO1FBQ3RELElBQUksUUFBUSxZQUFZLGlEQUF1QixFQUFFLENBQUM7WUFDOUMsUUFBUSxDQUFDLG9CQUFvQixDQUFDLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO1FBQzFELENBQUM7UUFDRCxJQUFJLFFBQVEsWUFBWSx1QkFBdUIsRUFBRSxDQUFDO1lBQzlDLFFBQVEsQ0FBQyxrQkFBa0IsQ0FBQyxJQUFJLENBQUMsZUFBZSxDQUFDLENBQUM7UUFDdEQsQ0FBQztRQUNELElBQUksQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLFlBQVksRUFBRSxRQUFRLENBQUMsQ0FBQztJQUNsRCxDQUFDO0lBRUQsa0JBQWtCO1FBQ2QsT0FBTyxJQUFJLEdBQUcsRUFBa0IsQ0FBQztJQUNyQyxDQUFDO0lBRUQsS0FBSyxDQUFDLGFBQWEsQ0FBQyxPQUFlO1FBQy9CLElBQUksSUFBSSxDQUFDLGVBQWUsSUFBSSxJQUFJLEVBQUUsQ0FBQztZQUMvQixPQUFPLElBQUksQ0FBQyxlQUFlLENBQUMsYUFBYSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ3ZELENBQUM7YUFBTSxDQUFDO1lBQ0osT0FBTyxLQUFLLENBQUMsYUFBYSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ3hDLENBQUM7SUFDTCxDQUFDO0lBRUQsa0JBQWtCLENBQUMsZUFBdUM7UUFDdEQsSUFBSSxDQUFDLGVBQWUsR0FBRyxlQUFlLENBQUM7SUFDM0MsQ0FBQztDQUNKO0FBM0RELDBEQTJEQyJ9
|
package/index.js
CHANGED
|
@@ -19,6 +19,7 @@ const {OutsideApiService} = require("./dist/service/OutsideApiService");
|
|
|
19
19
|
const {GetPostHelper} = require("./dist/helper/GetPostHelper");
|
|
20
20
|
const {ContractStateMachine} = require("./dist/state-machine/ContractStateMachine");
|
|
21
21
|
const {ContractFsmHook} = require("./dist/state-machine/ContractFsmHook");
|
|
22
|
+
const {DynamicFunctionExecutor} = require("./dist/function-executor/DynamicFunctionExecutor");
|
|
22
23
|
|
|
23
24
|
exports.PolicyHelper = PolicyHelper;
|
|
24
25
|
exports.FunctionHelper = FunctionHelper
|
|
@@ -28,6 +29,7 @@ exports.VarContextCapable = VarContextCapable;
|
|
|
28
29
|
|
|
29
30
|
exports.DefaultContractDeclarationExecutor = DefaultContractDeclarationExecutor;
|
|
30
31
|
exports.DefaultFunctionExecutor = DefaultFunctionExecutor;
|
|
32
|
+
exports.DynamicFunctionExecutor = DynamicFunctionExecutor;
|
|
31
33
|
|
|
32
34
|
exports.OutsideApiService = OutsideApiService;
|
|
33
35
|
exports.GetPostHelper = GetPostHelper;
|
package/package.json
CHANGED
package/resources/zhaojn2.json
CHANGED
|
@@ -60,7 +60,9 @@
|
|
|
60
60
|
},
|
|
61
61
|
{
|
|
62
62
|
"varName": "labels0",
|
|
63
|
-
"varValue":
|
|
63
|
+
"varValue": [
|
|
64
|
+
"vip1"
|
|
65
|
+
]
|
|
64
66
|
},
|
|
65
67
|
{
|
|
66
68
|
"varName": "setUnlocked",
|
|
@@ -83,7 +85,9 @@
|
|
|
83
85
|
"varLocalCurrentStateList": [
|
|
84
86
|
{
|
|
85
87
|
"varName": "labels",
|
|
86
|
-
"varValue":
|
|
88
|
+
"varValue": [
|
|
89
|
+
"vip1"
|
|
90
|
+
]
|
|
87
91
|
}
|
|
88
92
|
],
|
|
89
93
|
"currentEventInfos": [
|
|
@@ -94,7 +98,7 @@
|
|
|
94
98
|
"varLocalAtEventList": [
|
|
95
99
|
{
|
|
96
100
|
"varName": "condition",
|
|
97
|
-
"varValue":
|
|
101
|
+
"varValue": true
|
|
98
102
|
}
|
|
99
103
|
]
|
|
100
104
|
}
|
|
@@ -37,6 +37,12 @@ export class DynamicFunctionExecutor extends DefaultFunctionExecutor {
|
|
|
37
37
|
}
|
|
38
38
|
|
|
39
39
|
addExecutor(functionName: string, executor: FunctionInvoke): void {
|
|
40
|
+
if (executor instanceof DefaultFunctionExecutor) {
|
|
41
|
+
executor.setOutsideApiService(this.outsideApiService);
|
|
42
|
+
}
|
|
43
|
+
if (executor instanceof DynamicFunctionExecutor) {
|
|
44
|
+
executor.setVarContextProxy(this.varContextProxy);
|
|
45
|
+
}
|
|
40
46
|
this.executorsMap.set(functionName, executor);
|
|
41
47
|
}
|
|
42
48
|
|
|
@@ -1,10 +1,9 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {DynamicFunctionExecutor} from "../../../src/function-executor/DynamicFunctionExecutor";
|
|
2
2
|
|
|
3
|
-
export class QueryEchoServiceLabels extends
|
|
3
|
+
export class QueryEchoServiceLabels extends DynamicFunctionExecutor {
|
|
4
4
|
|
|
5
5
|
async invoke(functionName: string, args: any[]): Promise<string[]> {
|
|
6
6
|
console.debug(`invoke 【QueryEchoServiceLabels】functionName = ${functionName} args = ${args}`);
|
|
7
|
-
|
|
8
7
|
return ["vip1"];
|
|
9
8
|
}
|
|
10
9
|
}
|
|
@@ -12,7 +12,7 @@ describe("test/state-machine/ContractStateMachineTest.test.ts", () => {
|
|
|
12
12
|
let source = JSON.parse(fs.readFileSync("./resources/zhaojn.json", "utf-8"));
|
|
13
13
|
|
|
14
14
|
let policyHelper = new PolicyHelper(source);
|
|
15
|
-
|
|
15
|
+
policyHelper.addExecutor("Query", "Query.EchoService.Labels", new QueryEchoServiceLabels());
|
|
16
16
|
policyHelper.setVarGlobalList(JSON.parse(fs.readFileSync("./resources/test/var_context_list.json", "utf-8")));
|
|
17
17
|
policyHelper.setGetPostInvoke(new CustomGetPostHelper());
|
|
18
18
|
policyHelper.setApiAddressMulti(JSON.parse(fs.readFileSync("./resources/test/api_address_list.json", "utf-8")));
|