@freelog/freelog-cg-collection 1.1.3 → 1.1.6

package/CollectionPolicyCustomVisitor.js

@@ -176,7 +176,7 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
                 if (condition["paramName"] == null) {
                     throw new Error(`参数名不可为空 ${condition["content"]}`);
                 }
-                if (["echoSubject", "labels", "exps"].indexOf(condition["paramName"]) === -1) {
+                if (["echoSubject", "echoPolicyId", "labels", "exps"].indexOf(condition["paramName"]) === -1) {
                     throw new Error(`无效的参数名 ${condition["content"]}`);
                 }
                 if (condition["paramValueObj"]["variableChainList"].find(vc => !this.symbolTableHas(vc)) != null) {
@@ -436,6 +436,7 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
             return suitable;
         });
         if (event_config != null) {
+            this.currentEventElem["eventCode"] = event_config["code"];
             try {
                 if (!this.functionHelper.argsMatch(this.currentEventElem["eventParamList"], event_config["paramList"], this.getVarDeclarationValueTypeList())) {
                     throw new Error(`参数列表错误 ----- ${ctx.event().getText()}`);

package/dist/calculator/CalculatorFactory.d.ts

@@ -10,12 +10,8 @@ export declare class CalculatorFactory implements FunctionHelperAware, ExpHelper
     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;
+    getCalculatorByExpType(expType: string): Calculator;
 }

package/dist/calculator/CalculatorFactory.js

@@ -13,36 +13,14 @@ class CalculatorFactory {
         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() {
+        for (let expType of ["expOp", "number", "string", "entity", "variableChain", "functionCall", "expParen", "expSigned"]) {
+            this.expTypeMap.set(expType, this.expCalculator);
+        }
+        for (let expType of ["expBooleanOpLogic", "expBooleanOpCollection", "expBooleanOpCompare", "expBooleanParen", "boolean"]) {
+            this.expTypeMap.set(expType, this.expBooleanCalculator);
+        }
         this.expTypeMap.set("expCondition", this.expConditionCalculator);
-    }
-    initExpArgsGroup() {
         this.expTypeMap.set("expArgsGroup", this.expArgsGroupCalculator);
     }
     setFunctionHelper(functionHelper) {
@@ -54,6 +32,9 @@ class CalculatorFactory {
         this.expConditionCalculator.setExpHelper(expHelper);
         this.expArgsGroupCalculator.setExpHelper(expHelper);
     }
+    getCalculatorByExpType(expType) {
+        return this.expTypeMap.get(expType);
+    }
 }
 exports.CalculatorFactory = CalculatorFactory;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ2FsY3VsYXRvckZhY3RvcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY2FsY3VsYXRvci9DYWxjdWxhdG9yRmFjdG9yeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxtREFBOEM7QUFDOUMsaUVBQTREO0FBQzVELHFFQUFnRTtBQUNoRSxxRUFBZ0U7QUFPaEUsTUFBYSxpQkFBaUI7SUFZMUI7UUFWUSxlQUFVLEdBQUcsSUFBSSxHQUFHLEVBQXNCLENBQUM7UUFXL0MsSUFBSSxDQUFDLGFBQWEsR0FBRyxJQUFJLDZCQUFhLEVBQUUsQ0FBQztRQUN6QyxJQUFJLENBQUMsb0JBQW9CLEdBQUcsSUFBSSwyQ0FBb0IsRUFBRSxDQUFDO1FBQ3ZELElBQUksQ0FBQyxzQkFBc0IsR0FBRyxJQUFJLCtDQUFzQixFQUFFLENBQUM7UUFDM0QsSUFBSSxDQUFDLHNCQUFzQixHQUFHLElBQUksK0NBQXNCLEVBQUUsQ0FBQztJQUMvRCxDQUFDO0lBRUQsc0JBQXNCLENBQUMsT0FBZTtRQUNsQyxPQUFPLElBQUksQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ3hDLENBQUM7SUFFRCxJQUFJO1FBQ0EsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ2YsSUFBSSxDQUFDLGNBQWMsRUFBRSxDQUFDO1FBQ3RCLElBQUksQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDO1FBQ3hCLElBQUksQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDO0lBQzVCLENBQUM7SUFFTyxPQUFPO1FBQ1gsSUFBSSxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsT0FBTyxFQUFFLElBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUNqRCxJQUFJLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxRQUFRLEVBQUUsSUFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFDO1FBQ2xELElBQUksQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLFFBQVEsRUFBRSxJQUFJLENBQUMsYUFBYSxDQUFDLENBQUM7UUFDbEQsSUFBSSxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsUUFBUSxFQUFFLElBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUNsRCxJQUFJLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxlQUFlLEVBQUUsSUFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFDO1FBQ3pELElBQUksQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLGNBQWMsRUFBRSxJQUFJLENBQUMsYUFBYSxDQUFDLENBQUM7UUFDeEQsSUFBSSxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsVUFBVSxFQUFFLElBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUNwRCxJQUFJLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxXQUFXLEVBQUUsSUFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFDO0lBQ3pELENBQUM7SUFFTyxjQUFjO1FBQ2xCLElBQUksQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLG1CQUFtQixFQUFFLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDO1FBQ3BFLElBQUksQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLHdCQUF3QixFQUFFLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDO1FBQ3pFLElBQUksQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLHFCQUFxQixFQUFFLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDO1FBQ3RFLElBQUksQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLGlCQUFpQixFQUFFLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDO1FBQ2xFLElBQUksQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLFNBQVMsRUFBRSxJQUFJLENBQUMsb0JBQW9CLENBQUMsQ0FBQztJQUM5RCxDQUFDO0lBRU8sZ0JBQWdCO1FBQ3BCLElBQUksQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLGNBQWMsRUFBRSxJQUFJLENBQUMsc0JBQXNCLENBQUMsQ0FBQztJQUNyRSxDQUFDO0lBRU8sZ0JBQWdCO1FBQ3BCLElBQUksQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLGNBQWMsRUFBRSxJQUFJLENBQUMsc0JBQXNCLENBQUMsQ0FBQztJQUNyRSxDQUFDO0lBRUQsaUJBQWlCLENBQUMsY0FBOEI7UUFDNUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxpQkFBaUIsQ0FBQyxjQUFjLENBQUMsQ0FBQztJQUN6RCxDQUFDO0lBRUQsWUFBWSxDQUFDLFNBQW9CO1FBQzdCLElBQUksQ0FBQyxhQUFhLENBQUMsWUFBWSxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBQzNDLElBQUksQ0FBQyxvQkFBb0IsQ0FBQyxZQUFZLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDbEQsSUFBSSxDQUFDLHNCQUFzQixDQUFDLFlBQVksQ0FBQyxTQUFTLENBQUMsQ0FBQztRQUNwRCxJQUFJLENBQUMsc0JBQXNCLENBQUMsWUFBWSxDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBQ3hELENBQUM7Q0FDSjtBQW5FRCw4Q0FtRUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ2FsY3VsYXRvckZhY3RvcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY2FsY3VsYXRvci9DYWxjdWxhdG9yRmFjdG9yeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxtREFBOEM7QUFDOUMsaUVBQTREO0FBQzVELHFFQUFnRTtBQUNoRSxxRUFBZ0U7QUFPaEUsTUFBYSxpQkFBaUI7SUFZMUI7UUFWUSxlQUFVLEdBQUcsSUFBSSxHQUFHLEVBQXNCLENBQUM7UUFXL0MsSUFBSSxDQUFDLGFBQWEsR0FBRyxJQUFJLDZCQUFhLEVBQUUsQ0FBQztRQUN6QyxJQUFJLENBQUMsb0JBQW9CLEdBQUcsSUFBSSwyQ0FBb0IsRUFBRSxDQUFDO1FBQ3ZELElBQUksQ0FBQyxzQkFBc0IsR0FBRyxJQUFJLCtDQUFzQixFQUFFLENBQUM7UUFDM0QsSUFBSSxDQUFDLHNCQUFzQixHQUFHLElBQUksK0NBQXNCLEVBQUUsQ0FBQztJQUMvRCxDQUFDO0lBRUQsSUFBSTtRQUNBLEtBQUssSUFBSSxPQUFPLElBQUksQ0FBQyxPQUFPLEVBQUUsUUFBUSxFQUFFLFFBQVEsRUFBRSxRQUFRLEVBQUUsZUFBZSxFQUFFLGNBQWMsRUFBRSxVQUFVLEVBQUUsV0FBVyxDQUFDLEVBQUUsQ0FBQztZQUNwSCxJQUFJLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxPQUFPLEVBQUUsSUFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFDO1FBQ3JELENBQUM7UUFDRCxLQUFLLElBQUksT0FBTyxJQUFJLENBQUMsbUJBQW1CLEVBQUUsd0JBQXdCLEVBQUUscUJBQXFCLEVBQUUsaUJBQWlCLEVBQUUsU0FBUyxDQUFDLEVBQUUsQ0FBQztZQUN2SCxJQUFJLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxPQUFPLEVBQUUsSUFBSSxDQUFDLG9CQUFvQixDQUFDLENBQUM7UUFDNUQsQ0FBQztRQUNELElBQUksQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLGNBQWMsRUFBRSxJQUFJLENBQUMsc0JBQXNCLENBQUMsQ0FBQztRQUNqRSxJQUFJLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxjQUFjLEVBQUUsSUFBSSxDQUFDLHNCQUFzQixDQUFDLENBQUM7SUFDckUsQ0FBQztJQUVELGlCQUFpQixDQUFDLGNBQThCO1FBQzVDLElBQUksQ0FBQyxhQUFhLENBQUMsaUJBQWlCLENBQUMsY0FBYyxDQUFDLENBQUM7SUFDekQsQ0FBQztJQUVELFlBQVksQ0FBQyxTQUFvQjtRQUM3QixJQUFJLENBQUMsYUFBYSxDQUFDLFlBQVksQ0FBQyxTQUFTLENBQUMsQ0FBQztRQUMzQyxJQUFJLENBQUMsb0JBQW9CLENBQUMsWUFBWSxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBQ2xELElBQUksQ0FBQyxzQkFBc0IsQ0FBQyxZQUFZLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDcEQsSUFBSSxDQUFDLHNCQUFzQixDQUFDLFlBQVksQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUN4RCxDQUFDO0lBRUQsc0JBQXNCLENBQUMsT0FBZTtRQUNsQyxPQUFPLElBQUksQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ3hDLENBQUM7Q0FDSjtBQTVDRCw4Q0E0Q0MifQ==

package/dist/calculator/CalculatorFactoryBuilder.d.ts

@@ -1,12 +1,4 @@
-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;
+export declare class CalculatorFactoryBuilder {
     build(): CalculatorFactory;
-    setFunctionHelper(functionHelper: FunctionHelper): void;
-    setExpHelper(expHelper: ExpHelper): void;
 }

package/dist/calculator/CalculatorFactoryBuilder.js

@@ -5,21 +5,9 @@ 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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ2FsY3VsYXRvckZhY3RvcnlCdWlsZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NhbGN1bGF0b3IvQ2FsY3VsYXRvckZhY3RvcnlCdWlsZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDJEQUFzRDtBQUV0RCxNQUFhLHdCQUF3QjtJQUVqQyxLQUFLO1FBQ0QsSUFBSSxpQkFBaUIsR0FBRyxJQUFJLHFDQUFpQixFQUFFLENBQUM7UUFDaEQsaUJBQWlCLENBQUMsSUFBSSxFQUFFLENBQUM7UUFFekIsT0FBTyxpQkFBaUIsQ0FBQztJQUM3QixDQUFDO0NBQ0o7QUFSRCw0REFRQyJ9

package/dist/calculator/ExpArgsGroupCalculator.d.ts

@@ -2,10 +2,11 @@ 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";
 import { ExpHelperAware } from "../interface/ExpHelperAware";
 export declare class ExpArgsGroupCalculator implements Calculator, ExpHelperAware {
     private expHelper;
     getExpValue(varObj: AssignmentClauseInfo, varContextCapable: VarContextCapable<any>): Promise<any>;
-    private generateExpArgsGroupValue;
+    generateExpArgsGroupValue(expArgsGroup: ExpArgsGroup, varContextCapable: VarContextCapable<any>): Promise<{}>;
     setExpHelper(expHelper: ExpHelper): void;
 }

package/dist/calculator/ExpArgsGroupCalculator.js

@@ -8,13 +8,12 @@ class ExpArgsGroupCalculator {
         }
         throw new Error("getExpValue fail [ExpArgsGroupCalculator]...");
     }
-    generateExpArgsGroupValue(expArgsGroup, varContextCapable) {
+    async generateExpArgsGroupValue(expArgsGroup, varContextCapable) {
         let result = {};
-        // @ts-ignore
         if (expArgsGroup.paramList.length != 0) {
-            expArgsGroup.paramList.forEach(param => {
-                result[param.paramName] = this.expHelper.getExpValue(param.paramValueObj, varContextCapable);
-            });
+            for (let param of expArgsGroup.paramList) {
+                result[param.paramName] = await this.expHelper.getExpValue(param.paramValueObj, varContextCapable);
+            }
         }
         return result;
     }
@@ -23,4 +22,4 @@ class ExpArgsGroupCalculator {
     }
 }
 exports.ExpArgsGroupCalculator = ExpArgsGroupCalculator;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRXhwQXJnc0dyb3VwQ2FsY3VsYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jYWxjdWxhdG9yL0V4cEFyZ3NHcm91cENhbGN1bGF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBT0EsTUFBYSxzQkFBc0I7SUFJL0IsS0FBSyxDQUFDLFdBQVcsQ0FBQyxNQUE0QixFQUFFLGlCQUF5QztRQUNyRixJQUFJLE1BQU0sQ0FBQyxPQUFPLElBQUksY0FBYyxFQUFFLENBQUM7WUFDbkMsT0FBTyxJQUFJLENBQUMseUJBQXlCLENBQUMsTUFBYSxFQUFFLGlCQUFpQixDQUFDLENBQUM7UUFDNUUsQ0FBQztRQUVELE1BQU0sSUFBSSxLQUFLLENBQUMsOENBQThDLENBQUMsQ0FBQztJQUNwRSxDQUFDO0lBRU8seUJBQXlCLENBQUMsWUFBMEIsRUFBRSxpQkFBeUM7UUFDbkcsSUFBSSxNQUFNLEdBQUcsRUFBRSxDQUFDO1FBQ2hCLGFBQWE7UUFDYixJQUFJLFlBQVksQ0FBQyxTQUFTLENBQUMsTUFBTSxJQUFJLENBQUMsRUFBRSxDQUFDO1lBQ3JDLFlBQVksQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxFQUFFO2dCQUNuQyxNQUFNLENBQUMsS0FBSyxDQUFDLFNBQVMsQ0FBQyxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUMsV0FBVyxDQUFDLEtBQUssQ0FBQyxhQUFhLEVBQUUsaUJBQWlCLENBQUMsQ0FBQztZQUNqRyxDQUFDLENBQUMsQ0FBQztRQUNQLENBQUM7UUFFRCxPQUFPLE1BQU0sQ0FBQztJQUNsQixDQUFDO0lBRUQsWUFBWSxDQUFDLFNBQW9CO1FBQzdCLElBQUksQ0FBQyxTQUFTLEdBQUcsU0FBUyxDQUFDO0lBQy9CLENBQUM7Q0FDSjtBQTNCRCx3REEyQkMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRXhwQXJnc0dyb3VwQ2FsY3VsYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jYWxjdWxhdG9yL0V4cEFyZ3NHcm91cENhbGN1bGF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBT0EsTUFBYSxzQkFBc0I7SUFJL0IsS0FBSyxDQUFDLFdBQVcsQ0FBQyxNQUE0QixFQUFFLGlCQUF5QztRQUNyRixJQUFJLE1BQU0sQ0FBQyxPQUFPLElBQUksY0FBYyxFQUFFLENBQUM7WUFDbkMsT0FBTyxJQUFJLENBQUMseUJBQXlCLENBQUMsTUFBYSxFQUFFLGlCQUFpQixDQUFDLENBQUM7UUFDNUUsQ0FBQztRQUVELE1BQU0sSUFBSSxLQUFLLENBQUMsOENBQThDLENBQUMsQ0FBQztJQUNwRSxDQUFDO0lBRUQsS0FBSyxDQUFDLHlCQUF5QixDQUFDLFlBQTBCLEVBQUUsaUJBQXlDO1FBQ2pHLElBQUksTUFBTSxHQUFHLEVBQUUsQ0FBQztRQUNoQixJQUFJLFlBQVksQ0FBQyxTQUFTLENBQUMsTUFBTSxJQUFJLENBQUMsRUFBRSxDQUFDO1lBQ3JDLEtBQUssSUFBSSxLQUFLLElBQUksWUFBWSxDQUFDLFNBQVMsRUFBRSxDQUFDO2dCQUN2QyxNQUFNLENBQUMsS0FBSyxDQUFDLFNBQVMsQ0FBQyxHQUFHLE1BQU0sSUFBSSxDQUFDLFNBQVMsQ0FBQyxXQUFXLENBQUMsS0FBSyxDQUFDLGFBQWEsRUFBRSxpQkFBaUIsQ0FBQyxDQUFDO1lBQ3ZHLENBQUM7UUFDTCxDQUFDO1FBRUQsT0FBTyxNQUFNLENBQUM7SUFDbEIsQ0FBQztJQUVELFlBQVksQ0FBQyxTQUFvQjtRQUM3QixJQUFJLENBQUMsU0FBUyxHQUFHLFNBQVMsQ0FBQztJQUMvQixDQUFDO0NBQ0o7QUExQkQsd0RBMEJDIn0=

package/dist/calculator/ExpCalculator.d.ts

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

package/dist/calculator/ExpCalculator.js

@@ -19,7 +19,7 @@ class ExpCalculator {
             return varContextCapable.getVarContext(varObj["content"]);
         }
         if (varObj.expType == "functionCall") {
-            return this.functionHelper.getFunctionValue(varObj, varContextCapable);
+            return this.functionHelper.getExpValue(varObj, varContextCapable);
         }
         if (varObj.expType == "expParen") {
             return this.expHelper.getExpValue(varObj["var1"], varContextCapable);
@@ -29,9 +29,9 @@ class ExpCalculator {
         }
         throw new Error("getExpValue fail [ExpCalculator]...");
     }
-    calculateExpOp(expOp, varContextCapable) {
-        let var1 = this.expHelper.getExpValue(expOp.var1, varContextCapable);
-        let var2 = this.expHelper.getExpValue(expOp.var2, varContextCapable);
+    async calculateExpOp(expOp, varContextCapable) {
+        let var1 = await this.expHelper.getExpValue(expOp.var1, varContextCapable);
+        let var2 = await this.expHelper.getExpValue(expOp.var2, varContextCapable);
         let expStr = `${var1} ${expOp.op} ${var2}`;
         return eval(expStr);
     }
@@ -52,4 +52,4 @@ class ExpCalculator {
     }
 }
 exports.ExpCalculator = ExpCalculator;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRXhwQ2FsY3VsYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jYWxjdWxhdG9yL0V4cENhbGN1bGF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBVUEsTUFBYSxhQUFhO0lBTXRCLEtBQUssQ0FBQyxXQUFXLENBQUMsTUFBNEIsRUFBRSxpQkFBeUM7UUFDckYsSUFBSSxNQUFNLENBQUMsT0FBTyxJQUFJLE9BQU8sRUFBRSxDQUFDO1lBQzVCLE9BQU8sSUFBSSxDQUFDLGNBQWMsQ0FBQyxNQUFhLEVBQUUsaUJBQWlCLENBQUMsQ0FBQztRQUNqRSxDQUFDO1FBQ0QsSUFBSSxNQUFNLENBQUMsT0FBTyxJQUFJLFFBQVEsRUFBRSxDQUFDO1lBQzdCLE9BQU8sUUFBUSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDO1FBQ3JDLENBQUM7UUFDRCxJQUFJLE1BQU0sQ0FBQyxPQUFPLElBQUksUUFBUSxFQUFFLENBQUM7WUFDN0IsT0FBTyxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDM0IsQ0FBQztRQUNELElBQUksTUFBTSxDQUFDLE9BQU8sSUFBSSxRQUFRLEVBQUUsQ0FBQztZQUM3QixPQUFPLE1BQU0sQ0FBQztRQUNsQixDQUFDO1FBQ0QsSUFBSSxNQUFNLENBQUMsT0FBTyxJQUFJLGVBQWUsRUFBRSxDQUFDO1lBQ3BDLE9BQU8saUJBQWlCLENBQUMsYUFBYSxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDO1FBQzlELENBQUM7UUFDRCxJQUFJLE1BQU0sQ0FBQyxPQUFPLElBQUksY0FBYyxFQUFFLENBQUM7WUFDbkMsT0FBTyxJQUFJLENBQUMsY0FBYyxDQUFDLGdCQUFnQixDQUFDLE1BQWEsRUFBRSxpQkFBaUIsQ0FBQyxDQUFDO1FBQ2xGLENBQUM7UUFDRCxJQUFJLE1BQU0sQ0FBQyxPQUFPLElBQUksVUFBVSxFQUFFLENBQUM7WUFDL0IsT0FBTyxJQUFJLENBQUMsU0FBUyxDQUFDLFdBQVcsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLEVBQUUsaUJBQWlCLENBQUMsQ0FBQztRQUN6RSxDQUFDO1FBQ0QsSUFBSSxNQUFNLENBQUMsT0FBTyxJQUFJLFdBQVcsRUFBRSxDQUFDO1lBQ2hDLE9BQU8sSUFBSSxDQUFDLGtCQUFrQixDQUFDLE1BQWEsRUFBRSxpQkFBaUIsQ0FBQyxDQUFDO1FBQ3JFLENBQUM7UUFFRCxNQUFNLElBQUksS0FBSyxDQUFDLHFDQUFxQyxDQUFDLENBQUM7SUFDM0QsQ0FBQztJQUVPLGNBQWMsQ0FBQyxLQUFZLEVBQUUsaUJBQXlDO1FBQzFFLElBQUksSUFBSSxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUMsV0FBVyxDQUFDLEtBQUssQ0FBQyxJQUFJLEVBQUUsaUJBQWlCLENBQUMsQ0FBQztRQUNyRSxJQUFJLElBQUksR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLFdBQVcsQ0FBQyxLQUFLLENBQUMsSUFBSSxFQUFFLGlCQUFpQixDQUFDLENBQUM7UUFDckUsSUFBSSxNQUFNLEdBQUcsR0FBRyxJQUFJLElBQUksS0FBSyxDQUFDLEVBQUUsSUFBSSxJQUFJLEVBQUUsQ0FBQztRQUUzQyxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUN4QixDQUFDO0lBRU8sS0FBSyxDQUFDLGtCQUFrQixDQUFDLFNBQW9CLEVBQUUsaUJBQXlDO1FBQzVGLElBQUksSUFBSSxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUMsV0FBVyxDQUFDLFNBQVMsQ0FBQyxJQUFJLEVBQUUsaUJBQWlCLENBQUMsQ0FBQztRQUN6RSxJQUFJLFNBQVMsQ0FBQyxNQUFNLElBQUksR0FBRyxFQUFFLENBQUM7WUFDMUIsT0FBTyxDQUFDLElBQUksQ0FBQztRQUNqQixDQUFDO2FBQU0sQ0FBQztZQUNKLE9BQU8sSUFBSSxDQUFDO1FBQ2hCLENBQUM7SUFDTCxDQUFDO0lBRUQsaUJBQWlCLENBQUMsY0FBOEI7UUFDNUMsSUFBSSxDQUFDLGNBQWMsR0FBRyxjQUFjLENBQUM7SUFDekMsQ0FBQztJQUVELFlBQVksQ0FBQyxTQUFvQjtRQUM3QixJQUFJLENBQUMsU0FBUyxHQUFHLFNBQVMsQ0FBQztJQUMvQixDQUFDO0NBQ0o7QUEzREQsc0NBMkRDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRXhwQ2FsY3VsYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jYWxjdWxhdG9yL0V4cENhbGN1bGF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBVUEsTUFBYSxhQUFhO0lBTXRCLEtBQUssQ0FBQyxXQUFXLENBQUMsTUFBNEIsRUFBRSxpQkFBeUM7UUFDckYsSUFBSSxNQUFNLENBQUMsT0FBTyxJQUFJLE9BQU8sRUFBRSxDQUFDO1lBQzVCLE9BQU8sSUFBSSxDQUFDLGNBQWMsQ0FBQyxNQUFhLEVBQUUsaUJBQWlCLENBQUMsQ0FBQztRQUNqRSxDQUFDO1FBQ0QsSUFBSSxNQUFNLENBQUMsT0FBTyxJQUFJLFFBQVEsRUFBRSxDQUFDO1lBQzdCLE9BQU8sUUFBUSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDO1FBQ3JDLENBQUM7UUFDRCxJQUFJLE1BQU0sQ0FBQyxPQUFPLElBQUksUUFBUSxFQUFFLENBQUM7WUFDN0IsT0FBTyxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDM0IsQ0FBQztRQUNELElBQUksTUFBTSxDQUFDLE9BQU8sSUFBSSxRQUFRLEVBQUUsQ0FBQztZQUM3QixPQUFPLE1BQU0sQ0FBQztRQUNsQixDQUFDO1FBQ0QsSUFBSSxNQUFNLENBQUMsT0FBTyxJQUFJLGVBQWUsRUFBRSxDQUFDO1lBQ3BDLE9BQU8saUJBQWlCLENBQUMsYUFBYSxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDO1FBQzlELENBQUM7UUFDRCxJQUFJLE1BQU0sQ0FBQyxPQUFPLElBQUksY0FBYyxFQUFFLENBQUM7WUFDbkMsT0FBTyxJQUFJLENBQUMsY0FBYyxDQUFDLFdBQVcsQ0FBQyxNQUFNLEVBQUUsaUJBQWlCLENBQUMsQ0FBQztRQUN0RSxDQUFDO1FBQ0QsSUFBSSxNQUFNLENBQUMsT0FBTyxJQUFJLFVBQVUsRUFBRSxDQUFDO1lBQy9CLE9BQU8sSUFBSSxDQUFDLFNBQVMsQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxFQUFFLGlCQUFpQixDQUFDLENBQUM7UUFDekUsQ0FBQztRQUNELElBQUksTUFBTSxDQUFDLE9BQU8sSUFBSSxXQUFXLEVBQUUsQ0FBQztZQUNoQyxPQUFPLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxNQUFhLEVBQUUsaUJBQWlCLENBQUMsQ0FBQztRQUNyRSxDQUFDO1FBRUQsTUFBTSxJQUFJLEtBQUssQ0FBQyxxQ0FBcUMsQ0FBQyxDQUFDO0lBQzNELENBQUM7SUFFRCxLQUFLLENBQUMsY0FBYyxDQUFDLEtBQVksRUFBRSxpQkFBeUM7UUFDeEUsSUFBSSxJQUFJLEdBQUcsTUFBTSxJQUFJLENBQUMsU0FBUyxDQUFDLFdBQVcsQ0FBQyxLQUFLLENBQUMsSUFBSSxFQUFFLGlCQUFpQixDQUFDLENBQUM7UUFDM0UsSUFBSSxJQUFJLEdBQUcsTUFBTSxJQUFJLENBQUMsU0FBUyxDQUFDLFdBQVcsQ0FBQyxLQUFLLENBQUMsSUFBSSxFQUFFLGlCQUFpQixDQUFDLENBQUM7UUFDM0UsSUFBSSxNQUFNLEdBQUcsR0FBRyxJQUFJLElBQUksS0FBSyxDQUFDLEVBQUUsSUFBSSxJQUFJLEVBQUUsQ0FBQztRQUUzQyxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUN4QixDQUFDO0lBRU8sS0FBSyxDQUFDLGtCQUFrQixDQUFDLFNBQW9CLEVBQUUsaUJBQXlDO1FBQzVGLElBQUksSUFBSSxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUMsV0FBVyxDQUFDLFNBQVMsQ0FBQyxJQUFJLEVBQUUsaUJBQWlCLENBQUMsQ0FBQztRQUN6RSxJQUFJLFNBQVMsQ0FBQyxNQUFNLElBQUksR0FBRyxFQUFFLENBQUM7WUFDMUIsT0FBTyxDQUFDLElBQUksQ0FBQztRQUNqQixDQUFDO2FBQU0sQ0FBQztZQUNKLE9BQU8sSUFBSSxDQUFDO1FBQ2hCLENBQUM7SUFDTCxDQUFDO0lBRUQsaUJBQWlCLENBQUMsY0FBOEI7UUFDNUMsSUFBSSxDQUFDLGNBQWMsR0FBRyxjQUFjLENBQUM7SUFDekMsQ0FBQztJQUVELFlBQVksQ0FBQyxTQUFvQjtRQUM3QixJQUFJLENBQUMsU0FBUyxHQUFHLFNBQVMsQ0FBQztJQUMvQixDQUFDO0NBQ0o7QUEzREQsc0NBMkRDIn0=

package/dist/calculator/ExpConditionCalculator.d.ts

@@ -2,10 +2,11 @@ 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";
 import { ExpHelperAware } from "../interface/ExpHelperAware";
 export declare class ExpConditionCalculator implements Calculator, ExpHelperAware {
     private expHelper;
     getExpValue(varObj: AssignmentClauseInfo, varContextCapable: VarContextCapable<any>): Promise<any>;
-    private generateExpConditionValue;
+    generateExpConditionValue(expCondition: ExpCondition, varContextCapable: VarContextCapable<any>): Promise<any[]>;
     setExpHelper(expHelper: ExpHelper): void;
 }

package/dist/calculator/ExpConditionCalculator.js

@@ -4,27 +4,25 @@ exports.ExpConditionCalculator = void 0;
 class ExpConditionCalculator {
     async getExpValue(varObj, varContextCapable) {
         if (varObj.expType == "expCondition") {
-            return this.generateExpConditionValue(varObj, varContextCapable);
+            return await this.generateExpConditionValue(varObj, varContextCapable);
         }
         throw new Error("getExpValue fail [ExpConditionCalculator]...");
     }
-    generateExpConditionValue(expCondition, varContextCapable) {
+    async generateExpConditionValue(expCondition, varContextCapable) {
         let result = [];
-        // @ts-ignore
-        if (expCondition.paramList.length != 0) {
-            expCondition.paramList.forEach(param => {
-                if (param.paramConditionObj == null) {
-                    let paramV = this.expHelper.getExpValue(param.paramValueObj, varContextCapable);
+        for (let i = 0; i < expCondition.paramList.length; i++) {
+            let param = expCondition.paramList[i];
+            if (param.paramConditionObj == null) {
+                let paramV = await this.expHelper.getExpValue(param.paramValueObj, varContextCapable);
+                result.push(paramV);
+            }
+            else {
+                let paramC = await this.expHelper.getExpValue(param.paramConditionObj, varContextCapable);
+                if (paramC) {
+                    let paramV = await this.expHelper.getExpValue(param.paramValueObj, varContextCapable);
                     result.push(paramV);
                 }
-                else {
-                    let paramC = this.expHelper.getExpValue(param.paramConditionObj, varContextCapable);
-                    if (paramC) {
-                        let paramV = this.expHelper.getExpValue(param.paramValueObj, varContextCapable);
-                        result.push(paramV);
-                    }
-                }
-            });
+            }
         }
         return result;
     }
@@ -33,4 +31,4 @@ class ExpConditionCalculator {
     }
 }
 exports.ExpConditionCalculator = ExpConditionCalculator;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRXhwQ29uZGl0aW9uQ2FsY3VsYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jYWxjdWxhdG9yL0V4cENvbmRpdGlvbkNhbGN1bGF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBT0EsTUFBYSxzQkFBc0I7SUFJL0IsS0FBSyxDQUFDLFdBQVcsQ0FBQyxNQUE0QixFQUFFLGlCQUF5QztRQUNyRixJQUFJLE1BQU0sQ0FBQyxPQUFPLElBQUksY0FBYyxFQUFFLENBQUM7WUFDbkMsT0FBTyxJQUFJLENBQUMseUJBQXlCLENBQUMsTUFBYSxFQUFFLGlCQUFpQixDQUFDLENBQUM7UUFDNUUsQ0FBQztRQUVELE1BQU0sSUFBSSxLQUFLLENBQUMsOENBQThDLENBQUMsQ0FBQztJQUNwRSxDQUFDO0lBRU8seUJBQXlCLENBQUMsWUFBMEIsRUFBRSxpQkFBeUM7UUFDbkcsSUFBSSxNQUFNLEdBQUcsRUFBRSxDQUFDO1FBQ2hCLGFBQWE7UUFDYixJQUFJLFlBQVksQ0FBQyxTQUFTLENBQUMsTUFBTSxJQUFJLENBQUMsRUFBRSxDQUFDO1lBQ3JDLFlBQVksQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxFQUFFO2dCQUNuQyxJQUFJLEtBQUssQ0FBQyxpQkFBaUIsSUFBSSxJQUFJLEVBQUUsQ0FBQztvQkFDbEMsSUFBSSxNQUFNLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxXQUFXLENBQUMsS0FBSyxDQUFDLGFBQWEsRUFBRSxpQkFBaUIsQ0FBQyxDQUFDO29CQUNoRixNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDO2dCQUN4QixDQUFDO3FCQUFNLENBQUM7b0JBQ0osSUFBSSxNQUFNLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxXQUFXLENBQUMsS0FBSyxDQUFDLGlCQUFpQixFQUFFLGlCQUFpQixDQUFDLENBQUM7b0JBQ3BGLElBQUksTUFBTSxFQUFFLENBQUM7d0JBQ1QsSUFBSSxNQUFNLEdBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxXQUFXLENBQUMsS0FBSyxDQUFDLGFBQWEsRUFBRSxpQkFBaUIsQ0FBQyxDQUFDO3dCQUNoRixNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDO29CQUN4QixDQUFDO2dCQUNMLENBQUM7WUFDTCxDQUFDLENBQUMsQ0FBQztRQUNQLENBQUM7UUFFRCxPQUFPLE1BQU0sQ0FBQztJQUNsQixDQUFDO0lBRUQsWUFBWSxDQUFDLFNBQW9CO1FBQzdCLElBQUksQ0FBQyxTQUFTLEdBQUcsU0FBUyxDQUFDO0lBQy9CLENBQUM7Q0FDSjtBQXBDRCx3REFvQ0MifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRXhwQ29uZGl0aW9uQ2FsY3VsYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jYWxjdWxhdG9yL0V4cENvbmRpdGlvbkNhbGN1bGF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBT0EsTUFBYSxzQkFBc0I7SUFJL0IsS0FBSyxDQUFDLFdBQVcsQ0FBQyxNQUE0QixFQUFFLGlCQUF5QztRQUNyRixJQUFJLE1BQU0sQ0FBQyxPQUFPLElBQUksY0FBYyxFQUFFLENBQUM7WUFDbkMsT0FBTyxNQUFNLElBQUksQ0FBQyx5QkFBeUIsQ0FBQyxNQUFhLEVBQUUsaUJBQWlCLENBQUMsQ0FBQztRQUNsRixDQUFDO1FBRUQsTUFBTSxJQUFJLEtBQUssQ0FBQyw4Q0FBOEMsQ0FBQyxDQUFDO0lBQ3BFLENBQUM7SUFFRCxLQUFLLENBQUMseUJBQXlCLENBQUMsWUFBMEIsRUFBRSxpQkFBeUM7UUFDakcsSUFBSSxNQUFNLEdBQUcsRUFBRSxDQUFDO1FBQ2hCLEtBQUssSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsR0FBRyxZQUFZLENBQUMsU0FBUyxDQUFDLE1BQU0sRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDO1lBQ3JELElBQUksS0FBSyxHQUFHLFlBQVksQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFDdEMsSUFBSSxLQUFLLENBQUMsaUJBQWlCLElBQUksSUFBSSxFQUFFLENBQUM7Z0JBQ2xDLElBQUksTUFBTSxHQUFHLE1BQU0sSUFBSSxDQUFDLFNBQVMsQ0FBQyxXQUFXLENBQUMsS0FBSyxDQUFDLGFBQWEsRUFBRSxpQkFBaUIsQ0FBQyxDQUFDO2dCQUN0RixNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1lBQ3hCLENBQUM7aUJBQU0sQ0FBQztnQkFDSixJQUFJLE1BQU0sR0FBRyxNQUFNLElBQUksQ0FBQyxTQUFTLENBQUMsV0FBVyxDQUFDLEtBQUssQ0FBQyxpQkFBaUIsRUFBRSxpQkFBaUIsQ0FBQyxDQUFDO2dCQUMxRixJQUFJLE1BQU0sRUFBRSxDQUFDO29CQUNULElBQUksTUFBTSxHQUFHLE1BQU0sSUFBSSxDQUFDLFNBQVMsQ0FBQyxXQUFXLENBQUMsS0FBSyxDQUFDLGFBQWEsRUFBRSxpQkFBaUIsQ0FBQyxDQUFDO29CQUN0RixNQUFNLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDO2dCQUN4QixDQUFDO1lBQ0wsQ0FBQztRQUNMLENBQUM7UUFFRCxPQUFPLE1BQU0sQ0FBQztJQUNsQixDQUFDO0lBRUQsWUFBWSxDQUFDLFNBQW9CO1FBQzdCLElBQUksQ0FBQyxTQUFTLEdBQUcsU0FBUyxDQUFDO0lBQy9CLENBQUM7Q0FDSjtBQWxDRCx3REFrQ0MifQ==

package/dist/contract-declaration-executor/DefaultContractDeclarationExecutor.d.ts

@@ -1,4 +1,8 @@
 import { ContractDeclarationExecute } from "../interface/ContractDeclarationExecute";
-export declare abstract class DefaultContractDeclarationExecutor implements ContractDeclarationExecute {
-    execute(keyword: string, dataObj: any): any;
+import { OutsideApiServiceAware } from "../interface/OutsideApiServiceAware";
+import { OutsideApiService } from "../service/OutsideApiService";
+export declare abstract class DefaultContractDeclarationExecutor implements ContractDeclarationExecute, OutsideApiServiceAware {
+    protected outsideApiService: OutsideApiService;
+    execute(keyword: string, dataObj: any): Promise<any>;
+    setOutsideApiService(outsideApiService: OutsideApiService): void;
 }

package/dist/contract-declaration-executor/DefaultContractDeclarationExecutor.js

@@ -2,9 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DefaultContractDeclarationExecutor = void 0;
 class DefaultContractDeclarationExecutor {
-    execute(keyword, dataObj) {
+    async execute(keyword, dataObj) {
         throw new Error("这是个空实现，不能被调用！");
     }
+    setOutsideApiService(outsideApiService) {
+        this.outsideApiService = outsideApiService;
+    }
 }
 exports.DefaultContractDeclarationExecutor = DefaultContractDeclarationExecutor;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGVmYXVsdENvbnRyYWN0RGVjbGFyYXRpb25FeGVjdXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250cmFjdC1kZWNsYXJhdGlvbi1leGVjdXRvci9EZWZhdWx0Q29udHJhY3REZWNsYXJhdGlvbkV4ZWN1dG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUVBLE1BQXNCLGtDQUFrQztJQUNwRCxPQUFPLENBQUMsT0FBZSxFQUFFLE9BQVk7UUFDakMsTUFBTSxJQUFJLEtBQUssQ0FBQyxlQUFlLENBQUMsQ0FBQztJQUNyQyxDQUFDO0NBQ0o7QUFKRCxnRkFJQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGVmYXVsdENvbnRyYWN0RGVjbGFyYXRpb25FeGVjdXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250cmFjdC1kZWNsYXJhdGlvbi1leGVjdXRvci9EZWZhdWx0Q29udHJhY3REZWNsYXJhdGlvbkV4ZWN1dG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUlBLE1BQXNCLGtDQUFrQztJQUlwRCxLQUFLLENBQUMsT0FBTyxDQUFDLE9BQWUsRUFBRSxPQUFZO1FBQ3ZDLE1BQU0sSUFBSSxLQUFLLENBQUMsZUFBZSxDQUFDLENBQUM7SUFDckMsQ0FBQztJQUVELG9CQUFvQixDQUFDLGlCQUFvQztRQUNyRCxJQUFJLENBQUMsaUJBQWlCLEdBQUcsaUJBQWlCLENBQUM7SUFDL0MsQ0FBQztDQUNKO0FBWEQsZ0ZBV0MifQ==

package/dist/contract-declaration-executor/DynamicContractDeclarationExecutor.d.ts

@@ -1,6 +1,7 @@
 import { ContractDeclarationExecute } from "../interface/ContractDeclarationExecute";
-export declare class DynamicContractDeclarationExecutor implements ContractDeclarationExecute {
-    protected executorsMap: Map<string, ContractDeclarationExecute>;
-    execute(keyword: string, dataObj: any): any;
+import { DefaultContractDeclarationExecutor } from "./DefaultContractDeclarationExecutor";
+export declare class DynamicContractDeclarationExecutor extends DefaultContractDeclarationExecutor {
+    protected executorMap: Map<string, ContractDeclarationExecute>;
+    execute(keyword: string, dataObj: any): Promise<any>;
     addExecutor(keyword: string, executor: ContractDeclarationExecute): void;
 }

package/dist/contract-declaration-executor/DynamicContractDeclarationExecutor.js

@@ -1,19 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DynamicContractDeclarationExecutor = void 0;
-class DynamicContractDeclarationExecutor {
+const DefaultContractDeclarationExecutor_1 = require("./DefaultContractDeclarationExecutor");
+class DynamicContractDeclarationExecutor extends DefaultContractDeclarationExecutor_1.DefaultContractDeclarationExecutor {
     constructor() {
-        this.executorsMap = new Map();
+        super(...arguments);
+        this.executorMap = new Map();
     }
-    execute(keyword, dataObj) {
-        if (this.executorsMap.has(keyword)) {
-            return this.executorsMap.get(keyword).execute(keyword, dataObj);
+    async execute(keyword, dataObj) {
+        if (this.executorMap.has(keyword)) {
+            return this.executorMap.get(keyword).execute(keyword, dataObj);
         }
         throw new Error(`该关键字未实现【${keyword}】！`);
     }
     addExecutor(keyword, executor) {
-        this.executorsMap.set(keyword, executor);
+        this.executorMap.set(keyword, executor);
     }
 }
 exports.DynamicContractDeclarationExecutor = DynamicContractDeclarationExecutor;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRHluYW1pY0NvbnRyYWN0RGVjbGFyYXRpb25FeGVjdXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250cmFjdC1kZWNsYXJhdGlvbi1leGVjdXRvci9EeW5hbWljQ29udHJhY3REZWNsYXJhdGlvbkV4ZWN1dG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUVBLE1BQWEsa0NBQWtDO0lBQS9DO1FBRWMsaUJBQVksR0FBRyxJQUFJLEdBQUcsRUFBc0MsQ0FBQztJQWEzRSxDQUFDO0lBWEcsT0FBTyxDQUFDLE9BQWUsRUFBRSxPQUFZO1FBQ2pDLElBQUksSUFBSSxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQztZQUNqQyxPQUFPLElBQUksQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDLE9BQU8sQ0FBQyxPQUFPLEVBQUUsT0FBTyxDQUFDLENBQUM7UUFDcEUsQ0FBQztRQUVELE1BQU0sSUFBSSxLQUFLLENBQUMsV0FBVyxPQUFPLElBQUksQ0FBQyxDQUFDO0lBQzVDLENBQUM7SUFFRCxXQUFXLENBQUMsT0FBZSxFQUFFLFFBQW9DO1FBQzdELElBQUksQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLE9BQU8sRUFBRSxRQUFRLENBQUMsQ0FBQztJQUM3QyxDQUFDO0NBQ0o7QUFmRCxnRkFlQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRHluYW1pY0NvbnRyYWN0RGVjbGFyYXRpb25FeGVjdXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250cmFjdC1kZWNsYXJhdGlvbi1leGVjdXRvci9EeW5hbWljQ29udHJhY3REZWNsYXJhdGlvbkV4ZWN1dG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUNBLDZGQUF3RjtBQUV4RixNQUFhLGtDQUFtQyxTQUFRLHVFQUFrQztJQUExRjs7UUFFYyxnQkFBVyxHQUFHLElBQUksR0FBRyxFQUFzQyxDQUFDO0lBYTFFLENBQUM7SUFYRyxLQUFLLENBQUMsT0FBTyxDQUFDLE9BQWUsRUFBRSxPQUFZO1FBQ3ZDLElBQUksSUFBSSxDQUFDLFdBQVcsQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQztZQUNoQyxPQUFPLElBQUksQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDLE9BQU8sQ0FBQyxPQUFPLEVBQUUsT0FBTyxDQUFDLENBQUM7UUFDbkUsQ0FBQztRQUVELE1BQU0sSUFBSSxLQUFLLENBQUMsV0FBVyxPQUFPLElBQUksQ0FBQyxDQUFDO0lBQzVDLENBQUM7SUFFRCxXQUFXLENBQUMsT0FBZSxFQUFFLFFBQW9DO1FBQzdELElBQUksQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLE9BQU8sRUFBRSxRQUFRLENBQUMsQ0FBQztJQUM1QyxDQUFDO0NBQ0o7QUFmRCxnRkFlQyJ9

package/dist/contract-declaration-executor/USEContractDeclaration.d.ts

@@ -0,0 +1,4 @@
+import { DefaultContractDeclarationExecutor } from "./DefaultContractDeclarationExecutor";
+export declare class USEContractDeclaration extends DefaultContractDeclarationExecutor {
+    execute(keyword: string, dataObj: any): Promise<any>;
+}

package/dist/contract-declaration-executor/USEContractDeclaration.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.USEContractDeclaration = void 0;
+const DefaultContractDeclarationExecutor_1 = require("./DefaultContractDeclarationExecutor");
+class USEContractDeclaration extends DefaultContractDeclarationExecutor_1.DefaultContractDeclarationExecutor {
+    async execute(keyword, dataObj) {
+        let conditions = dataObj["conditions"];
+        let infos = await this.outsideApiService.contractInfos({
+            subject: conditions["subject"],
+            policyId: conditions["policyId"],
+            licensee: conditions["licensee"],
+            status: 0
+        });
+        if (infos.length != 0) {
+            return infos[0];
+        }
+        else {
+            return null;
+        }
+    }
+}
+exports.USEContractDeclaration = USEContractDeclaration;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVVNFQ29udHJhY3REZWNsYXJhdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb250cmFjdC1kZWNsYXJhdGlvbi1leGVjdXRvci9VU0VDb250cmFjdERlY2xhcmF0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDZGQUF3RjtBQUV4RixNQUFhLHNCQUF1QixTQUFRLHVFQUFrQztJQUUxRSxLQUFLLENBQUMsT0FBTyxDQUFDLE9BQWUsRUFBRSxPQUFZO1FBQ3ZDLElBQUksVUFBVSxHQUFHLE9BQU8sQ0FBQyxZQUFZLENBQUMsQ0FBQztRQUN2QyxJQUFJLEtBQUssR0FBRyxNQUFNLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxhQUFhLENBQUM7WUFDbkQsT0FBTyxFQUFFLFVBQVUsQ0FBQyxTQUFTLENBQUM7WUFDOUIsUUFBUSxFQUFFLFVBQVUsQ0FBQyxVQUFVLENBQUM7WUFDaEMsUUFBUSxFQUFFLFVBQVUsQ0FBQyxVQUFVLENBQUM7WUFDaEMsTUFBTSxFQUFFLENBQUM7U0FDWixDQUFDLENBQUM7UUFDSCxJQUFJLEtBQUssQ0FBQyxNQUFNLElBQUksQ0FBQyxFQUFFLENBQUM7WUFDcEIsT0FBTyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDcEIsQ0FBQzthQUFNLENBQUM7WUFDSixPQUFPLElBQUksQ0FBQztRQUNoQixDQUFDO0lBQ0wsQ0FBQztDQUNKO0FBaEJELHdEQWdCQyJ9

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

@@ -6,6 +6,6 @@ export declare class ApiFunctionExecutor extends DynamicFunctionExecutor {
         subject?: any;
         policyId?: string;
         status?: number;
-        licensee?: any;
-    }): number;
+        licensee: any;
+    }): Promise<number>;
 }

package/dist/function-executor/ApiFunctionExecutor.js

@@ -8,9 +8,10 @@ class ApiFunctionExecutor extends DynamicFunctionExecutor_1.DynamicFunctionExecu
             ["api.contract.querySignCount", "F_001"]
         ]);
     }
-    F_001(args) {
-        throw new Error("该函数未实现【api.contract.querySignCount】");
+    async F_001(args) {
+        return this.outsideApiService.contractSignCount(args);
+        // throw new Error("该函数未实现【api.contract.querySignCount】");
     }
 }
 exports.ApiFunctionExecutor = ApiFunctionExecutor;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBpRnVuY3Rpb25FeGVjdXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9mdW5jdGlvbi1leGVjdXRvci9BcGlGdW5jdGlvbkV4ZWN1dG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHVFQUFrRTtBQUVsRSxNQUFhLG1CQUFvQixTQUFRLGlEQUF1QjtJQUU1RCxrQkFBa0I7UUFDZCxPQUFPLElBQUksR0FBRyxDQUFpQjtZQUMzQixDQUFDLDZCQUE2QixFQUFFLE9BQU8sQ0FBQztTQUMzQyxDQUFDLENBQUM7SUFDUCxDQUFDO0lBRUQsS0FBSyxDQUFDLElBQTBGO1FBQzVGLE1BQU0sSUFBSSxLQUFLLENBQUMscUNBQXFDLENBQUMsQ0FBQztJQUMzRCxDQUFDO0NBQ0o7QUFYRCxrREFXQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBpRnVuY3Rpb25FeGVjdXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9mdW5jdGlvbi1leGVjdXRvci9BcGlGdW5jdGlvbkV4ZWN1dG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHVFQUFrRTtBQUVsRSxNQUFhLG1CQUFvQixTQUFRLGlEQUF1QjtJQUU1RCxrQkFBa0I7UUFDZCxPQUFPLElBQUksR0FBRyxDQUFpQjtZQUMzQixDQUFDLDZCQUE2QixFQUFFLE9BQU8sQ0FBQztTQUMzQyxDQUFDLENBQUM7SUFDUCxDQUFDO0lBRUQsS0FBSyxDQUFDLEtBQUssQ0FBQyxJQU1YO1FBQ0csT0FBTyxJQUFJLENBQUMsaUJBQWlCLENBQUMsaUJBQWlCLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDdEQsMERBQTBEO0lBQzlELENBQUM7Q0FDSjtBQWxCRCxrREFrQkMifQ==

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

@@ -1,8 +1,11 @@
 import { FunctionInvoke } from "../interface/FunctionInvoke";
 import { OutsideApiService } from "../service/OutsideApiService";
-export declare abstract class DefaultFunctionExecutor implements FunctionInvoke {
+import { VarContextCapable } from "../interface/VarContextCapable";
+import { OutsideApiServiceAware } from "../interface/OutsideApiServiceAware";
+export declare abstract class DefaultFunctionExecutor implements FunctionInvoke, OutsideApiServiceAware, VarContextCapable<any> {
     protected outsideApiService: OutsideApiService;
     setOutsideApiService(outsideApiService: OutsideApiService): void;
     invoke(functionName: string, args: any[]): Promise<any>;
     invokeEnable(functionName: string): boolean;
+    getVarContext(varName: string): Promise<any>;
 }

package/dist/function-executor/DefaultFunctionExecutor.js

@@ -11,6 +11,9 @@ class DefaultFunctionExecutor {
     invokeEnable(functionName) {
         return false;
     }
+    async getVarContext(varName) {
+        throw new Error("这是个空实现，不能被调用！");
+    }
 }
 exports.DefaultFunctionExecutor = DefaultFunctionExecutor;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGVmYXVsdEZ1bmN0aW9uRXhlY3V0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZnVuY3Rpb24tZXhlY3V0b3IvRGVmYXVsdEZ1bmN0aW9uRXhlY3V0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBR0EsTUFBc0IsdUJBQXVCO0lBSXpDLG9CQUFvQixDQUFDLGlCQUFvQztRQUNyRCxJQUFJLENBQUMsaUJBQWlCLEdBQUcsaUJBQWlCLENBQUM7SUFDL0MsQ0FBQztJQUVELEtBQUssQ0FBQyxNQUFNLENBQUMsWUFBb0IsRUFBRSxJQUFXO1FBQzFDLE1BQU0sSUFBSSxLQUFLLENBQUMsZUFBZSxDQUFDLENBQUM7SUFDckMsQ0FBQztJQUVELFlBQVksQ0FBQyxZQUFvQjtRQUM3QixPQUFPLEtBQUssQ0FBQztJQUNqQixDQUFDO0NBQ0o7QUFmRCwwREFlQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGVmYXVsdEZ1bmN0aW9uRXhlY3V0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZnVuY3Rpb24tZXhlY3V0b3IvRGVmYXVsdEZ1bmN0aW9uRXhlY3V0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBS0EsTUFBc0IsdUJBQXVCO0lBSXpDLG9CQUFvQixDQUFDLGlCQUFvQztRQUNyRCxJQUFJLENBQUMsaUJBQWlCLEdBQUcsaUJBQWlCLENBQUM7SUFDL0MsQ0FBQztJQUVELEtBQUssQ0FBQyxNQUFNLENBQUMsWUFBb0IsRUFBRSxJQUFXO1FBQzFDLE1BQU0sSUFBSSxLQUFLLENBQUMsZUFBZSxDQUFDLENBQUM7SUFDckMsQ0FBQztJQUVELFlBQVksQ0FBQyxZQUFvQjtRQUM3QixPQUFPLEtBQUssQ0FBQztJQUNqQixDQUFDO0lBRUQsS0FBSyxDQUFDLGFBQWEsQ0FBQyxPQUFlO1FBQy9CLE1BQU0sSUFBSSxLQUFLLENBQUMsZUFBZSxDQUFDLENBQUM7SUFDckMsQ0FBQztDQUNKO0FBbkJELDBEQW1CQyJ9

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

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

package/dist/function-executor/DynamicFunctionExecutor.js

@@ -36,6 +36,17 @@ class DynamicFunctionExecutor extends DefaultFunctionExecutor_1.DefaultFunctionE
     getFunctionCodeMap() {
         return new Map();
     }
+    async getVarContext(varName) {
+        if (this.varContextProxy != null) {
+            return this.varContextProxy.getVarContext(varName);
+        }
+        else {
+            return super.getVarContext(varName);
+        }
+    }
+    setVarContextProxy(varContextProxy) {
+        this.varContextProxy = varContextProxy;
+    }
 }
 exports.DynamicFunctionExecutor = DynamicFunctionExecutor;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRHluYW1pY0Z1bmN0aW9uRXhlY3V0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZnVuY3Rpb24tZXhlY3V0b3IvRHluYW1pY0Z1bmN0aW9uRXhlY3V0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsdUVBQWtFO0FBR2xFLE1BQWEsdUJBQXdCLFNBQVEsaURBQXVCO0lBQXBFOztRQUVjLGlCQUFZLEdBQUcsSUFBSSxHQUFHLEVBQTBCLENBQUM7SUFxQy9ELENBQUM7SUFuQ0csWUFBWSxDQUFDLFlBQW9CO1FBQzdCLE9BQU8sSUFBSSxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsWUFBWSxDQUFDLElBQUksSUFBSSxDQUFDLGtCQUFrQixFQUFFLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQyxDQUFDO0lBQzlGLENBQUM7SUFFRCxLQUFLLENBQUMsTUFBTSxDQUFDLFlBQW9CLEVBQUUsSUFBVztRQUMxQyxJQUFJLElBQUksQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQyxFQUFFLENBQUM7WUFDdEMsT0FBTyxJQUFJLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUMsQ0FBQyxNQUFNLENBQUMsWUFBWSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQzFFLENBQUM7UUFDRCxJQUFJLElBQUksQ0FBQyxrQkFBa0IsRUFBRSxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUMsRUFBRSxDQUFDO1lBQzlDLElBQUksWUFBWSxHQUFHLElBQUksQ0FBQyxrQkFBa0IsRUFBRSxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUMsQ0FBQztZQUMvRCxvQkFBb0I7WUFDcEIsMENBQTBDO1lBQzFDLG9CQUFvQjtZQUNwQiw2Q0FBNkM7WUFDN0MsZUFBZTtZQUNmLDZEQUE2RDtZQUM3RCxRQUFRO1lBQ1IsSUFBSTtZQUNKLG1EQUFtRDtZQUVuRCxPQUFPLE9BQU8sQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxFQUFFLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQztZQUVyRCx1QkFBdUI7UUFDM0IsQ0FBQztRQUVELE1BQU0sSUFBSSxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDOUIsQ0FBQztJQUVELFdBQVcsQ0FBQyxZQUFvQixFQUFFLFFBQXdCO1FBQ3RELElBQUksQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLFlBQVksRUFBRSxRQUFRLENBQUMsQ0FBQztJQUNsRCxDQUFDO0lBRUQsa0JBQWtCO1FBQ2QsT0FBTyxJQUFJLEdBQUcsRUFBa0IsQ0FBQztJQUNyQyxDQUFDO0NBQ0o7QUF2Q0QsMERBdUNDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRHluYW1pY0Z1bmN0aW9uRXhlY3V0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZnVuY3Rpb24tZXhlY3V0b3IvRHluYW1pY0Z1bmN0aW9uRXhlY3V0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsdUVBQWtFO0FBSWxFLE1BQWEsdUJBQXdCLFNBQVEsaURBQXVCO0lBQXBFOztRQUVjLGlCQUFZLEdBQUcsSUFBSSxHQUFHLEVBQTBCLENBQUM7SUFtRC9ELENBQUM7SUEvQ0csWUFBWSxDQUFDLFlBQW9CO1FBQzdCLE9BQU8sSUFBSSxDQUFDLFlBQVksQ0FBQyxHQUFHLENBQUMsWUFBWSxDQUFDLElBQUksSUFBSSxDQUFDLGtCQUFrQixFQUFFLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQyxDQUFDO0lBQzlGLENBQUM7SUFFRCxLQUFLLENBQUMsTUFBTSxDQUFDLFlBQW9CLEVBQUUsSUFBVztRQUMxQyxJQUFJLElBQUksQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQyxFQUFFLENBQUM7WUFDdEMsT0FBTyxJQUFJLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUMsQ0FBQyxNQUFNLENBQUMsWUFBWSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQzFFLENBQUM7UUFDRCxJQUFJLElBQUksQ0FBQyxrQkFBa0IsRUFBRSxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUMsRUFBRSxDQUFDO1lBQzlDLElBQUksWUFBWSxHQUFHLElBQUksQ0FBQyxrQkFBa0IsRUFBRSxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUMsQ0FBQztZQUMvRCxvQkFBb0I7WUFDcEIsMENBQTBDO1lBQzFDLG9CQUFvQjtZQUNwQiw2Q0FBNkM7WUFDN0MsZUFBZTtZQUNmLDZEQUE2RDtZQUM3RCxRQUFRO1lBQ1IsSUFBSTtZQUNKLG1EQUFtRDtZQUVuRCxPQUFPLE9BQU8sQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLFlBQVksQ0FBQyxFQUFFLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQztZQUVyRCx1QkFBdUI7UUFDM0IsQ0FBQztRQUVELE1BQU0sSUFBSSxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDOUIsQ0FBQztJQUVELFdBQVcsQ0FBQyxZQUFvQixFQUFFLFFBQXdCO1FBQ3RELElBQUksQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLFlBQVksRUFBRSxRQUFRLENBQUMsQ0FBQztJQUNsRCxDQUFDO0lBRUQsa0JBQWtCO1FBQ2QsT0FBTyxJQUFJLEdBQUcsRUFBa0IsQ0FBQztJQUNyQyxDQUFDO0lBRUQsS0FBSyxDQUFDLGFBQWEsQ0FBQyxPQUFlO1FBQy9CLElBQUksSUFBSSxDQUFDLGVBQWUsSUFBSSxJQUFJLEVBQUUsQ0FBQztZQUMvQixPQUFPLElBQUksQ0FBQyxlQUFlLENBQUMsYUFBYSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ3ZELENBQUM7YUFBTSxDQUFDO1lBQ0osT0FBTyxLQUFLLENBQUMsYUFBYSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ3hDLENBQUM7SUFDTCxDQUFDO0lBRUQsa0JBQWtCLENBQUMsZUFBdUM7UUFDdEQsSUFBSSxDQUFDLGVBQWUsR0FBRyxlQUFlLENBQUM7SUFDM0MsQ0FBQztDQUNKO0FBckRELDBEQXFEQyJ9

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

@@ -1,10 +1,10 @@
 import { DynamicFunctionExecutor } from "./DynamicFunctionExecutor";
 export declare class FunFunctionExecutor extends DynamicFunctionExecutor {
     getFunctionCodeMap(): Map<string, string>;
-    F_001(set: [], elems: []): [];
-    F_002(set: []): [];
-    F_003(ttl: number): number;
+    F_001(set: [], elems: []): Promise<[]>;
+    F_002(set: []): Promise<[]>;
+    F_003(limitTime: string, ttl: number): Promise<string>;
     F_004(args: {
         title: string;
-    }): void;
+    }): Promise<void>;
 }

package/dist/function-executor/FunFunctionExecutor.js

@@ -11,20 +11,27 @@ class FunFunctionExecutor extends DynamicFunctionExecutor_1.DynamicFunctionExecu
             ["fun.sendEvent", "F_004"]
         ]);
     }
