Round 7b: B方案 真镜像 web constructTreeUtil.ts (替换自写算法)
问题: Round 7 我用 C方案 自写了简化版 BFS 水平布局算法, 违反镜像架构原则.
用户质疑 '你是自己写的布局, 还是用平台的源码', 要求真复用 web 源码.
B方案: 用 webapi loader 模式镜像 web 端 constructTreeUtil.ts (763 行):
1. 读 web/.../jnpf-bpmn/lib/utils/constructTreeUtil.ts 源
2. shim 处理 bpmn-js 依赖:
- NodeUtils → 本地 stub (BPMNTreeBuilder 自身只用了 getNextElementList, 已剔除)
- '../config' → hasGatewayType 等常量
- '../config/constants' → DEFAULT_CONNECT, DEFAULT_DISTANCE
- '../config/variableName' → bpmnStart, bpmnTask, typeConfluence 等
3. 剔除 bpmn-js runtime-only methods (Node 跑不了 modeling API):
- formatCanvas / formatCanvasHorizontal (要 modeling.moveElements)
- getElementsByGateway (要 NodeUtils.getNextElementList)
- getGroupElementById (要 bpmn.get('elementRegistry'))
4. 写 tmp 文件, dynamic import, 单进程缓存
保留的 web 纯方法 (BPMNTreeBuilder):
- constructTree() — 构建 BPMN 树
- bpmnTraverseTreeBFS() — BFS 水平布局核心算法
- calculateVirtualHeight() — 同层 y 错开 (按 parentData.height 计算)
- handleCollisionsByLevel() — 横向碰撞检测
- findStartElement/findNodeById/getOutgoingConnections
端到端对比 (vehicleRefuelApprovalDemoV3):
C方案 (Round 7 自写): y 全部 200 (统一对齐), x 350px 等距
B方案 (Round 7b 真镜像): y 按 web 算法智能对齐 (4 approver 在 272, start/end 在 300)
start 不变 (root), 子节点 x = parentX + 150 + childWidth
镜像架构审计:
✅ 复用 web 算法 (BPMNTreeBuilder) - 不自创
✅ 复用 web 算法 (BFS 水平布局 + 虚拟高度 + 碰撞检测)
✅ 复用 web XML 解析 (bpmn-moddle)
✅ 镜像源引用 web 行号
vitest: 70/70 PASS (4 文件, 包括 8 个 autoLayout 单元测试), 575ms
改动:
- webapi/bpmnTreeBuilder.ts (NEW, 145 行): webapi loader, shim + dynamic import
- workflow/_autoLayout.ts (REWRITE): 用镜像 BPMNTreeBuilder 替换自写 BFS
- workflow-autolayout.spec.ts: 3 节点测试改成 web 算法预期值
- docs/drift/2026-07-14-round7b-autolayout-mirror-summary.md (NEW)
This commit is contained in:
1 parent
ffcc3e07a2
commit
22dfeaae64
4 files changed
+418
-193
No files matched your search
@@ -0,0 +1,150 @@
|
||||
/**
|
||||
* webapi/bpmnTreeBuilder.ts — webapi loader for BPMNTreeBuilder (B方案)
|
||||
*
|
||||
* 镜像源: web/packages/jnpf/plugins/jnpf-bpmn/lib/utils/constructTreeUtil.ts
|
||||
*
|
||||
* 复用 web 端核心算法 (BFS 树构建 + 水平布局 + 碰撞检测), 但通过 shim 处理 bpmn-js 依赖:
|
||||
* - NodeUtils 替换为 stub (web 端 NodeUtils 用 bpmn-js LabelUtil/ModelUtil, Node 跑不了)
|
||||
* - config imports 替换为最小 stub (web 端 config 是 monorepo 内部 index, 无独立 .ts)
|
||||
* - 删除 bpmn-js runtime 依赖的 methods (formatCanvas/formatCanvasHorizontal/getElementsByGateway/getGroupElementById)
|
||||
* 这些方法需要 bpmn-js modeling API (Node 不可用), 我们用 moddle 直接写 bounds, 不需要它们
|
||||
*
|
||||
* 保留的纯方法 (用于 autoLayout):
|
||||
* - constructTree() — 构建 BPMN 树
|
||||
* - bpmnTraverseTreeBFS() — BFS 水平布局 (autoLayout 核心算法)
|
||||
* - calculateVirtualHeight() — 计算节点虚拟高度 (同层 y 错开逻辑)
|
||||
* - calculateVirtualWidth() — 同上 (垂直布局用, 我们不用)
|
||||
* - handleCollisionsByLevel() — 横向碰撞检测
|
||||
* - findStartElement() — 找 start 节点
|
||||
* - findNodeById() — 按 id 查找 TreeNode
|
||||
* - getOutgoingConnections() — 获取出边
|
||||
*
|
||||
* 用法:
|
||||
* import { loadBpmnTreeBuilder } from '../webapi/bpmnTreeBuilder.ts'
|
||||
* const { BPMNTreeBuilder } = await loadBpmnTreeBuilder()
|
||||
* const builder = new BPMNTreeBuilder(allElements)
|
||||
* const tree = builder.constructTree()
|
||||
* builder.bpmnTraverseTreeBFS(tree, () => {}, 'horizontal')
|
||||
* // tree.children[*].offset = { x, y }
|
||||
*/
|
||||
|
||||
import { readFileSync, writeFileSync, mkdirSync } from 'fs'
|
||||
import { tmpdir } from 'os'
|
||||
import { join } from 'path'
|
||||
import { pathToFileURL } from 'url'
|
||||
|
||||
/** web 端 constructTreeUtil.ts 源文件路径 (权威源) */
|
||||
const WEB_SOURCE = '/home/ubuntu/ccWorkDir/web/packages/jnpf/plugins/jnpf-bpmn/lib/utils/constructTreeUtil.ts'
|
||||
|
||||
/** 缓存: 同进程内只 load 一次 */
|
||||
let _loaded: any = null
|
||||
|
||||
/**
|
||||
* 加载并处理 web 端 BPMNTreeBuilder, 返回 shim 后的类
|
||||
*/
|
||||
export async function loadBpmnTreeBuilder(): Promise<any> {
|
||||
if (_loaded) return _loaded
|
||||
|
||||
// 1. 读 web 端源
|
||||
let source = readFileSync(WEB_SOURCE, 'utf-8')
|
||||
|
||||
// 2. 替换 import (按顺序, 避免误伤)
|
||||
// a. NodeUtils (依赖 bpmn-js LabelUtil/ModelUtil) → 本地 stub
|
||||
// b. '../config' / '../config/*' → 本地 stub (只用到几个常量)
|
||||
source = source.replace(
|
||||
/^import \{ changeTypeByDecisionShape, changeTypeByTaskShape, hasGatewayType, typeConfig \} from '\.\.\/config';?/m,
|
||||
`// shim: ../config → const stubs
|
||||
const hasGatewayType = new Set(['bpmn:ParallelGateway', 'bpmn:InclusiveGateway', 'bpmn:ExclusiveGateway', 'bpmn:EventBasedGateway']);
|
||||
const changeTypeByDecisionShape = (n: any) => n;
|
||||
const changeTypeByTaskShape = (n: any) => n;
|
||||
const typeConfig: any = {};`,
|
||||
)
|
||||
source = source.replace(
|
||||
/^import \{ DEFAULT_CONNECT, DEFAULT_DISTANCE \} from '\.\.\/config\/constants';?/m,
|
||||
`const DEFAULT_CONNECT = 160;
|
||||
const DEFAULT_DISTANCE = 120;`,
|
||||
)
|
||||
source = source.replace(
|
||||
/^import \{ bpmnStart, bpmnTask, typeConfluence, typeDecisionStart, typeTrigger \} from '\.\.\/config\/variableName';?/m,
|
||||
`const bpmnStart = 'bpmn:StartEvent';
|
||||
const bpmnTask = 'bpmn:UserTask';
|
||||
const typeConfluence = 'bpmn:InclusiveGateway';
|
||||
const typeDecisionStart = 'bpmn:StartEvent';
|
||||
const typeTrigger = 'trigger';`,
|
||||
)
|
||||
source = source.replace(
|
||||
/^import \{ NodeUtils \} from '\.\/nodeUtil';?/m,
|
||||
`// shim: NodeUtils → stub (web 端用 bpmn-js LabelUtil, Node 不可用)
|
||||
// BPMNTreeBuilder 自身只用 NodeUtils.getNextElementList (在 getElementsByGateway), 该方法被我们剔除
|
||||
class NodeUtils {
|
||||
static getNextElementList(_el: any, _allElements: any): any[] { return []; }
|
||||
static getEndlessLoop(_bpmn: any): any[] { return []; }
|
||||
}`,
|
||||
)
|
||||
|
||||
// 3. 删除 bpmn-js runtime 依赖的 methods (它们引用不存在的参数, 编译失败)
|
||||
// 这些方法是 web 端用来在 bpmn-js canvas 上 apply 布局的, 我们用 moddle 写 bounds 不需要
|
||||
// a. formatCanvas (line 381) - 用 modeling.moveElements
|
||||
// b. formatCanvasHorizontal (line 396) - 同上
|
||||
// c. getElementsByGateway (line 409) - 用 NodeUtils.getNextElementList
|
||||
// d. getGroupElementById (line 426) - 用 bpmn.get('elementRegistry')
|
||||
source = removeMethod(source, 'formatCanvas')
|
||||
source = removeMethod(source, 'formatCanvasHorizontal')
|
||||
source = removeMethod(source, 'getElementsByGateway')
|
||||
source = removeMethod(source, 'getGroupElementById')
|
||||
|
||||
// 4. 写 tmp 文件 (.ts 让 tsx 编译, 保留类型)
|
||||
const tmpDir = join(tmpdir(), 'dacli-webapi')
|
||||
mkdirSync(tmpDir, { recursive: true })
|
||||
const tmpFile = join(tmpDir, 'bpmn-tree-builder.ts')
|
||||
writeFileSync(tmpFile, source, 'utf-8')
|
||||
|
||||
// 5. dynamic import
|
||||
const mod = await import(pathToFileURL(tmpFile).href)
|
||||
_loaded = mod
|
||||
log.info(`webapi/bpmnTreeBuilder: 镜像 web constructTreeUtil.ts (B方案, 剔除 bpmn-js runtime methods)`)
|
||||
return mod
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除 class 中的指定 public method (从 `public methodName(` 到下一个 `}` 匹配的 method end)
|
||||
*
|
||||
* 算法: 找到 ` public methodName(` 或 `methodName(` 行, 然后找到 method 结束的下一行
|
||||
* (通过 brace 配对, 不依赖精确缩进)
|
||||
*/
|
||||
function removeMethod(source: string, methodName: string): string {
|
||||
// 匹配 method 开头: `public methodName(` 或 `methodName(`
|
||||
const startRegex = new RegExp(`^\\s*public\\s+${methodName}\\s*\\(`, 'm')
|
||||
const match = source.match(startRegex)
|
||||
if (!match) return source
|
||||
|
||||
const startIdx = match.index!
|
||||
// 从 method 名后第一个 `{` 开始计 brace
|
||||
let i = startIdx
|
||||
// 找到 method signature 的结束 (下一个 `{`)
|
||||
while (i < source.length && source[i] !== '{') i++
|
||||
if (i >= source.length) return source
|
||||
|
||||
// brace 配对
|
||||
let depth = 1
|
||||
i++
|
||||
while (i < source.length && depth > 0) {
|
||||
if (source[i] === '{') depth++
|
||||
else if (source[i] === '}') depth--
|
||||
i++
|
||||
}
|
||||
// i 现在在 method 结束 `}` 之后
|
||||
|
||||
// 跳过方法签名前的注释 (往上找 `/**` 或 `*` 注释)
|
||||
let commentStart = startIdx
|
||||
const beforeBlock = source.substring(Math.max(0, startIdx - 500), startIdx)
|
||||
const lastCommentMatch = beforeBlock.match(/\/\*\*[\s\S]*?\*\/\s*$/)
|
||||
if (lastCommentMatch) {
|
||||
commentStart = startIdx - 500 + lastCommentMatch.index!
|
||||
}
|
||||
|
||||
return source.substring(0, commentStart) + source.substring(i)
|
||||
}
|
||||
|
||||
// log 仅用 info 级别避免循环引用 (log 模块可能在更早加载)
|
||||
import { log } from '../core/log.ts'
|
||||
Reference in new issue
Block a user