@freelog/freelog-cg-collection 1.0.16 → 1.0.18

package/CollectionPolicyCustomVisitor.js

@@ -13,6 +13,7 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
         // 签约条件
         this.audienceSection = {conditions: []};
         this.contractDeclarationSection = {contractDeclarations: []};
+        this.varContractDeclarationList = [];
         // 全局定义（变量）声明
         this.varDeclarationList = [];
         // 状态机
@@ -55,6 +56,9 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
         if (system_keywords.varList.indexOf(varName) !== -1) {
             throw new Error(`不能和系统关键字同名 --- ${varName}`);
         }
+        if (this.varContractDeclarationList.find(cd => cd["varValueObj"]["varName"] === varName) != null) {
+            throw new Error(`已存在合约声明的变量 --- ${varName}`);
+        }
         if (this.varDeclarationList.find(vd => vd["varName"] === varName) != null) {
             throw new Error(`不能重复定义同名的全局变量 --- ${varName}`);
         }
@@ -69,6 +73,13 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
             variables.push({name: c, scope: "context"});
         }
         if (this.parseState.inFsmState === 1 || this.parseState.inFsmEvent === 1) {
+            for (let v of this.varContractDeclarationList) {
+                variables.push({
+                    name: v["varValueObj"]["varName"],
+                    type: v["varValueObj"]["varValueType"],
+                    scope: "global"
+                });
+            }
             for (let v of this.varDeclarationList) {
                 variables.push({name: v["varName"], type: v["varValueType"], scope: "global"});
             }
@@ -138,13 +149,14 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
     }
 
     visitContract_declaration(ctx) {
+        let keyword = ctx.contract_declaration_expression().contractDeclarationKeyword.text;
         let result = {
             type: "contractDeclaration",
             content: ctx.getText(),
-            keywords: [ctx.contract_declaration_expression().contractDeclarationKeyword.text],
+            keywords: [keyword],
             varValueObj: {
                 expType: "varContractDeclaration",
-                keyword: ctx.contract_declaration_expression().contractDeclarationKeyword.text,
+                keyword: keyword,
                 type: ctx.contract_declaration_expression().contract_declaration_type().getText(),
                 conditions: this.visitExpression_param_list(ctx.contract_declaration_expression().expression_param_list()),
                 varName: ctx.contract_declaration_variable().getText(),
@@ -154,6 +166,10 @@ class CollectionPolicyCustomVisitor extends CollectionPolicyVisitor {
         };
         this.contractDeclarationSection.contractDeclarations.push(result);
 
+        if (result["type"] === "contractDeclaration" && result["varValueObj"] != null && result["varValueObj"]["expType"] === "varContractDeclaration") {
+            this.varContractDeclarationList.push(result);
+        }
+
         return super.visitContract_declaration(ctx);
     }
 

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

@@ -0,0 +1,4 @@
+import { ContractDeclarationExecute } from "../interface/ContractDeclarationExecute";
+export declare abstract class DefaultContractDeclarationExecutor implements ContractDeclarationExecute {
+    execute(keyword: string, dataObj: any): any;
+}

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

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

package/index.js

@@ -12,6 +12,7 @@ const {FunctionInvoke} = require("./dist/interface/FunctionInvoke");
 const {VarContextCapable} = require("./dist/interface/VarContextCapable");
 const {FunctionHelper} = require("./dist/helper/FunctionHelper");
 const {ExpHelper} = require("./dist/helper/ExpHelper");
+const {DefaultContractDeclarationExecutor} = require("./dist/contract-declaration-executor/DefaultContractDeclarationExecutor");
 const {DefaultFunctionExecutor} = require("./dist/function-executor/DefaultFunctionExecutor");
 
 exports.PolicyHelper = PolicyHelper;
@@ -20,6 +21,7 @@ exports.ExpHelper = ExpHelper;
 exports.FunctionInvoke = FunctionInvoke;
 exports.VarContextCapable = VarContextCapable;
 
+exports.DefaultContractDeclarationExecutor = DefaultContractDeclarationExecutor;
 exports.DefaultFunctionExecutor = DefaultFunctionExecutor;
 
 exports.compile = async function (serviceName, policyText) {

package/package.json

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

package/src/contract-declaration-executor/DefaultContractDeclarationExecutor.ts

@@ -0,0 +1,7 @@
+import {ContractDeclarationExecute} from "../interface/ContractDeclarationExecute";
+
+export abstract class DefaultContractDeclarationExecutor implements ContractDeclarationExecute{
+    execute(keyword: string, dataObj: any): any {
+        throw new Error("这是个空实现，不能被调用！");
+    }
+}