@freelog/freelog-cg-collection 1.0.5 → 1.0.7

package/CollectionPolicyCustomVisitor.js

@@ -1,15 +1,28 @@
 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 event_configs = require("./resources/context_config/event_configs.json");
 
 class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
     constructor() {
         super();
+        // 签约条件
         this.audienceSection = {};
+        // 全局定义（变量）声明
         this.varDeclarationList = [];
+        this.varDeclarationMap = new Map();
+        // 状态机
         this.stateMachine = [];
 
         this.currentState = null;
         this.currentStateObj = null;
         this.currentEventElem = null;
+
+        this.expHelper = new ExpHelper();
+        this.functionHelper = new FunctionHelper();
+        this.functionHelper.setExpHelper(this.expHelper);
     }
 
     visitAudience_clause(ctx) {
@@ -37,6 +50,14 @@ 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.varDeclarationList.push(varElem);
 
         return varElem;
@@ -51,6 +72,14 @@ 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.varDeclarationList.push(varElem);
 
         return varElem;
@@ -73,6 +102,14 @@ 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.varDeclarationList.push(varElem);
 
         return varElem;
@@ -90,11 +127,19 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
         let assignmentElem = {
             type: "varAssigment",
             content: ctx.getText(),
-            varName: ctx.variable_assignment().variable_chain().getText(),
+            varName: ctx.variable_assignment().ID().getText(),
             varValue: ctx.variable_assignment().assignment_clause().getText(),
             varValueObj: super.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) {
+            throw new Error(`该局部变量未声明 --- ${assignmentElem.varName}`);
+        }
         this.currentStateObj["assignments"].push(assignmentElem);
 
         return assignmentElem;
@@ -109,6 +154,14 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
             varValueObj: super.visitAssignment_clause(ctx.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) {
+            throw new Error(`该局部变量已声明 --- ${assignmentElem.varName}`);
+        }
         this.currentStateObj["assignments"].push(assignmentElem);
 
         return assignmentElem;
@@ -132,6 +185,24 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
             this.visitAction_section(ctx.action_section());
         }
 
+        let event_config = event_configs.find(ec => {
+            let suitable = true;
+            if (this.currentEventElem["eventPath"] != null) {
+                if (this.currentEventElem["eventPath"] !== ec["path"]) {
+                    suitable = false;
+                }
+            }
+            if (this.currentEventElem["eventName"] !== ec["name"]) {
+                suitable = false;
+            }
+            return suitable;
+        });
+        if (event_config != null) {
+            if (!this.functionHelper.argsMatch(this.currentEventElem["eventParamList"], event_config["paramList"])) {
+                throw new Error(`参数列表错误 ----- ${ctx.event().getText()}`);
+            }
+        }
+
         this.currentStateObj["events"].push(this.currentEventElem);
 
         return this.currentEventElem;
@@ -172,7 +243,7 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
             type: "varAssignment",
             content: "ctx.getText()",
             actionObj: {
-                varName: ctx.variable_assignment().variable_chain().getText(),
+                varName: ctx.variable_assignment().ID().getText(),
                 varValue: ctx.variable_assignment().assignment_clause().getText(),
                 varValueObj: this.visitAssignment_clause(ctx.variable_assignment().assignment_clause())
             }
@@ -199,6 +270,20 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
         }
     }
 
+    visitExpression_collection_clause(ctx) {
+        if (ctx.function_call() != null) {
+            return this.visitFunction_call(ctx.function_call());
+        } else if (ctx.variable_chain() != null) {
+            return this.visitVariable_chain(ctx.variable_chain());
+        } else if (ctx.condition_expression() != null) {
+            return this.visitCondition_expression(ctx.condition_expression());
+        } else if (ctx.collection_expression() != null) {
+            return this.visitCollection_expression(ctx.collection_expression());
+        } else {
+            return super.visitExpression_collection_clause(ctx);
+        }
+    }
+
     visitExpression(ctx) {
         if (ctx.expression_op() != null) {
             return {
@@ -331,8 +416,8 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
     visitExpBooleanOpCollection(ctx) {
         return {
             expType: "expBooleanOpCollection",
-            var1: this.visitBoolean_atom_or_expression(ctx.boolean_atom_or_expression()),
-            var2: super.visitExpression_collection_clause(ctx.expression_collection_clause()),
+            var1: this.visitBoolean_atom_or_expression(ctx.boolean_atom_or_expression(0)),
+            var2: this.visitExpression_collection_clause(ctx.expression_collection_clause()),
             op: ctx.boolean_op_collection().getText()
         };
     }
@@ -499,6 +584,24 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
             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;
+        });
+        if (function_config != null) {
+            if (!this.functionHelper.argsMatch(result["paramList"], function_config["paramList"])) {
+                throw new Error(`参数列表错误 ----- ${ctx.getText()}`);
+            }
+        }
+
         return result;
     }
 
@@ -530,14 +633,15 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
 
     visitVariable_chain(ctx) {
         let varType = "normal";
-        if (ctx.variable().environment_context() != null) {
-            varType = "context";
-        }
+        let content = ctx.getText();
+
         if (ctx.variable().environment_event() != null) {
             varType = "event";
+        } else if (content === "policy" || content === "contract") {
+            varType = "context";
         }
 
-        return {expType: "variableChain", varType: varType, content: ctx.getText()};
+        return {expType: "variableChain", varType: varType, content: content};
     }
 }
 

package/dist/calculator/CalculatorFactory.d.ts

@@ -0,0 +1,21 @@
+import { FunctionHelperAware } from "../interface/FunctionHelperAware";
+import { FunctionHelper } from "../helper/FunctionHelper";
+import { ExpHelperAware } from "../interface/ExpHelperAware";
+import { ExpHelper } from "../helper/ExpHelper";
+import { Calculator } from "../interface/Calculator";
+export declare class CalculatorFactory implements FunctionHelperAware, ExpHelperAware {
+    private expTypeMap;
+    private expCalculator;
+    private expBooleanCalculator;
+    private expConditionCalculator;
+    private expArgsGroupCalculator;
+    constructor();
+    getCalculatorByExpType(expType: string): Calculator;
+    init(): void;
+    private initExp;
+    private initExpBoolean;
+    private initExpCondition;
+    private initExpArgsGroup;
+    setFunctionHelper(functionHelper: FunctionHelper): void;
+    setExpHelper(expHelper: ExpHelper): void;
+}

