@freelog/freelog-cg-collection 1.1.0 → 1.1.1

package/package.json

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

package/src/calculator/ExpArgsGroupCalculator.ts

@@ -9,7 +9,7 @@ export class ExpArgsGroupCalculator implements Calculator,ExpHelperAware {
 
     private expHelper: ExpHelper;
 
-    getExpValue(varObj: AssignmentClauseInfo, varContextCapable: VarContextCapable<any>): any {
+    async getExpValue(varObj: AssignmentClauseInfo, varContextCapable: VarContextCapable<any>): Promise<any> {
         if (varObj.expType == "expArgsGroup") {
             return this.generateExpArgsGroupValue(varObj as any, varContextCapable);
         }

package/src/calculator/ExpBooleanCalculator.ts

@@ -11,10 +11,10 @@ export class ExpBooleanCalculator implements Calculator, ExpHelperAware {
 
     private expHelper: ExpHelper;
 
-    getExpValue(varObj: AssignmentClauseInfo, varContextCapable: VarContextCapable<any>): boolean {
+    async getExpValue(varObj: AssignmentClauseInfo, varContextCapable: VarContextCapable<any>): Promise<boolean> {
         if (varObj.expType == "expBooleanOpLogic") {
             return this.calculateExpBooleanOpLogic(varObj as any, varContextCapable);
-        }
+        }2
         if (varObj.expType == "expBooleanOpCollection") {
             return this.calculateExpBooleanOpCollection(varObj as any, varContextCapable);
         }
@@ -31,7 +31,7 @@ export class ExpBooleanCalculator implements Calculator, ExpHelperAware {
         throw new Error("getExpValue fail [ExpBooleanCalculator]...");
     }
 
-    private calculateExpBooleanOpLogic(expBooleanOpLogic: ExpBooleanOpLogic, varContextCapable: VarContextCapable<any>): boolean {
+    private async calculateExpBooleanOpLogic(expBooleanOpLogic: ExpBooleanOpLogic, varContextCapable: VarContextCapable<any>): Promise<boolean> {
         let var1 = this.expHelper.getExpValue(expBooleanOpLogic.var1, varContextCapable);
         if (expBooleanOpLogic.op == "not") {
             return !var1;
@@ -48,9 +48,9 @@ export class ExpBooleanCalculator implements Calculator, ExpHelperAware {
         return false;
     }
 
-    private calculateExpBooleanOpCollection(expBooleanOpCollection: ExpBooleanOpCollection, varContextCapable: VarContextCapable<any>): boolean {
-        let var1 = this.expHelper.getExpValue(expBooleanOpCollection.var1, varContextCapable);
-        let var2 = this.expHelper.getExpValue(expBooleanOpCollection.var2, varContextCapable);
+    private async calculateExpBooleanOpCollection(expBooleanOpCollection: ExpBooleanOpCollection, varContextCapable: VarContextCapable<any>): Promise<boolean> {
+        let var1 = await this.expHelper.getExpValue(expBooleanOpCollection.var1, varContextCapable);
+        let var2 = await this.expHelper.getExpValue(expBooleanOpCollection.var2, varContextCapable);
         if (expBooleanOpCollection.op == "in") {
             return var2.indexOf(var1) != -1;
         }

package/src/calculator/ExpCalculator.ts

@@ -14,7 +14,7 @@ export class ExpCalculator implements Calculator, FunctionHelperAware, ExpHelper
 
     private expHelper: ExpHelper;
 
-    getExpValue(varObj: AssignmentClauseInfo, varContextCapable: VarContextCapable<any>): any {
+    async getExpValue(varObj: AssignmentClauseInfo, varContextCapable: VarContextCapable<any>): Promise<any> {
         if (varObj.expType == "expOp") {
             return this.calculateExpOp(varObj as any, varContextCapable);
         }
@@ -51,7 +51,7 @@ export class ExpCalculator implements Calculator, FunctionHelperAware, ExpHelper
         return eval(expStr);
     }
 
-    private calculateExpSigned(expSigned: ExpSigned, varContextCapable: VarContextCapable<any>): number {
+    private async calculateExpSigned(expSigned: ExpSigned, varContextCapable: VarContextCapable<any>): Promise<number> {
         let var1 = this.expHelper.getExpValue(expSigned.var1, varContextCapable);
         if (expSigned.symbol == "-") {
             return -var1;

package/src/calculator/ExpConditionCalculator.ts

@@ -9,7 +9,7 @@ export class ExpConditionCalculator implements Calculator, ExpHelperAware {
 
     private expHelper: ExpHelper;
 
-    getExpValue(varObj: AssignmentClauseInfo, varContextCapable: VarContextCapable<any>): any {
+    async getExpValue(varObj: AssignmentClauseInfo, varContextCapable: VarContextCapable<any>): Promise<any> {
         if (varObj.expType == "expCondition") {
             return this.generateExpConditionValue(varObj as any, varContextCapable);
         }

package/src/function-executor/DefaultFunctionExecutor.ts

@@ -9,7 +9,7 @@ export abstract class DefaultFunctionExecutor implements FunctionInvoke {
         this.outsideApiService = outsideApiService;
     }
 
-    invoke(functionName: string, args: any[]): any {
+    async invoke(functionName: string, args: any[]): Promise<any> {
         throw new Error("这是个空实现，不能被调用！");
     }
 

package/src/function-executor/DynamicFunctionExecutor.ts

@@ -9,23 +9,25 @@ export class DynamicFunctionExecutor extends DefaultFunctionExecutor {
         return this.executorsMap.has(functionName) || this.getFunctionCodeMap().has(functionName);
     }
 
-    invoke(functionName: string, args: any[]): any {
+    async invoke(functionName: string, args: any[]): Promise<any> {
         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);
+            // 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 Reflect.apply(this[functionCode], this, args);
+
+            // return eval(expStr);
         }
 
         throw new Error("该函数未实现");

package/src/function-executor/QueryFunctionExecutor.ts

@@ -13,7 +13,7 @@ export class QueryFunctionExecutor extends DynamicFunctionExecutor {
         ]);
     }
 
-    F_001(args: { subject: any, interval?: "PAST_MONTH", startTime?: string, limitTime?: string }): number {
+    async F_001(args: { subject: any, interval?: "PAST_MONTH", startTime?: string, limitTime?: string }): Promise<number> {
         return this.outsideApiService.resourceCountOfUpdates(args);
         // throw new Error("该函数未实现【Query.ResourceService.CountOfUpdates】");
     }

package/src/helper/ExpHelper.ts

@@ -21,7 +21,7 @@ export class ExpHelper implements Calculator, FunctionHelperAware {
         this.calculatorFactory = factoryBuilder.build();
     }
 
-    getExpValue(varObj: AssignmentClauseInfo, varContextCapable: VarContextCapable<any>): any {
+    async getExpValue(varObj: AssignmentClauseInfo, varContextCapable: VarContextCapable<any>): Promise<any> {
         console.debug(`getExpValue 【ExpHelper】${JSON.stringify(varObj)}`);
 
         let calculator = this.calculatorFactory.getCalculatorByExpType(varObj.expType);

package/src/helper/FunctionHelper.ts

@@ -43,7 +43,7 @@ export class FunctionHelper implements FunctionInvoke, ExpHelperAware {
         });
     }
 
-    getFunctionValue(funcInfo: FunctionCallInfo, varContextCapable: VarContextCapable<any>): any {
+    async getFunctionValue(funcInfo: FunctionCallInfo, varContextCapable: VarContextCapable<any>): Promise<any> {
         let args = funcInfo.paramList.map(paramElem => {
             return this.expHelper.getExpValue(paramElem.paramValueObj, varContextCapable);
         });
@@ -59,7 +59,7 @@ export class FunctionHelper implements FunctionInvoke, ExpHelperAware {
         throw new Error("这是个空实现，不能被调用！");
     }
 
-    invoke(functionName: string, args: any[]): any {
+    async invoke(functionName: string, args: any[]): Promise<any> {
         console.debug(`invoke 【FunctionHelper】functionName = ${functionName} args = ${args}`);
 
         let expCustom = this.getExpCustom(functionName);

package/src/helper/PolicyHelper.ts

@@ -46,7 +46,7 @@ export class PolicyHelper implements VarContextCapable<any>, Calculator, Functio
     }
 
     // 在合约签约的时候，可签约条件和全局申明的变量是已经计算完毕的，在这里做这件事
-    init(varContextCapable: VarContextCapable<any>, checkConditions: boolean) {
+    async init(varContextCapable: VarContextCapable<any>, checkConditions: boolean) {
         this.audienceInfo["audiences"] = this.policyInfo.audienceSection.audiences;
 
         /*
@@ -112,7 +112,7 @@ export class PolicyHelper implements VarContextCapable<any>, Calculator, Functio
             if (this.audienceInfo["condition"]["echoSubject"] != null && this.audienceInfo["condition"]["labels"] != null) {
                 let echoSubject = this.audienceInfo["condition"]["echoSubject"];
                 let contractLicensee = this.getVarContext("contract.licensee");
-                let labels = this.invoke("Query.EchoService.Labels", [echoSubject, contractLicensee]);
+                let labels = await this.invoke("Query.EchoService.Labels", [echoSubject, contractLicensee]);
                 if (labels.filter(label => this.audienceInfo["condition"]["labels"].indexOf(label) != -1).length != this.audienceInfo["condition"]["labels"].length) {
                     throw new Error(`【echoSubject】【labels】验证失败！`);
                 }
@@ -134,7 +134,7 @@ export class PolicyHelper implements VarContextCapable<any>, Calculator, Functio
         for (let varDeclaration of varDeclarationList) {
             if (varDeclaration.type == "varGlobal") {
                 if (this.getVarGlobal(varDeclaration.varName) == null) {
-                    let value = this.getExpValue(varDeclaration.varValueObj, varContextCapable);
+                    let value = await this.getExpValue(varDeclaration.varValueObj, varContextCapable);
                     this.setVarGlobal(varDeclaration.varName, value);
                 }
             }
@@ -244,7 +244,7 @@ export class PolicyHelper implements VarContextCapable<any>, Calculator, Functio
         return this.contractDeclarationHelper.execute(varObj["keyword"], varObj);
     }
 
-    getExpValue(varObj: AssignmentClauseInfo, varContextCapable: VarContextCapable<any>): any {
+    async getExpValue(varObj: AssignmentClauseInfo, varContextCapable: VarContextCapable<any>): Promise<any> {
         return this.expHelper.getExpValue(varObj, varContextCapable);
     }
 
@@ -252,7 +252,7 @@ export class PolicyHelper implements VarContextCapable<any>, Calculator, Functio
         throw new Error("这是个空实现，不能被调用！");
     }
 
-    invoke(functionName: string, args: any[]): any {
+    async invoke(functionName: string, args: any[]): Promise<any> {
         return this.functionHelper.invoke(functionName, args);
     }
 

package/src/interface/Calculator.ts

@@ -2,5 +2,5 @@ import {AssignmentClauseInfo} from "../model/AssignmentClauseInfo";
 import {VarContextCapable} from "./VarContextCapable";
 
 export interface Calculator {
-    getExpValue(varObj: AssignmentClauseInfo, varContextCapable: VarContextCapable<any>): any;
+    getExpValue(varObj: AssignmentClauseInfo, varContextCapable: VarContextCapable<any>): Promise<any>;
 }

package/src/interface/FunctionInvoke.ts

@@ -2,5 +2,5 @@ export interface FunctionInvoke {
 
     invokeEnable(functionName: string): boolean;
 
-    invoke(functionName: string, args: any[]): any;
+    invoke(functionName: string, args: any[]): Promise<any>;
 }

package/src/interface/GetPostInvoke.ts

@@ -1,6 +1,6 @@
 export interface GetPostInvoke {
 
-    doGet(url: string, payloadData: any): any;
+    doGet(url: string, payloadData: any): Promise<any>;
 
-    doPost(url: string, payloadData: any): any;
+    doPost(url: string, payloadData: any): Promise<any>;
 }

package/src/service/OutsideApiService.ts

@@ -6,12 +6,12 @@ export class OutsideApiService {
 
     private apiAddressMap: Map<string, string> = new Map<string, string>();
 
-    resourceCountOfUpdates(args: {
+    async resourceCountOfUpdates(args: {
         subject: any,
         interval?: "PAST_MONTH",
         startTime?: string,
         limitTime?: string
-    }): number {
+    }): Promise<number> {
         return this.getPostInvoke.doPost(this.apiAddressMap.get("resourceCountOfUpdates"), args);
     }
 

package/test/function/api/ApiContractQuerySignCount.ts

@@ -2,7 +2,7 @@ import {DefaultFunctionExecutor} from "../../../src/function-executor/DefaultFun
 
 export class ApiContractQuerySignCount extends DefaultFunctionExecutor {
 
-    invoke(functionName: string, args: any[]): number {
+    async invoke(functionName: string, args: any[]): Promise<number> {
         console.debug(`invoke 【ApiContractQuerySignCount】functionName = ${functionName} args = ${args}`);
 
         return -1;

package/test/function/fun/FunAddElements.ts

@@ -2,7 +2,7 @@ import {DefaultFunctionExecutor} from "../../../src/function-executor/DefaultFun
 
 export class FunAddElements extends DefaultFunctionExecutor {
 
-    invoke(functionName: string, args: any[]): any {
+    async invoke(functionName: string, args: any[]): Promise<any> {
         console.debug(`invoke 【FunAddElements】functionName = ${functionName} args = ${args}`);
 
         args[0].push(...args[1]);

package/test/function/query/QueryEchoServiceLabels.ts

@@ -2,7 +2,7 @@ import {DefaultFunctionExecutor} from "../../../src/function-executor/DefaultFun
 
 export class QueryEchoServiceLabels extends DefaultFunctionExecutor {
 
-    invoke(functionName: string, args: any[]): string[] {
+    async invoke(functionName: string, args: any[]): Promise<string[]> {
         console.debug(`invoke 【QueryEchoServiceLabels】functionName = ${functionName} args = ${args}`);
 
         return ["vip1"];

package/test/helper/PolicyHelperTest.test.ts

@@ -12,9 +12,9 @@ describe("test/helper/PolicyHelperTest.test.ts", () => {
 
         let source = JSON.parse(fs.readFileSync("./resources/zhaojn.json", "utf-8"))
 
-        let functionHelper = new FunctionHelper();
         let outsideApiService = new OutsideApiService();
         outsideApiService.setGetPostInvoke(new CustomGetPostHelper());
+        let functionHelper = new FunctionHelper();
         functionHelper.setOutsideApiService(outsideApiService);
         let policyHelper = new PolicyHelper(source, functionHelper);
         policyHelper.addContractDeclarationExecutor("DEMAND", new USEContractDeclaration());