-    F_001(set, elems) {
+    async F_001(set, elems) {
         set.push(...elems);
         return set;
     }
-    F_002(set) {
+    async F_002(set) {
         set.length = 0;
         return set;
     }
-    F_003(ttl) {
-        throw new Error("该函数未实现【fun.appendTTL】");
+    async F_003(limitTime, ttl) {
+        let echoSubject = await this.getVarContext("policy.audienceCondition.echoSubject");
+        let echoPolicyId = await this.getVarContext("policy.audienceCondition.echoPolicyId");
+        let licensee = await this.getVarContext("contract.licensee");
+        return this.outsideApiService.funAppendTTL({ limitTime, ttl, echoSubject, echoPolicyId, licensee });
+        // throw new Error("该函数未实现【fun.appendTTL】");
     }
-    F_004(args) {
-        throw new Error("该函数未实现【fun.sendEvent】");
+    async F_004(args) {
+        args["contractId"] = await this.getVarContext("contract.contractId");
+        args["licensee"] = await this.getVarContext("contract.licensee");
+        return this.outsideApiService.funSendEvent(args);
+        // throw new Error("该函数未实现【fun.sendEvent】");
     }
 }
 exports.FunFunctionExecutor = FunFunctionExecutor;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRnVuRnVuY3Rpb25FeGVjdXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9mdW5jdGlvbi1leGVjdXRvci9GdW5GdW5jdGlvbkV4ZWN1dG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHVFQUFrRTtBQUVsRSxNQUFhLG1CQUFvQixTQUFRLGlEQUF1QjtJQUU1RCxrQkFBa0I7UUFDZCxPQUFPLElBQUksR0FBRyxDQUFpQjtZQUMzQixDQUFDLGlCQUFpQixFQUFFLE9BQU8sQ0FBQztZQUM1QixDQUFDLGdCQUFnQixFQUFFLE9BQU8sQ0FBQztZQUMzQixDQUFDLGVBQWUsRUFBRSxPQUFPLENBQUM7WUFDMUIsQ0FBQyxlQUFlLEVBQUUsT0FBTyxDQUFDO1NBQzdCLENBQUMsQ0FBQztJQUNQLENBQUM7SUFFRCxLQUFLLENBQUMsR0FBTyxFQUFFLEtBQVM7UUFDcEIsR0FBRyxDQUFDLElBQUksQ0FBQyxHQUFHLEtBQUssQ0FBQyxDQUFDO1FBQ25CLE9BQU8sR0FBRyxDQUFDO0lBQ2YsQ0FBQztJQUVELEtBQUssQ0FBQyxHQUFPO1FBQ1QsR0FBRyxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUM7UUFDZixPQUFPLEdBQUcsQ0FBQztJQUNmLENBQUM7SUFFRCxLQUFLLENBQUMsR0FBVztRQUNiLE1BQU0sSUFBSSxLQUFLLENBQUMsdUJBQXVCLENBQUMsQ0FBQztJQUM3QyxDQUFDO0lBRUQsS0FBSyxDQUFDLElBQXVCO1FBQ3pCLE1BQU0sSUFBSSxLQUFLLENBQUMsdUJBQXVCLENBQUMsQ0FBQztJQUM3QyxDQUFDO0NBQ0o7QUE1QkQsa0RBNEJDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRnVuRnVuY3Rpb25FeGVjdXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9mdW5jdGlvbi1leGVjdXRvci9GdW5GdW5jdGlvbkV4ZWN1dG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHVFQUFrRTtBQUVsRSxNQUFhLG1CQUFvQixTQUFRLGlEQUF1QjtJQUU1RCxrQkFBa0I7UUFDZCxPQUFPLElBQUksR0FBRyxDQUFpQjtZQUMzQixDQUFDLGlCQUFpQixFQUFFLE9BQU8sQ0FBQztZQUM1QixDQUFDLGdCQUFnQixFQUFFLE9BQU8sQ0FBQztZQUMzQixDQUFDLGVBQWUsRUFBRSxPQUFPLENBQUM7WUFDMUIsQ0FBQyxlQUFlLEVBQUUsT0FBTyxDQUFDO1NBQzdCLENBQUMsQ0FBQztJQUNQLENBQUM7SUFFRCxLQUFLLENBQUMsS0FBSyxDQUFDLEdBQU8sRUFBRSxLQUFTO1FBQzFCLEdBQUcsQ0FBQyxJQUFJLENBQUMsR0FBRyxLQUFLLENBQUMsQ0FBQztRQUNuQixPQUFPLEdBQUcsQ0FBQztJQUNmLENBQUM7SUFFRCxLQUFLLENBQUMsS0FBSyxDQUFDLEdBQU87UUFDZixHQUFHLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQztRQUNmLE9BQU8sR0FBRyxDQUFDO0lBQ2YsQ0FBQztJQUVELEtBQUssQ0FBQyxLQUFLLENBQUMsU0FBaUIsRUFBRSxHQUFXO1FBQ3RDLElBQUksV0FBVyxHQUFHLE1BQU0sSUFBSSxDQUFDLGFBQWEsQ0FBQyxzQ0FBc0MsQ0FBQyxDQUFDO1FBQ25GLElBQUksWUFBWSxHQUFHLE1BQU0sSUFBSSxDQUFDLGFBQWEsQ0FBQyx1Q0FBdUMsQ0FBQyxDQUFDO1FBQ3JGLElBQUksUUFBUSxHQUFHLE1BQU0sSUFBSSxDQUFDLGFBQWEsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDO1FBRTdELE9BQU8sSUFBSSxDQUFDLGlCQUFpQixDQUFDLFlBQVksQ0FBQyxFQUFDLFNBQVMsRUFBRSxHQUFHLEVBQUUsV0FBVyxFQUFFLFlBQVksRUFBRSxRQUFRLEVBQUMsQ0FBQyxDQUFDO1FBQ2xHLDRDQUE0QztJQUNoRCxDQUFDO0lBRUQsS0FBSyxDQUFDLEtBQUssQ0FBQyxJQUF1QjtRQUMvQixJQUFJLENBQUMsWUFBWSxDQUFDLEdBQUcsTUFBTSxJQUFJLENBQUMsYUFBYSxDQUFDLHFCQUFxQixDQUFDLENBQUM7UUFDckUsSUFBSSxDQUFDLFVBQVUsQ0FBQyxHQUFHLE1BQU0sSUFBSSxDQUFDLGFBQWEsQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDO1FBRWpFLE9BQU8sSUFBSSxDQUFDLGlCQUFpQixDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNqRCw0Q0FBNEM7SUFDaEQsQ0FBQztDQUNKO0FBckNELGtEQXFDQyJ9

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

@@ -1,9 +1,9 @@
 import { DynamicFunctionExecutor } from "./DynamicFunctionExecutor";
 export declare class KitFunctionExecutor extends DynamicFunctionExecutor {
     getFunctionCodeMap(): Map<string, string>;
-    F_001(va1: any, var2: any): any;
-    F_002(va1: any): boolean;
-    F_003(elems: any[]): number;
-    F_004(labels: any[], labelName: string): number;
-    F_005(va1: any, var2: any): any;
+    F_001(va1: any, var2: any): Promise<any>;
+    F_002(va1: any): Promise<boolean>;
+    F_003(elems: any[]): Promise<number>;
+    F_004(labels: string[], labelName: string): Promise<boolean>;
+    F_005(va1: any, var2: any): Promise<any>;
 }

package/dist/function-executor/KitFunctionExecutor.js

@@ -8,25 +8,25 @@ class KitFunctionExecutor extends DynamicFunctionExecutor_1.DynamicFunctionExecu
             ["Kit.Max", "F_001"],
             ["Kit.IsNull", "F_002"],
             ["Kit.Array.Size", "F_003"],
-            ["Kit.Echo.IncludeLabel", "F_004"],
+            ["Kit.Array.Include", "F_004"],
             ["Kit.Min", "F_005"],
         ]);
     }