package/dist/calculator/CalculatorFactory.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CalculatorFactory = void 0;
+const ExpCalculator_1 = require("./ExpCalculator");
+const ExpBooleanCalculator_1 = require("./ExpBooleanCalculator");
+const ExpConditionCalculator_1 = require("./ExpConditionCalculator");
+const ExpArgsGroupCalculator_1 = require("./ExpArgsGroupCalculator");
+class CalculatorFactory {
+    constructor() {
+        this.expTypeMap = new Map();
+        this.expCalculator = new ExpCalculator_1.ExpCalculator();
+        this.expBooleanCalculator = new ExpBooleanCalculator_1.ExpBooleanCalculator();
+        this.expConditionCalculator = new ExpConditionCalculator_1.ExpConditionCalculator();
+        this.expArgsGroupCalculator = new ExpArgsGroupCalculator_1.ExpArgsGroupCalculator();
+    }
+    getCalculatorByExpType(expType) {
+        return this.expTypeMap.get(expType);
+    }
+    init() {
+        this.initExp();
+        this.initExpBoolean();
+        this.initExpCondition();
+        this.initExpArgsGroup();
+    }
+    initExp() {
+        this.expTypeMap.set("expOp", this.expCalculator);
+        this.expTypeMap.set("number", this.expCalculator);
+        this.expTypeMap.set("string", this.expCalculator);
+        this.expTypeMap.set("entity", this.expCalculator);
+        this.expTypeMap.set("variableChain", this.expCalculator);
+        this.expTypeMap.set("functionCall", this.expCalculator);
+        this.expTypeMap.set("expParen", this.expCalculator);
+        this.expTypeMap.set("expSigned", this.expCalculator);
+    }
+    initExpBoolean() {
+        this.expTypeMap.set("expBooleanOpLogic", this.expBooleanCalculator);
+        this.expTypeMap.set("expBooleanOpCollection", this.expBooleanCalculator);
+        this.expTypeMap.set("expBooleanOpCompare", this.expBooleanCalculator);
+        this.expTypeMap.set("expBooleanParen", this.expBooleanCalculator);
+        this.expTypeMap.set("boolean", this.expBooleanCalculator);
+    }
+    initExpCondition() {
+        this.expTypeMap.set("expCondition", this.expConditionCalculator);
+    }
+    initExpArgsGroup() {
+        this.expTypeMap.set("expArgsGroup", this.expArgsGroupCalculator);
+    }
+    setFunctionHelper(functionHelper) {
+        this.expCalculator.setFunctionHelper(functionHelper);
+    }
+    setExpHelper(expHelper) {
+        this.expCalculator.setExpHelper(expHelper);
+        this.expBooleanCalculator.setExpHelper(expHelper);
+        this.expConditionCalculator.setExpHelper(expHelper);
+        this.expArgsGroupCalculator.setExpHelper(expHelper);
+    }
+}
+exports.CalculatorFactory = CalculatorFactory;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ2FsY3VsYXRvckZhY3RvcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY2FsY3VsYXRvci9DYWxjdWxhdG9yRmFjdG9yeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxtREFBOEM7QUFDOUMsaUVBQTREO0FBQzVELHFFQUFnRTtBQUNoRSxxRUFBZ0U7QUFPaEUsTUFBYSxpQkFBaUI7SUFZMUI7UUFWUSxlQUFVLEdBQUcsSUFBSSxHQUFHLEVBQXNCLENBQUM7UUFXL0MsSUFBSSxDQUFDLGFBQWEsR0FBRyxJQUFJLDZCQUFhLEVBQUUsQ0FBQztRQUN6QyxJQUFJLENBQUMsb0JBQW9CLEdBQUcsSUFBSSwyQ0FBb0IsRUFBRSxDQUFDO1FBQ3ZELElBQUksQ0FBQyxzQkFBc0IsR0FBRyxJQUFJLCtDQUFzQixFQUFFLENBQUM7UUFDM0QsSUFBSSxDQUFDLHNCQUFzQixHQUFHLElBQUksK0NBQXNCLEVBQUUsQ0FBQztJQUMvRCxDQUFDO0lBRUQsc0JBQXNCLENBQUMsT0FBZTtRQUNsQyxPQUFPLElBQUksQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ3hDLENBQUM7SUFFRCxJQUFJO1FBQ0EsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ2YsSUFBSSxDQUFDLGNBQWMsRUFBRSxDQUFDO1FBQ3RCLElBQUksQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDO1FBQ3hCLElBQUksQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDO0lBQzVCLENBQUM7SUFFTyxPQUFPO1FBQ1gsSUFBSSxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsT0FBTyxFQUFFLElBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUNqRCxJQUFJLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxRQUFRLEVBQUUsSUFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFDO1FBQ2xELElBQUksQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLFFBQVEsRUFBRSxJQUFJLENBQUMsYUFBYSxDQUFDLENBQUM7UUFDbEQsSUFBSSxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsUUFBUSxFQUFFLElBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUNsRCxJQUFJLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxlQUFlLEVBQUUsSUFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFDO1FBQ3pELElBQUksQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLGNBQWMsRUFBRSxJQUFJLENBQUMsYUFBYSxDQUFDLENBQUM7UUFDeEQsSUFBSSxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsVUFBVSxFQUFFLElBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUNwRCxJQUFJLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxXQUFXLEVBQUUsSUFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFDO0lBQ3pELENBQUM7SUFFTyxjQUFjO1FBQ2xCLElBQUksQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLG1CQUFtQixFQUFFLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDO1FBQ3BFLElBQUksQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLHdCQUF3QixFQUFFLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDO1FBQ3pFLElBQUksQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLHFCQUFxQixFQUFFLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDO1FBQ3RFLElBQUksQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLGlCQUFpQixFQUFFLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDO1FBQ2xFLElBQUksQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLFNBQVMsRUFBRSxJQUFJLENBQUMsb0JBQW9CLENBQUMsQ0FBQztJQUM5RCxDQUFDO0lBRU8sZ0JBQWdCO1FBQ3BCLElBQUksQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLGNBQWMsRUFBRSxJQUFJLENBQUMsc0JBQXNCLENBQUMsQ0FBQztJQUNyRSxDQUFDO0lBRU8sZ0JBQWdCO1FBQ3BCLElBQUksQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLGNBQWMsRUFBRSxJQUFJLENBQUMsc0JBQXNCLENBQUMsQ0FBQztJQUNyRSxDQUFDO0lBRUQsaUJBQWlCLENBQUMsY0FBOEI7UUFDNUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxpQkFBaUIsQ0FBQyxjQUFjLENBQUMsQ0FBQztJQUN6RCxDQUFDO0lBRUQsWUFBWSxDQUFDLFNBQW9CO1FBQzdCLElBQUksQ0FBQyxhQUFhLENBQUMsWUFBWSxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBQzNDLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxZQUFZLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDbEQsSUFBSSxDQUFDLHNCQUFzQixDQUFDLFlBQVksQ0FBQyxTQUFTLENBQUMsQ0FBQztRQUNwRCxJQUFJLENBQUMsc0JBQXNCLENBQUMsWUFBWSxDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBQ3hELENBQUM7Q0FDSjtBQW5FRCw4Q0FtRUMifQ==

package/dist/calculator/CalculatorFactoryBuilder.d.ts

@@ -0,0 +1,12 @@
+import { FunctionHelperAware } from "../interface/FunctionHelperAware";
+import { ExpHelperAware } from "../interface/ExpHelperAware";
+import { FunctionHelper } from "../helper/FunctionHelper";
+import { ExpHelper } from "../helper/ExpHelper";
+import { CalculatorFactory } from "./CalculatorFactory";
+export declare class CalculatorFactoryBuilder implements FunctionHelperAware, ExpHelperAware {
+    private functionHelper;
+    private expHelper;
+    build(): CalculatorFactory;
+    setFunctionHelper(functionHelper: FunctionHelper): void;
+    setExpHelper(expHelper: ExpHelper): void;
+}

package/dist/calculator/CalculatorFactoryBuilder.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CalculatorFactoryBuilder = void 0;
+const CalculatorFactory_1 = require("./CalculatorFactory");
+class CalculatorFactoryBuilder {
+    build() {
+        let calculatorFactory = new CalculatorFactory_1.CalculatorFactory();
+        if (this.functionHelper != null) {
+            calculatorFactory.setFunctionHelper(this.functionHelper);
+        }
+        if (this.expHelper != null) {
+            calculatorFactory.setExpHelper(this.expHelper);
+        }
+        calculatorFactory.init();
+        return calculatorFactory;
+    }
+    setFunctionHelper(functionHelper) {
+        this.functionHelper = functionHelper;
+    }
+    setExpHelper(expHelper) {
+        this.expHelper = expHelper;
+    }
+}
+exports.CalculatorFactoryBuilder = CalculatorFactoryBuilder;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ2FsY3VsYXRvckZhY3RvcnlCdWlsZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NhbGN1bGF0b3IvQ2FsY3VsYXRvckZhY3RvcnlCdWlsZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUlBLDJEQUFzRDtBQUV0RCxNQUFhLHdCQUF3QjtJQU1qQyxLQUFLO1FBQ0QsSUFBSSxpQkFBaUIsR0FBRyxJQUFJLHFDQUFpQixFQUFFLENBQUM7UUFDaEQsSUFBSSxJQUFJLENBQUMsY0FBYyxJQUFJLElBQUksRUFBRSxDQUFDO1lBQzlCLGlCQUFpQixDQUFDLGlCQUFpQixDQUFDLElBQUksQ0FBQyxjQUFjLENBQUMsQ0FBQztRQUM3RCxDQUFDO1FBQ0QsSUFBSSxJQUFJLENBQUMsU0FBUyxJQUFJLElBQUksRUFBRSxDQUFDO1lBQ3pCLGlCQUFpQixDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDbkQsQ0FBQztRQUNELGlCQUFpQixDQUFDLElBQUksRUFBRSxDQUFDO1FBRXpCLE9BQU8saUJBQWlCLENBQUM7SUFDN0IsQ0FBQztJQUVELGlCQUFpQixDQUFDLGNBQThCO1FBQzVDLElBQUksQ0FBQyxjQUFjLEdBQUcsY0FBYyxDQUFDO0lBQ3pDLENBQUM7SUFFRCxZQUFZLENBQUMsU0FBb0I7UUFDN0IsSUFBSSxDQUFDLFNBQVMsR0FBRyxTQUFTLENBQUM7SUFDL0IsQ0FBQztDQUNKO0FBMUJELDREQTBCQyJ9

