@freelog/freelog-cg-collection 1.0.9 → 1.0.11

package/CollectionPolicyCustomVisitor.js

@@ -2,12 +2,14 @@ const {CollectionPolicyVisitor} = require("./gen/CollectionPolicyVisitor");
 const {ExpHelper} = require("./dist/helper/ExpHelper");
 const {FunctionHelper} = require("./dist/helper/FunctionHelper");
 const system_keywords = require("./resources/context_config/system_keywords.json");
-const function_configs = require("./resources/context_config/function_configs.json");
+const context_variables = require("./resources/context_config/context_variables.json");
+const service_state_configs = require("./resources/context_config/service_state_configs.json");
 const event_configs = require("./resources/context_config/event_configs.json");
 
 class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
-    constructor() {
+    constructor(serviceName) {
         super();
+        this.serviceName = serviceName;
         // 签约条件
         this.audienceSection = {};
         // 全局定义（变量）声明
@@ -19,10 +21,25 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
         this.currentState = null;
         this.currentStateObj = null;
         this.currentEventElem = null;
+        this.parseState = {inContextArgsSectionAtEvent: 0, inActionSection: 0};
 
         this.expHelper = new ExpHelper();
         this.functionHelper = new FunctionHelper();
         this.functionHelper.setExpHelper(this.expHelper);
+        this.expHelper.setFunctionHelper(this.functionHelper);
+    }
+
+    generateVarValueTypeList(varValueList) {
+        let varValueListTmp = [...varValueList].reverse();
+        return varValueListTmp.map(vv => {
+            return {
+                varName: vv["varName"], varValueType: vv["varValueType"]
+            };
+        });
+    }
+
+    getVarDeclarationValueTypeList() {
+        return this.generateVarValueTypeList(this.varDeclarationList);
     }
 
     visitAudience_clause(ctx) {
@@ -36,9 +53,11 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
             let conditions = this.visitExpression_param_list(ctx.expression_param_list());
             for (let condition of conditions) {
                 if (condition["paramName"] == null) {
-                    throw new Error(`参数名不可为空 ${condition}`);
+                    throw new Error(`参数名不可为空 ${condition["content"]}`);
+                }
+                if (["echoSubject", "labels", "exps"].indexOf(condition["paramName"]) === -1) {
+                    throw new Error(`无效的参数名 ${condition["content"]}`);
                 }
-                console.log(condition);
             }
             this.audienceSection["conditions"] = conditions;
         } else {
@@ -65,6 +84,9 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
         } else {
             this.varDeclarationMap.set(varElem.varName, varElem);
         }
+        varElem["varValueType"] = this.expHelper.guessBaseTypeByExpType(varElem["varValueObj"], this.getVarDeclarationValueTypeList());
+        console.debug(`>> ${ctx.getText()} --> ${varElem["varValueType"]}`);
+
         this.varDeclarationList.push(varElem);
 
         return varElem;
@@ -87,6 +109,9 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
         } else {
             this.varDeclarationMap.set(varElem.varName, varElem);
         }
+        varElem["varValueType"] = this.expHelper.guessBaseTypeByExpType(varElem["varValueObj"], this.getVarDeclarationValueTypeList());
+        console.debug(`>> ${ctx.getText()} --> ${varElem["varValueType"]}`);
+
         this.varDeclarationList.push(varElem);
 
         return varElem;
@@ -125,9 +150,35 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
     visitState_definition(ctx) {
         this.currentState = ctx.state_name().getText();
         this.currentStateObj = {stateName: this.currentState, assignments: [], events: []};
+        if (ctx.service_state_section() != null) {
+            this.currentStateObj["serviceStateSection"] = this.visitService_state_section(ctx.service_state_section());
+        }
+        if (ctx.state_context_args_section() != null) {
+            this.currentStateObj["stateContextArgs"] = ctx.state_context_args_section().ID().map(i => i.getText());
+        } else {
+            this.currentStateObj["stateContextArgs"] = [];
+        }
         this.stateMachine.push(this.currentStateObj);
 
-        return super.visitState_definition(ctx);
+        let result = super.visitState_definition(ctx);
+        this.currentState = null;
+        this.currentStateObj = null;
+        return result;
+    }
+
+    visitService_state_section(ctx) {
+        let serviceStateSection = {};
+        if (ctx.service_state() != null) {
+            serviceStateSection["serviceState"] = ctx.service_state().getText();
+            if (service_state_configs[this.serviceName].indexOf(serviceStateSection["serviceState"]) === -1) {
+                throw new Error(`该颜色态颜色不被允许 --- ${serviceStateSection["serviceState"]}`);
+            }
+        }
+        if (ctx.service_state_collection() != null) {
+            serviceStateSection["serviceStateCollection"] = ctx.service_state_collection().ID().map(i => i.getText());
+        }
+
+        return serviceStateSection;
     }
 
     visitFsmVarAssignment(ctx) {
@@ -136,7 +187,7 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
             content: ctx.getText(),
             varName: ctx.variable_assignment().ID().getText(),
             varValue: ctx.variable_assignment().assignment_clause().getText(),
-            varValueObj: super.visitAssignment_clause(ctx.variable_assignment().assignment_clause())
+            varValueObj: this.visitAssignment_clause(ctx.variable_assignment().assignment_clause())
         };
 
         if (this.varDeclarationMap.has(assignmentElem.varName)) {
@@ -147,6 +198,17 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
         }) == null) {
             throw new Error(`该局部变量未声明 --- ${assignmentElem.varName}`);
         }
