@freelog/freelog-cg-collection 1.2.11 → 1.2.13

package/resources/zhaojn.sc

@@ -1,5 +1,6 @@
 // 所有人都可以签该策略，所以身份信息不在签约时判定，下面的echoSubject = echoSubject和echoPolicyId = echoCorePolicyId可以不写，因为它需要和labels一起使用，来判断某用户组是否有某标签
 FOR USER(echoSubject = echoSubject, echoPolicyId = echoCorePolicyId, labels = ["vip1"])
+USE &Contract(subject = Echo.<连载小说的会员>, policyId = echoCorePolicyId, licensee = contract.licensee) AS membership
 
 labels0 = Query.EchoService.Labels({"subject":echoSubject, "policyId":echoCorePolicyId, "licensee":contract.licensee})
 
@@ -7,7 +8,7 @@ echoSubject <- Echo.<连载小说的会员>
 
 echoCorePolicyId = "xxx连载小说会员的主策略ID"
 
-unitPrice <- 1
+unitPrice <- (+1)
 
 setUnlocked = []
 
@@ -15,13 +16,17 @@ setTemp = []
 
 setFree = []
 
+defExpr s2CalculateExpr(sumAmounts, discount1, discount2) = [
+sumAmounts greater 10000 : discount1 * (sumAmounts - 10000) + discount2 * 7500,
+sumAmounts greater 2500 and sumAmounts lessOrEqual 10000 : discount2 * (sumAmounts - 2500),
+0]
+
 Initial None:
 	let labels = Query.EchoService.Labels({"subject":echoSubject, "licensee":contract.licensee})
 //	Event.Void("vip1" in labels) -> AUTH_VIP1
 //	Event.Void(not ("vip1" in labels)) -> AUTH_MEMBER
 //	Event.Echo.Labels({"subject":echoSubject, "licensee":contract.licensee, "label":"vip1"}) -> AUTH_VIP1
     Event.Void(not ("vip2" in labels)) -> AUTH_MEMBER{fun.setLabel({"label":"vip2", "ttl":7200})}
-    Event.Time.Relative(1, "minute") -> AUTH_MEMBER{fun.setLabel({"label":"vip1", "ttl":1800})}
 
 AUTH_MEMBER Partial{setUnlocked, setTemp}:
 	Event.Transaction.Pay(amount = unitPrice, elemsNum = 1) -> AUTH_MEMBER{fun.addElements(setUnlocked, contract.licenseeSelectedElems, false)}
@@ -29,12 +34,12 @@ AUTH_MEMBER Partial{setUnlocked, setTemp}:
 	Event.Custom.AcceptEvent({"title":"MembershipChange", "subject":echoSubject, "label":"vip1"}) -> AUTH_VIP1
 
 	Event.Custom.WatchAD(elemsNum = 1) -> AUTH_MEMBER{fun.addElements(setTemp, contract.licenseeSelectedElems, false)}
-//	Event.Time.Schedule(Time.AddTime(Time.GetTime(Time.Now(), "day"), 1, "day")) -> AUTH_MEMBER{fun.clearElems(setTemp)}
-	Event.Time.Relative(2, "minute") -> FINISH
+	Event.Time.Schedule(Time.AddTime(Time.GetTime(Time.Now(), "day"), 1, "day")) -> AUTH_MEMBER{fun.clearElems(setTemp)}
 
 AUTH_VIP1 Partial{setUnlocked, setTemp, setFree}:
     let a = 1
     let b = []
+    a = 3
 	Event.Transaction.Pay(amount = unitPrice * 0.75, elemsNum = 1) -> AUTH_VIP1{fun.addElements(setUnlocked, contract.licenseeSelectedElems, false)}
 	Event.Transaction.Pay(amount = unitPrice * 10 * 0.6, elemsNum = 10) -> AUTH_VIP1{fun.addElements(setUnlocked, contract.licenseeSelectedElems, false)}
 	Event.Custom.AcceptEvent({"title":"MembershipChange", "subject":echoSubject, "label":"member"}) -> AUTH_MEMBER
@@ -51,5 +56,5 @@ FREE_UNLOCK_ROUTE None[elems]:
 	Event.Void(freeUnlockedSize < 4) -> AUTH_VIP1{fun.addElements(setFree, elems, false)}
 	Event.Void(freeUnlockedSize >= 4) -> AUTH_VIP1
 
-FINISH:
-    terminate
+ABC:
+    terminate

package/resources/zhaojn2.json

