@freelog/freelog-cg-collection 1.2.2 → 1.2.4
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/calculator/ExpBooleanCalculator.js +6 -7
- package/dist/state-machine/ContractStateMachine.js +5 -1
- package/package.json +1 -1
- package/resources/zhaojn2.json +11 -81
- package/src/calculator/ExpBooleanCalculator.ts +6 -6
- package/src/state-machine/ContractStateMachine.ts +4 -0
- package/test/state-machine/ContractStateMachineTest.test.ts +1 -1
|
@@ -6,7 +6,6 @@ class ExpBooleanCalculator {
|
|
|
6
6
|
if (varObj.expType == "expBooleanOpLogic") {
|
|
7
7
|
return this.calculateExpBooleanOpLogic(varObj, varContextCapable);
|
|
8
8
|
}
|
|
9
|
-
2;
|
|
10
9
|
if (varObj.expType == "expBooleanOpCollection") {
|
|
11
10
|
return this.calculateExpBooleanOpCollection(varObj, varContextCapable);
|
|
12
11
|
}
|
|
@@ -22,12 +21,12 @@ class ExpBooleanCalculator {
|
|
|
22
21
|
throw new Error("getExpValue fail [ExpBooleanCalculator]...");
|
|
23
22
|
}
|
|
24
23
|
async calculateExpBooleanOpLogic(expBooleanOpLogic, varContextCapable) {
|
|
25
|
-
let var1 = this.expHelper.getExpValue(expBooleanOpLogic.var1, varContextCapable);
|
|
24
|
+
let var1 = await this.expHelper.getExpValue(expBooleanOpLogic.var1, varContextCapable);
|
|
26
25
|
if (expBooleanOpLogic.op == "not") {
|
|
27
26
|
return !var1;
|
|
28
27
|
}
|
|
29
28
|
else {
|
|
30
|
-
let var2 = this.expHelper.getExpValue(expBooleanOpLogic.var2, varContextCapable);
|
|
29
|
+
let var2 = await this.expHelper.getExpValue(expBooleanOpLogic.var2, varContextCapable);
|
|
31
30
|
if (expBooleanOpLogic.op == "and") {
|
|
32
31
|
return var1 && var2;
|
|
33
32
|
}
|
|
@@ -45,9 +44,9 @@ class ExpBooleanCalculator {
|
|
|
45
44
|
}
|
|
46
45
|
return false;
|
|
47
46
|
}
|
|
48
|
-
calculateExpBooleanOpCompare(expBooleanOpCompare, varContextCapable) {
|
|
49
|
-
let var1 = this.expHelper.getExpValue(expBooleanOpCompare.var1, varContextCapable);
|
|
50
|
-
let var2 = this.expHelper.getExpValue(expBooleanOpCompare.var2, varContextCapable);
|
|
47
|
+
async calculateExpBooleanOpCompare(expBooleanOpCompare, varContextCapable) {
|
|
48
|
+
let var1 = await this.expHelper.getExpValue(expBooleanOpCompare.var1, varContextCapable);
|
|
49
|
+
let var2 = await this.expHelper.getExpValue(expBooleanOpCompare.var2, varContextCapable);
|
|
51
50
|
if (expBooleanOpCompare.op == "less" || expBooleanOpCompare.op == "<") {
|
|
52
51
|
return var1 < var2;
|
|
53
52
|
}
|
|
@@ -79,4 +78,4 @@ class ExpBooleanCalculator {
|
|
|
79
78
|
}
|
|
80
79
|
}
|
|
81
80
|
exports.ExpBooleanCalculator = ExpBooleanCalculator;
|
|
82
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
81
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRXhwQm9vbGVhbkNhbGN1bGF0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY2FsY3VsYXRvci9FeHBCb29sZWFuQ2FsY3VsYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFTQSxNQUFhLG9CQUFvQjtJQUk3QixLQUFLLENBQUMsV0FBVyxDQUFDLE1BQTRCLEVBQUUsaUJBQXlDO1FBQ3JGLElBQUksTUFBTSxDQUFDLE9BQU8sSUFBSSxtQkFBbUIsRUFBRSxDQUFDO1lBQ3hDLE9BQU8sSUFBSSxDQUFDLDBCQUEwQixDQUFDLE1BQWEsRUFBRSxpQkFBaUIsQ0FBQyxDQUFDO1FBQzdFLENBQUM7UUFDRCxJQUFJLE1BQU0sQ0FBQyxPQUFPLElBQUksd0JBQXdCLEVBQUUsQ0FBQztZQUM3QyxPQUFPLElBQUksQ0FBQywrQkFBK0IsQ0FBQyxNQUFhLEVBQUUsaUJBQWlCLENBQUMsQ0FBQztRQUNsRixDQUFDO1FBQ0QsSUFBSSxNQUFNLENBQUMsT0FBTyxJQUFJLHFCQUFxQixFQUFFLENBQUM7WUFDMUMsT0FBTyxJQUFJLENBQUMsNEJBQTRCLENBQUMsTUFBYSxFQUFFLGlCQUFpQixDQUFDLENBQUM7UUFDL0UsQ0FBQztRQUNELElBQUksTUFBTSxDQUFDLE9BQU8sSUFBSSxpQkFBaUIsRUFBRSxDQUFDO1lBQ3RDLE9BQU8sSUFBSSxDQUFDLFNBQVMsQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxFQUFFLGlCQUFpQixDQUFDLENBQUM7UUFDekUsQ0FBQztRQUNELElBQUksTUFBTSxDQUFDLE9BQU8sSUFBSSxTQUFTLEVBQUUsQ0FBQztZQUM5QixPQUFPLE1BQU0sQ0FBQyxPQUFPLENBQUMsSUFBSSxNQUFNLENBQUM7UUFDckMsQ0FBQztRQUVELE1BQU0sSUFBSSxLQUFLLENBQUMsNENBQTRDLENBQUMsQ0FBQztJQUNsRSxDQUFDO0lBRU8sS0FBSyxDQUFDLDBCQUEwQixDQUFDLGlCQUFvQyxFQUFFLGlC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
|
|
@@ -89,11 +89,14 @@ class ContractStateMachine {
|
|
|
89
89
|
console.log(`state = [${lifeCycle.from}]`);
|
|
90
90
|
console.log(`transition = [${lifeCycle.transition}]`);
|
|
91
91
|
if (this.isInitEvent(lifeCycle.transition)) {
|
|
92
|
+
console.log(`>> isInitEvent return`);
|
|
92
93
|
return true;
|
|
93
94
|
}
|
|
94
95
|
if (this.fsmHook != null) {
|
|
96
|
+
console.log(`>> this.fsmHook != null`);
|
|
95
97
|
return this.fsmHook.doOnTransition(lifeCycle).then(b => {
|
|
96
98
|
if (b && this.policyHelper != null) {
|
|
99
|
+
console.log(`>> b && this.policyHelper != null`);
|
|
97
100
|
return this.policyHelper.execEventTail(lifeCycle.transition, this.policyHelper).then(() => {
|
|
98
101
|
return b;
|
|
99
102
|
});
|
|
@@ -103,6 +106,7 @@ class ContractStateMachine {
|
|
|
103
106
|
}
|
|
104
107
|
else {
|
|
105
108
|
if (this.policyHelper != null) {
|
|
109
|
+
console.log(`>> this.policyHelper != null`);
|
|
106
110
|
return this.policyHelper.execEventTail(lifeCycle.transition, this.policyHelper).then(() => {
|
|
107
111
|
return true;
|
|
108
112
|
});
|
|
@@ -155,4 +159,4 @@ class ContractStateMachine {
|
|
|
155
159
|
}
|
|
156
160
|
}
|
|
157
161
|
exports.ContractStateMachine = ContractStateMachine;
|
|
158
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
162
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29udHJhY3RTdGF0ZU1hY2hpbmUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc3RhdGUtbWFjaGluZS9Db250cmFjdFN0YXRlTWFjaGluZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSx5REFBeUQ7QUFJekQsTUFBYSxvQkFBb0I7SUFBakM7UUFJWSx5QkFBb0IsR0FBRyxRQUFRLENBQUM7UUFFeEMsc0JBQWlCLEdBQWEsRUFBRSxDQUFDO0lBbUxyQyxDQUFDO0lBM0tHLEtBQUssQ0FBQyxLQUFLLENBQUMsTUFBK0M7UUFDdkQsT0FBTyxDQUFDLEdBQUcsQ0FBQyxnQ0FBZ0MsQ0FBQyxDQUFDO1FBRTlDLElBQUksQ0FBQyx1QkFBdUIsR0FBRyxNQUFNLElBQUksQ0FBQywrQkFBK0IsQ0FBQyxNQUFNLENBQUMsYUFBYSxDQUFDLENBQUM7UUFDaEcsSUFBSSxtQkFBbUIsR0FBRztZQUN0Qiw2QkFBNkI7WUFDN0IsV0FBVyxFQUFFLElBQUksQ0FBQyx1QkFBdUI7WUFDekMsT0FBTyxFQUFFO2dCQUNMLGtCQUFrQixFQUFFLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDO2dCQUN0RCxZQUFZLEVBQUUsSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDO2dCQUMxQyxZQUFZLEVBQUUsSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDO2dCQUMxQyxZQUFZLEVBQUUsSUFBSSxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDO2dCQUMxQyxpQkFBaUIsRUFBRSxJQUFJLENBQUMsaUJBQWlCLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQztnQkFDcEQsbUJBQW1CLEVBQUUsSUFBSSxDQUFDLG1CQUFtQixDQUFDLElBQUksQ0FBQyxJQUFJLENBQUM7YUFDM0Q7U0FDSixDQUFDO1FBQ0YsWUFBWSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQyxvQkFBb0IsQ0FBQztRQUM1RCxJQUFJLENBQUMsR0FBRyxHQUFHLElBQUksWUFBWSxDQUFDLG1CQUFtQixDQUFDLENBQUM7UUFFakQsTUFBTSxJQUFJLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQywyQkFBMkIsQ0FBQyxNQUFNLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQztJQUNoRixDQUFDO0lBRUQsZUFBZSxDQUFDLFlBQTBCO1FBQ3RDLElBQUksQ0FBQyxZQUFZLEdBQUcsWUFBWSxDQUFDO0lBQ3JDLENBQUM7SUFFRCxVQUFVLENBQUMsT0FBd0I7UUFDL0IsSUFBSSxDQUFDLE9BQU8sR0FBRyxPQUFPLENBQUM7SUFDM0IsQ0FBQztJQUVELEtBQUssQ0FBQywrQkFBK0IsQ0FBQyxhQUFhO1FBQy9DLElBQUksdUJBQXVCLEdBQUcsRUFBRSxDQUFDO1FBQ2pDLEtBQUssSUFBSSxTQUFTLElBQUksYUFBYSxDQUFDLGNBQWMsQ0FBQyxFQUFFLENBQUM7WUFDbEQsSUFBSSxhQUFhLEdBQUcsSUFBSSxDQUFDLDJCQUEyQixDQUFDLFNBQVMsQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDO1lBQzdFLHVCQUF1QixDQUFDLElBQUksQ0FBQztnQkFDekIsSUFBSSxFQUFFLGFBQWE7Z0JBQ25CLElBQUksRUFBRSxJQUFJLENBQUMsb0JBQW9CO2dCQUMvQixFQUFFLEVBQUUsU0FBUyxDQUFDLFdBQVcsQ0FBQzthQUU3QixDQUFDLENBQUM7WUFDSCxJQUFJLENBQUMsaUJBQWlCLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFDO1lBRTNDLEtBQUssSUFBSSxTQUFTLElBQUksU0FBUyxDQUFDLFFBQVEsQ0FBQyxFQUFFLENBQUM7Z0JBQ3hDLHVCQUF1QixDQUFDLElBQUksQ0FBQztvQkFDekIsSUFBSSxFQUFFLFNBQVMsQ0FBQyxTQUFTLENBQUM7b0JBQzFCLElBQUksRUFBRSxTQUFTLENBQUMsV0FBVyxDQUFDO29CQUM1QixFQUFFLEVBQUUsU0FBUyxDQUFDLFNBQVMsQ0FBQztpQkFDM0IsQ0FBQyxDQUFBO1lBQ04sQ0FBQztRQUNMLENBQUM7UUFFRCxPQUFPLHVCQUF1QixDQUFDO0lBQ25DLENBQUM7SUFFRCwwQkFBMEI7UUFDdEIsT0FBTyxJQUFJLENBQUMsdUJBQXVCLENBQUM7SUFDeEMsQ0FBQztJQUVELDJCQUEyQixDQUFDLFNBQWlCO1FBQ3pDLE9BQU8sT0FBTyxTQUFTLENBQUMsT0FBTyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUMsRUFBRSxDQUFDO0lBQ2hELENBQUM7SUFFRCxXQUFXLENBQUMsU0FBaUI7UUFDekIsT0FBTyxJQUFJLENBQUMsaUJBQWlCLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDO0lBQzNELENBQUM7SUFFRCxLQUFLLENBQUMsU0FBUyxDQUFDLFNBQWlCO1FBQzdCLE9BQU8sSUFBSSxDQUFDLEdBQUcsQ0FBQyxTQUFTLENBQUMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQzlDLENBQUM7SUFFRCxRQUFRO0lBQ0Esa0JBQWtCLENBQUMsU0FBUztRQUNoQyxPQUFPLENBQUMsR0FBRyxDQUFDLDZDQUE2QyxDQUFDLENBQUM7UUFDM0QsT0FBTyxDQUFDLEdBQUcsQ0FBQyxZQUFZLFNBQVMsQ0FBQyxJQUFJLEdBQUcsQ0FBQyxDQUFDO1FBQzNDLE9BQU8sQ0FBQyxHQUFHLENBQUMsaUJBQWlCLFNBQVMsQ0FBQyxVQUFVLEdBQUcsQ0FBQyxDQUFDO1FBQ3RELElBQUksSUFBSSxDQUFDLE9BQU8sSUFBSSxJQUFJLEVBQUUsQ0FBQztZQUN2QixPQUFPLElBQUksQ0FBQyxPQUFPLENBQUMsb0JBQW9CLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDeEQsQ0FBQztRQUVELE9BQU8sSUFBSSxDQUFDO0lBQ2hCLENBQUM7SUFFRCxTQUFTO0lBQ0QsWUFBWSxDQUFDLFNBQVM7UUFDMUIsT0FBTyxDQUFDLEdBQUcsQ0FBQyx1Q0FBdUMsQ0FBQyxDQUFDO1FBQ3JELE9BQU8sQ0FBQyxHQUFHLENBQUMsWUFBWSxTQUFTLENBQUMsSUFBSSxHQUFHLENBQUMsQ0FBQztRQUMzQyxPQUFPLENBQUMsR0FBRyxDQUFDLGlCQUFpQixTQUFTLENBQUMsVUFBVSxHQUFHLENBQUMsQ0FBQztRQUN0RCxJQUFJLElBQUksQ0FBQyxPQUFPLElBQUksSUFBSSxFQUFFLENBQUM7WUFDdkIsT0FBTyxJQUFJLENBQUMsT0FBTyxDQUFDLGNBQWMsQ0FBQyxTQUFTLENBQUMsQ0FBQztRQUNsRCxDQUFDO1FBRUQsT0FBTyxJQUFJLENBQUM7SUFDaEIsQ0FBQztJQUVPLFlBQVksQ0FBQyxTQUFTO1FBQzFCLE9BQU8sQ0FBQyxHQUFHLENBQUMsdUNBQXVDLENBQUMsQ0FBQztRQUNyRCxPQUFPLENBQUMsR0FBRyxDQUFDLFlBQVksU0FBUyxDQUFDLElBQUksR0FBRyxDQUFDLENBQUM7UUFDM0MsT0FBTyxDQUFDLEdBQUcsQ0FBQyxpQkFBaUIsU0FBUyxDQUFDLFVBQVUsR0FBRyxDQUFDLENBQUM7UUFDdEQsSUFBSSxJQUFJLENBQUMsV0FBVyxDQUFDLFNBQVMsQ0FBQyxVQUFVLENBQUMsRUFBRSxDQUFDO1lBQ3pDLE9BQU8sQ0FBQyxHQUFHLENBQUMsdUJBQXVCLENBQUMsQ0FBQztZQUNyQyxPQUFPLElBQUksQ0FBQztRQUNoQixDQUFDO1FBQ0QsSUFBSSxJQUFJLENBQUMsT0FBTyxJQUFJLElBQUksRUFBRSxDQUFDO1lBQ3ZCLE9BQU8sQ0FBQyxHQUFHLENBQUMseUJBQXlCLENBQUMsQ0FBQztZQUN2QyxPQUFPLElBQUksQ0FBQyxPQUFPLENBQUMsY0FBYyxDQUFDLFNBQVMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsRUFBRTtnQkFDbkQsSUFBSSxDQUFDLElBQUksSUFBSSxDQUFDLFlBQVksSUFBSSxJQUFJLEVBQUUsQ0FBQztvQkFDakMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxtQ0FBbUMsQ0FBQyxDQUFDO29CQUNqRCxPQUFPLElBQUksQ0FBQyxZQUFZLENBQUMsYUFBYSxDQUFDLFNBQVMsQ0FBQyxVQUFVLEVBQUUsSUFBSSxDQUFDLFlBQVksQ0FBQyxDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUU7d0JBQ3RGLE9BQU8sQ0FBQyxDQUFDO29CQUNiLENBQUMsQ0FBQyxDQUFDO2dCQUNQLENBQUM7Z0JBRUQsT0FBTyxDQUFDLENBQUM7WUFDYixDQUFDLENBQUMsQ0FBQztRQUNQLENBQUM7YUFBTSxDQUFDO1lBQ0osSUFBSSxJQUFJLENBQUMsWUFBWSxJQUFJLElBQUksRUFBRSxDQUFDO2dCQUM1QixPQUFPLENBQUMsR0FBRyxDQUFDLDhCQUE4QixDQUFDLENBQUM7Z0JBQzVDLE9BQU8sSUFBSSxDQUFDLFlBQVksQ0FBQyxhQUFhLENBQUMsU0FBUyxDQUFDLFVBQVUsRUFBRSxJQUFJLENBQUMsWUFBWSxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRTtvQkFDdEYsT0FBTyxJQUFJLENBQUM7Z0JBQ2hCLENBQUMsQ0FBQyxDQUFBO1lBQ04sQ0FBQztRQUNMLENBQUM7UUFFRCxPQUFPLElBQUksQ0FBQztJQUNoQixDQUFDO0lBRUQsU0FBUztJQUNELFlBQVksQ0FBQyxTQUFTO1FBQzFCLE9BQU8sQ0FBQyxHQUFHLENBQUMsdUNBQXVDLENBQUMsQ0FBQztRQUNyRCxPQUFPLENBQUMsR0FBRyxDQUFDLFlBQVksU0FBUyxDQUFDLElBQUksR0FBRyxDQUFDLENBQUM7UUFDM0MsT0FBTyxDQUFDLEdBQUcsQ0FBQyxpQkFBaUIsU0FBUyxDQUFDLFVBQVUsR0FBRyxDQUFDLENBQUM7UUFDdEQsSUFBSSxJQUFJLENBQUMsWUFBWSxJQUFJLElBQUksRUFBRSxDQUFDO1lBQzVCLE9BQU8sSUFBSSxDQUFDLFlBQVksQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDLEVBQUUsRUFBRSxJQUFJLENBQUMsWUFBWSxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRTtnQkFDM0UsSUFBSSxJQUFJLENBQUMsT0FBTyxJQUFJLElBQUksRUFBRSxDQUFDO29CQUN2QixPQUFPLElBQUksQ0FBQyxPQUFPLENBQUMsY0FBYyxDQUFDLFNBQVMsQ0FBQyxDQUFDO2dCQUNsRCxDQUFDO1lBQ0wsQ0FBQyxDQUFDLENBQUM7UUFDUCxDQUFDO2FBQU0sQ0FBQztZQUNKLElBQUksSUFBSSxDQUFDLE9BQU8sSUFBSSxJQUFJLEVBQUUsQ0FBQztnQkFDdkIsT0FBTyxJQUFJLENBQUMsT0FBTyxDQUFDLGNBQWMsQ0FBQyxTQUFTLENBQUMsQ0FBQztZQUNsRCxDQUFDO1FBQ0wsQ0FBQztJQUNMLENBQUM7SUFFRCxRQUFRO0lBQ0EsaUJBQWlCLENBQUMsU0FBUztRQUMvQixPQUFPLENBQUMsR0FBRyxDQUFDLDRDQUE0QyxDQUFDLENBQUM7UUFDMUQsT0FBTyxDQUFDLEdBQUcsQ0FBQyxZQUFZLFNBQVMsQ0FBQyxJQUFJLEdBQUcsQ0FBQyxDQUFDO1FBQzNDLE9BQU8sQ0FBQyxHQUFHLENBQUMsaUJBQWlCLFNBQVMsQ0FBQyxVQUFVLEdBQUcsQ0FBQyxDQUFDO1FBQ3RELElBQUksSUFBSSxDQUFDLE9BQU8sSUFBSSxJQUFJLEVBQUUsQ0FBQztZQUN2QixPQUFPLElBQUksQ0FBQyxPQUFPLENBQUMsbUJBQW1CLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDdkQsQ0FBQztJQUNMLENBQUM7SUFFTyxtQkFBbUIsQ0FBQyxTQUFTO1FBQ2pDLE9BQU8sQ0FBQyxHQUFHLENBQUMsOENBQThDLENBQUMsQ0FBQztRQUM1RCxPQUFPLENBQUMsR0FBRyxDQUFDLFlBQVksU0FBUyxDQUFDLElBQUksR0FBRyxDQUFDLENBQUM7UUFDM0MsT0FBTyxDQUFDLEdBQUcsQ0FBQyxpQkFBaUIsU0FBUyxDQUFDLFVBQVUsR0FBRyxDQUFDLENBQUM7UUFDdEQsSUFBSSxJQUFJLENBQUMsT0FBTyxJQUFJLElBQUksRUFBRSxDQUFDO1lBQ3ZCLE9BQU8sSUFBSSxDQUFDLE9BQU8sQ0FBQyxxQkFBcUIsQ0FBQyxTQUFTLENBQUMsQ0FBQztRQUN6RCxDQUFDO0lBQ0wsQ0FBQztJQUVELEtBQUssQ0FBQyxjQUFjO1FBQ2hCLE9BQU87WUFDSCxLQUFLLEVBQUUsSUFBSSxDQUFDLEdBQUcsQ0FBQyxLQUFLO1lBQ3JCLFdBQVcsRUFBRSxJQUFJLENBQUMsR0FBRyxDQUFDLFdBQVcsRUFBRTtZQUNuQyxpQkFBaUIsRUFBRSxJQUFJLENBQUMsaUJBQWlCO1lBQ3pDLGdCQUFnQixFQUFFLElBQUksQ0FBQyxZQUFZLElBQUksSUFBSSxDQUFDLENBQUMsQ0FBQyxNQUFNLElBQUksQ0FBQyxZQUFZLENBQUMsbUJBQW1CLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSTtTQUNyRyxDQUFBO0lBQ0wsQ0FBQztDQUNKO0FBekxELG9EQXlMQyJ9
|
package/package.json
CHANGED
package/resources/zhaojn2.json
CHANGED
|
@@ -76,95 +76,25 @@
|
|
|
76
76
|
}
|
|
77
77
|
],
|
|
78
78
|
"currentStateInfo": {
|
|
79
|
-
"currentState": "
|
|
80
|
-
"currentServiceState": "
|
|
81
|
-
"serviceStateCollection": [
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
"varValue": []
|
|
85
|
-
},
|
|
79
|
+
"currentState": "Initial",
|
|
80
|
+
"currentServiceState": "None",
|
|
81
|
+
"serviceStateCollection": [],
|
|
82
|
+
"varLocalAtStateList": [],
|
|
83
|
+
"varLocalCurrentStateList": [
|
|
86
84
|
{
|
|
87
|
-
"varName": "
|
|
88
|
-
"varValue":
|
|
85
|
+
"varName": "labels",
|
|
86
|
+
"varValue": -1
|
|
89
87
|
}
|
|
90
88
|
],
|
|
91
|
-
"varLocalAtStateList": [],
|
|
92
|
-
"varLocalCurrentStateList": [],
|
|
93
89
|
"currentEventInfos": [
|
|
94
90
|
{
|
|
95
|
-
"eventCode": "
|
|
96
|
-
"
|
|
97
|
-
"
|
|
98
|
-
"eventId": "b103eb03",
|
|
99
|
-
"varLocalAtEventList": [
|
|
100
|
-
{
|
|
101
|
-
"varName": "amount",
|
|
102
|
-
"varValue": 1
|
|
103
|
-
},
|
|
104
|
-
{
|
|
105
|
-
"varName": "elemsNum",
|
|
106
|
-
"varValue": 1
|
|
107
|
-
}
|
|
108
|
-
]
|
|
109
|
-
},
|
|
110
|
-
{
|
|
111
|
-
"eventCode": "T101",
|
|
112
|
-
"eventPath": "Transaction",
|
|
113
|
-
"eventName": "Pay",
|
|
114
|
-
"eventId": "1f954422",
|
|
115
|
-
"varLocalAtEventList": [
|
|
116
|
-
{
|
|
117
|
-
"varName": "amount",
|
|
118
|
-
"varValue": 8
|
|
119
|
-
},
|
|
120
|
-
{
|
|
121
|
-
"varName": "elemsNum",
|
|
122
|
-
"varValue": 10
|
|
123
|
-
}
|
|
124
|
-
]
|
|
125
|
-
},
|
|
126
|
-
{
|
|
127
|
-
"eventCode": "C103",
|
|
128
|
-
"eventPath": "Custom",
|
|
129
|
-
"eventName": "AcceptEvent",
|
|
130
|
-
"eventId": "a237f57a",
|
|
91
|
+
"eventCode": "V101",
|
|
92
|
+
"eventName": "Void",
|
|
93
|
+
"eventId": "b3449b02",
|
|
131
94
|
"varLocalAtEventList": [
|
|
132
95
|
{
|
|
133
96
|
"varName": "condition",
|
|
134
|
-
"varValue":
|
|
135
|
-
"title": "MembershipChange",
|
|
136
|
-
"subject": {
|
|
137
|
-
"expType": "entity",
|
|
138
|
-
"entityType": "Echo",
|
|
139
|
-
"entityName": "连载小说的会员",
|
|
140
|
-
"variableChainList": []
|
|
141
|
-
},
|
|
142
|
-
"label": "vip1"
|
|
143
|
-
}
|
|
144
|
-
}
|
|
145
|
-
]
|
|
146
|
-
},
|
|
147
|
-
{
|
|
148
|
-
"eventCode": "C101",
|
|
149
|
-
"eventPath": "Custom",
|
|
150
|
-
"eventName": "WatchAD",
|
|
151
|
-
"eventId": "ab73e554",
|
|
152
|
-
"varLocalAtEventList": [
|
|
153
|
-
{
|
|
154
|
-
"varName": "elemsNum",
|
|
155
|
-
"varValue": 1
|
|
156
|
-
}
|
|
157
|
-
]
|
|
158
|
-
},
|
|
159
|
-
{
|
|
160
|
-
"eventCode": "T202",
|
|
161
|
-
"eventPath": "Time",
|
|
162
|
-
"eventName": "Schedule",
|
|
163
|
-
"eventId": "490d5f83",
|
|
164
|
-
"varLocalAtEventList": [
|
|
165
|
-
{
|
|
166
|
-
"varName": "dateTime",
|
|
167
|
-
"varValue": "2026-03-06 00:00:00"
|
|
97
|
+
"varValue": false
|
|
168
98
|
}
|
|
169
99
|
]
|
|
170
100
|
}
|
|
@@ -14,7 +14,7 @@ export class ExpBooleanCalculator implements Calculator, ExpHelperAware {
|
|
|
14
14
|
async getExpValue(varObj: AssignmentClauseInfo, varContextCapable: VarContextCapable<any>): Promise<boolean> {
|
|
15
15
|
if (varObj.expType == "expBooleanOpLogic") {
|
|
16
16
|
return this.calculateExpBooleanOpLogic(varObj as any, varContextCapable);
|
|
17
|
-
}
|
|
17
|
+
}
|
|
18
18
|
if (varObj.expType == "expBooleanOpCollection") {
|
|
19
19
|
return this.calculateExpBooleanOpCollection(varObj as any, varContextCapable);
|
|
20
20
|
}
|
|
@@ -32,11 +32,11 @@ export class ExpBooleanCalculator implements Calculator, ExpHelperAware {
|
|
|
32
32
|
}
|
|
33
33
|
|
|
34
34
|
private async calculateExpBooleanOpLogic(expBooleanOpLogic: ExpBooleanOpLogic, varContextCapable: VarContextCapable<any>): Promise<boolean> {
|
|
35
|
-
let var1 = this.expHelper.getExpValue(expBooleanOpLogic.var1, varContextCapable);
|
|
35
|
+
let var1 = await this.expHelper.getExpValue(expBooleanOpLogic.var1, varContextCapable);
|
|
36
36
|
if (expBooleanOpLogic.op == "not") {
|
|
37
37
|
return !var1;
|
|
38
38
|
} else {
|
|
39
|
-
let var2 = this.expHelper.getExpValue(expBooleanOpLogic.var2, varContextCapable);
|
|
39
|
+
let var2 = await this.expHelper.getExpValue(expBooleanOpLogic.var2, varContextCapable);
|
|
40
40
|
if (expBooleanOpLogic.op == "and") {
|
|
41
41
|
return var1 && var2;
|
|
42
42
|
}
|
|
@@ -58,9 +58,9 @@ export class ExpBooleanCalculator implements Calculator, ExpHelperAware {
|
|
|
58
58
|
return false;
|
|
59
59
|
}
|
|
60
60
|
|
|
61
|
-
private calculateExpBooleanOpCompare(expBooleanOpCompare: ExpBooleanOpCompare, varContextCapable: VarContextCapable<any>): boolean {
|
|
62
|
-
let var1 = this.expHelper.getExpValue(expBooleanOpCompare.var1, varContextCapable);
|
|
63
|
-
let var2 = this.expHelper.getExpValue(expBooleanOpCompare.var2, varContextCapable);
|
|
61
|
+
private async calculateExpBooleanOpCompare(expBooleanOpCompare: ExpBooleanOpCompare, varContextCapable: VarContextCapable<any>): Promise<boolean> {
|
|
62
|
+
let var1 = await this.expHelper.getExpValue(expBooleanOpCompare.var1, varContextCapable);
|
|
63
|
+
let var2 = await this.expHelper.getExpValue(expBooleanOpCompare.var2, varContextCapable);
|
|
64
64
|
if (expBooleanOpCompare.op == "less" || expBooleanOpCompare.op == "<") {
|
|
65
65
|
return var1 < var2;
|
|
66
66
|
}
|
|
@@ -115,11 +115,14 @@ export class ContractStateMachine {
|
|
|
115
115
|
console.log(`state = [${lifeCycle.from}]`);
|
|
116
116
|
console.log(`transition = [${lifeCycle.transition}]`);
|
|
117
117
|
if (this.isInitEvent(lifeCycle.transition)) {
|
|
118
|
+
console.log(`>> isInitEvent return`);
|
|
118
119
|
return true;
|
|
119
120
|
}
|
|
120
121
|
if (this.fsmHook != null) {
|
|
122
|
+
console.log(`>> this.fsmHook != null`);
|
|
121
123
|
return this.fsmHook.doOnTransition(lifeCycle).then(b => {
|
|
122
124
|
if (b && this.policyHelper != null) {
|
|
125
|
+
console.log(`>> b && this.policyHelper != null`);
|
|
123
126
|
return this.policyHelper.execEventTail(lifeCycle.transition, this.policyHelper).then(() => {
|
|
124
127
|
return b;
|
|
125
128
|
});
|
|
@@ -129,6 +132,7 @@ export class ContractStateMachine {
|
|
|
129
132
|
});
|
|
130
133
|
} else {
|
|
131
134
|
if (this.policyHelper != null) {
|
|
135
|
+
console.log(`>> this.policyHelper != null`);
|
|
132
136
|
return this.policyHelper.execEventTail(lifeCycle.transition, this.policyHelper).then(() => {
|
|
133
137
|
return true;
|
|
134
138
|
})
|
|
@@ -23,7 +23,7 @@ describe("test/state-machine/ContractStateMachineTest.test.ts", () => {
|
|
|
23
23
|
csm.setPolicyHelper(policyHelper);
|
|
24
24
|
csm.setFsmHook(cfh);
|
|
25
25
|
await csm.build({compileResult: source, currentState: "Initial"});
|
|
26
|
-
await csm.execEvent("b3449b02");
|
|
26
|
+
// await csm.execEvent("b3449b02");
|
|
27
27
|
|
|
28
28
|
fs.writeFile("./resources/zhaojn2.json", JSON.stringify(await policyHelper.getPolicyInfoResult(), null, 4), (err) => {
|
|
29
29
|
if (err) throw err;
|