+        let varValueTypeList = [...this.varDeclarationList, ...this.currentStateObj["assignments"]];
+        assignmentElem["varValueType"] = this.expHelper.guessBaseTypeByExpType(assignmentElem["varValueObj"], this.generateVarValueTypeList(varValueTypeList));
+        console.debug(`| ${this.currentState} | ${ctx.getText()} --> ${assignmentElem["varValueType"]}`);
+        let varValueTypeListTmp = [...varValueTypeList].reverse();
+        let varValueTypeObj = varValueTypeListTmp.find(elem => {
+            return elem.varName === assignmentElem.varName;
+        });
+        if (assignmentElem["varValueType"] !== varValueTypeObj.varValueType) {
+            throw new Error(`类型验证不通过 >| ${ctx.getText()}`);
+        }
+
         this.currentStateObj["assignments"].push(assignmentElem);
 
         return assignmentElem;
@@ -158,7 +220,7 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
             content: ctx.getText(),
             varName: ctx.local_variable_name().getText(),
             varValue: ctx.assignment_clause().getText(),
-            varValueObj: super.visitAssignment_clause(ctx.assignment_clause())
+            varValueObj: this.visitAssignment_clause(ctx.assignment_clause())
         };
 
         if (this.varDeclarationMap.has(assignmentElem.varName)) {
@@ -169,14 +231,20 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
         }) != null) {
             throw new Error(`该局部变量已声明 --- ${assignmentElem.varName}`);
         }