@@ -1,125 +1,73 @@
 {
-    "audienceInfo": {
+    "state_machine": {
         "audiences": [
-            "USER"
-        ],
-        "condition": {
-            "echoSubject": {
-                "expType": "entity",
-                "entityType": "Echo",
-                "entityName": "连载小说的会员",
-                "variableChainList": []
-            },
-            "echoPolicyId": "xxx连载小说会员的主策略ID",
-            "labels": [
-                "vip1"
-            ]
-        }
-    },
-    "varContractDeclarationList": [],
-    "varGlobalList": [
-        {
-            "varName": "policy.subject",
-            "varValue": {
-                "expType": "entity",
-                "entityType": "Resource",
-                "entityName": "12345676789/haohaoxuexi"
-            }
-        },
-        {
-            "varName": "policy.policyId",
-            "varValue": "694e2a95b5a8cc1a4ca11924"
-        },
-        {
-            "varName": "contract.contractId",
-            "varValue": "69a6a68490e845dce6b08e05"
-        },
-        {
-            "varName": "contract.licensee",
-            "varValue": {
-                "expType": "entity",
-                "entityType": "User",
-                "entityName": "zhaojn"
-            }
-        },
-        {
-            "varName": "contract.licenseeOwner",
-            "varValue": {
-                "expType": "entity",
-                "entityType": "User",
-                "entityName": "zhaojn"
-            }
-        },
-        {
-            "varName": "contract.licenseeSelectedElems",
-            "varValue": []
-        },
-        {
-            "varName": "echoCorePolicyId",
-            "varValue": "xxx连载小说会员的主策略ID"
-        },
-        {
-            "varName": "labels0",
-            "varValue": [
-                "vip1"
-            ]
-        },
-        {
-            "varName": "setUnlocked",
-            "varValue": []
-        },
-        {
-            "varName": "setTemp",
-            "varValue": []
-        },
-        {
-            "varName": "setFree",
-            "varValue": []
-        }
-    ],
-    "currentStateInfo": {
-        "currentState": "Initial",
-        "currentServiceState": "None",
-        "serviceStateCollection": [],
-        "varLocalAtStateList": [],
-        "varLocalCurrentStateList": [
             {
-                "varName": "labels",
-                "varValue": [
-                    "vip1"
-                ]
+                "name": "public",
+                "type": "public"
             }
         ],
-        "currentEventInfos": [
-            {
-                "eventType": "normal",
-                "eventCode": "V101",
-                "eventName": "Void",
-                "eventId": "b3449b02",
-                "varLocalAtEventList": [
-                    {
-                        "varName": "condition",
-                        "varValue": true
-                    }
-                ]
-            },
-            {
-                "eventType": "normal",
-                "eventCode": "T201",
-                "eventPath": "Time",
-                "eventName": "Relative",
-                "eventId": "04e9cfdc",
-                "varLocalAtEventList": [
+        "subjectIcon": {},
+        "declarations": {
+            "serviceStates": [
+                {
+                    "name": "active",
+                    "type": "authorization"
+                }
+            ]
+        },
+        "states": {
+            "initial": {
+                "transitions": [
                     {
-                        "varName": "elapsed",
-                        "varValue": 1
+                        "toState": "auth",
+                        "service": "freelog",
+                        "name": "TransactionEvent",
+                        "args": {
+                            "amount": 1.9,
+                            "account": "self.account"
+                        },
+                        "code": "S201",
+                        "description": "one time transaction",
+                        "isSingleton": true,
+                        "id": "a2da448a"
                     },
                     {
-                        "varName": "timeUnit",
-                        "varValue": "minute"
+                        "toState": "finish",
+                        "service": "freelog",
+                        "name": "TimeEvent",
+                        "args": {
+                            "dateTime": "2024-12-31 00:00"
+                        },
+                        "code": "A102",
+                        "description": "fired on a pre-determined time",
+                        "isSingleton": false,
+                        "id": "c656f9cb"
                     }
+                ],
+                "serviceStates": [],
+                "isInitial": true
+            },
+            "auth": {
+                "transitions": [],
+                "serviceStates": [
+                    "active"
                 ]
+            },
+            "finish": {
+                "transitions": [],
+                "serviceStates": []
             }
-        ]
-    }
+        },
+        "description": {
+            "symbolArgs": {
+                "envArgs": [
+                    "self.account"
+                ]
+            }
+        }
+    },
+    "warnings": [],
+    "warningObjects": [],
+    "errors": [],
+    "errorObjects": []
 }

package/resources/zhaojn3.json

@@ -0,0 +1,76 @@
+{
+    "audienceSection": {
+        "conditions": [],
+        "audiences": [
+            "PUBLIC"
+        ]
+    },
+    "contractDeclarationSection": {
+        "contractDeclarations": []
+    },
+    "varDeclarationList": [],
+    "stateMachine": [
+        {
+            "stateName": "Initial",
+            "serviceStateSection": {},
+            "events": [
+                {
+                    "type": "normal",
+                    "eventName": "Pay",
+                    "eventPath": "Transaction",
+                    "eventParamList": [
+                        {
+                            "paramValueObj": {
+                                "expType": "number",
+                                "value": 1.9
+                            }
+                        },
+                        {
+                            "paramValueObj": {
+                                "expType": "number",
+                                "value": 1
+                            }
+                        }
+                    ],
+                    "toState": "auth"
+                },
+                {
+                    "type": "normal",
+                    "eventName": "Schedule",
+                    "eventPath": "Time",
+                    "eventParamList": [
+                        {
+                            "paramValueObj": {
+                                "expType": "string",
+                                "value": "2024-12-31 00:00"
+                            }
+                        }
+                    ],
+                    "toState": "finish"
+                }
+            ]
+        },
+        {
+            "stateName": "auth",
+            "serviceStateSection": {
+                "serviceState": "Permit"
+            },
+            "events": [
+                {
+                    "type": "terminate",
+                    "eventName": "terminate"
+                }
+            ]
+        },
+        {
+            "stateName": "finish",
+            "serviceStateSection": {},
+            "events": [
+                {
+                    "type": "terminate",
+                    "eventName": "terminate"
+                }
+            ]
+        }
+    ]
+}

package/src/helper/PolicyHelper.ts

@@ -252,6 +252,7 @@ export class PolicyHelper implements VarContextCapable<any>, Calculator, Functio
                 eventPath: eventInfo.eventPath,
                 eventName: eventInfo.eventName,
                 eventId: eventInfo.eventId,
+                toState: eventInfo.toState,
                 varLocalAtEventList: varLocalAtEventList
             });
         }