package/dist/calculator/ExpArgsGroupCalculator.d.ts

@@ -2,10 +2,10 @@ import { Calculator } from "../interface/Calculator";
 import { AssignmentClauseInfo } from "../model/AssignmentClauseInfo";
 import { VarContextCapable } from "../interface/VarContextCapable";
 import { ExpHelper } from "../helper/ExpHelper";
-import { ExpArgsGroup } from "../model/exp-args-group/ExpArgsGroup";
-export declare class ExpArgsGroupCalculator implements Calculator {
+import { ExpHelperAware } from "../interface/ExpHelperAware";
+export declare class ExpArgsGroupCalculator implements Calculator, ExpHelperAware {
     private expHelper;
     getExpValue(varObj: AssignmentClauseInfo, varContextCapable: VarContextCapable<any>): any;
-    generateExpArgsGroupValue(expArgsGroup: ExpArgsGroup, varContextCapable: VarContextCapable<any>): {};
+    private generateExpArgsGroupValue;
     setExpHelper(expHelper: ExpHelper): void;
 }

package/dist/calculator/ExpArgsGroupCalculator.js

@@ -23,4 +23,4 @@ class ExpArgsGroupCalculator {
     }
 }
 exports.ExpArgsGroupCalculator = ExpArgsGroupCalculator;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRXhwQXJnc0dyb3VwQ2FsY3VsYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jYWxjdWxhdG9yL0V4cEFyZ3NHcm91cENhbGN1bGF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBTUEsTUFBYSxzQkFBc0I7SUFJL0IsV0FBVyxDQUFDLE1BQTRCLEVBQUUsaUJBQXlDO1FBQy9FLElBQUksTUFBTSxDQUFDLE9BQU8sSUFBSSxjQUFjLEVBQUUsQ0FBQztZQUNuQyxPQUFPLElBQUksQ0FBQyx5QkFBeUIsQ0FBQyxNQUFhLEVBQUUsaUJBQWlCLENBQUMsQ0FBQztRQUM1RSxDQUFDO1FBRUQsTUFBTSxJQUFJLEtBQUssQ0FBQyw4Q0FBOEMsQ0FBQyxDQUFDO0lBQ3BFLENBQUM7SUFFRCx5QkFBeUIsQ0FBQyxZQUEwQixFQUFFLGlCQUF5QztRQUMzRixJQUFJLE1BQU0sR0FBRyxFQUFFLENBQUM7UUFDaEIsYUFBYTtRQUNiLElBQUksWUFBWSxDQUFDLFNBQVMsQ0FBQyxNQUFNLElBQUksQ0FBQyxFQUFFLENBQUM7WUFDckMsWUFBWSxDQUFDLFNBQVMsQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLEVBQUU7Z0JBQ25DLE1BQU0sQ0FBQyxLQUFLLENBQUMsU0FBUyxDQUFDLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxXQUFXLENBQUMsS0FBSyxDQUFDLGFBQWEsRUFBRSxpQkFBaUIsQ0FBQyxDQUFDO1lBQ2pHLENBQUMsQ0FBQyxDQUFDO1FBQ1AsQ0FBQztRQUVELE9BQU8sTUFBTSxDQUFDO0lBQ2xCLENBQUM7SUFFRCxZQUFZLENBQUMsU0FBb0I7UUFDN0IsSUFBSSxDQUFDLFNBQVMsR0FBRyxTQUFTLENBQUM7SUFDL0IsQ0FBQztDQUNKO0FBM0JELHdEQTJCQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRXhwQXJnc0dyb3VwQ2FsY3VsYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jYWxjdWxhdG9yL0V4cEFyZ3NHcm91cENhbGN1bGF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBT0EsTUFBYSxzQkFBc0I7SUFJL0IsV0FBVyxDQUFDLE1BQTRCLEVBQUUsaUJBQXlDO1FBQy9FLElBQUksTUFBTSxDQUFDLE9BQU8sSUFBSSxjQUFjLEVBQUUsQ0FBQztZQUNuQyxPQUFPLElBQUksQ0FBQyx5QkFBeUIsQ0FBQyxNQUFhLEVBQUUsaUJBQWlCLENBQUMsQ0FBQztRQUM1RSxDQUFDO1FBRUQsTUFBTSxJQUFJLEtBQUssQ0FBQyw4Q0FBOEMsQ0FBQyxDQUFDO0lBQ3BFLENBQUM7SUFFTyx5QkFBeUIsQ0FBQyxZQUEwQixFQUFFLGlCQUF5QztRQUNuRyxJQUFJLE1BQU0sR0FBRyxFQUFFLENBQUM7UUFDaEIsYUFBYTtRQUNiLElBQUksWUFBWSxDQUFDLFNBQVMsQ0FBQyxNQUFNLElBQUksQ0FBQyxFQUFFLENBQUM7WUFDckMsWUFBWSxDQUFDLFNBQVMsQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLEVBQUU7Z0JBQ25DLE1BQU0sQ0FBQyxLQUFLLENBQUMsU0FBUyxDQUFDLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxXQUFXLENBQUMsS0FBSyxDQUFDLGFBQWEsRUFBRSxpQkFBaUIsQ0FBQyxDQUFDO1lBQ2pHLENBQUMsQ0FBQyxDQUFDO1FBQ1AsQ0FBQztRQUVELE9BQU8sTUFBTSxDQUFDO0lBQ2xCLENBQUM7SUFFRCxZQUFZLENBQUMsU0FBb0I7UUFDN0IsSUFBSSxDQUFDLFNBQVMsR0FBRyxTQUFTLENBQUM7SUFDL0IsQ0FBQztDQUNKO0FBM0JELHdEQTJCQyJ9

package/dist/calculator/ExpBooleanCalculator.d.ts

@@ -2,12 +2,12 @@ import { Calculator } from "../interface/Calculator";
 import { AssignmentClauseInfo } from "../model/AssignmentClauseInfo";
 import { VarContextCapable } from "../interface/VarContextCapable";
 import { ExpHelper } from "../helper/ExpHelper";
