@freelog/freelog-cg-collection 1.0.13 → 1.0.15

package/CollectionPolicyCustomVisitor.js

@@ -14,14 +14,22 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
         this.audienceSection = {conditions: []};
         // 全局定义（变量）声明
         this.varDeclarationList = [];
-        this.varDeclarationMap = new Map();
         // 状态机
         this.stateMachine = [];
 
+        this.currentAssignmentClauseObj = null;
+        this.currentBuildInFunctionObj = null;
         this.currentState = null;
         this.currentStateObj = null;
         this.currentEventElem = null;
-        this.parseState = {inContextArgsSectionAtEvent: 0, inActionSection: 0};
+        this.parseState = {
+            inFsmState: 0,
+            inFsmEvent: 0,
+            inContextArgsSectionAtEvent: 0,
+            inActionSection: 0,
+            atAssignmentClause: 0,
+            atBuildInFunction: 0
+        };
 
         this.expHelper = new ExpHelper();
         this.functionHelper = new FunctionHelper();
@@ -42,6 +50,65 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
         return this.generateVarValueTypeList(this.varDeclarationList);
     }
 
+    checkVarDeclarationEnable(varName) {
+        if (system_keywords.varList.indexOf(varName) !== -1) {
+            throw new Error(`不能和系统关键字同名 --- ${varName}`);
+        }
+        if (this.varDeclarationList.find(vd => vd["varName"] === varName) != null) {
+            throw new Error(`不能重复定义同名的全局变量 --- ${varName}`);
+        }
+    }
+
+    /*
+     * 绘制当前符号表
+     */
+    drawSymbolTable() {
+        let variables = [];
+        for (let c of context_variables) {
+            variables.push({name: c, scope: "context"});
+        }
+        if (this.parseState.inFsmState === 1 || this.parseState.inFsmEvent === 1) {
+            for (let v of this.varDeclarationList) {
+                variables.push({name: v["varName"], type: v["varValueType"], scope: "global"});
+            }
+            for (let s of this.currentStateObj["stateContextArgs"]) {
+                variables.push({name: s, scope: "fsm"});
+            }
+            for (let a of this.currentStateObj["assignments"]) {
+                if (a["type"] === "varInitial") {
+                    variables.push({name: a["varName"], type: a["varValueType"], scope: "fsm"});
+                }
+            }
+        }
+        if (this.parseState.inContextArgsSectionAtEvent || this.parseState.inActionSection) {
+            for (let p of this.currentEventElem["config_params"]) {
+                variables.push({
+                    name: p["name"],
+                    type: p["type"],
+                    regex: p["type"] === "argsGroup" ? `^\\$event\\.${p["name"]}(\\.[0-9A-Za-z_]+)*$` : `^\\$event\\.${p["name"]}$`,
+                    scope: "event"
+                });
+            }
+        }
+
+        return variables;
+    }
+
+    /**
+     * 符号表包含某个变量
+     * @param varName 变量名
+     * @returns {boolean}
+     */
+    symbolTableHas(varName) {
+        return this.drawSymbolTable().find(s => {
+            if (s["scope"] !== "event") {
+                return s["name"] === varName;
+            } else {
+                return varName.match(s["regex"]) != null;
+            }
+        }) != null;
+    }
+
     visitAudience_clause(ctx) {
         this.audienceSection["audiences"] = ctx.audience().map(elem => elem.getText());
 
@@ -74,14 +141,8 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
             varValueObj: this.visitAssignment_clause(ctx.assignment_clause())
         };
 
-        if (system_keywords.varList.indexOf(varElem.varName) !== -1) {
-            throw new Error(`不能和系统关键字同名 --- ${varElem.varName}`);
-        }
-        if (this.varDeclarationMap.has(varElem.varName)) {
-            throw new Error(`不能重复定义同名的全局变量 --- ${varElem.varName}`);
-        } else {
-            this.varDeclarationMap.set(varElem.varName, varElem);
-        }
+        this.checkVarDeclarationEnable(varElem.varName);
+
         varElem["varValueType"] = this.expHelper.guessBaseTypeByExpType(varElem["varValueObj"], this.getVarDeclarationValueTypeList());
         console.debug(`>> ${ctx.getText()} --> ${varElem["varValueType"]}`);
 
@@ -99,14 +160,8 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
             varValueObj: this.visitAssignment_clause(ctx.assignment_clause())
         };
 
-        if (system_keywords.varList.indexOf(varElem.varName) !== -1) {
-            throw new Error(`不能和系统关键字同名 --- ${varElem.varName}`);
-        }
-        if (this.varDeclarationMap.has(varElem.varName)) {
-            throw new Error(`不能重复定义同名的全局变量 --- ${varElem.varName}`);
-        } else {
-            this.varDeclarationMap.set(varElem.varName, varElem);
-        }
+        this.checkVarDeclarationEnable(varElem.varName);
+
         varElem["varValueType"] = this.expHelper.guessBaseTypeByExpType(varElem["varValueObj"], this.getVarDeclarationValueTypeList());
         console.debug(`>> ${ctx.getText()} --> ${varElem["varValueType"]}`);
 
