@freelog/freelog-cg-collection 1.1.8 → 1.1.9

package/dist/helper/PolicyHelper.d.ts

@@ -5,6 +5,7 @@ import { FunctionHelper } from "./FunctionHelper";
 import { Calculator } from "../interface/Calculator";
 import { AssignmentClauseInfo } from "../model/AssignmentClauseInfo";
 import { FunctionInvoke } from "../interface/FunctionInvoke";
+import { VarDeclarationInfo } from "../model/policy/VarDeclarationInfo";
 import { ContractDeclarationHelper } from "./ContractDeclarationHelper";
 import { ContractDeclarationExecute } from "../interface/ContractDeclarationExecute";
 import { VarContractDeclarationInfo } from "../model/contract-declaration/VarContractDeclarationInfo";
@@ -14,8 +15,8 @@ export declare class PolicyHelper implements VarContextCapable<any>, Calculator,
     protected policyInfo: PolicyInfo;
     protected varContractDeclarationMap: Map<string, VarContractDeclarationInfo>;
     protected varContractDeclarationList: any[];
+    protected varGlobalMap: Map<string, VarDeclarationInfo>;
     protected varGlobalList: any[];
-    private varGlobalMap;
     protected varMacroList: any[];
     protected outsideApiService: OutsideApiService;
     protected contractDeclarationHelper: ContractDeclarationHelper;
@@ -23,10 +24,24 @@ export declare class PolicyHelper implements VarContextCapable<any>, Calculator,
     protected functionHelper: FunctionHelper;
     private audienceInfo;
     constructor(policyInfo: PolicyInfo);
-    init(varContextCapable: VarContextCapable<any>, checkConditions: boolean): Promise<void>;
+    init(varContextCapable: VarContextCapable<any>, options: {
+        isCheckConditions: boolean;
+    }): Promise<void>;
+    buildSymbolTable(): Promise<void>;
+    checkConditions(varContextCapable: VarContextCapable<any>, options: {
+        isCheckConditions: boolean;
+    }): Promise<void>;
+    snapshotBuild(varContextCapable: VarContextCapable<any>): Promise<void>;
+    snapshotRollback(policyInfoResult: {
+        varContractDeclarationList: any[];
+        varGlobalList: any[];
+        audienceInfo: {};
+    }): Promise<void>;
     setVarContractDeclaration(varName: string, varValue: any): void;
     getVarContractDeclarationList(): any[];
     getVarContractDeclaration(varName: string): any;
+    getVarAudienceConditionList(): any[];
+    getVarAudienceCondition(varName: string): any;
     setVarGlobal(varName: string, varValue: any): void;
     setVarGlobalList(varGlobalList: any[]): void;
     getVarGlobal(varName: string): any;

package/dist/helper/PolicyHelper.js