package/src/model/exp/FunctionCallInfo.ts

@@ -5,9 +5,9 @@ export interface FunctionCallInfo extends Exp {
     expType: "functionCall";
     varChain?: string;
     funcName: string;
-    paramList: [{
+    paramList: {
         paramName?: string;
         paramValue: string;
         paramValueObj: AssignmentClauseInfo;
-    }];
+    }[];
 }

package/src/model/exp-condition/ExpCondition.ts

@@ -3,10 +3,10 @@ import {ExpBoolean} from "../exp-boolean/ExpBoolean";
 
 export interface ExpCondition extends AssignmentClauseInfo {
     expType: "expCondition";
-    paramList: [{
+    paramList: {
         paramCondition?: string;
         paramConditionObj?: ExpBoolean;
         paramValue: string;
         paramValueObj: any;
-    }];
+    }[];
 }

package/src/model/policy/ActionInfo.ts

@@ -2,7 +2,7 @@ import {FunctionCallInfo} from "../exp/FunctionCallInfo";
 import {AssignmentClauseInfo} from "../AssignmentClauseInfo";
 
 export interface ActionInfo {
-
+    type: string;
 }
 
 export interface ActionFunctionCall extends ActionInfo {

package/src/model/policy/PolicyInfo.ts

@@ -4,27 +4,33 @@ import {AssignmentClauseInfo} from "../AssignmentClauseInfo";
 import {ContractDeclarationInfo} from "./ContractDeclarationInfo";
 
 export interface PolicyInfo {
-    audienceSection: {
-        audiences: string[];
-        conditions: [{
-            paramName?: string;
-            paramValue: string;
-            paramValueObj: AssignmentClauseInfo;
-            content: string;
-        }];
-    };
-    contractDeclarationSection: {
-        contractDeclarations: ContractDeclarationInfo[];
-    };
+    audienceSection: AudienceSection;
+    contractDeclarationSection: ContractDeclarationSection;
     varDeclarationList: VarDeclarationInfo[];
-    stateMachine: [{
-        stateName: string;
-        assignments: VarDeclarationInfo[];
-        events: EventInfo[];
-        serviceStateSection?: {
-            serviceState?: string;
-            serviceStateCollection?: string[];
-        };
-        stateContextArgs?: string[];
-    }];
+    stateMachine: StateInfo[];
+}
+
+export interface AudienceSection {
+    audiences: string[];
+    conditions: {
+        paramName?: string;
+        paramValue: string;
+        paramValueObj: AssignmentClauseInfo;
+        content: string;
+    }[];
 }
+
+export interface ContractDeclarationSection {
+    contractDeclarations: ContractDeclarationInfo[];
+}
+
+export interface StateInfo {
+    stateName: string;
+    assignments: VarDeclarationInfo[];
+    events: EventInfo[];
+    serviceStateSection?: {
+        serviceState?: string;
+        serviceStateCollection?: string[];
+    };
+    stateContextArgs?: string[];
+}