@@ -132,20 +187,17 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
         }
         varElem["paramList"] = paramList;
 
-        if (system_keywords.varList.indexOf(varElem.varName) !== -1) {
-            throw new Error(`不能和系统关键字同名 --- ${varElem.varName}`);
-        }
-        if (this.varDeclarationMap.has(varElem.varName)) {
-            throw new Error(`不能重复定义同名的全局变量 --- ${varElem.varName}`);
-        } else {
-            this.varDeclarationMap.set(varElem.varName, varElem);
-        }
+        this.checkVarDeclarationEnable(varElem.varName);
+
         this.varDeclarationList.push(varElem);
 
         return varElem;
     }
 
     visitState_definition(ctx) {
+        console.debug(`^^ ${ctx.state_name().getText()}`)
+
+        this.parseState.inFsmState = 1;
         this.currentState = ctx.state_name().getText();
         this.currentStateObj = {stateName: this.currentState, assignments: [], events: []};
         if (ctx.service_state_section() != null) {
@@ -159,8 +211,7 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
         this.stateMachine.push(this.currentStateObj);
 
         let result = super.visitState_definition(ctx);
-        this.currentState = null;
-        this.currentStateObj = null;
+        this.parseState.inFsmState = 0;
         return result;
     }
 
@@ -188,24 +239,22 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
             varValueObj: this.visitAssignment_clause(ctx.variable_assignment().assignment_clause())
         };
 
-        // if (this.varDeclarationMap.has(assignmentElem.varName)) {
-        //     throw new Error(`全局变量不可以被再次赋值 --- ${assignmentElem.varName}`);
-        // }
-        if (this.currentStateObj["assignments"].find(elem => {
-            return elem.varName === assignmentElem.varName;
-        }) == null) {
+        if (this.currentStateObj["assignments"].find(elem => elem.varName === assignmentElem.varName) == 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;
-        });
+        let varValueTypeObj = [...varValueTypeList].reverse().find(elem => elem.varName === assignmentElem.varName);
         if (assignmentElem["varValueType"] !== varValueTypeObj.varValueType) {
             throw new Error(`类型验证不通过 >| ${ctx.getText()}`);
         }
+        if (this.currentAssignmentClauseObj != null && this.currentAssignmentClauseObj["variableChainList"] != null) {
+            for (let vc of this.currentAssignmentClauseObj["variableChainList"]) {
+                if (!this.symbolTableHas(vc)) {
+                    throw new Error(`存在无效的变量引用 --- ${vc} | ${assignmentElem.content}`);
+                }
+            }
+        }
 
         this.currentStateObj["assignments"].push(assignmentElem);
 
@@ -221,7 +270,7 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
             varValueObj: this.visitAssignment_clause(ctx.assignment_clause())
         };
 
-        if (this.varDeclarationMap.has(assignmentElem.varName)) {
+        if (this.varDeclarationList.find(vd => vd["varName"] === assignmentElem.varName) != null) {
             throw new Error(`局部变量不可以和全局变量同名 --- ${assignmentElem.varName}`);
         }
         if (this.currentStateObj["stateContextArgs"].indexOf(assignmentElem.varName) !== -1) {
@@ -232,10 +281,18 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
         }) != null) {
             throw new Error(`该局部变量已声明 --- ${assignmentElem.varName}`);
         }
+        if (this.currentAssignmentClauseObj != null && this.currentAssignmentClauseObj["variableChainList"] != null) {
+            for (let vc of this.currentAssignmentClauseObj["variableChainList"]) {
+                if (!this.symbolTableHas(vc)) {
+                    throw new Error(`存在无效的变量引用 --- ${vc} | ${assignmentElem.content}`);
+                }
+            }
+        }
+
         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"]}`);
+        console.debug(`${ctx.getText()} --> ${assignmentElem["varValueType"]}`);
 
         this.currentStateObj["assignments"].push(assignmentElem);
 
@@ -244,14 +301,18 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
 
     visitEventNormal(ctx) {
         console.debug(`>> ${ctx.event().getText()}`);
+        this.parseState.inFsmEvent = 1;
 
         let builtInFunctionResult = this.visitBuilt_in_function(ctx.event().built_in_function());
         this.currentEventElem = {
             type: "normal",
             content: ctx.getText(),
+            config_params: [],
             eventName: builtInFunctionResult["funcName"],
+            variableChainList: builtInFunctionResult["variableChainList"],
             eventParamList: builtInFunctionResult["paramList"],
             toState: ctx.state_name().getText(),
+            stateContextArgs: [],
             actions: []
         };
         if (ctx.event().event_path() != null) {
@@ -269,7 +330,6 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
             }
             return suitable;
         });