+        let varValueTypeList = [...this.varDeclarationList, ...this.currentStateObj["assignments"]];
+        assignmentElem["varValueType"] = this.expHelper.guessBaseTypeByExpType(assignmentElem["varValueObj"], this.generateVarValueTypeList(varValueTypeList));
+
+        console.debug(`| ${this.currentState} | ${ctx.getText()} --> ${assignmentElem["varValueType"]}`);
+
         this.currentStateObj["assignments"].push(assignmentElem);
 
         return assignmentElem;
     }
 
     visitEventNormal(ctx) {
-        let builtInFunctionResult = this.visitBuilt_in_function(ctx.event().built_in_function());
+        console.debug(`>> ${ctx.event().getText()}`);
 
+        let builtInFunctionResult = this.visitBuilt_in_function(ctx.event().built_in_function());
         this.currentEventElem = {
             type: "normal",
             content: ctx.getText(),
@@ -188,10 +256,6 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
         if (ctx.event().event_path() != null) {
             this.currentEventElem["eventPath"] = ctx.event().event_path().getText();
         }
-        if (ctx.action_section() != null) {
-            this.visitAction_section(ctx.action_section());
-        }
-
         let event_config = event_configs.find(ec => {
             let suitable = true;
             if (this.currentEventElem["eventPath"] != null) {
@@ -204,45 +268,86 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
             }
             return suitable;
         });
+        let event_configParamList = [];
         if (event_config != null) {
             try {
-                if (!this.functionHelper.argsMatch(this.currentEventElem["eventParamList"], event_config["paramList"])) {
+                if (!this.functionHelper.argsMatch(this.currentEventElem["eventParamList"], event_config["paramList"], this.getVarDeclarationValueTypeList())) {
                     throw new Error(`参数列表错误 ----- ${ctx.event().getText()}`);
                 }
             } catch (e) {
                 console.debug(`参数验证错误 ----- ${ctx.event().getText()}`);
                 throw e;
             }
+            event_configParamList = event_config["paramList"];
+        }
+
+        if (ctx.state_context_args_section_at_event() != null) {
+            this.currentEventElem["stateContextArgs"] = ctx.state_context_args_section_at_event().variable_assignment().map(elem => {
+                this.parseState.inContextArgsSectionAtEvent = 1;
+                let paramElem = {
+                    paramName: elem.ID().getText(),
+                    paramValue: elem.assignment_clause().getText(),
+                    paramValueObj: this.visitAssignment_clause(elem.assignment_clause()),
+                    content: elem.getText()
+                };
+                this.parseState.inContextArgsSectionAtEvent = 0;
+
+                if (paramElem["paramValueObj"]["expType"] === "variableChain"
+                    && context_variables.indexOf(paramElem["paramValue"]) === -1
+                    && !this.varDeclarationMap.has(paramElem["paramValue"])
+                    && this.currentStateObj["stateContextArgs"].find(sca => `contextArgs.${sca}` === paramElem["paramValue"]) == null
+                    && this.currentStateObj["assignments"].find(assignment => assignment.varName === paramElem["paramValue"]) == null
+                    && event_configParamList.find(event_configParam => {
+                            if (event_configParam["type"] === "argsGroup") {
+                                return paramElem["paramValue"].match(`^\\$event\\.${event_configParam["name"]}(\\.[0-9A-Za-z_]+)*$`) != null
+                            } else {
+                                return paramElem["paramValue"].match(`^\\$event\\.${event_configParam["name"]}$`) != null;
+                            }
+                        }
+                    ) == null) {
+                    throw new Error(`该环境参数未声明 --- ${paramElem["content"]}`);
+                }
+
+                return paramElem;
+            });
+        }
+
+        if (ctx.action_section() != null) {
+            this.visitAction_section(ctx.action_section());
         }
 
         this.currentStateObj["events"].push(this.currentEventElem);
 
-        return this.currentEventElem;
+        let result = this.currentEventElem;
+        this.currentEventElem = null;
+        return result;
     }
 
     visitEventTerminate(ctx) {
         this.currentEventElem = {
-            type: "terminate",
-            content: ctx.getText(),
-            eventName: ctx.TERMINATE().getText()
+            type: "terminate", content: ctx.getText(), eventName: ctx.TERMINATE().getText()
         };
 
         this.currentStateObj["events"].push(this.currentEventElem);
 
-        return this.currentEventElem;
+        let result = this.currentEventElem;
+        this.currentEventElem = null;
+        return result;
     }
 
     visitAction_section(ctx) {
+        this.parseState.inActionSection = 1;
+
         this.currentEventElem["actions"] = [];
 
-        return super.visitAction_section(ctx);
+        let result = super.visitAction_section(ctx);
+        this.parseState.inActionSection = 0;
+        return result;
     }
 
     visitFsmActionFunctionCall(ctx) {
         let actionElem = {
-            type: "functionCall",
-            content: ctx.getText(),
-            actionObj: this.visitFunction_call(ctx.function_call())
+            type: "functionCall", content: ctx.getText(), actionObj: this.visitFunction_call(ctx.function_call())
         };
 
         this.currentEventElem["actions"].push(actionElem);
@@ -252,15 +357,34 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
 
     visitFsmActionVarAssignment(ctx) {
         let actionElem = {
-            type: "varAssignment",
-            content: "ctx.getText()",
-            actionObj: {
-                varName: ctx.variable_assignment().ID().getText(),
-                varValue: ctx.variable_assignment().assignment_clause().getText(),
-                varValueObj: this.visitAssignment_clause(ctx.variable_assignment().assignment_clause())
-            }
+            type: "varAssignment", content: ctx.getText(),
+        };
+        let actionObj = {
+            varName: ctx.variable_assignment().ID().getText(),
+            varValue: ctx.variable_assignment().assignment_clause().getText(),
+            varValueObj: this.visitAssignment_clause(ctx.variable_assignment().assignment_clause())
         };
 
+        if (this.varDeclarationMap.has(actionObj.varName)) {
+            throw new Error(`全局变量不可以被再次赋值 --- ${actionObj.varName}`);
+        }
+        if (this.currentStateObj["assignments"].find(elem => {
+            return elem.varName === actionObj.varName;
+        }) == null) {
+            throw new Error(`该局部变量未声明 --- ${actionObj.varName}`);
+        }
+        let varValueTypeList = [...this.varDeclarationList, ...this.currentStateObj["assignments"]];
+        actionObj["varValueType"] = this.expHelper.guessBaseTypeByExpType(actionObj["varValueObj"], this.generateVarValueTypeList(varValueTypeList));
+        console.debug(`actions -- ${ctx.getText()} --> ${actionObj["varValueType"]}`);
+        let varValueTypeListTmp = [...varValueTypeList].reverse();
+        let varValueTypeObj = varValueTypeListTmp.find(elem => {
+            return elem.varName === actionObj.varName;
+        });
+        if (actionObj["varValueType"] !== varValueTypeObj.varValueType) {
+            throw new Error(`类型验证不通过 >| ${ctx.getText()}`);
+        }
+
+        actionElem["actionObj"] = actionObj;
         this.currentEventElem["actions"].push(actionElem);
 
         return actionElem;
@@ -342,9 +466,7 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
             return this.visitAtom(ctx.atom());
         } else if (ctx.signedSymbol != null) {
             return {
-                expType: "expSigned",
-                var1: this.visitSigned_atom(ctx.signed_atom()),
-                symbol: ctx.signedSymbol.text
+                expType: "expSigned", var1: this.visitSigned_atom(ctx.signed_atom()), symbol: ctx.signedSymbol.text
             };
         } else {
             return super.visitSigned_atom(ctx);
@@ -376,8 +498,7 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
 
         if (ctx.LPAREN() != null) {
             return {
-                expType: "expBooleanParen",
-                var1: this.visitBoolean_expression(ctx.boolean_expression(0))
+                expType: "expBooleanParen", var1: this.visitBoolean_expression(ctx.boolean_expression(0))
             };
         }
 
@@ -523,8 +644,7 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
 
     visitArgs_group_expression(ctx) {
         return {
-            expType: "expArgsGroup",
-            paramList: this.visitArgs_group_param_list(ctx.args_group_param_list())
+            expType: "expArgsGroup", paramList: this.visitArgs_group_param_list(ctx.args_group_param_list())
         };
     }
 
@@ -578,7 +698,8 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
         ctx.expression_param().forEach(expParam => {
             let paramElem = {
                 paramValue: expParam.assignment_clause().getText(),
-                paramValueObj: this.visitAssignment_clause(expParam.assignment_clause())
+                paramValueObj: this.visitAssignment_clause(expParam.assignment_clause()),
+                content: expParam.getText()
             };
             if (expParam.expression_param_name() != null) {
                 paramElem["paramName"] = expParam.expression_param_name().getText();
@@ -590,27 +711,18 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
     }
 
     visitFunction_call(ctx) {
+        console.debug(`>> ${ctx.getText()}`);
+
         let result = this.visitBuilt_in_function(ctx.built_in_function());
         result["expType"] = "functionCall";
         if (ctx.variable_chain() != null) {
             result["varChain"] = ctx.variable_chain().getText();
         }
 
-        let function_config = function_configs.find(fc => {
-            let suitable = true;
-            if (result["varChain"] != null) {
-                if (result["varChain"] !== fc["varChain"]) {
-                    suitable = false;
-                }
-            }
-            if (result["funcName"] !== fc["funcName"]) {
-                suitable = false;
-            }
-            return suitable;
-        });
+        let function_config = this.functionHelper.findFunctionConfig(result["varChain"], result["funcName"]);
         if (function_config != null) {
             try {
-                if (!this.functionHelper.argsMatch(result["paramList"], function_config["paramList"])) {
+                if (!this.functionHelper.argsMatch(result["paramList"], function_config["paramList"], this.getVarDeclarationValueTypeList())) {
                     throw new Error(`参数列表错误 ----- ${ctx.getText()}`);
                 }
             } catch (e) {
@@ -655,6 +767,9 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
         let content = ctx.getText();
 
         if (ctx.variable().environment_event() != null) {
+            if (this.parseState.inContextArgsSectionAtEvent === 0 && this.parseState.inActionSection === 0) {
+                throw new Error(`该变量不能出现在除事件动作区以外的任何位置 -- ${ctx.getText()}`);
+            }
             varType = "event";
         } else if (content === "policy" || content === "contract") {
             varType = "context";

package/dist/helper/ExpHelper.d.ts

@@ -4,9 +4,13 @@ import { Calculator } from "../interface/Calculator";
 import { AssignmentClauseInfo } from "../model/AssignmentClauseInfo";
 import { FunctionHelperAware } from "../interface/FunctionHelperAware";
 export declare class ExpHelper implements Calculator, FunctionHelperAware {
+    private functionHelper;
     private calculatorFactory;
     constructor();
     getExpValue(varObj: AssignmentClauseInfo, varContextCapable: VarContextCapable<any>): any;
     setFunctionHelper(functionHelper: FunctionHelper): void;
-    guessBaseTypeByExpType(exp: AssignmentClauseInfo): string;
+    guessBaseTypeByExpType(exp: AssignmentClauseInfo, varValueTypeList: {
+        varName: string;
+        varValueType: string;
+    }[]): string;
 }

package/dist/helper/ExpHelper.js

@@ -17,12 +17,13 @@ class ExpHelper {
         throw new Error("getExpValue fail [ExpHelper]...");
     }
     setFunctionHelper(functionHelper) {
+        this.functionHelper = functionHelper;
         this.calculatorFactory.setFunctionHelper(functionHelper);
     }
     /*
      * 类型推断
      */
-    guessBaseTypeByExpType(exp) {
+    guessBaseTypeByExpType(exp, varValueTypeList) {
         switch (exp.expType) {
             case "entity":
                 return "entity";
@@ -30,17 +31,38 @@ class ExpHelper {
                 return "number";
             case "expParen":
                 let expParen = exp;
-                return this.guessBaseTypeByExpType(expParen.var1);
+                return this.guessBaseTypeByExpType(expParen.var1, varValueTypeList);
             case "expSigned":
                 return "number";
             case "functionCall":
-                return "any";
+                let functionCallInfo = exp;
+                let function_config = this.functionHelper.findFunctionConfig(functionCallInfo.varChain, functionCallInfo.funcName);
+                if (function_config != null) {
+                    return function_config["returnType"];
+                }
+                else {
+                    return "any";
+                }
             case "number":
                 return "number";
             case "string":
                 return "string";
             case "variableChain":
-                return "any";
+                if (varValueTypeList != null) {
+                    let variableChainInfo = exp;
+                    let vvtTemp = varValueTypeList.find(vvt => {
+                        return variableChainInfo.content == vvt["varName"];
+                    });
+                    if (vvtTemp != null) {
+                        return vvtTemp["varValueType"];
+                    }
+                    else {
+                        return "any";
+                    }
+                }
+                else {
+                    return "any";
+                }
             case "expArgsGroup":
                 return "argsGroup";
             case "boolean":
@@ -62,4 +84,4 @@ class ExpHelper {
     }
 }
 exports.ExpHelper = ExpHelper;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRXhwSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2hlbHBlci9FeHBIZWxwZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBS0EscUZBQWdGO0FBSWhGLE1BQWEsU0FBUztJQUlsQjtRQUNJLElBQUksY0FBYyxHQUFHLElBQUksbURBQXdCLEVBQUUsQ0FBQztRQUNwRCxjQUFjLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ2xDLElBQUksQ0FBQyxpQkFBaUIsR0FBRyxjQUFjLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDcEQsQ0FBQztJQUVELFdBQVcsQ0FBQyxNQUE0QixFQUFFLGlCQUF5QztRQUMvRSxPQUFPLENBQUMsS0FBSyxDQUFDLDBCQUEwQixJQUFJLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUVsRSxJQUFJLFVBQVUsR0FBRyxJQUFJLENBQUMsaUJBQWlCLENBQUMsc0JBQXNCLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQy9FLElBQUksVUFBVSxJQUFJLElBQUksRUFBRSxDQUFDO1lBQ3JCLE9BQU8sVUFBVSxDQUFDLFdBQVcsQ0FBQyxNQUFNLEVBQUUsaUJBQWlCLENBQUMsQ0FBQztRQUM3RCxDQUFDO1FBRUQsTUFBTSxJQUFJLEtBQUssQ0FBQyxpQ0FBaUMsQ0FBQyxDQUFDO0lBQ3ZELENBQUM7SUFFRCxpQkFBaUIsQ0FBQyxjQUE4QjtRQUM1QyxJQUFJLENBQUMsaUJBQWlCLENBQUMsaUJBQWlCLENBQUMsY0FBYyxDQUFDLENBQUM7SUFDN0QsQ0FBQztJQUVEOztPQUVHO0lBQ0gsc0JBQXNCLENBQUMsR0FBeUI7UUFDNUMsUUFBUSxHQUFHLENBQUMsT0FBTyxFQUFFLENBQUM7WUFDbEIsS0FBSyxRQUFRO2dCQUNULE9BQU8sUUFBUSxDQUFDO1lBQ3BCLEtBQUssT0FBTztnQkFDUixPQUFPLFFBQVEsQ0FBQztZQUNwQixLQUFLLFVBQVU7Z0JBQ1gsSUFBSSxRQUFRLEdBQWEsR0FBZSxDQUFDO2dCQUN6QyxPQUFPLElBQUksQ0FBQyxzQkFBc0IsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDdEQsS0FBSyxXQUFXO2dCQUNaLE9BQU8sUUFBUSxDQUFDO1lBQ3BCLEtBQUssY0FBYztnQkFDZixPQUFPLEtBQUssQ0FBQztZQUNqQixLQUFLLFFBQVE7Z0JBQ1QsT0FBTyxRQUFRLENBQUM7WUFDcEIsS0FBSyxRQUFRO2dCQUNULE9BQU8sUUFBUSxDQUFDO1lBQ3BCLEtBQUssZUFBZTtnQkFDaEIsT0FBTyxLQUFLLENBQUM7WUFFakIsS0FBSyxjQUFjO2dCQUNmLE9BQU8sV0FBVyxDQUFDO1lBRXZCLEtBQUksU0FBUztnQkFDVCxPQUFPLFNBQVMsQ0FBQztZQUNyQixLQUFLLHdCQUF3QjtnQkFDekIsT0FBTyxTQUFTLENBQUM7WUFDckIsS0FBSyxxQkFBcUI7Z0JBQ3RCLE9BQU8sU0FBUyxDQUFDO1lBQ3JCLEtBQUssbUJBQW1CO2dCQUNwQixPQUFPLFNBQVMsQ0FBQztZQUNyQixLQUFLLGlCQUFpQjtnQkFDbEIsT0FBTyxTQUFTLENBQUM7WUFFckIsS0FBSyxlQUFlO2dCQUNoQixPQUFPLE9BQU8sQ0FBQztZQUVuQixLQUFLLGNBQWM7Z0JBQ2YsT0FBTyxPQUFPLENBQUM7UUFDdkIsQ0FBQztRQUVELE9BQU8sS0FBSyxDQUFDO0lBQ2pCLENBQUM7Q0FDSjtBQXZFRCw4QkF1RUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRXhwSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2hlbHBlci9FeHBIZWxwZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBS0EscUZBQWdGO0FBTWhGLE1BQWEsU0FBUztJQU1sQjtRQUNJLElBQUksY0FBYyxHQUFHLElBQUksbURBQXdCLEVBQUUsQ0FBQztRQUNwRCxjQUFjLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ2xDLElBQUksQ0FBQyxpQkFBaUIsR0FBRyxjQUFjLENBQUMsS0FBSyxFQUFFLENBQUM7SUFDcEQsQ0FBQztJQUVELFdBQVcsQ0FBQyxNQUE0QixFQUFFLGlCQUF5QztRQUMvRSxPQUFPLENBQUMsS0FBSyxDQUFDLDBCQUEwQixJQUFJLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUVsRSxJQUFJLFVBQVUsR0FBRyxJQUFJLENBQUMsaUJBQWlCLENBQUMsc0JBQXNCLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQy9FLElBQUksVUFBVSxJQUFJLElBQUksRUFBRSxDQUFDO1lBQ3JCLE9BQU8sVUFBVSxDQUFDLFdBQVcsQ0FBQyxNQUFNLEVBQUUsaUJBQWlCLENBQUMsQ0FBQztRQUM3RCxDQUFDO1FBRUQsTUFBTSxJQUFJLEtBQUssQ0FBQyxpQ0FBaUMsQ0FBQyxDQUFDO0lBQ3ZELENBQUM7SUFFRCxpQkFBaUIsQ0FBQyxjQUE4QjtRQUM1QyxJQUFJLENBQUMsY0FBYyxHQUFHLGNBQWMsQ0FBQztRQUNyQyxJQUFJLENBQUMsaUJBQWlCLENBQUMsaUJBQWlCLENBQUMsY0FBYyxDQUFDLENBQUM7SUFDN0QsQ0FBQztJQUVEOztPQUVHO0lBQ0gsc0JBQXNCLENBQUMsR0FBeUIsRUFDekIsZ0JBQTZEO1FBQ2hGLFFBQVEsR0FBRyxDQUFDLE9BQU8sRUFBRSxDQUFDO1lBQ2xCLEtBQUssUUFBUTtnQkFDVCxPQUFPLFFBQVEsQ0FBQztZQUNwQixLQUFLLE9BQU87Z0JBQ1IsT0FBTyxRQUFRLENBQUM7WUFDcEIsS0FBSyxVQUFVO2dCQUNYLElBQUksUUFBUSxHQUFhLEdBQWUsQ0FBQztnQkFDekMsT0FBTyxJQUFJLENBQUMsc0JBQXNCLENBQUMsUUFBUSxDQUFDLElBQUksRUFBRSxnQkFBZ0IsQ0FBQyxDQUFDO1lBQ3hFLEtBQUssV0FBVztnQkFDWixPQUFPLFFBQVEsQ0FBQztZQUNwQixLQUFLLGNBQWM7Z0JBQ2YsSUFBSSxnQkFBZ0IsR0FBcUIsR0FBdUIsQ0FBQztnQkFDakUsSUFBSSxlQUFlLEdBQUcsSUFBSSxDQUFDLGNBQWMsQ0FBQyxrQkFBa0IsQ0FBQyxnQkFBZ0IsQ0FBQyxRQUFRLEVBQUUsZ0JBQWdCLENBQUMsUUFBUSxDQUFDLENBQUM7Z0JBQ25ILElBQUksZUFBZSxJQUFJLElBQUksRUFBRSxDQUFDO29CQUMxQixPQUFPLGVBQWUsQ0FBQyxZQUFZLENBQUMsQ0FBQztnQkFDekMsQ0FBQztxQkFBTSxDQUFDO29CQUNKLE9BQU8sS0FBSyxDQUFDO2dCQUNqQixDQUFDO1lBQ0wsS0FBSyxRQUFRO2dCQUNULE9BQU8sUUFBUSxDQUFDO1lBQ3BCLEtBQUssUUFBUTtnQkFDVCxPQUFPLFFBQVEsQ0FBQztZQUNwQixLQUFLLGVBQWU7Z0JBQ2hCLElBQUksZ0JBQWdCLElBQUksSUFBSSxFQUFFLENBQUM7b0JBQzNCLElBQUksaUJBQWlCLEdBQXNCLEdBQXdCLENBQUM7b0JBQ3BFLElBQUksT0FBTyxHQUFHLGdCQUFnQixDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRTt3QkFDdEMsT0FBTyxpQkFBaUIsQ0FBQyxPQUFPLElBQUksR0FBRyxDQUFDLFNBQVMsQ0FBQyxDQUFDO29CQUN2RCxDQUFDLENBQUMsQ0FBQztvQkFDSCxJQUFJLE9BQU8sSUFBSSxJQUFJLEVBQUUsQ0FBQzt3QkFDbEIsT0FBTyxPQUFPLENBQUMsY0FBYyxDQUFDLENBQUM7b0JBQ25DLENBQUM7eUJBQU0sQ0FBQzt3QkFDSixPQUFPLEtBQUssQ0FBQztvQkFDakIsQ0FBQztnQkFDTCxDQUFDO3FCQUFNLENBQUM7b0JBQ0osT0FBTyxLQUFLLENBQUM7Z0JBQ2pCLENBQUM7WUFDTCxLQUFLLGNBQWM7Z0JBQ2YsT0FBTyxXQUFXLENBQUM7WUFDdkIsS0FBSSxTQUFTO2dCQUNULE9BQU8sU0FBUyxDQUFDO1lBQ3JCLEtBQUssd0JBQXdCO2dCQUN6QixPQUFPLFNBQVMsQ0FBQztZQUNyQixLQUFLLHFCQUFxQjtnQkFDdEIsT0FBTyxTQUFTLENBQUM7WUFDckIsS0FBSyxtQkFBbUI7Z0JBQ3BCLE9BQU8sU0FBUyxDQUFDO1lBQ3JCLEtBQUssaUJBQWlCO2dCQUNsQixPQUFPLFNBQVMsQ0FBQztZQUVyQixLQUFLLGVBQWU7Z0JBQ2hCLE9BQU8sT0FBTyxDQUFDO1lBRW5CLEtBQUssY0FBYztnQkFDZixPQUFPLE9BQU8sQ0FBQztRQUN2QixDQUFDO1FBRUQsT0FBTyxLQUFLLENBQUM7SUFDakIsQ0FBQztDQUNKO0FBM0ZELDhCQTJGQyJ9

package/dist/helper/FunctionHelper.d.ts

@@ -17,9 +17,15 @@ export declare class FunctionHelper implements FunctionInvoke, ExpHelperAware {
     addExecutor(executorName: "Query" | "Kit" | "Time" | "fun" | "api", functionName: string, executor: FunctionInvoke): void;
     setExpHelper(expHelper: ExpHelper): void;
     argsMatch(paramList: {
+        paramValue: string;
         paramValueObj: AssignmentClauseInfo;
     }[], paramConfigList: {
         name: string;
         type: string;
+        optional?: boolean;
+    }[], varValueTypeList: {
+        varName: string;
+        varValueType: string;
     }[]): boolean;
+    findFunctionConfig(varChain: string, funcName: string): any;
 }

package/dist/helper/FunctionHelper.js

@@ -6,6 +6,7 @@ const KitFunctionExecutor_1 = require("../function-executor/KitFunctionExecutor"
 const TimeFunctionExecutor_1 = require("../function-executor/TimeFunctionExecutor");
 const FunFunctionExecutor_1 = require("../function-executor/FunFunctionExecutor");
 const ApiFunctionExecutor_1 = require("../function-executor/ApiFunctionExecutor");
+const function_configs = require("../../resources/context_config/function_configs.json");
 class FunctionHelper {
     constructor() {
         this.funcExecutors = new Map();
@@ -73,20 +74,43 @@ class FunctionHelper {
     /*
      * 参数校验
      */
-    argsMatch(paramList, paramConfigList) {
+    argsMatch(paramList, paramConfigList, varValueTypeList) {
+        if (paramConfigList.length === 1) {
+            let paramConfig = paramConfigList[0];
+            if (paramConfig.optional != null && paramConfig.optional) {
+                if (paramList.length === 0) {
+                    return true;
+                }
+            }
+        }
         if (paramList.length != paramConfigList.length) {
             return false;
         }
         for (let i = 0; i < paramList.length; i++) {
             let param = paramList[i];
             let paramConfig = paramConfigList[i];
-            let paramType = this.expHelper.guessBaseTypeByExpType(param.paramValueObj);
+            let paramType = this.expHelper.guessBaseTypeByExpType(param.paramValueObj, varValueTypeList);
+            console.debug(`args -- ${param.paramValue} --> ${paramType}`);
             if (paramType != "any" && paramConfig.type != "any" && paramType != paramConfig.type) {
                 return false;
             }
         }
         return true;
     }
+    findFunctionConfig(varChain, funcName) {
+        return function_configs.find(fc => {
+            let suitable = true;
+            if (varChain != null) {
+                if (varChain !== fc["varChain"]) {
+                    suitable = false;
+                }
+            }
+            if (funcName !== fc["funcName"]) {
+                suitable = false;
+            }
+            return suitable;
+        });
+    }
 }
 exports.FunctionHelper = FunctionHelper;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRnVuY3Rpb25IZWxwZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaGVscGVyL0Z1bmN0aW9uSGVscGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUlBLHNGQUFpRjtBQUNqRixrRkFBNkU7QUFDN0Usb0ZBQStFO0FBQy9FLGtGQUE2RTtBQUM3RSxrRkFBNkU7QUFLN0UsTUFBYSxjQUFjO0lBUXZCO1FBSlEsa0JBQWEsR0FBRyxJQUFJLEdBQUcsRUFBbUMsQ0FBQztRQUsvRCxJQUFJLENBQUMsYUFBYSxHQUFHLEVBQUUsQ0FBQztRQUN4QixJQUFJLENBQUMsYUFBYSxDQUFDLEdBQUcsQ0FBQyxPQUFPLEVBQUUsSUFBSSw2Q0FBcUIsRUFBRSxDQUFDLENBQUM7UUFDN0QsSUFBSSxDQUFDLGFBQWEsQ0FBQyxHQUFHLENBQUMsS0FBSyxFQUFFLElBQUkseUNBQW1CLEVBQUUsQ0FBQyxDQUFDO1FBQ3pELElBQUksQ0FBQyxhQUFhLENBQUMsR0FBRyxDQUFDLE1BQU0sRUFBRSxJQUFJLDJDQUFvQixFQUFFLENBQUMsQ0FBQztRQUMzRCxJQUFJLENBQUMsYUFBYSxDQUFDLEdBQUcsQ0FBQyxLQUFLLEVBQUUsSUFBSSx5Q0FBbUIsRUFBRSxDQUFDLENBQUM7UUFDekQsSUFBSSxDQUFDLGFBQWEsQ0FBQyxHQUFHLENBQUMsS0FBSyxFQUFFLElBQUkseUNBQW1CLEVBQUUsQ0FBQyxDQUFDO0lBQzdELENBQUM7SUFFRCxZQUFZLENBQUMsU0FBYztRQUN2QixJQUFJLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUN2QyxDQUFDO0lBRUQsWUFBWSxDQUFDLFlBQW9CO1FBQzdCLElBQUksZ0JBQWdCLEdBQUcsQ0FBQyxHQUFHLElBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUN6RCxPQUFPLGdCQUFnQixDQUFDLElBQUksQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFO1lBQ2xDLE9BQU8sSUFBSSxDQUFDLE9BQU8sSUFBSSxZQUFZLENBQUM7UUFDeEMsQ0FBQyxDQUFDLENBQUM7SUFDUCxDQUFDO0lBRUQsZ0JBQWdCLENBQUMsUUFBMEIsRUFBRSxpQkFBeUM7UUFDbEYsSUFBSSxJQUFJLEdBQUcsUUFBUSxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUFDLEVBQUU7WUFDMUMsT0FBTyxJQUFJLENBQUMsU0FBUyxDQUFDLFdBQVcsQ0FBQyxTQUFTLENBQUMsYUFBYSxFQUFFLGlCQUFpQixDQUFDLENBQUM7UUFDbEYsQ0FBQyxDQUFDLENBQUM7UUFDSCxJQUFJLFlBQVksR0FBRyxRQUFRLENBQUMsUUFBUSxDQUFDO1FBQ3JDLElBQUksUUFBUSxDQUFDLFFBQVEsSUFBSSxJQUFJLEVBQUUsQ0FBQztZQUM1QixZQUFZLEdBQUcsR0FBRyxRQUFRLENBQUMsUUFBUSxJQUFJLFlBQVksRUFBRSxDQUFDO1FBQzFELENBQUM7UUFFRCxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsWUFBWSxFQUFFLElBQUksQ0FBQyxDQUFDO0lBQzNDLENBQUM7SUFFRCxZQUFZLENBQUMsWUFBb0I7UUFDN0IsTUFBTSxJQUFJLEtBQUssQ0FBQyxlQUFlLENBQUMsQ0FBQztJQUNyQyxDQUFDO0lBRUQsTUFBTSxDQUFDLFlBQW9CLEVBQUUsSUFBVztRQUNwQyxPQUFPLENBQUMsS0FBSyxDQUFDLHlDQUF5QyxZQUFZLFdBQVcsSUFBSSxFQUFFLENBQUMsQ0FBQztRQUV0RixJQUFJLFNBQVMsR0FBRyxJQUFJLENBQUMsWUFBWSxDQUFDLFlBQVksQ0FBQyxDQUFDO1FBQ2hELElBQUksU0FBUyxJQUFJLElBQUksRUFBRSxDQUFDO1lBQ3BCLElBQUksYUFBYSxHQUFHLElBQUksR0FBRyxFQUFFLENBQUM7WUFDOUIsS0FBSyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxHQUFHLFNBQVMsQ0FBQyxXQUFXLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FBQztnQkFDckQsYUFBYSxDQUFDLEdBQUcsQ0FBQyxTQUFTLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFDMUQsQ0FBQztZQUNELE9BQU8sSUFBSSxDQUFDLFNBQVMsQ0FBQyxXQUFXLENBQUMsU0FBUyxDQUFDLGFBQWEsQ0FBQyxFQUFFLElBQUk7Z0JBQzVELGFBQWEsQ0FBQyxPQUFlO29CQUN6QixPQUFPLGFBQWEsQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUM7Z0JBQ3RDLENBQUM7YUFDSixDQUFDLENBQUM7UUFDUCxDQUFDO1FBRUQsSUFBSSxxQkFBcUIsR0FBRyxJQUFJLENBQUMsYUFBYSxDQUFDLE1BQU0sRUFBRSxDQUFDO1FBQ3hELElBQUksWUFBWSxHQUFHLElBQUksQ0FBQztRQUN4QixPQUFPLENBQUMsWUFBWSxHQUFHLHFCQUFxQixDQUFDLElBQUksRUFBRSxDQUFDLEtBQUssQ0FBQyxJQUFJLElBQUksRUFBRSxDQUFDO1lBQ2pFLElBQUksWUFBWSxDQUFDLFlBQVksQ0FBQyxZQUFZLENBQUMsRUFBRSxDQUFDO2dCQUMxQyxPQUFPLFlBQVksQ0FBQyxNQUFNLENBQUMsWUFBWSxFQUFFLElBQUksQ0FBQyxDQUFDO1lBQ25ELENBQUM7UUFDTCxDQUFDO1FBRUQsb0RBQW9EO1FBQ3BELHlEQUF5RDtRQUN6RCxJQUFJO1FBRUosTUFBTSxJQUFJLEtBQUssQ0FBQyxpQ0FBaUMsQ0FBQyxDQUFDO0lBQ3ZELENBQUM7SUFFRCxXQUFXLENBQUMsWUFBc0QsRUFBRSxZQUFvQixFQUFFLFFBQXdCO1FBQzlHLElBQUksQ0FBQyxhQUFhLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQyxDQUFDLFdBQVcsQ0FBQyxZQUFZLEVBQUUsUUFBUSxDQUFDLENBQUM7SUFDN0UsQ0FBQztJQUVELFlBQVksQ0FBQyxTQUFvQjtRQUM3QixJQUFJLENBQUMsU0FBUyxHQUFHLFNBQVMsQ0FBQztJQUMvQixDQUFDO0lBRUQ7O09BRUc7SUFDSCxTQUFTLENBQUMsU0FBb0QsRUFBRSxlQUc3RDtRQUNDLElBQUksU0FBUyxDQUFDLE1BQU0sSUFBSSxlQUFlLENBQUMsTUFBTSxFQUFFLENBQUM7WUFDN0MsT0FBTyxLQUFLLENBQUM7UUFDakIsQ0FBQztRQUNELEtBQUssSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxTQUFTLENBQUMsTUFBTSxFQUFFLENBQUMsRUFBRSxFQUFFLENBQUM7WUFDeEMsSUFBSSxLQUFLLEdBQUcsU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQ3pCLElBQUksV0FBVyxHQUFHLGVBQWUsQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUNyQyxJQUFJLFNBQVMsR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLHNCQUFzQixDQUFDLEtBQUssQ0FBQyxhQUFhLENBQUMsQ0FBQztZQUMzRSxJQUFJLFNBQVMsSUFBSSxLQUFLLElBQUksV0FBVyxDQUFDLElBQUksSUFBSSxLQUFLLElBQUksU0FBUyxJQUFJLFdBQVcsQ0FBQyxJQUFJLEVBQUUsQ0FBQztnQkFDbkYsT0FBTyxLQUFLLENBQUM7WUFDakIsQ0FBQztRQUNMLENBQUM7UUFFRCxPQUFPLElBQUksQ0FBQztJQUNoQixDQUFDO0NBQ0o7QUF4R0Qsd0NBd0dDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRnVuY3Rpb25IZWxwZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaGVscGVyL0Z1bmN0aW9uSGVscGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUlBLHNGQUFpRjtBQUNqRixrRkFBNkU7QUFDN0Usb0ZBQStFO0FBQy9FLGtGQUE2RTtBQUM3RSxrRkFBNkU7QUFLN0UsTUFBTSxnQkFBZ0IsR0FBRyxPQUFPLENBQUMsc0RBQXNELENBQUMsQ0FBQztBQUV6RixNQUFhLGNBQWM7SUFRdkI7UUFKUSxrQkFBYSxHQUFHLElBQUksR0FBRyxFQUFtQyxDQUFDO1FBSy9ELElBQUksQ0FBQyxhQUFhLEdBQUcsRUFBRSxDQUFDO1FBQ3hCLElBQUksQ0FBQyxhQUFhLENBQUMsR0FBRyxDQUFDLE9BQU8sRUFBRSxJQUFJLDZDQUFxQixFQUFFLENBQUMsQ0FBQztRQUM3RCxJQUFJLENBQUMsYUFBYSxDQUFDLEdBQUcsQ0FBQyxLQUFLLEVBQUUsSUFBSSx5Q0FBbUIsRUFBRSxDQUFDLENBQUM7UUFDekQsSUFBSSxDQUFDLGFBQWEsQ0FBQyxHQUFHLENBQUMsTUFBTSxFQUFFLElBQUksMkNBQW9CLEVBQUUsQ0FBQyxDQUFDO1FBQzNELElBQUksQ0FBQyxhQUFhLENBQUMsR0FBRyxDQUFDLEtBQUssRUFBRSxJQUFJLHlDQUFtQixFQUFFLENBQUMsQ0FBQztRQUN6RCxJQUFJLENBQUMsYUFBYSxDQUFDLEdBQUcsQ0FBQyxLQUFLLEVBQUUsSUFBSSx5Q0FBbUIsRUFBRSxDQUFDLENBQUM7SUFDN0QsQ0FBQztJQUVELFlBQVksQ0FBQyxTQUFjO1FBQ3ZCLElBQUksQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBQ3ZDLENBQUM7SUFFRCxZQUFZLENBQUMsWUFBb0I7UUFDN0IsSUFBSSxnQkFBZ0IsR0FBRyxDQUFDLEdBQUcsSUFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ3pELE9B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

package/dist/model/policy/ActionInfo.d.ts

@@ -14,5 +14,6 @@ export interface ActionVarAssignment extends ActionInfo {
         varName: string;
         varValue: string;
         varValueObj: AssignmentClauseInfo;
+        varValueType: string;
     };
 }

package/dist/model/policy/EventInfo.d.ts

@@ -1,4 +1,5 @@
 import { AssignmentClauseInfo } from "../AssignmentClauseInfo";
+import { ActionInfo } from "./ActionInfo";
 export interface EventInfo {
     type: "normal" | "terminate";
     content: string;
@@ -11,4 +12,7 @@ export interface EventInfo {
             paramValueObj: AssignmentClauseInfo;
         }
     ];
+    toState: string;
+    stateContextArgs?: string[];
+    actions: ActionInfo[];
 }

package/dist/model/policy/PolicyInfo.d.ts

@@ -9,6 +9,7 @@ export interface PolicyInfo {
                 paramName?: string;
                 paramValue: string;
                 paramValueObj: AssignmentClauseInfo;
+                content: string;
             }
         ];
     };
@@ -18,6 +19,11 @@ export interface PolicyInfo {
             stateName: string;
             assignments: VarDeclarationInfo[];
             events: EventInfo[];
+            serviceStateSection?: {
+                serviceState?: string;
+                serviceStateCollection?: string[];
+            };
+            stateContextArgs?: string[];
         }
     ];
 }

package/dist/model/policy/VarDeclarationInfo.d.ts

@@ -6,4 +6,5 @@ export interface VarDeclarationInfo {
     paramList?: string[];
     varValue: string;
     varValueObj: AssignmentClauseInfo;
+    varValueType?: "void" | "boolean" | "number" | "string" | "entity" | "array" | "argsGroup" | "any";
 }