Merge pull request #59 from codingapi/dev

Dev

Author: xlorne

flow-engine-framework/src/main/java/com/codingapi/flow/manager/FlowNodeState.java

@@ -5,6 +5,7 @@
 import lombok.Getter;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Stream;
 
@@ -31,7 +32,7 @@ public FlowNodeState(IFlowNode node) {
         this.branchNodeTypes.add(NodeType.PARALLEL_BRANCH.name());
     }
 
-    public boolean isEndNode(){
+    public boolean isEndNode() {
         return this.node.getType().equals(NodeType.END.name());
     }
 
@@ -65,8 +66,8 @@ public String getName() {
     }
 
     public List<IFlowNode> getFirstBlocks() {
-        List<IFlowNode> blocks = this.node.blocks();
-        if (blocks != null && !blocks.isEmpty()) {
+        List<IFlowNode> blocks = this.node.blocks().stream().sorted(Comparator.comparingInt(IFlowNode::getOrder)).toList();
+        if (!blocks.isEmpty()) {
             return Stream.of(blocks.get(0)).toList();
         }
         return new ArrayList<>();

flow-engine-framework/src/main/java/com/codingapi/flow/node/nodes/ConditionNode.java

@@ -37,6 +37,7 @@ public void addDefaultBranch(int count){
         List<IFlowNode> branches = new ArrayList<>();
         for (int i=0;i<count;i++){
             ConditionBranchNode branchNode = new ConditionBranchNode();
+            branchNode.setOrder(i+1);
             branches.add(branchNode);
         }
         this.setBlocks(branches);

flow-engine-framework/src/main/java/com/codingapi/flow/node/nodes/InclusiveNode.java

@@ -40,6 +40,7 @@ public void addDefaultBranch(int count){
         List<IFlowNode> branches = new ArrayList<>();
         for (int i=0;i<count;i++){
             InclusiveBranchNode branchNode = new InclusiveBranchNode();
+            branchNode.setOrder(i+1);
             branches.add(branchNode);
         }
         this.setBlocks(branches);

flow-engine-framework/src/main/java/com/codingapi/flow/node/nodes/ParallelNode.java

@@ -38,6 +38,7 @@ public void addDefaultBranch(int count){
         List<IFlowNode> branches = new ArrayList<>();
         for (int i=0;i<count;i++){
             ParallelBranchNode branchNode = new ParallelBranchNode();
+            branchNode.setOrder(i+1);
             branches.add(branchNode);
         }
         this.setBlocks(branches);

frontend/packages/flow-core/package.json

@@ -14,7 +14,8 @@
   ],
   "scripts": {
     "build": "rslib build",
-    "dev": "rslib build --watch"
+    "dev": "rslib build --watch",
+    "test": "rstest"
   },
   "peerDependencies": {
     "react": ">=18",

frontend/packages/flow-core/rstest.config.ts

@@ -0,0 +1,15 @@
+import {pluginReact} from '@rsbuild/plugin-react';
+import {defineConfig} from '@rstest/core';
+import {pluginSass} from "@rsbuild/plugin-sass";
+import * as path from "path";
+
+export default defineConfig({
+    testEnvironment: 'jsdom',
+    setupFiles: ['./rstest.setup.ts'],
+    plugins: [pluginReact(), pluginSass()],
+    resolve: {
+        alias: {
+            "@/": path.resolve(__dirname, "src"),
+        }
+    }
+});

frontend/packages/flow-core/rstest.setup.ts

@@ -0,0 +1,4 @@
+import { expect } from '@rstest/core';
+import * as jestDomMatchers from '@testing-library/jest-dom/matchers';
+
+expect.extend(jestDomMatchers);

frontend/packages/flow-core/src/groovy.ts

@@ -415,7 +415,7 @@ export class GroovyScriptConvertorUtil {
      */
     public static updateScriptMeta(script: string, meta: string): string {
         const metaComment = `// ${SCRIPT_META} ${meta}`;
-        if (GroovyScriptConvertorUtil.getScriptTitle(script)) {
+        if (GroovyScriptConvertorUtil.getScriptMeta(script)) {
             return script.replace(new RegExp(`//\\s*${SCRIPT_META}\\s*.+`), metaComment);
         } else {
             return `${metaComment}\n${script}`;

…sts/script/utils/convertor-utils.test.ts …/packages/flow-core/tests/groovy.test.tsfrontend/packages/flow-pc/flow-pc-design/tests/script/utils/convertor-utils.test.ts renamed to frontend/packages/flow-core/tests/groovy.test.ts frontend/packages/flow-pc/flow-pc-design/tests/script/utils/convertor-utils.test.ts renamed to frontend/packages/flow-core/tests/groovy.test.ts

@@ -1,5 +1,5 @@
 import {describe, expect, it} from '@rstest/core';
-import {GroovyScriptConvertorUtil} from "@/components/script/utils/convertor";
+import {GroovyScriptConvertorUtil} from "@/groovy";
 
 describe('GroovyScriptUtil', () => {
 
@@ -54,7 +54,7 @@ def run(request){
     });
 
 
-    describe('getScriptMeta', () => {
+    describe('getScriptMeta1', () => {
         it('get groovy script meta', () => {
             const script = `
 // @SCRIPT_TITLE 这是一个实例的标题     
@@ -67,8 +67,21 @@ def run(request){
         });
     });
 
+    describe('getScriptMeta2', () => {
+        it('get groovy script meta', () => {
+            const script = `
+// @CUSTOM_SCRIPT 自定义脚本，返回的数据为动作类型
+// @SCRIPT_META {"trigger":"PASS"}
+def run(request){
+    return 'SAVE';
+}`
+            const result = GroovyScriptConvertorUtil.getScriptMeta(script)
+            expect(result).toEqual(`{"trigger":"PASS"}`);
+        });
+    });
 
-    describe('updateScriptMeta', () => {
+
+    describe('updateScriptMeta1', () => {
         it('update groovy script meta', () => {
             const script = `
 // @SCRIPT_TITLE 这是一个实例的标题  
@@ -82,4 +95,19 @@ def run(request){
             expect(title).toEqual(`{name:"test"}`);
         });
     });
+
+    describe('updateScriptMeta2', () => {
+        it('update groovy script meta', () => {
+            const script = `
+// @CUSTOM_SCRIPT 自定义脚本，返回的数据为动作类型
+// @SCRIPT_META {"trigger":"PASS"}
+def run(request){
+    return 'SAVE';
+}`
+            const result = GroovyScriptConvertorUtil.updateScriptMeta(script,'{trigger:"SAVE"}');
+            console.log(result);
+            const title = GroovyScriptConvertorUtil.getScriptMeta(result)
+            expect(title).toEqual(`{trigger:"SAVE"}`);
+        });
+    });
 });

frontend/packages/flow-core/tests/test.d.ts

@@ -0,0 +1 @@
+/// <reference types="@testing-library/jest-dom" />