-        let event_configParamList = [];
         if (event_config != null) {
             try {
                 if (!this.functionHelper.argsMatch(this.currentEventElem["eventParamList"], event_config["paramList"], this.getVarDeclarationValueTypeList())) {
@@ -279,38 +339,16 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
                 console.debug(`参数验证错误 ----- ${ctx.event().getText()}`);
                 throw e;
             }
-            event_configParamList = event_config["paramList"];
+            this.currentEventElem["config_params"] = event_config["paramList"];
+        }
+        for (let vc of this.currentEventElem["variableChainList"]) {
+            if (!this.symbolTableHas(vc)) {
+                throw new Error(`存在无效的变量引用 --- ${vc} | ${this.currentEventElem["content"]}`);
+            }
         }
 
         if (ctx.state_context_args_section_at_event() != null) {
-            this.currentEventElem["stateContextArgs"] = ctx.state_context_args_section_at_event().sc_args_at_event_param().map(elem => {
-                this.parseState.inContextArgsSectionAtEvent = 1;
-                let paramElem = {
-                    paramName: elem.sc_args_at_event_param_name().getText(),
-                    paramValue: elem.sc_args_at_event_param_value().assignment_clause().getText(),
-                    paramValueObj: this.visitAssignment_clause(elem.sc_args_at_event_param_value().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"].indexOf(paramElem["paramValue"]) === -1
-                    && 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;
-            });
+            this.visitState_context_args_section_at_event(ctx.state_context_args_section_at_event());
         }
 
         if (ctx.action_section() != null) {
@@ -320,7 +358,7 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
         this.currentStateObj["events"].push(this.currentEventElem);
 
         let result = this.currentEventElem;
-        this.currentEventElem = null;
+        this.parseState.inFsmEvent = 0;
         return result;
     }
 
@@ -331,16 +369,36 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
 
         this.currentStateObj["events"].push(this.currentEventElem);
 
-        let result = this.currentEventElem;
-        this.currentEventElem = null;
+        return this.currentEventElem;
+    }
+
+    visitState_context_args_section_at_event(ctx) {
+        this.parseState.inContextArgsSectionAtEvent = 1;
+        this.currentEventElem["stateContextArgs"] = ctx.sc_args_at_event_param().map(elem => {
+            let paramElem = {
+                paramName: elem.sc_args_at_event_param_name().getText(),
+                paramValue: elem.sc_args_at_event_param_value().assignment_clause().getText(),
+                paramValueObj: this.visitAssignment_clause(elem.sc_args_at_event_param_value().assignment_clause()),
+                content: elem.getText()
+            };
+
+            for (let vc of this.currentAssignmentClauseObj["variableChainList"]) {
+                if (!this.symbolTableHas(vc)) {
+                    throw new Error(`存在无效的变量引用 --- ${vc} | ${this.currentEventElem["content"]}`);
+                }
+            }
+
+            return paramElem;
+        });
+
+        let result = super.visitState_context_args_section_at_event(ctx);
+        this.parseState.inContextArgsSectionAtEvent = 0;
         return result;
     }
 
     visitAction_section(ctx) {
         this.parseState.inActionSection = 1;
 
-        this.currentEventElem["actions"] = [];
-
         let result = super.visitAction_section(ctx);
         this.parseState.inActionSection = 0;
         return result;
@@ -350,6 +408,11 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
         let actionElem = {
             type: "functionCall", content: ctx.getText(), actionObj: this.visitFunction_call(ctx.function_call())
         };
+        for (let vc of actionElem["actionObj"]["variableChainList"]) {
+            if (!this.symbolTableHas(vc)) {
+                throw new Error(`存在无效的变量引用 --- ${vc} | ${actionElem["content"]}`);
+            }
+        }
 
         this.currentEventElem["actions"].push(actionElem);
 
@@ -366,7 +429,7 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
             varValueObj: this.visitAssignment_clause(ctx.variable_assignment().assignment_clause())
         };
 
-        if (this.varDeclarationMap.has(actionObj.varName)) {
+        if (this.varDeclarationList.find(vd => vd["varName"] === actionObj.varName) != null) {
             throw new Error(`全局变量不可以被再次赋值 --- ${actionObj.varName}`);
         }
         if (this.currentStateObj["assignments"].find(elem => {
@@ -376,14 +439,15 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
         }
         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;
-        });
+        let varValueTypeObj = [...varValueTypeList].reverse().find(elem => elem.varName === actionObj.varName);
         if (actionObj["varValueType"] !== varValueTypeObj.varValueType) {
             throw new Error(`类型验证不通过 >| ${ctx.getText()}`);
         }
+        for (let vc of this.currentAssignmentClauseObj["variableChainList"]) {
+            if (!this.symbolTableHas(vc)) {
+                throw new Error(`存在无效的变量引用 --- ${vc} | ${this.currentEventElem["content"]}`);
+            }
+        }
 
         actionElem["actionObj"] = actionObj;
         this.currentEventElem["actions"].push(actionElem);
@@ -392,19 +456,26 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
     }
 
     visitAssignment_clause(ctx) {
+        this.parseState.atAssignmentClause++;
+        this.currentAssignmentClauseObj = {variableChainList: []};
+        let result = null;
+
         if (ctx.expression() != null) {
-            return this.visitExpression(ctx.expression());
+            result = this.visitExpression(ctx.expression());
         } else if (ctx.boolean_expression() != null) {
-            return this.visitBoolean_expression(ctx.boolean_expression());
+            result = this.visitBoolean_expression(ctx.boolean_expression());
         } else if (ctx.condition_expression() != null) {
-            return this.visitCondition_expression(ctx.condition_expression());
+            result = this.visitCondition_expression(ctx.condition_expression());
         } else if (ctx.args_group_expression() != null) {
-            return this.visitArgs_group_expression(ctx.args_group_expression());
+            result = this.visitArgs_group_expression(ctx.args_group_expression());
         } else if (ctx.collection_expression() != null) {
-            return this.visitCollection_expression(ctx.collection_expression());
+            result = this.visitCollection_expression(ctx.collection_expression());
         } else {
-            return super.visitAssignment_clause(ctx);
+            result = super.visitAssignment_clause(ctx);
         }
+
+        this.parseState.atAssignmentClause--;
+        return result;
     }
 
     visitExpression_collection_clause(ctx) {
@@ -530,6 +601,7 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
 
     visitBoolean_expression_clause(ctx) {
         let result = null;
+
         if (ctx.boolean_atom() != null) {
             result = this.visitExpBooleanSingle(ctx);
         } else if (ctx.boolean_op_collection() != null) {
@@ -712,7 +784,7 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
     }
 
     visitFunction_call(ctx) {
-        console.debug(`>> ${ctx.getText()}`);
+        console.debug(`| ${this.parseState.inFsmState}-${this.parseState.inFsmEvent}-${this.parseState.inContextArgsSectionAtEvent}-${this.parseState.inActionSection} | >> ${ctx.getText()}`);
 
         let result = this.visitBuilt_in_function(ctx.built_in_function());
         result["expType"] = "functionCall";
@@ -736,15 +808,17 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
     }
 
     visitBuilt_in_function(ctx) {
-        let result = {funcName: ctx.funcname().getText()};
+        this.parseState.atBuildInFunction++;
+        this.currentBuildInFunctionObj = {funcName: ctx.funcname().getText(), variableChainList: []};
 
         if (ctx.expression_param_list() != null) {
-            result["paramList"] = this.visitExpression_param_list(ctx.expression_param_list());
+            this.currentBuildInFunctionObj["paramList"] = this.visitExpression_param_list(ctx.expression_param_list());
         } else {
-            result["paramList"] = [];
+            this.currentBuildInFunctionObj["paramList"] = [];
         }
 
-        return result;
+        this.parseState.atBuildInFunction--;
+        return this.currentBuildInFunctionObj;
     }
 
     visitScientific(ctx) {
@@ -776,6 +850,13 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
             varType = "context";
         }
 
+        if (this.parseState.atAssignmentClause > 0) {
+            this.currentAssignmentClauseObj["variableChainList"].push(content);
+        }
+        if (this.parseState.atBuildInFunction > 0) {
+            this.currentBuildInFunctionObj["variableChainList"].push(content);
+        }
+
         return {expType: "variableChain", varType: varType, content: content};
     }
 }

package/dist/helper/PolicyHelper.d.ts

@@ -14,7 +14,7 @@ export declare class PolicyHelper implements VarContextCapable<any>, Calculator,
     protected functionHelper: FunctionHelper;
     private audienceInfo;
     constructor(policyInfo: PolicyInfo);
-    init(varContextCapable: VarContextCapable<any>): void;
+    init(varContextCapable: VarContextCapable<any>, checkConditions: boolean): void;
     setVarGlobal(varName: string, varValue: any): void;
     setVarGlobalList(varGlobalList: any[]): void;
     getVarGlobal(varName: string): any;

package/dist/helper/PolicyHelper.js

@@ -16,7 +16,7 @@ class PolicyHelper {
         this.audienceInfo = {};
     }
     // 在合约签约的时候，可签约条件和全局申明的变量是已经计算完毕的，在这里做这件事
-    init(varContextCapable) {
+    init(varContextCapable, checkConditions) {
         let varDeclarationList = this.policyInfo.varDeclarationList;
         for (let varDeclaration of varDeclarationList) {
             if (varDeclaration.type == "varGlobal") {
@@ -36,7 +36,42 @@ class PolicyHelper {
         this.audienceInfo["audiences"] = this.policyInfo.audienceSection.audiences;
         this.audienceInfo["condition"] = {};
         for (let c of this.policyInfo.audienceSection.conditions) {
-            this.audienceInfo["condition"][c.paramName] = this.getExpValue(c.paramValueObj, varContextCapable);
+            let ev = this.getExpValue(c.paramValueObj, varContextCapable);
+            if (c.paramName == "echoSubject" && ev["expType"] != "entity") {
+                throw new Error(`【echoSubject】类型错误！`);
+            }
+            if (c.paramName == "labels") {
+                if (!Array.isArray(ev)) {
+                    throw new Error(`【labels】类型错误！`);
+                }
+                if (ev.find(elem => typeof elem != "string") != null) {
+                    throw new Error(`【labels】元素错误！`);
+                }
+            }
+            if (c.paramName == "exps") {
+                if (!Array.isArray(ev)) {
+                    throw new Error(`【exps】类型错误！`);
+                }
+                if (ev.find(elem => [true, false].indexOf(elem) == -1) != null) {
+                    throw new Error(`【exps】元素错误！`);
+                }
+            }
+            this.audienceInfo["condition"][c.paramName] = ev;
+        }
+        if (checkConditions) {
+            if (this.audienceInfo["condition"]["exps"] != null) {
+                if (this.audienceInfo["condition"]["exps"].indexOf(false) != -1) {
+                    throw new Error(`【exps】验证失败！`);
+                }
+            }
+            if (this.audienceInfo["condition"]["echoSubject"] != null && this.audienceInfo["condition"]["labels"] != null) {
+                let echoSubject = this.audienceInfo["condition"]["echoSubject"];
+                let contractLicensee = this.getVarContext("contract.licensee");
+                let labels = this.invoke("Query.EchoService.Labels", [echoSubject, contractLicensee]);
+                if (labels.filter(label => this.audienceInfo["condition"]["labels"].indexOf(label) != -1).length != this.audienceInfo["condition"]["labels"].length) {
+                    throw new Error(`【echoSubject】【labels】验证失败！`);
+                }
+            }
         }
         for (let varDeclaration of varDeclarationList) {
             if (varDeclaration.type == "varGlobal") {
@@ -105,4 +140,4 @@ class PolicyHelper {
     }
 }
 exports.PolicyHelper = PolicyHelper;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUG9saWN5SGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2hlbHBlci9Qb2xpY3lIZWxwZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQ0EsMkNBQXNDO0FBRXRDLHFEQUFnRDtBQU1oRCxNQUFhLFlBQVk7SUFnQnJCLFlBQVksVUFBc0I7UUFWMUIsaUJBQVksR0FBRyxJQUFJLEdBQUcsRUFBOEIsQ0FBQztRQVd6RCxJQUFJLENBQUMsVUFBVSxHQUFHLFVBQVUsQ0FBQztRQUM3QixJQUFJLENBQUMsYUFBYSxHQUFHLEVBQUUsQ0FBQztRQUN4QixJQUFJLENBQUMsWUFBWSxHQUFHLEVBQUUsQ0FBQztRQUN2QixJQUFJLENBQUMsU0FBUyxHQUFHLElBQUkscUJBQVMsRUFBRSxDQUFDO1FBQ2pDLElBQUksQ0FBQyxjQUFjLEdBQUcsSUFBSSwrQkFBYyxFQUFFLENBQUM7UUFDM0MsSUFBSSxDQUFDLFNBQVMsQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsY0FBYyxDQUFDLENBQUM7UUFDdEQsSUFBSSxDQUFDLGNBQWMsQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBRWpELElBQUksQ0FBQyxZQUFZLEdBQUcsRUFBRSxDQUFDO0lBQzNCLENBQUM7SUFFRCx5Q0FBeUM7SUFDekMsSUFBSSxDQUFDLGlCQUF5QztRQUMxQyxJQUFJLGtCQUFrQixHQUFHLElBQUksQ0FBQyxVQUFVLENBQUMsa0JBQWtCLENBQUM7UUFDNUQsS0FBSyxJQUFJLGNBQWMsSUFBSSxrQkFBa0IsRUFBRSxDQUFDO1lBQzVDLElBQUksY0FBYyxDQUFDLElBQUksSUFBSSxXQUFXLEVBQUUsQ0FBQztnQkFDckMsSUFBSSxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsY0FBYyxDQUFDLE9BQU8sRUFBRSxjQUFjLENBQUMsQ0FBQztZQUNsRSxDQUFDO1lBQ0QsSUFBSSxjQUFjLENBQUMsSUFBSSxJQUFJLFVBQVUsRUFBRSxD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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUG9saWN5SGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2hlbHBlci9Qb2xpY3lIZWxwZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQ0EsMkNBQXNDO0FBRXRDLHFEQUFnRDtBQU1oRCxNQUFhLFlBQVk7SUFnQnJCLFlBQVksVUFBc0I7UUFWMUIsaUJBQVksR0FBRyxJQUFJLEdBQUcsRUFBOEIsQ0FBQztRQVd6RCxJQUFJLENBQUMsVUFBVSxHQUFHLFVBQVUsQ0FBQztRQUM3QixJQUFJLENBQUMsYUFBYSxHQUFHLEVBQUUsQ0FBQztRQUN4QixJQUFJLENBQUMsWUFBWSxHQUFHLEVBQUUsQ0FBQztRQUN2QixJQUFJLENBQUMsU0FBUyxHQUFHLElBQUkscUJBQVMsRUFBRSxDQUFDO1FBQ2pDLElBQUksQ0FBQyxjQUFjLEdBQUcsSUFBSSwrQkFBYyxFQUFFLENBQUM7UUFDM0MsSUFBSSxDQUFDLFNBQVMsQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsY0FBYyxDQUFDLENBQUM7UUFDdEQsSUFBSSxDQUFDLGNBQWMsQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBRWpELElBQUksQ0FBQyxZQUFZLEdBQUcsRUFBRSxDQUFDO0lBQzNCLENBQUM7SUFFRCx5Q0FBeUM7SUFDekMsSUFBSSxDQUFDLGlCQUF5QyxFQUFFLGVBQXdCO1FBQ3BFLElBQUksa0JBQWtCLEdBQUcsSUFBSSxDQUFDLFVBQVUsQ0FBQyxrQkFBa0IsQ0FBQztRQUM1RCxLQUFLLElBQUksY0FBYyxJQUFJLGtCQUFrQixFQUFFLENBQUM7WUFDNUMsSUFBSSxjQUFjLENBQUMsSUFBSSxJQUFJLFdBQVcsRUFBRSxDQUFDO2dCQUNyQyxJQUFJLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxjQUFjLENBQUMsT0FBTyxFQUFFLGNBQWMsQ0FBQyxDQUFDO1lBQ2xFLENBQUM7WUFDRCxJQUFJLGNBQWMsQ0FBQyxJQUFJLElBQUksVUFBVSxFQUFFLENBQUM7Z0JBQ3BDLElBQUksQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLEVBQUMsT0FBTyxFQUFFLGNBQWMsQ0FBQyxPQUFPLEVBQUUsV0FBVyxFQUFFLGNBQWMsQ0FBQyxXQUFXLEVBQUMsQ0FBQyxDQUFDO1lBQ3ZHLENBQUM7WUFDRCxJQUFJLGNBQWMsQ0FBQyxJQUFJLElBQUksV0FBVyxFQUFFLENBQUM7Z0JBQ3JDLElBQUksQ0FBQyxjQUFjLENBQUMsWUFBWSxDQUFDO29CQUM3QixPQUFPLEVBQUUsY0FBYyxDQUFDLE9BQU87b0JBQy9CLFNBQVMsRUFBRSxjQUFjLENBQUMsU0FBUztvQkFDbkMsV0FBVyxFQUFFLGNBQWMsQ0FBQyxXQUFXO2lCQUMxQyxDQUFDLENBQUM7WUFDUCxDQUFDO1FBQ0wsQ0FBQztRQUVELElBQUksQ0FBQyxZQUFZLENBQUMsV0FBVyxDQUFDLEdBQUcsSUFBSSxDQUFDLFVBQVUsQ0FBQyxlQUFlLENBQUMsU0FBUyxDQUFDO1FBQzNFLElBQUksQ0FBQyxZQUFZLENBQUMsV0FBVyxDQUFDLEdBQUcsRUFBRSxDQUFDO1FBQ3BDLEtBQUssSUFBSSxDQUFDLElBQUksSUFBSSxDQUFDLFVBQVUsQ0FBQyxlQUFlLENBQUMsVUFBVSxFQUFFLENBQUM7WUFDdkQsSUFBSSxFQUFFLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsYUFBYSxFQUFFLGlCQUFpQixDQUFDLENBQUM7WUFDOUQsSUFBSSxDQUFDLENBQUMsU0FBUyxJQUFJLGFBQWEsSUFBSSxFQUFFLENBQUMsU0FBUyxDQUFDLElBQUksUUFBUSxFQUFFLENBQUM7Z0JBQzVELE1BQU0sSUFBSSxLQUFLLENBQUMsb0JBQW9CLENBQUMsQ0FBQztZQUMxQyxDQUFDO1lBQ0QsSUFBSSxDQUFDLENBQUMsU0FBUyxJQUFJLFFBQVEsRUFBRSxDQUFDO2dCQUMxQixJQUFJLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDO29CQUNyQixNQUFNLElBQUksS0FBSyxDQUFDLGVBQWUsQ0FBQyxDQUFDO2dCQUNyQyxDQUFDO2dCQUNELElBQUksRUFBRSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLE9BQU8sSUFBSSxJQUFJLFFBQVEsQ0FBQyxJQUFJLElBQUksRUFBRSxDQUFDO29CQUNuRCxNQUFNLElBQUksS0FBSyxDQUFDLGVBQWUsQ0FBQyxDQUFDO2dCQUNyQyxDQUFDO1lBQ0wsQ0FBQztZQUNELElBQUksQ0FBQyxDQUFDLFNBQVMsSUFBSSxNQUFNLEVBQUUsQ0FBQztnQkFDeEIsSUFBSSxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQztvQkFDckIsTUFBTSxJQUFJLEtBQUssQ0FBQyxhQUFhLENBQUMsQ0FBQztnQkFDbkMsQ0FBQztnQkFDRCxJQUFJLEVBQUUsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDLElBQUksRUFBRSxLQUFLLENBQUMsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsSUFBSSxJQUFJLEVBQUUsQ0FBQztvQkFDN0QsTUFBTSxJQUFJLEtBQUssQ0FBQyxhQUFhLENBQUMsQ0FBQztnQkFDbkMsQ0FBQztZQUNMLENBQUM7WUFDRCxJQUFJLENBQUMsWUFBWSxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsR0FBRyxFQUFFLENBQUM7UUFDckQsQ0FBQztRQUNELElBQUksZUFBZSxFQUFFLENBQUM7WUFDbEIsSUFBSSxJQUFJLENBQUMsWUFBWSxDQUFDLFdBQVcsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxJQUFJLElBQUksRUFBRSxDQUFDO2dCQUNqRCxJQUFJLElBQUksQ0FBQyxZQUFZLENBQUMsV0FBVyxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQyxFQUFFLENBQUM7b0JBQzlELE1BQU0sSUFBSSxLQUFLLENBQUMsYUFBYSxDQUFDLENBQUM7Z0JBQ25DLENBQUM7WUFDTCxDQUFDO1lBQ0QsSUFBSSxJQUFJLENBQUMsWUFBWSxDQUFDLFdBQVcsQ0FBQyxDQUFDLGFBQWEsQ0FBQyxJQUFJLElBQUksSUFBSSxJQUFJLENBQUMsWUFBWSxDQUFDLFdBQVcsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxJQUFJLElBQUksRUFBRSxDQUFDO2dCQUM1RyxJQUFJLFdBQVcsR0FBRyxJQUFJLENBQUMsWUFBWSxDQUFDLFdBQVcsQ0FBQyxDQUFDLGFBQWEsQ0FBQyxDQUFDO2dCQUNoRSxJQUFJLGdCQUFnQixHQUFHLElBQUksQ0FBQyxhQUFhLENBQUMsbUJBQW1CLENBQUMsQ0FBQztnQkFDL0QsSUFBSSxNQUFNLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQywwQkFBMEIsRUFBRSxDQUFDLFdBQVcsRUFBRSxnQkFBZ0IsQ0FBQyxDQUFDLENBQUM7Z0JBQ3RGLElBQUksTUFBTSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsV0FBVyxDQUFDLENBQUMsUUFBUSxDQUFDLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsTUFBTSxJQUFJLElBQUksQ0FBQyxZQUFZLENBQUMsV0FBVyxDQUFDLENBQUMsUUFBUSxDQUFDLENBQUMsTUFBTSxFQUFFLENBQUM7b0JBQ2xKLE1BQU0sSUFBSSxLQUFLLENBQUMsNEJBQTRCLENBQUMsQ0FBQztnQkFDbEQsQ0FBQztZQUNMLENBQUM7UUFDTCxDQUFDO1FBRUQsS0FBSyxJQUFJLGNBQWMsSUFBSSxrQkFBa0IsRUFBRSxDQUFDO1lBQzVDLElBQUksY0FBYyxDQUFDLElBQUksSUFBSSxXQUFXLEVBQUUsQ0FBQztnQkFDckMsSUFBSSxJQUFJLENBQUMsWUFBWSxDQUFDLGNBQWMsQ0FBQyxPQUFPLENBQUMsSUFBSSxJQUFJLEVBQUUsQ0FBQztvQkFDcEQsSUFBSSxLQUFLLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQyxjQUFjLENBQUMsV0FBVyxFQUFFLGlCQUFpQixDQUFDLENBQUM7b0JBQzVFLElBQUksQ0FBQyxZQUFZLENBQUMsY0FBYyxDQUFDLE9BQU8sRUFBRSxLQUFLLENBQUMsQ0FBQztnQkFDckQsQ0FBQztZQUNMLENBQUM7UUFDTCxDQUFDO0lBQ0wsQ0FBQztJQUVELFlBQVksQ0FBQyxPQUFlLEVBQUUsUUFBYTtRQUN2QyxJQUFJLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQyxJQUFJLENBQUMsRUFBQyxPQUFPLEVBQUUsUUFBUSxFQUFDLENBQUMsQ0FBQztJQUN0RCxDQUFDO0lBRUQsZ0JBQWdCLENBQUMsYUFBb0I7UUFDakMsSUFBSSxDQUFDLGFBQWEsR0FBRyxhQUFhLENBQUM7SUFDdkMsQ0FBQztJQUVELFlBQVksQ0FBQyxPQUFlO1FBQ3hCLElBQUksZ0JBQWdCLEdBQUcsQ0FBQyxHQUFHLElBQUksQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDOUQsT0FBTyxnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRTtZQUNsQyxPQUFPLElBQUksQ0FBQyxPQUFPLElBQUksT0FBTyxDQUFDO1FBQ25DLENBQUMsQ0FBQyxDQUFDO0lBQ1AsQ0FBQztJQUVELGdCQUFnQjtRQUNaLE9BQU8sSUFBSSxDQUFDLGFBQWEsQ0FBQztJQUM5QixDQUFDO0lBRUQsV0FBVyxDQUFDLE9BQWU7UUFDdkIsSUFBSSxlQUFlLEdBQUcsQ0FBQyxHQUFHLElBQUksQ0FBQyxZQUFZLENBQUMsQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUN2RCxPQUFPLGVBQWUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRTtZQUNqQyxPQUFPLElBQUksQ0FBQyxPQUFPLElBQUksT0FBTyxDQUFDO1FBQ25DLENBQUMsQ0FBQyxDQUFDO0lBQ1AsQ0FBQztJQUVELG1CQUFtQjtRQUNmLE9BQU87WUFDSCxhQUFhLEVBQUUsSUFBSSxDQUFDLGFBQWE7WUFDakMsWUFBWSxFQUFFLElBQUksQ0FBQyxZQUFZO1NBQ2xDLENBQUE7SUFDTCxDQUFDO0lBRUQsYUFBYSxDQUFDLE9BQWU7UUFDekIsSUFBSSxNQUFNLEdBQUcsSUFBSSxDQUFDLFlBQVksQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUN4QyxJQUFJLE1BQU0sSUFBSSxJQUFJLEVBQUUsQ0FBQztZQUNqQixPQUFPLE1BQU0sQ0FBQyxVQUFVLENBQUMsQ0FBQztRQUM5QixDQUFDO2FBQU0sSUFBSSxJQUFJLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDO1lBQ3hDLElBQUksY0FBYyxHQUFHLElBQUksQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1lBQ3BELElBQUksS0FBSyxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsY0FBYyxDQUFDLFdBQVcsRUFBRSxJQUFJLENBQUMsQ0FBQztZQUMvRCxJQUFJLENBQUMsWUFBWSxDQUFDLGNBQWMsQ0FBQyxPQUFPLEVBQUUsS0FBSyxDQUFDLENBQUM7WUFDakQsT0FBTyxLQUFLLENBQUM7UUFDakIsQ0FBQztRQUVELElBQUksU0FBUyxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDMUMsSUFBSSxTQUFTLElBQUksSUFBSSxFQUFFLENBQUM7WUFDcEIsT0FBTyxJQUFJLENBQUMsV0FBVyxDQUFDLFNBQVMsQ0FBQyxXQUFXLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFDekQsQ0FBQztRQUVELE1BQU0sSUFBSSxLQUFLLENBQUMsa0RBQWtELE9BQU8sRUFBRSxDQUFDLENBQUM7SUFDakYsQ0FBQztJQUVELFdBQVcsQ0FBQyxNQUE0QixFQUFFLGlCQUF5QztRQUMvRSxPQUFPLElBQUksQ0FBQyxTQUFTLENBQUMsV0FBVyxDQUFDLE1BQU0sRUFBRSxpQkFBaUIsQ0FBQyxDQUFDO0lBQ2pFLENBQUM7SUFFRCxZQUFZLENBQUMsWUFBb0I7UUFDN0IsTUFBTSxJQUFJLEtBQUssQ0FBQyxlQUFlLENBQUMsQ0FBQztJQUNyQyxDQUFDO0lBRUQsTUFBTSxDQUFDLFlBQW9CLEVBQUUsSUFBVztRQUNwQyxPQUFPLElBQUksQ0FBQyxjQUFjLENBQUMsTUFBTSxDQUFDLFlBQVksRUFBRSxJQUFJLENBQUMsQ0FBQztJQUMxRCxDQUFDO0lBRUQsV0FBVyxDQUFDLFlBQXNELEVBQUUsWUFBb0IsRUFBRSxRQUF3QjtRQUM5RyxJQUFJLENBQUMsY0FBYyxDQUFDLFdBQVcsQ0FBQyxZQUFZLEVBQUUsWUFBWSxFQUFFLFFBQVEsQ0FBQyxDQUFDO0lBQzFFLENBQUM7Q0FDSjtBQXJLRCxvQ0FxS0MifQ==

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@freelog/freelog-cg-collection",
-  "version": "1.0.13",
+  "version": "1.0.15",
   "main": "index.js",
   "dependencies": {
     "antlr4": "4.8.0",