@@ -9,8 +9,8 @@ class PolicyHelper {
     constructor(policyInfo) {
         this.varContractDeclarationMap = new Map();
         this.varContractDeclarationList = [];
-        this.varGlobalList = [];
         this.varGlobalMap = new Map();
+        this.varGlobalList = [];
         this.varMacroList = [];
         this.audienceInfo = {};
         this.policyInfo = policyInfo;
@@ -25,11 +25,16 @@ class PolicyHelper {
         this.functionHelper.setVarContextProxy(this);
     }
     // 在合约签约的时候，可签约条件和全局申明的变量是已经计算完毕的，在这里做这件事
-    async init(varContextCapable, checkConditions) {
+    async init(varContextCapable, options) {
         this.audienceInfo["audiences"] = this.policyInfo.audienceSection.audiences;
-        /*
-         * 建立符号表
-         */
+        await this.buildSymbolTable();
+        await this.checkConditions(varContextCapable, options);
+        await this.snapshotBuild(varContextCapable);
+    }
+    /*
+     * 建立符号表
+     */
+    async buildSymbolTable() {
         let contractDeclarations = this.policyInfo["contractDeclarationSection"]["contractDeclarations"];
         for (let contractDeclaration of contractDeclarations) {
             if (contractDeclaration["varValueObj"] != null && contractDeclaration["varValueObj"]["expType"] == "varContractDeclaration") {
@@ -52,18 +57,25 @@ class PolicyHelper {
                 });
             }
         }
-        /*
-         * 签约条件验证，这里可能有部分初始化动作
-         */
+    }
+    /*
+     * 签约条件验证，这里可能有部分初始化动作
+     * this.audienceInfo["condition"]
+     */
+    async checkConditions(varContextCapable, options) {
         this.audienceInfo["condition"] = {};
+        // 格式校验
         for (let c of this.policyInfo.audienceSection.conditions) {
             let ev = await this.getExpValue(c.paramValueObj, varContextCapable);
+            // ${echoSubject} => entity
             if (c.paramName == "echoSubject" && ev["expType"] != "entity") {
                 throw new Error(`【echoSubject】类型错误！`);
             }
+            // ${echoPolicyId} => string
             if (c.paramName == "echoPolicyId" && typeof ev != "string") {
                 throw new Error(`【echoPolicyId】类型错误！`);
             }
+            // ${labels} => string[]
             if (c.paramName == "labels") {
                 if (!Array.isArray(ev)) {
                     throw new Error(`【labels】类型错误！`);
@@ -72,6 +84,7 @@ class PolicyHelper {
                     throw new Error(`【labels】元素错误！`);
                 }
             }
+            // ${exps} => boolean[]
             if (c.paramName == "exps") {
                 if (!Array.isArray(ev)) {
                     throw new Error(`【exps】类型错误！`);
@@ -81,10 +94,9 @@ class PolicyHelper {
                 }
             }
             this.audienceInfo["condition"][c.paramName] = ev;
-            // 设置到全局变量中，方便读取
-            this.setVarGlobal(`policy.audienceCondition.${c.paramName}`, ev);
         }
-        if (checkConditions) {
+        if (options.isCheckConditions) {
+            // 值校验
             if (this.audienceInfo["condition"]["exps"] != null) {
                 if (this.audienceInfo["condition"]["exps"].indexOf(false) != -1) {
                     throw new Error(`【exps】验证失败！`);
@@ -102,9 +114,12 @@ class PolicyHelper {
                 }
             }
         }
-        /*
-         * 真正的初始化
-         */
+    }
+    /*
+     * 真正的初始化
+     */
+    async snapshotBuild(varContextCapable) {
+        let contractDeclarations = this.policyInfo["contractDeclarationSection"]["contractDeclarations"];
         for (let contractDeclaration of contractDeclarations) {
             if (contractDeclaration["varValueObj"] != null && contractDeclaration["varValueObj"]["expType"] == "varContractDeclaration") {
                 if (contractDeclaration["varValueObj"]["keyword"] == "USE") {
@@ -113,6 +128,7 @@ class PolicyHelper {
                 }
             }
         }
+        let varDeclarationList = this.policyInfo.varDeclarationList;
         for (let varDeclaration of varDeclarationList) {
             if (varDeclaration.type == "varGlobal") {
                 if (this.getVarGlobal(varDeclaration.varName) == null) {
@@ -122,6 +138,14 @@ class PolicyHelper {
             }
         }
     }
+    async snapshotRollback(policyInfoResult) {
+        this.varContractDeclarationList = policyInfoResult.varContractDeclarationList;
+        this.setVarGlobalList(policyInfoResult.varGlobalList);
+        this.audienceInfo = policyInfoResult.audienceInfo;
+    }
+    /*
+     * 合约声明变量
+     */
     setVarContractDeclaration(varName, varValue) {
         this.getVarContractDeclarationList().push({ varName, varValue });
     }
@@ -134,6 +158,28 @@ class PolicyHelper {
             return elem.varName == varName;
         });
     }
+    /*
+     * 签约条件变量
+     */
+    getVarAudienceConditionList() {
+        let varAudienceConditionList = [];
+        for (let varName in this.audienceInfo["condition"]) {
+            varAudienceConditionList.push({
+                varName: `policy.audienceCondition.${varName}`,
+                varValue: this.audienceInfo["condition"][varName]
+            });
+        }
+        return varAudienceConditionList;
+    }
+    getVarAudienceCondition(varName) {
+        let varAudienceConditionListTmp = [...this.getVarAudienceConditionList()];
+        return varAudienceConditionListTmp.find((elem) => {
+            return elem.varName == varName;
+        });
+    }
+    /*
+     * 全局变量
+     */
     setVarGlobal(varName, varValue) {
         this.getVarGlobalList().push({ varName, varValue });
     }
@@ -149,6 +195,9 @@ class PolicyHelper {
     getVarGlobalList() {
         return this.varGlobalList;
     }
+    /*
+     * 宏
+     */
     getVarMacro(varName) {
         let varMacroListTmp = [...this.varMacroList].reverse();
         return varMacroListTmp.find((elem) => {
@@ -179,6 +228,10 @@ class PolicyHelper {
                 return this.getVarObjValue(varValueObj, this);
             }
         }
+        result = this.getVarAudienceCondition(varName);
+        if (result != null) {
+            return result["varValue"];
+        }
         result = this.getVarGlobal(varName);
         if (result != null) {
             return result["varValue"];
@@ -237,4 +290,4 @@ class PolicyHelper {
     }
 }
 exports.PolicyHelper = PolicyHelper;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PolicyHelper.js","sourceRoot":"","sources":["../../src/helper/PolicyHelper.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PolicyHelper.js","sourceRoot":"","sources":["../../src/helper/PolicyHelper.ts"],"names":[],"mappings":"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"}

package/package.json

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

package/src/helper/PolicyHelper.ts

@@ -20,9 +20,9 @@ export class PolicyHelper implements VarContextCapable<any>, Calculator, Functio
 
     protected varContractDeclarationList = [];
 
-    protected varGlobalList = [];
+    protected varGlobalMap = new Map<string, VarDeclarationInfo>();
 
-    private varGlobalMap = new Map<string, VarDeclarationInfo>();
+    protected varGlobalList = [];
 
     protected varMacroList = [];
 
@@ -50,12 +50,20 @@ export class PolicyHelper implements VarContextCapable<any>, Calculator, Functio
     }
 
     // 在合约签约的时候，可签约条件和全局申明的变量是已经计算完毕的，在这里做这件事
-    async init(varContextCapable: VarContextCapable<any>, checkConditions: boolean) {
+    async init(varContextCapable: VarContextCapable<any>, options: { isCheckConditions: boolean }) {
         this.audienceInfo["audiences"] = this.policyInfo.audienceSection.audiences;
 
-        /*
-         * 建立符号表
-         */
+        await this.buildSymbolTable();
+
+        await this.checkConditions(varContextCapable, options);
+
+        await this.snapshotBuild(varContextCapable);
+    }
+
+    /*
+     * 建立符号表
+     */
+    async buildSymbolTable() {
         let contractDeclarations = this.policyInfo["contractDeclarationSection"]["contractDeclarations"];
         for (let contractDeclaration of contractDeclarations) {
             if (contractDeclaration["varValueObj"] != null && contractDeclaration["varValueObj"]["expType"] == "varContractDeclaration") {
@@ -79,19 +87,26 @@ export class PolicyHelper implements VarContextCapable<any>, Calculator, Functio
                 });
             }
         }
+    }
 
-        /*
-         * 签约条件验证，这里可能有部分初始化动作
-         */
+    /*
+     * 签约条件验证，这里可能有部分初始化动作
+     * this.audienceInfo["condition"]
+     */
+    async checkConditions(varContextCapable: VarContextCapable<any>, options: { isCheckConditions: boolean }) {
         this.audienceInfo["condition"] = {};
+        // 格式校验
         for (let c of this.policyInfo.audienceSection.conditions) {
             let ev = await this.getExpValue(c.paramValueObj, varContextCapable);
+            // ${echoSubject} => entity
             if (c.paramName == "echoSubject" && ev["expType"] != "entity") {
                 throw new Error(`【echoSubject】类型错误！`);
             }
+            // ${echoPolicyId} => string
             if (c.paramName == "echoPolicyId" && typeof ev != "string") {
                 throw new Error(`【echoPolicyId】类型错误！`);
             }
+            // ${labels} => string[]
             if (c.paramName == "labels") {
                 if (!Array.isArray(ev)) {
                     throw new Error(`【labels】类型错误！`);
@@ -100,6 +115,7 @@ export class PolicyHelper implements VarContextCapable<any>, Calculator, Functio
                     throw new Error(`【labels】元素错误！`);
                 }
             }
+            // ${exps} => boolean[]
             if (c.paramName == "exps") {
                 if (!Array.isArray(ev)) {
                     throw new Error(`【exps】类型错误！`);
@@ -109,10 +125,10 @@ export class PolicyHelper implements VarContextCapable<any>, Calculator, Functio
                 }
             }
             this.audienceInfo["condition"][c.paramName] = ev;
-            // 设置到全局变量中，方便读取
-            this.setVarGlobal(`policy.audienceCondition.${c.paramName}`, ev);
         }
-        if (checkConditions) {
+
+        if (options.isCheckConditions) {
+            // 值校验
             if (this.audienceInfo["condition"]["exps"] != null) {
                 if (this.audienceInfo["condition"]["exps"].indexOf(false) != -1) {
                     throw new Error(`【exps】验证失败！`);
@@ -130,10 +146,13 @@ export class PolicyHelper implements VarContextCapable<any>, Calculator, Functio
                 }
             }
         }
+    }
 
-        /*
-         * 真正的初始化
-         */
+    /*
+     * 真正的初始化
+     */
+    async snapshotBuild(varContextCapable: VarContextCapable<any>) {
+        let contractDeclarations = this.policyInfo["contractDeclarationSection"]["contractDeclarations"];
         for (let contractDeclaration of contractDeclarations) {
             if (contractDeclaration["varValueObj"] != null && contractDeclaration["varValueObj"]["expType"] == "varContractDeclaration") {
                 if (contractDeclaration["varValueObj"]["keyword"] == "USE") {
@@ -143,6 +162,7 @@ export class PolicyHelper implements VarContextCapable<any>, Calculator, Functio
             }
         }
 
+        let varDeclarationList = this.policyInfo.varDeclarationList;
         for (let varDeclaration of varDeclarationList) {
             if (varDeclaration.type == "varGlobal") {
                 if (this.getVarGlobal(varDeclaration.varName) == null) {
@@ -153,6 +173,19 @@ export class PolicyHelper implements VarContextCapable<any>, Calculator, Functio
         }
     }
 
+    async snapshotRollback(policyInfoResult: {
+        varContractDeclarationList: any[],
+        varGlobalList: any[],
+        audienceInfo: {}
+    }) {
+        this.varContractDeclarationList = policyInfoResult.varContractDeclarationList;
+        this.setVarGlobalList(policyInfoResult.varGlobalList);
+        this.audienceInfo = policyInfoResult.audienceInfo;
+    }
+
+    /*
+     * 合约声明变量
+     */
     setVarContractDeclaration(varName: string, varValue: any) {
         this.getVarContractDeclarationList().push({varName, varValue});
     }
@@ -168,6 +201,30 @@ export class PolicyHelper implements VarContextCapable<any>, Calculator, Functio
         });
     }
 
+    /*
+     * 签约条件变量
+     */
+    getVarAudienceConditionList() {
+        let varAudienceConditionList = [];
+        for (let varName in this.audienceInfo["condition"]) {
+            varAudienceConditionList.push({
+                varName: `policy.audienceCondition.${varName}`,
+                varValue: this.audienceInfo["condition"][varName]
+            });
+        }
+        return varAudienceConditionList;
+    }
+
+    getVarAudienceCondition(varName: string): any {
+        let varAudienceConditionListTmp = [...this.getVarAudienceConditionList()];
+        return varAudienceConditionListTmp.find((elem) => {
+            return elem.varName == varName;
+        });
+    }
+
+    /*
+     * 全局变量
+     */
     setVarGlobal(varName: string, varValue: any) {
         this.getVarGlobalList().push({varName, varValue});
     }
@@ -187,6 +244,9 @@ export class PolicyHelper implements VarContextCapable<any>, Calculator, Functio
         return this.varGlobalList;
     }
 
+    /*
+     * 宏
+     */
     getVarMacro(varName: string): any {
         let varMacroListTmp = [...this.varMacroList].reverse();
         return varMacroListTmp.find((elem) => {
@@ -194,7 +254,7 @@ export class PolicyHelper implements VarContextCapable<any>, Calculator, Functio
         });
     }
 
-    getPolicyInfoResult() {
+    getPolicyInfoResult(): { varContractDeclarationList: any[], varGlobalList: any[], audienceInfo: {} } {
         return {
             varContractDeclarationList: this.varContractDeclarationList,
             varGlobalList: this.varGlobalList,
@@ -219,6 +279,10 @@ export class PolicyHelper implements VarContextCapable<any>, Calculator, Functio
                 return this.getVarObjValue(varValueObj, this);
             }
         }
+        result = this.getVarAudienceCondition(varName);
+        if (result != null) {
+            return result["varValue"];
+        }
         result = this.getVarGlobal(varName);
         if (result != null) {
             return result["varValue"];

package/test/helper/PolicyHelperTest.test.ts

@@ -15,7 +15,7 @@ describe("test/helper/PolicyHelperTest.test.ts", () => {
         policyHelper.setGetPostInvoke(new CustomGetPostHelper());
         policyHelper.setApiAddressMulti(JSON.parse(fs.readFileSync("./resources/test/api_address_list.json", "utf-8")));
 
-        await policyHelper.init(policyHelper, true);
+        await policyHelper.init(policyHelper, {isCheckConditions: false});
 
         console.log(JSON.stringify(policyHelper.getPolicyInfoResult(), null, 4));
     });