-import { ExpBooleanOpCompare } from "../model/exp-boolean/ExpBooleanOpCompare";
-import { ExpBooleanOpLogic } from "../model/exp-boolean/ExpBooleanOpLogic";
-export declare class ExpBooleanCalculator implements Calculator {
+import { ExpHelperAware } from "../interface/ExpHelperAware";
+export declare class ExpBooleanCalculator implements Calculator, ExpHelperAware {
     private expHelper;
     getExpValue(varObj: AssignmentClauseInfo, varContextCapable: VarContextCapable<any>): boolean;
-    calculateExpBooleanOpLogic(expBooleanOpLogic: ExpBooleanOpLogic, varContextCapable: VarContextCapable<any>): boolean;
-    calculateExpBooleanOpCompare(expBooleanOpCompare: ExpBooleanOpCompare, varContextCapable: VarContextCapable<any>): boolean;
+    private calculateExpBooleanOpLogic;
+    private calculateExpBooleanOpCollection;
+    private calculateExpBooleanOpCompare;
     setExpHelper(expHelper: ExpHelper): void;
 }

package/dist/calculator/ExpBooleanCalculator.js

@@ -6,9 +6,15 @@ class ExpBooleanCalculator {
         if (varObj.expType == "expBooleanOpLogic") {
             return this.calculateExpBooleanOpLogic(varObj, varContextCapable);
         }
+        if (varObj.expType == "expBooleanOpCollection") {
+            return this.calculateExpBooleanOpCollection(varObj, varContextCapable);
+        }
         if (varObj.expType == "expBooleanOpCompare") {
             return this.calculateExpBooleanOpCompare(varObj, varContextCapable);
         }
+        if (varObj.expType == "expBooleanParen") {
+            return this.expHelper.getExpValue(varObj["var1"], varContextCapable);
+        }
         if (varObj.expType == "boolean") {
             return varObj["value"] == "true";
         }
@@ -30,6 +36,14 @@ class ExpBooleanCalculator {
         }
         return false;
     }
+    calculateExpBooleanOpCollection(expBooleanOpCollection, varContextCapable) {
+        let var1 = this.expHelper.getExpValue(expBooleanOpCollection.var1, varContextCapable);
+        let var2 = this.expHelper.getExpValue(expBooleanOpCollection.var2, varContextCapable);
+        if (expBooleanOpCollection.op == "in") {
+            return var2.indexOf(var1) != -1;
+        }
+        return false;
+    }
     calculateExpBooleanOpCompare(expBooleanOpCompare, varContextCapable) {
         let var1 = this.expHelper.getExpValue(expBooleanOpCompare.var1, varContextCapable);
         let var2 = this.expHelper.getExpValue(expBooleanOpCompare.var2, varContextCapable);
@@ -64,4 +78,4 @@ class ExpBooleanCalculator {
     }
 }
 exports.ExpBooleanCalculator = ExpBooleanCalculator;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRXhwQm9vbGVhbkNhbGN1bGF0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY2FsY3VsYXRvci9FeHBCb29sZWFuQ2FsY3VsYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFPQSxNQUFhLG9CQUFvQjtJQUk3QixXQUFXLENBQUMsTUFBNEIsRUFBRSxpQkFBeUM7UUFDL0UsSUFBSSxNQUFNLENBQUMsT0FBTyxJQUFJLG1CQUFtQixFQUFFLENBQUM7WUFDeEMsT0FBTyxJQUFJLENBQUMsMEJBQTBCLENBQUMsTUFBYSxFQUFFLGlCQUFpQixDQUFDLENBQUM7UUFDN0UsQ0FBQztRQUNELElBQUksTUFBTSxDQUFDLE9BQU8sSUFBSSxxQkFBcUIsRUFBRSxDQUFDO1lBQzFDLE9BQU8sSUFBSSxDQUFDLDRCQUE0QixDQUFDLE1BQWEsRUFBRSxpQkFBaUIsQ0FBQyxDQUFDO1FBQy9FLENBQUM7UUFDRCxJQUFJLE1BQU0sQ0FBQyxPQUFPLElBQUksU0FBUyxFQUFFLENBQUM7WUFDOUIsT0FBTyxNQUFNLENBQUMsT0FBTyxDQUFDLElBQUksTUFBTSxDQUFDO1FBQ3JDLENBQUM7UUFFRCxNQUFNLElBQUksS0FBSyxDQUFDLDRDQUE0QyxDQUFDLENBQUM7SUFDbEUsQ0FBQztJQUVELDBCQUEwQixDQUFDLGlCQUFvQyxFQUFFLGlCQUF5QztRQUN0RyxJQUFJLElBQUksR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLFdBQVcsQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLEVBQUUsaUJBQWlCLENBQUMsQ0FBQztRQUNqRixJQUFJLGlCQUFpQixDQUFDLEVBQUUsSUFBSSxLQUFLLEVBQUUsQ0FBQztZQUNoQyxPQUFPLENBQUMsSUFBSSxDQUFDO1FBQ2pCLENBQUM7YUFBTSxDQUFDO1lBQ0osSUFBSSxJQUFJLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxXQUFXLENBQUMsaUJBQWlCLENBQUMsSUFBSSxFQUFFLGlCQUFpQixDQUFDLENBQUM7WUFDakYsSUFBSSxpQkFBaUIsQ0FBQyxFQUFFLElBQUksS0FBSyxFQUFFLENBQUM7Z0JBQ2hDLE9BQU8sSUFBSSxJQUFJLElBQUksQ0FBQztZQUN4QixDQUFDO1lBQ0QsSUFBSSxpQkFBaUIsQ0FBQyxFQUFFLElBQUksSUFBSSxFQUFFLENBQUM7Z0JBQy9CLE9BQU8sSUFBSSxJQUFJLElBQUksQ0FBQztZQUN4QixDQUFDO1FBQ0wsQ0FBQztRQUVELE9BQU8sS0FBSyxDQUFDO0lBQ2pCLENBQUM7SUFFRCw0QkFBNEIsQ0FBQyxtQkFBd0MsRUFBRSxpQkFBeUM7UUFDNUcsSUFBSSxJQUFJLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxXQUFXLENBQUMsbUJBQW1CLENBQUMsSUFBSSxFQUFFLGlCQUFpQixDQUFDLENBQUM7UUFDbkYsSUFBSSxJQUFJLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxXQUFXLENBQUMsbUJBQW1CLENBQUMsSUFBSSxFQUFFLGlCQUFpQixDQUFDLENBQUM7UUFDbkYsSUFBSSxtQkFBbUIsQ0FBQyxFQUFFLElBQUksTUFBTSxJQUFJLG1CQUFtQixDQUFDLEVBQUUsSUFBSSxHQUFHLEVBQUUsQ0FBQztZQUNwRSxPQUFPLElBQUksR0FBRyxJQUFJLENBQUM7UUFDdkIsQ0FBQztRQUNELElBQUksbUJBQW1CLENBQUMsRUFBRSxJQUFJLFFBQVEsRUFBRSxDQUFDO1lBQ3JDLE9BQU8sSUFBSSxHQUFHLElBQUksQ0FBQztRQUN2QixDQUFDO1FBQ0QsSUFBSSxtQkFBbUIsQ0FBQyxFQUFFLElBQUksYUFBYSxJQUFJLG1CQUFtQixDQUFDLEVBQUUsSUFBSSxJQUFJLEVBQUUsQ0FBQztZQUM1RSxPQUFPLElBQUksSUFBSSxJQUFJLENBQUM7UUFDeEIsQ0FBQztRQUNELElBQUksbUJBQW1CLENBQUMsRUFBRSxJQUFJLFNBQVMsSUFBSSxtQkFBbUIsQ0FBQyxFQUFFLElBQUksR0FBRyxFQUFFLENBQUM7WUFDdkUsT0FBTyxJQUFJLEdBQUcsSUFBSSxDQUFDO1FBQ3ZCLENBQUM7UUFDRCxJQUFJLG1CQUFtQixDQUFDLEVBQUUsSUFBSSxPQUFPLEVBQUUsQ0FBQztZQUNwQyxPQUFPLElBQUksR0FBRyxJQUFJLENBQUM7UUFDdkIsQ0FBQztRQUNELElBQUksbUJBQW1CLENBQUMsRUFBRSxJQUFJLGdCQUFnQixJQUFJLG1CQUFtQixDQUFDLEVBQUUsSUFBSSxJQUFJLEVBQUUsQ0FBQztZQUMvRSxPQUFPLElBQUksSUFBSSxJQUFJLENBQUM7UUFDeEIsQ0FBQztRQUNELElBQUksbUJBQW1CLENBQUMsRUFBRSxJQUFJLE9BQU8sSUFBSSxtQkFBbUIsQ0FBQyxFQUFFLElBQUksSUFBSSxFQUFFLENBQUM7WUFDdEUsT0FBTyxJQUFJLElBQUksSUFBSSxDQUFDO1FBQ3hCLENBQUM7UUFDRCxJQUFJLG1CQUFtQixDQUFDLEVBQUUsSUFBSSxVQUFVLElBQUksbUJBQW1CLENBQUMsRUFBRSxJQUFJLElBQUksRUFBRSxDQUFDO1lBQ3pFLE9BQU8sSUFBSSxJQUFJLElBQUksQ0FBQztRQUN4QixDQUFDO1FBRUQsT0FBTyxLQUFLLENBQUM7SUFDakIsQ0FBQztJQUVELFlBQVksQ0FBQyxTQUFvQjtRQUM3QixJQUFJLENBQUMsU0FBUyxHQUFHLFNBQVMsQ0FBQztJQUMvQixDQUFDO0NBQ0o7QUFyRUQsb0RBcUVDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRXhwQm9vbGVhbkNhbGN1bGF0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY2FsY3VsYXRvci9FeHBCb29sZWFuQ2FsY3VsYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFTQSxNQUFhLG9CQUFvQjtJQUk3QixXQUFXLENBQUMsTUFBNEIsRUFBRSxpQkFBeUM7UUFDL0UsSUFBSSxNQUFNLENBQUMsT0FBTyxJQUFJLG1CQUFtQixFQUFFLENBQUM7WUFDeEMsT0FBTyxJQUFJLENBQUMsMEJBQTBCLENBQUMsTUFBYSxFQUFFLGlCQUFpQixDQUFDLENBQUM7UUFDN0UsQ0FBQztRQUNELElBQUksTUFBTSxDQUFDLE9BQU8sSUFBSSx3QkFBd0IsRUFBRSxDQUFDO1lBQzdDLE9BQU8sSUFBSSxDQUFDLCtCQUErQixDQUFDLE1BQWEsRUFBRSxpQkFBaUIsQ0FBQyxDQUFDO1FBQ2xGLENBQUM7UUFDRCxJQUFJLE1BQU0sQ0FBQyxPQUFPLElBQUkscUJBQXFCLEVBQUUsQ0FBQztZQUMxQyxPQUFPLElBQUksQ0FBQyw0QkFBNEIsQ0FBQyxNQUFhLEVBQUUsaUJBQWlCLENBQUMsQ0FBQztRQUMvRSxDQUFDO1FBQ0QsSUFBSSxNQUFNLENBQUMsT0FBTyxJQUFJLGlCQUFpQixFQUFFLENBQUM7WUFDdEMsT0FBTyxJQUFJLENBQUMsU0FBUyxDQUFDLFdBQVcsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLEVBQUUsaUJBQWlCLENBQUMsQ0FBQztRQUN6RSxDQUFDO1FBQ0QsSUFBSSxNQUFNLENBQUMsT0FBTyxJQUFJLFNBQVMsRUFBRSxDQUFDO1lBQzlCLE9BQU8sTUFBTSxDQUFDLE9BQU8sQ0FBQyxJQUFJLE1BQU0sQ0FBQztRQUNyQyxDQUFDO1FBRUQsTUFBTSxJQUFJLEtBQUssQ0FBQyw0Q0FBNEMsQ0FBQyxDQUFDO0lBQ2xFLENBQUM7SUFFTywwQkFBMEIsQ0FBQyxpQkFBb0MsRUFBRSxpQkFBeUM7UUFDOUcsSUFBSSxJQUFJ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

package/dist/calculator/ExpCalculator.d.ts

@@ -1,16 +1,16 @@
-import { ExpOp } from "../model/exp/ExpOp";
 import { VarContextCapable } from "../interface/VarContextCapable";
 import { FunctionHelper } from "../helper/FunctionHelper";
 import { AssignmentClauseInfo } from "../model/AssignmentClauseInfo";
 import { Calculator } from "../interface/Calculator";
 import { ExpHelper } from "../helper/ExpHelper";
-import { ExpSigned } from "../model/exp/ExpSigned";
-export declare class ExpCalculator implements Calculator {
+import { FunctionHelperAware } from "../interface/FunctionHelperAware";
+import { ExpHelperAware } from "../interface/ExpHelperAware";
+export declare class ExpCalculator implements Calculator, FunctionHelperAware, ExpHelperAware {
     private functionHelper;
     private expHelper;
     getExpValue(varObj: AssignmentClauseInfo, varContextCapable: VarContextCapable<any>): any;
-    calculateExpOp(expOp: ExpOp, varContextCapable: VarContextCapable<any>): number;
-    calculateExpSigned(expSigned: ExpSigned, varContextCapable: VarContextCapable<any>): number;
+    private calculateExpOp;
+    private calculateExpSigned;
     setFunctionHelper(functionHelper: FunctionHelper): void;
     setExpHelper(expHelper: ExpHelper): void;
 }

package/dist/calculator/ExpCalculator.js

@@ -52,4 +52,4 @@ class ExpCalculator {
     }
 }
 exports.ExpCalculator = ExpCalculator;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRXhwQ2FsY3VsYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jYWxjdWxhdG9yL0V4cENhbGN1bGF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBUUEsTUFBYSxhQUFhO0lBTXRCLFdBQVcsQ0FBQyxNQUE0QixFQUFFLGlCQUF5QztRQUMvRSxJQUFJLE1BQU0sQ0FBQyxPQUFPLElBQUksT0FBTyxFQUFFLENBQUM7WUFDNUIsT0FBTyxJQUFJLENBQUMsY0FBYyxDQUFDLE1BQWEsRUFBRSxpQkFBaUIsQ0FBQyxDQUFDO1FBQ2pFLENBQUM7UUFDRCxJQUFJLE1BQU0sQ0FBQyxPQUFPLElBQUksUUFBUSxFQUFFLENBQUM7WUFDN0IsT0FBTyxRQUFRLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUM7UUFDckMsQ0FBQztRQUNELElBQUksTUFBTSxDQUFDLE9BQU8sSUFBSSxRQUFRLEVBQUUsQ0FBQztZQUM3QixPQUFPLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUMzQixDQUFDO1FBQ0QsSUFBSSxNQUFNLENBQUMsT0FBTyxJQUFJLFFBQVEsRUFBRSxDQUFDO1lBQzdCLE9BQU8sTUFBTSxDQUFDO1FBQ2xCLENBQUM7UUFDRCxJQUFJLE1BQU0sQ0FBQyxPQUFPLElBQUksZUFBZSxFQUFFLENBQUM7WUFDcEMsT0FBTyxpQkFBaUIsQ0FBQyxhQUFhLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUM7UUFDOUQsQ0FBQztRQUNELElBQUksTUFBTSxDQUFDLE9BQU8sSUFBSSxjQUFjLEVBQUUsQ0FBQztZQUNuQyxPQUFPLElBQUksQ0FBQyxjQUFjLENBQUMsZ0JBQWdCLENBQUMsTUFBYSxFQUFFLGlCQUFpQixDQUFDLENBQUM7UUFDbEYsQ0FBQztRQUNELElBQUksTUFBTSxDQUFDLE9BQU8sSUFBSSxVQUFVLEVBQUUsQ0FBQztZQUMvQixPQUFPLElBQUksQ0FBQyxTQUFTLENBQUMsV0FBVyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsRUFBRSxpQkFBaUIsQ0FBQyxDQUFDO1FBQ3pFLENBQUM7UUFDRCxJQUFJLE1BQU0sQ0FBQyxPQUFPLElBQUksV0FBVyxFQUFFLENBQUM7WUFDaEMsT0FBTyxJQUFJLENBQUMsa0JBQWtCLENBQUMsTUFBYSxFQUFFLGlCQUFpQixDQUFDLENBQUM7UUFDckUsQ0FBQztRQUVELE1BQU0sSUFBSSxLQUFLLENBQUMscUNBQXFDLENBQUMsQ0FBQztJQUMzRCxDQUFDO0lBRUQsY0FBYyxDQUFDLEtBQVksRUFBRSxpQkFBeUM7UUFDbEUsSUFBSSxJQUFJLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxXQUFXLENBQUMsS0FBSyxDQUFDLElBQUksRUFBRSxpQkFBaUIsQ0FBQyxDQUFDO1FBQ3JFLElBQUksSUFBSSxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUMsV0FBVyxDQUFDLEtBQUssQ0FBQyxJQUFJLEVBQUUsaUJBQWlCLENBQUMsQ0FBQztRQUNyRSxJQUFJLE1BQU0sR0FBRyxHQUFHLElBQUksSUFBSSxLQUFLLENBQUMsRUFBRSxJQUFJLElBQUksRUFBRSxDQUFDO1FBRTNDLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQ3hCLENBQUM7SUFFRCxrQkFBa0IsQ0FBQyxTQUFvQixFQUFFLGlCQUF5QztRQUM5RSxJQUFJLElBQUksR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLFdBQVcsQ0FBQyxTQUFTLENBQUMsSUFBSSxFQUFFLGlCQUFpQixDQUFDLENBQUM7UUFDekUsSUFBSSxTQUFTLENBQUMsTUFBTSxJQUFJLEdBQUcsRUFBRSxDQUFDO1lBQzFCLE9BQU8sQ0FBQyxJQUFJLENBQUM7UUFDakIsQ0FBQzthQUFNLENBQUM7WUFDSixPQUFPLElBQUksQ0FBQztRQUNoQixDQUFDO0lBQ0wsQ0FBQztJQUVELGlCQUFpQixDQUFDLGNBQThCO1FBQzVDLElBQUksQ0FBQyxjQUFjLEdBQUcsY0FBYyxDQUFDO0lBQ3pDLENBQUM7SUFFRCxZQUFZLENBQUMsU0FBb0I7UUFDN0IsSUFBSSxDQUFDLFNBQVMsR0FBRyxTQUFTLENBQUM7SUFDL0IsQ0FBQztDQUNKO0FBM0RELHNDQTJEQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRXhwQ2FsY3VsYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jYWxjdWxhdG9yL0V4cENhbGN1bGF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBVUEsTUFBYSxhQUFhO0lBTXRCLFdBQVcsQ0FBQyxNQUE0QixFQUFFLGlCQUF5QztRQUMvRSxJQUFJLE1BQU0sQ0FBQyxPQUFPLElBQUksT0FBTyxFQUFFLENBQUM7WUFDNUIsT0FBTyxJQUFJLENBQUMsY0FBYyxDQUFDLE1BQWEsRUFBRSxpQkFBaUIsQ0FBQyxDQUFDO1FBQ2pFLENBQUM7UUFDRCxJQUFJLE1BQU0sQ0FBQyxPQUFPLElBQUksUUFBUSxFQUFFLENBQUM7WUFDN0IsT0FBTyxRQUFRLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUM7UUFDckMsQ0FBQztRQUNELElBQUksTUFBTSxDQUFDLE9BQU8sSUFBSSxRQUFRLEVBQUUsQ0FBQztZQUM3QixPQUFPLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUMzQixDQUFDO1FBQ0QsSUFBSSxNQUFNLENBQUMsT0FBTyxJQUFJLFFBQVEsRUFBRSxDQUFDO1lBQzdCLE9BQU8sTUFBTSxDQUFDO1FBQ2xCLENBQUM7UUFDRCxJQUFJLE1BQU0sQ0FBQyxPQUFPLElBQUksZUFBZSxFQUFFLENBQUM7WUFDcEMsT0FBTyxpQkFBaUIsQ0FBQyxhQUFhLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUM7UUFDOUQsQ0FBQztRQUNELElBQUksTUFBTSxDQUFDLE9BQU8sSUFBSSxjQUFjLEVBQUUsQ0FBQztZQUNuQyxPQUFPLElBQUksQ0FBQyxjQUFjLENBQUMsZ0JBQWdCLENBQUMsTUFBYSxFQUFFLGlCQUFpQixDQUFDLENBQUM7UUFDbEYsQ0FBQztRQUNELElBQUksTUFBTSxDQUFDLE9BQU8sSUFBSSxVQUFVLEVBQUUsQ0FBQztZQUMvQixPQUFPLElBQUksQ0FBQyxTQUFTLENBQUMsV0FBVyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsRUFBRSxpQkFBaUIsQ0FBQyxDQUFDO1FBQ3pFLENBQUM7UUFDRCxJQUFJLE1BQU0sQ0FBQyxPQUFPLElBQUksV0FBVyxFQUFFLENBQUM7WUFDaEMsT0FBTyxJQUFJLENBQUMsa0JBQWtCLENBQUMsTUFBYSxFQUFFLGlCQUFpQixDQUFDLENBQUM7UUFDckUsQ0FBQztRQUVELE1BQU0sSUFBSSxLQUFLLENBQUMscUNBQXFDLENBQUMsQ0FBQztJQUMzRCxDQUFDO0lBRU8sY0FBYyxDQUFDLEtBQVksRUFBRSxpQkFBeUM7UUFDMUUsSUFBSSxJQUFJLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxXQUFXLENBQUMsS0FBSyxDQUFDLElBQUksRUFBRSxpQkFBaUIsQ0FBQyxDQUFDO1FBQ3JFLElBQUksSUFBSSxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUMsV0FBVyxDQUFDLEtBQUssQ0FBQyxJQUFJLEVBQUUsaUJBQWlCLENBQUMsQ0FBQztRQUNyRSxJQUFJLE1BQU0sR0FBRyxHQUFHLElBQUksSUFBSSxLQUFLLENBQUMsRUFBRSxJQUFJLElBQUksRUFBRSxDQUFDO1FBRTNDLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQ3hCLENBQUM7SUFFTyxrQkFBa0IsQ0FBQyxTQUFvQixFQUFFLGlCQUF5QztRQUN0RixJQUFJLElBQUksR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLFdBQVcsQ0FBQyxTQUFTLENBQUMsSUFBSSxFQUFFLGlCQUFpQixDQUFDLENBQUM7UUFDekUsSUFBSSxTQUFTLENBQUMsTUFBTSxJQUFJLEdBQUcsRUFBRSxDQUFDO1lBQzFCLE9BQU8sQ0FBQyxJQUFJLENBQUM7UUFDakIsQ0FBQzthQUFNLENBQUM7WUFDSixPQUFPLElBQUksQ0FBQztRQUNoQixDQUFDO0lBQ0wsQ0FBQztJQUVELGlCQUFpQixDQUFDLGNBQThCO1FBQzVDLElBQUksQ0FBQyxjQUFjLEdBQUcsY0FBYyxDQUFDO0lBQ3pDLENBQUM7SUFFRCxZQUFZLENBQUMsU0FBb0I7UUFDN0IsSUFBSSxDQUFDLFNBQVMsR0FBRyxTQUFTLENBQUM7SUFDL0IsQ0FBQztDQUNKO0FBM0RELHNDQTJEQyJ9

package/dist/calculator/ExpConditionCalculator.d.ts

@@ -2,10 +2,10 @@ import { Calculator } from "../interface/Calculator";
 import { AssignmentClauseInfo } from "../model/AssignmentClauseInfo";
 import { VarContextCapable } from "../interface/VarContextCapable";
 import { ExpHelper } from "../helper/ExpHelper";
-import { ExpCondition } from "../model/exp-condition/ExpCondition";
-export declare class ExpConditionCalculator implements Calculator {
+import { ExpHelperAware } from "../interface/ExpHelperAware";
+export declare class ExpConditionCalculator implements Calculator, ExpHelperAware {
     private expHelper;
     getExpValue(varObj: AssignmentClauseInfo, varContextCapable: VarContextCapable<any>): any;
-    generateExpConditionValue(expCondition: ExpCondition, varContextCapable: VarContextCapable<any>): any[];
+    private generateExpConditionValue;
     setExpHelper(expHelper: ExpHelper): void;
 }

package/dist/calculator/ExpConditionCalculator.js

@@ -33,4 +33,4 @@ class ExpConditionCalculator {
     }
 }
 exports.ExpConditionCalculator = ExpConditionCalculator;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRXhwQ29uZGl0aW9uQ2FsY3VsYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jYWxjdWxhdG9yL0V4cENvbmRpdGlvbkNhbGN1bGF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBTUEsTUFBYSxzQkFBc0I7SUFJL0IsV0FBVyxDQUFDLE1BQTRCLEVBQUUsaUJBQXlDO1FBQy9FLElBQUksTUFBTSxDQUFDLE9BQU8sSUFBSSxjQUFjLEVBQUUsQ0FBQztZQUNuQyxPQUFPLElBQUksQ0FBQyx5QkFBeUIsQ0FBQyxNQUFhLEVBQUUsaUJBQWlCLENBQUMsQ0FBQztRQUM1RSxDQUFDO1FBRUQsTUFBTSxJQUFJLEtBQUssQ0FBQyw4Q0FBOEMsQ0FBQyxDQUFDO0lBQ3BFLENBQUM7SUFFRCx5QkFBeUIsQ0FBQyxZQUEwQixFQUFFLGlCQUF5QztRQUMzRixJQUFJLE1BQU0sR0FBRyxFQUFFLENBQUM7UUFDaEIsYUFBYTtRQUNiLElBQUksWUFBWSxDQUFDLFNBQVMsQ0FBQyxNQUFNLElBQUksQ0FBQyxFQUFFLENBQUM7WUFDckMsWUFBWSxDQUFDLFNBQVMsQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLEVBQUU7Z0JBQ25DLElBQUksS0FBSyxDQUFDLGlCQUFpQixJQUFJLElBQUksRUFBRSxDQUFDO29CQUNsQyxJQUFJLE1BQU0sR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLFdBQVcsQ0FBQyxLQUFLLENBQUMsYUFBYSxFQUFFLGlCQUFpQixDQUFDLENBQUM7b0JBQ2hGLE1BQU0sQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUM7Z0JBQ3hCLENBQUM7cUJBQU0sQ0FBQztvQkFDSixJQUFJLE1BQU0sR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLFdBQVcsQ0FBQyxLQUFLLENBQUMsaUJBQWlCLEVBQUUsaUJBQWlCLENBQUMsQ0FBQztvQkFDcEYsSUFBSSxNQUFNLEVBQUUsQ0FBQzt3QkFDVCxJQUFJLE1BQU0sR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLFdBQVcsQ0FBQyxLQUFLLENBQUMsYUFBYSxFQUFFLGlCQUFpQixDQUFDLENBQUM7d0JBQ2hGLE1BQU0sQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUM7b0JBQ3hCLENBQUM7Z0JBQ0wsQ0FBQztZQUNMLENBQUMsQ0FBQyxDQUFDO1FBQ1AsQ0FBQztRQUVELE9BQU8sTUFBTSxDQUFDO0lBQ2xCLENBQUM7SUFFRCxZQUFZLENBQUMsU0FBb0I7UUFDN0IsSUFBSSxDQUFDLFNBQVMsR0FBRyxTQUFTLENBQUM7SUFDL0IsQ0FBQztDQUNKO0FBcENELHdEQW9DQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRXhwQ29uZGl0aW9uQ2FsY3VsYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jYWxjdWxhdG9yL0V4cENvbmRpdGlvbkNhbGN1bGF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBT0EsTUFBYSxzQkFBc0I7SUFJL0IsV0FBVyxDQUFDLE1BQTRCLEVBQUUsaUJBQXlDO1FBQy9FLElBQUksTUFBTSxDQUFDLE9BQU8sSUFBSSxjQUFjLEVBQUUsQ0FBQztZQUNuQyxPQUFPLElBQUksQ0FBQyx5QkFBeUIsQ0FBQyxNQUFhLEVBQUUsaUJBQWlCLENBQUMsQ0FBQztRQUM1RSxDQUFDO1FBRUQsTUFBTSxJQUFJLEtBQUssQ0FBQyw4Q0FBOEMsQ0FBQyxDQUFDO0lBQ3BFLENBQUM7SUFFTyx5QkFBeUIsQ0FBQyxZQUEwQixFQUFFLGlCQUF5QztRQUNuRyxJQUFJLE1BQU0sR0FBRyxFQUFFLENBQUM7UUFDaEIsYUFBYTtRQUNiLElBQUksWUFBWSxDQUFDLFNBQVMsQ0FBQyxNQUFNLElBQUksQ0FBQyxFQUFFLENBQUM7WUFDckMsWUFBWSxDQUFDLFNBQVMsQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLEVBQUU7Z0JBQ25DLElBQUksS0FBSyxDQUFDLGlCQUFpQixJQUFJLElBQUksRUFBRSxDQUFDO29CQUNsQyxJQUFJLE1BQU0sR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLFdBQVcsQ0FBQyxLQUFLLENBQUMsYUFBYSxFQUFFLGlCQUFpQixDQUFDLENBQUM7b0JBQ2hGLE1BQU0sQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUM7Z0JBQ3hCLENBQUM7cUJBQU0sQ0FBQztvQkFDSixJQUFJLE1BQU0sR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLFdBQVcsQ0FBQyxLQUFLLENBQUMsaUJBQWlCLEVBQUUsaUJBQWlCLENBQUMsQ0FBQztvQkFDcEYsSUFBSSxNQUFNLEVBQUUsQ0FBQzt3QkFDVCxJQUFJLE1BQU0sR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLFdBQVcsQ0FBQyxLQUFLLENBQUMsYUFBYSxFQUFFLGlCQUFpQixDQUFDLENBQUM7d0JBQ2hGLE1BQU0sQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUM7b0JBQ3hCLENBQUM7Z0JBQ0wsQ0FBQztZQUNMLENBQUMsQ0FBQyxDQUFDO1FBQ1AsQ0FBQztRQUVELE9BQU8sTUFBTSxDQUFDO0lBQ2xCLENBQUM7SUFFRCxZQUFZLENBQUMsU0FBb0I7UUFDN0IsSUFBSSxDQUFDLFNBQVMsR0FBRyxTQUFTLENBQUM7SUFDL0IsQ0FBQztDQUNKO0FBcENELHdEQW9DQyJ9

package/dist/function-executor/ApiFunctionExecutor.d.ts

@@ -0,0 +1,11 @@
+import { DynamicFunctionExecutor } from "./DynamicFunctionExecutor";
+export declare class ApiFunctionExecutor extends DynamicFunctionExecutor {
+    getFunctionCodeMap(): Map<string, string>;
+    F_001(args: {
+        node?: string;
+        subject?: any;
+        policyId?: string;
+        status?: number;
+        licensee?: any;
+    }): number;
+}

package/dist/function-executor/ApiFunctionExecutor.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ApiFunctionExecutor = void 0;
+const DynamicFunctionExecutor_1 = require("./DynamicFunctionExecutor");
+class ApiFunctionExecutor extends DynamicFunctionExecutor_1.DynamicFunctionExecutor {
+    getFunctionCodeMap() {
+        return new Map([
+            ["api.contract.querySignCount", "F_001"]
+        ]);
+    }
+    F_001(args) {
+        throw new Error("该函数未实现【api.contract.querySignCount】");
+    }
+}
+exports.ApiFunctionExecutor = ApiFunctionExecutor;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBpRnVuY3Rpb25FeGVjdXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9mdW5jdGlvbi1leGVjdXRvci9BcGlGdW5jdGlvbkV4ZWN1dG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHVFQUFrRTtBQUVsRSxNQUFhLG1CQUFvQixTQUFRLGlEQUF1QjtJQUU1RCxrQkFBa0I7UUFDZCxPQUFPLElBQUksR0FBRyxDQUFpQjtZQUMzQixDQUFDLDZCQUE2QixFQUFFLE9BQU8sQ0FBQztTQUMzQyxDQUFDLENBQUM7SUFDUCxDQUFDO0lBRUQsS0FBSyxDQUFDLElBQTBGO1FBQzVGLE1BQU0sSUFBSSxLQUFLLENBQUMscUNBQXFDLENBQUMsQ0FBQztJQUMzRCxDQUFDO0NBQ0o7QUFYRCxrREFXQyJ9

package/dist/function-executor/DefaultFunctionExecutor.d.ts

@@ -0,0 +1,5 @@
+import { FunctionInvoke } from "../interface/FunctionInvoke";
+export declare abstract class DefaultFunctionExecutor implements FunctionInvoke {
+    invoke(functionName: string, args: any[]): any;
+    invokeEnable(functionName: string): boolean;
+}

package/dist/function-executor/DefaultFunctionExecutor.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DefaultFunctionExecutor = void 0;
+class DefaultFunctionExecutor {
+    invoke(functionName, args) {
+        throw new Error("这是个空实现，不能被调用！");
+    }
+    invokeEnable(functionName) {
+        return false;
+    }
+}
+exports.DefaultFunctionExecutor = DefaultFunctionExecutor;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGVmYXVsdEZ1bmN0aW9uRXhlY3V0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZnVuY3Rpb24tZXhlY3V0b3IvRGVmYXVsdEZ1bmN0aW9uRXhlY3V0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBRUEsTUFBc0IsdUJBQXVCO0lBRXpDLE1BQU0sQ0FBQyxZQUFvQixFQUFFLElBQVc7UUFDcEMsTUFBTSxJQUFJLEtBQUssQ0FBQyxlQUFlLENBQUMsQ0FBQztJQUNyQyxDQUFDO0lBRUQsWUFBWSxDQUFDLFlBQW9CO1FBQzdCLE9BQU8sS0FBSyxDQUFDO0lBQ2pCLENBQUM7Q0FDSjtBQVRELDBEQVNDIn0=

package/dist/function-executor/DefaultFunctionInvoke.d.ts

@@ -0,0 +1,5 @@
+import { FunctionInvoke } from "../interface/FunctionInvoke";
+export declare abstract class DefaultFunctionInvoke implements FunctionInvoke {
+    invoke(functionName: string, args: any[]): any;
+    invokeEnable(functionName: string): boolean;
+}

package/dist/function-executor/DefaultFunctionInvoke.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DefaultFunctionInvoke = void 0;
+class DefaultFunctionInvoke {
+    invoke(functionName, args) {
+        throw new Error("这是个空实现，不能被调用！");
+    }
+    invokeEnable(functionName) {
+        return false;
+    }
+}
+exports.DefaultFunctionInvoke = DefaultFunctionInvoke;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGVmYXVsdEZ1bmN0aW9uSW52b2tlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Z1bmN0aW9uLWV4ZWN1dG9yL0RlZmF1bHRGdW5jdGlvbkludm9rZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFFQSxNQUFzQixxQkFBcUI7SUFFdkMsTUFBTSxDQUFDLFlBQW9CLEVBQUUsSUFBVztRQUNwQyxNQUFNLElBQUksS0FBSyxDQUFDLGVBQWUsQ0FBQyxDQUFDO0lBQ3JDLENBQUM7SUFFRCxZQUFZLENBQUMsWUFBb0I7UUFDN0IsT0FBTyxLQUFLLENBQUM7SUFDakIsQ0FBQztDQUNKO0FBVEQsc0RBU0MifQ==

package/dist/function-executor/DynamicFunctionExecutor.d.ts

@@ -0,0 +1,9 @@
+import { DefaultFunctionExecutor } from "./DefaultFunctionExecutor";
+import { FunctionInvoke } from "../interface/FunctionInvoke";
+export declare class DynamicFunctionExecutor extends DefaultFunctionExecutor {
+    protected executorsMap: Map<string, FunctionInvoke>;
+    invokeEnable(functionName: string): boolean;
+    invoke(functionName: string, args: any[]): any;
+    addExecutor(functionName: string, executor: FunctionInvoke): void;
+    getFunctionCodeMap(): Map<string, string>;
+}

package/dist/function-executor/DynamicFunctionExecutor.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DynamicFunctionExecutor = void 0;
+const DefaultFunctionExecutor_1 = require("./DefaultFunctionExecutor");
+class DynamicFunctionExecutor extends DefaultFunctionExecutor_1.DefaultFunctionExecutor {
+    constructor() {
+        super(...arguments);
+        this.executorsMap = new Map();
+    }
+    invokeEnable(functionName) {
+        return this.executorsMap.has(functionName) || this.getFunctionCodeMap().has(functionName);
+    }
+    invoke(functionName, args) {
+        if (this.executorsMap.has(functionName)) {
+            return this.executorsMap.get(functionName).invoke(functionName, args);
+        }
+        if (this.getFunctionCodeMap().has(functionName)) {
+            let functionCode = this.getFunctionCodeMap().get(functionName);
+            let argsStr = "";
+            for (let i = 0; i < args.length; i++) {
+                if (i == 0) {
+                    argsStr = JSON.stringify(args[i]);
+                }
+                else {
+                    argsStr = argsStr + "," + JSON.stringify(args[i]);
+                }
+            }
+            let expStr = `this.${functionCode}(${argsStr})`;
+            return eval(expStr);
+        }
+        throw new Error("该函数未实现");
+    }
+    addExecutor(functionName, executor) {
+        this.executorsMap.set(functionName, executor);
+    }
+    getFunctionCodeMap() {
+        return new Map();
+    }
+}
+exports.DynamicFunctionExecutor = DynamicFunctionExecutor;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRHluYW1pY0Z1bmN0aW9uRXhlY3V0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZnVuY3Rpb24tZXhlY3V0b3IvRHluYW1pY0Z1bmN0aW9uRXhlY3V0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsdUVBQWtFO0FBR2xFLE1BQWEsdUJBQXdCLFNBQVEsaURBQXVCO0lBQXBFOztRQUVjLGlCQUFZLEdBQUcsSUFBSSxHQUFHLEVBQTBCLENBQUM7SUFtQy9ELENBQUM7SUFqQ0csWUFBWSxDQUFDLFlBQW9CO1FBQzdCLE9BQU8sSUFBSSxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsWUFBWSxDQUFDLElBQUksSUFBSSxDQUFDLGtCQUFrQixFQUFFLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQyxDQUFDO0lBQzlGLENBQUM7SUFFRCxNQUFNLENBQUMsWUFBb0IsRUFBRSxJQUFXO1FBQ3BDLElBQUksSUFBSSxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsWUFBWSxDQUFDLEVBQUUsQ0FBQztZQUN0QyxPQUFPLElBQUksQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQyxDQUFDLE1BQU0sQ0FBQyxZQUFZLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFDMUUsQ0FBQztRQUNELElBQUksSUFBSSxDQUFDLGtCQUFrQixFQUFFLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQyxFQUFFLENBQUM7WUFDOUMsSUFBSSxZQUFZLEdBQUcsSUFBSSxDQUFDLGtCQUFrQixFQUFFLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQyxDQUFDO1lBQy9ELElBQUksT0FBTyxHQUFHLEVBQUUsQ0FBQztZQUNqQixLQUFLLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDO2dCQUNuQyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQztvQkFDVCxPQUFPLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztnQkFDdEMsQ0FBQztxQkFBTSxDQUFDO29CQUNKLE9BQU8sR0FBRyxPQUFPLEdBQUcsR0FBRyxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7Z0JBQ3RELENBQUM7WUFDTCxDQUFDO1lBQ0QsSUFBSSxNQUFNLEdBQUcsUUFBUSxZQUFZLElBQUksT0FBTyxHQUFHLENBQUM7WUFFaEQsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDeEIsQ0FBQztRQUVELE1BQU0sSUFBSSxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDOUIsQ0FBQztJQUVELFdBQVcsQ0FBQyxZQUFvQixFQUFFLFFBQXdCO1FBQ3RELElBQUksQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLFlBQVksRUFBRSxRQUFRLENBQUMsQ0FBQztJQUNsRCxDQUFDO0lBRUQsa0JBQWtCO1FBQ2QsT0FBTyxJQUFJLEdBQUcsRUFBa0IsQ0FBQztJQUNyQyxDQUFDO0NBQ0o7QUFyQ0QsMERBcUNDIn0=