-    F_001(va1, var2) {
+    async F_001(va1, var2) {
         return va1 >= var2 ? va1 : var2;
     }
-    F_002(va1) {
+    async F_002(va1) {
         return va1 == null;
     }
-    F_003(elems) {
+    async F_003(elems) {
         return elems.length;
     }
-    F_004(labels, labelName) {
-        throw new Error("该函数未实现【Kit.Echo.IncludeLabel】");
+    async F_004(labels, labelName) {
+        return labels.indexOf(labelName) != -1;
     }
-    F_005(va1, var2) {
+    async F_005(va1, var2) {
         return va1 <= var2 ? va1 : var2;
     }
 }
 exports.KitFunctionExecutor = KitFunctionExecutor;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiS2l0RnVuY3Rpb25FeGVjdXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9mdW5jdGlvbi1leGVjdXRvci9LaXRGdW5jdGlvbkV4ZWN1dG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHVFQUFrRTtBQUVsRSxNQUFhLG1CQUFvQixTQUFRLGlEQUF1QjtJQUU1RCxrQkFBa0I7UUFDZCxPQUFPLElBQUksR0FBRyxDQUFpQjtZQUMzQixDQUFDLFNBQVMsRUFBRSxPQUFPLENBQUM7WUFDcEIsQ0FBQyxZQUFZLEVBQUUsT0FBTyxDQUFDO1lBQ3ZCLENBQUMsZ0JBQWdCLEVBQUUsT0FBTyxDQUFDO1lBQzNCLENBQUMsdUJBQXVCLEVBQUUsT0FBTyxDQUFDO1lBQ2xDLENBQUMsU0FBUyxFQUFFLE9BQU8sQ0FBQztTQUN2QixDQUFDLENBQUM7SUFDUCxDQUFDO0lBRUQsS0FBSyxDQUFDLEdBQVEsRUFBRSxJQUFTO1FBQ3JCLE9BQU8sR0FBRyxJQUFJLElBQUksQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUM7SUFDcEMsQ0FBQztJQUVELEtBQUssQ0FBQyxHQUFRO1FBQ1YsT0FBTyxHQUFHLElBQUksSUFBSSxDQUFDO0lBQ3ZCLENBQUM7SUFFRCxLQUFLLENBQUMsS0FBWTtRQUNkLE9BQU8sS0FBSyxDQUFDLE1BQU0sQ0FBQztJQUN4QixDQUFDO0lBRUQsS0FBSyxDQUFDLE1BQWEsRUFBRSxTQUFpQjtRQUNsQyxNQUFNLElBQUksS0FBSyxDQUFDLCtCQUErQixDQUFDLENBQUM7SUFDckQsQ0FBQztJQUVELEtBQUssQ0FBQyxHQUFRLEVBQUUsSUFBUztRQUNyQixPQUFPLEdBQUcsSUFBSSxJQUFJLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDO0lBQ3BDLENBQUM7Q0FDSjtBQS9CRCxrREErQkMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiS2l0RnVuY3Rpb25FeGVjdXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9mdW5jdGlvbi1leGVjdXRvci9LaXRGdW5jdGlvbkV4ZWN1dG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLHVFQUFrRTtBQUVsRSxNQUFhLG1CQUFvQixTQUFRLGlEQUF1QjtJQUU1RCxrQkFBa0I7UUFDZCxPQUFPLElBQUksR0FBRyxDQUFpQjtZQUMzQixDQUFDLFNBQVMsRUFBRSxPQUFPLENBQUM7WUFDcEIsQ0FBQyxZQUFZLEVBQUUsT0FBTyxDQUFDO1lBQ3ZCLENBQUMsZ0JBQWdCLEVBQUUsT0FBTyxDQUFDO1lBQzNCLENBQUMsbUJBQW1CLEVBQUUsT0FBTyxDQUFDO1lBQzlCLENBQUMsU0FBUyxFQUFFLE9BQU8sQ0FBQztTQUN2QixDQUFDLENBQUM7SUFDUCxDQUFDO0lBRUQsS0FBSyxDQUFDLEtBQUssQ0FBQyxHQUFRLEVBQUUsSUFBUztRQUMzQixPQUFPLEdBQUcsSUFBSSxJQUFJLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDO0lBQ3BDLENBQUM7SUFFRCxLQUFLLENBQUMsS0FBSyxDQUFDLEdBQVE7UUFDaEIsT0FBTyxHQUFHLElBQUksSUFBSSxDQUFDO0lBQ3ZCLENBQUM7SUFFRCxLQUFLLENBQUMsS0FBSyxDQUFDLEtBQVk7UUFDcEIsT0FBTyxLQUFLLENBQUMsTUFBTSxDQUFDO0lBQ3hCLENBQUM7SUFFRCxLQUFLLENBQUMsS0FBSyxDQUFDLE1BQWdCLEVBQUUsU0FBaUI7UUFDM0MsT0FBTyxNQUFNLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDO0lBQzNDLENBQUM7SUFFRCxLQUFLLENBQUMsS0FBSyxDQUFDLEdBQVEsRUFBRSxJQUFTO1FBQzNCLE9BQU8sR0FBRyxJQUFJLElBQUksQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUM7SUFDcEMsQ0FBQztDQUNKO0FBL0JELGtEQStCQyJ9