- rewrite.py: 新增 _VAADIN_EXTRA_IMPORT_RE / _DSASP_CLIENT_IMPORT_RE / _ENVIROMENT_GET_IMPORT_RE 三条 import 剥离规则,统一在 5.9 清理节 运行;补多余引号修复(源数据 bug "...SQL 100"";") - run_batch_regression.py: connect_db 优先连本地 eip4dev:5433, 回退远程 192.168.20.68:5435 - output/rewritten/*.groovy: 规则重跑后的 rewritten 产物更新 - output/manual_workpackage/*.md: 对应工包重生成 - output/batch_regression_20260612_053253.json: 最终批跑结果 FULL_AUTO 94.1%(476/506);删除 3 个中间产物 JSON - docs/P1/F2-4批量回归报告.md: 最终通过率写入报告 Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
1192 lines
52 KiB
Python
1192 lines
52 KiB
Python
"""
|
||
S3 脚本正则改写器 — rewrite.py
|
||
将 Groovy S3 脚本(直接调 Vaadin API)改写为 S2 形态(facade 辅助函数调用)。
|
||
|
||
分类标签:
|
||
FULL_AUTO — 全部 S3 模式改写成功,无遗留
|
||
PARTIAL — 部分改写成功,仍有 S3 片段待人工处理
|
||
HARD — 命中硬 S3 特征(动态 Vaadin 组件/确认框),整条转人工
|
||
NO_S3 — 未检测到任何 S3 模式,原样返回
|
||
|
||
用法:
|
||
from rewrite import rewrite_script
|
||
text, details, label = rewrite_script(groovy_src)
|
||
"""
|
||
|
||
import re
|
||
from dataclasses import dataclass, field
|
||
from typing import List, Tuple
|
||
|
||
# ──────────────────────────────────────────────
|
||
# 1. 硬 S3 检测模式(命中即整条转人工)
|
||
#
|
||
# 注意: Button 已从 HARD 列表移除 ——
|
||
# 规则族2(动态按钮家族)可将"new Button + addClickListener + fieldVar.addButton"
|
||
# 整体改写为 addFieldButton(field, label, {闭包}),改写成功后不再是 HARD。
|
||
# 若改写后仍剩余 new Button(不属于可识别模式),残留检测会降级为 PARTIAL。
|
||
# ──────────────────────────────────────────────
|
||
HARD_S3_PATTERNS: List[Tuple[str, str]] = [
|
||
# 动态创建 Vaadin 组件(排除 Button,Button 由规则族2 处理)
|
||
(r"\bnew\s+(Window|ComboBox|TextField|Label|Table|Panel|"
|
||
r"VerticalLayout|HorizontalLayout|FormLayout|GridLayout|"
|
||
r"AbsoluteLayout|TabSheet|Accordion|PopupView|Upload|"
|
||
r"ProgressBar|Slider|DateField|CheckBox|OptionGroup|"
|
||
r"TwinColSelect|ListSelect|NativeSelect|PasswordField|"
|
||
r"RichTextArea|TextArea|InlineDateField|Link|Embedded|"
|
||
r"MenuBar|Tree|TreeTable|SplitPanel|HorizontalSplitPanel|"
|
||
r"VerticalSplitPanel|Notification)\b",
|
||
"动态创建 Vaadin 组件"),
|
||
# showConfirmDialog: 同步确认框,无法用规则族2改写(闭包语义需 Java 侧实现)
|
||
# 当独立出现(脚本中无 new Button)时直接 HARD;
|
||
# 当与 new Button 同时出现时,规则族2 先改写 Button,改写后
|
||
# showConfirmDialog 变成 addFieldButton 闭包体内部的普通语句,无需再 HARD。
|
||
# 因此此处只检测:不在已改写的 addFieldButton 闭包内的 showConfirmDialog。
|
||
# 实现上:在规则族2 改写之后,若文本中仍直接含 showConfirmDialog(非闭包内)才 HARD。
|
||
# 简化实现:规则族2 改写后,若仍有独立 showConfirmDialog 才列为 HARD 原因(见 5.1 逻辑)。
|
||
(r"\bshowConfirmDialog\b", "同步确认框 showConfirmDialog"),
|
||
(r"\bUI\.getCurrent\(\)", "UI.getCurrent()"),
|
||
]
|
||
|
||
# ──────────────────────────────────────────────
|
||
# 2. 数据表驱动改写规则(按优先级顺序)
|
||
# 每条规则: (规则名, 正则模式, 替换模板或替换函数)
|
||
#
|
||
# 占位符约定:
|
||
# {FIELD} — 字段名字符串(含引号),如 "PROJ_NAME"
|
||
# {ARG} — 单参数
|
||
# {ARGS} — 多参数(逗号分隔)
|
||
# {VAR} — Groovy 变量名
|
||
# ──────────────────────────────────────────────
|
||
|
||
@dataclass
|
||
class RewriteRule:
|
||
name: str
|
||
pattern: re.Pattern
|
||
replacement: str # 可含 \1 \2 等反向引用,或直接是字符串
|
||
|
||
|
||
def _make_field_rules() -> List[RewriteRule]:
|
||
"""生成字段句柄链式调用规则表(数据表驱动)。
|
||
|
||
形态说明(真实库实测,2026-06-11):
|
||
- 字段句柄链同时存在普通点 `.` 与 Groovy 安全导航 `?.`,二者语义在
|
||
facade 形态下等价(facade 内部处理空值),因此每条字段规则用 NAV 占位
|
||
统一匹配两者。真实库 266/400 字段链调用使用 `?.`,不支持则丢失约半数。
|
||
"""
|
||
# field_ref 匹配: group.getField("X") 或 group.getField('X')
|
||
# NAV 同时匹配 `.` 与 `?.`,并允许中间空白(真实库有换行/空格变体)。
|
||
fref = r'group\.getField\((["\'][^"\']+["\'])\)'
|
||
NAV = r'\s*\??\.\s*'
|
||
rules: List[RewriteRule] = []
|
||
|
||
# ── 2.1 addButton(字段内联按钮)─────────────────────────────
|
||
# group.getField("X").addButton("label", handler)
|
||
# → addFieldButton("X", "label", handler)
|
||
# 注意: 仅当首参为字符串字面量(按钮文案)时才视为字段按钮。
|
||
# 形如 addButton(group.getField("SELECT"),0) 是子表动作按钮(另规则)。
|
||
rules.append(RewriteRule(
|
||
name="addButton",
|
||
pattern=re.compile(
|
||
fref + NAV + r'addButton\(\s*(["\'][^"\']*["\'][^)]*)\)',
|
||
re.DOTALL
|
||
),
|
||
replacement=r'addFieldButton(\1, \2)',
|
||
))
|
||
|
||
# ── 2.1b addSubTableButton(子表动作按钮)────────────────────
|
||
# group.getField("LIST").addButton(group.getField("SELECT"), 0)
|
||
# → addSubTableButton("LIST", "SELECT", 0)
|
||
# 真实库子表挂载选择/新增按钮的写法,首参是另一个字段句柄。
|
||
rules.append(RewriteRule(
|
||
name="addSubTableButton",
|
||
pattern=re.compile(
|
||
fref + NAV +
|
||
r'addButton\(\s*group\.getField\((["\'][^"\']+["\'])\)\s*,\s*([^)]+)\)',
|
||
re.DOTALL
|
||
),
|
||
replacement=r'addSubTableButton(\1, \2, \3)',
|
||
))
|
||
|
||
# ── 2.2 getValue ───────────────────────────────────────────
|
||
# group.getField("X").getValue() → getFieldValue("X")
|
||
rules.append(RewriteRule(
|
||
name="getValue",
|
||
pattern=re.compile(fref + NAV + r'getValue\(\)'),
|
||
replacement=r'getFieldValue(\1)',
|
||
))
|
||
|
||
# ── 2.3 setValue ───────────────────────────────────────────
|
||
# group.getField("X").setValue(v) → setFieldValue("X", v)
|
||
rules.append(RewriteRule(
|
||
name="setValue",
|
||
pattern=re.compile(fref + NAV + r'setValue\(([^)]+)\)'),
|
||
replacement=r'setFieldValue(\1, \2)',
|
||
))
|
||
|
||
# ── 2.4 setVisible ─────────────────────────────────────────
|
||
# group.getField("X").setVisible(b) → setFieldVisible("X", b)
|
||
rules.append(RewriteRule(
|
||
name="setVisible",
|
||
pattern=re.compile(fref + NAV + r'setVisible\(([^)]+)\)'),
|
||
replacement=r'setFieldVisible(\1, \2)',
|
||
))
|
||
|
||
# ── 2.5 setCaption ─────────────────────────────────────────
|
||
# group.getField("X").setCaption(s) → setFieldCaption("X", s)
|
||
rules.append(RewriteRule(
|
||
name="setCaption",
|
||
pattern=re.compile(fref + NAV + r'setCaption\(([^)]+)\)'),
|
||
replacement=r'setFieldCaption(\1, \2)',
|
||
))
|
||
|
||
# ── 2.6 setEnabled / setReadOnly ───────────────────────────
|
||
# group.getField("X").setEnabled(b) → setFieldEnabled("X", b)
|
||
rules.append(RewriteRule(
|
||
name="setEnabled",
|
||
pattern=re.compile(fref + NAV + r'setEnabled\(([^)]+)\)'),
|
||
replacement=r'setFieldEnabled(\1, \2)',
|
||
))
|
||
# group.getField("X").getPropertyDataSource().setReadOnly(b)
|
||
# → setFieldReadOnly("X", b)
|
||
# 真实库"把字段底层属性置只读"的等价惯用写法,须先于裸 setReadOnly 规则,
|
||
# 否则中间的 getPropertyDataSource() 会阻断匹配。
|
||
rules.append(RewriteRule(
|
||
name="propertyDataSource_setReadOnly",
|
||
pattern=re.compile(
|
||
fref + NAV + r'getPropertyDataSource\(\)' + NAV + r'setReadOnly\(([^)]+)\)'),
|
||
replacement=r'setFieldReadOnly(\1, \2)',
|
||
))
|
||
# group.getField("X").setReadOnly(b) → setFieldReadOnly("X", b)
|
||
rules.append(RewriteRule(
|
||
name="setReadOnly_field",
|
||
pattern=re.compile(fref + NAV + r'setReadOnly\(([^)]+)\)'),
|
||
replacement=r'setFieldReadOnly(\1, \2)',
|
||
))
|
||
|
||
# ── 2.7 setRequired / setRequiredError ─────────────────────
|
||
# group.getField("X").setRequired(b) → setFieldRequired("X", b)
|
||
rules.append(RewriteRule(
|
||
name="setRequired",
|
||
pattern=re.compile(fref + NAV + r'setRequired\(([^)]+)\)'),
|
||
replacement=r'setFieldRequired(\1, \2)',
|
||
))
|
||
# group.getField("X").setRequiredError(msg) → setFieldRequiredError("X", msg)
|
||
rules.append(RewriteRule(
|
||
name="setRequiredError",
|
||
pattern=re.compile(fref + NAV + r'setRequiredError\(([^)]+)\)', re.DOTALL),
|
||
replacement=r'setFieldRequiredError(\1, \2)',
|
||
))
|
||
|
||
# ── 2.8 getContainerDataSource().setFilter / removeAllItems ─
|
||
# group.getField("X").getContainerDataSource().setFilter(...)
|
||
# → setFieldDataFilter("X", ...)
|
||
rules.append(RewriteRule(
|
||
name="setFilter",
|
||
pattern=re.compile(
|
||
fref + NAV + r'getContainerDataSource\(\)' + NAV + r'setFilter\(([^)]*)\)',
|
||
re.DOTALL
|
||
),
|
||
replacement=r'setFieldDataFilter(\1, \2)',
|
||
))
|
||
# group.getField("X").getContainerDataSource().removeAllItems()
|
||
# → clearFieldData("X")
|
||
rules.append(RewriteRule(
|
||
name="removeAllItems_ds",
|
||
pattern=re.compile(
|
||
fref + NAV + r'getContainerDataSource\(\)' + NAV + r'removeAllItems\(\)'
|
||
),
|
||
replacement=r'clearFieldData(\1)',
|
||
))
|
||
# group.getField("X").removeAllItems() (无中间 getContainerDataSource)
|
||
# → clearFieldData("X") — 真实库下拉清空常见简写
|
||
rules.append(RewriteRule(
|
||
name="removeAllItems",
|
||
pattern=re.compile(fref + NAV + r'removeAllItems\(\)'),
|
||
replacement=r'clearFieldData(\1)',
|
||
))
|
||
|
||
# ── 2.9 getContainerDataSource (裸取数据源) ─────────────────
|
||
# group.getField("X").getContainerDataSource()
|
||
# → getFieldDataSource("X")
|
||
rules.append(RewriteRule(
|
||
name="getContainerDataSource",
|
||
pattern=re.compile(fref + NAV + r'getContainerDataSource\(\)'),
|
||
replacement=r'getFieldDataSource(\1)',
|
||
))
|
||
|
||
# ── 2.10 getDisplay ────────────────────────────────────────
|
||
# group.getField("X").getDisplay() → getFieldDisplay("X")
|
||
rules.append(RewriteRule(
|
||
name="getDisplay",
|
||
pattern=re.compile(fref + NAV + r'getDisplay\(\)'),
|
||
replacement=r'getFieldDisplay(\1)',
|
||
))
|
||
|
||
# ── 2.10b showAddButton(子表新增按钮显隐)──────────────────
|
||
# group.getField("X").showAddButton(b) → setSubTableAddButtonVisible("X", b)
|
||
rules.append(RewriteRule(
|
||
name="showAddButton",
|
||
pattern=re.compile(fref + NAV + r'showAddButton\(([^)]+)\)'),
|
||
replacement=r'setSubTableAddButtonVisible(\1, \2)',
|
||
))
|
||
|
||
# ── 2.10c setViewWithoutEditor(只读视图无编辑器)────────────
|
||
# group.getField("X").setViewWithoutEditor(b) → setFieldViewOnly("X", b)
|
||
rules.append(RewriteRule(
|
||
name="setViewWithoutEditor",
|
||
pattern=re.compile(fref + NAV + r'setViewWithoutEditor\(([^)]+)\)'),
|
||
replacement=r'setFieldViewOnly(\1, \2)',
|
||
))
|
||
|
||
# ── 2.10d setFilter / setFilterMap(字段下拉过滤,复杂参数)─
|
||
# 直接挂在字段句柄上的 setFilter(map) / setFilterMap(map)。
|
||
# 参数常含嵌套 [..] 与函数调用,无法用 [^)]+ 安全匹配,
|
||
# 改由平衡括号预处理 _rewrite_balanced_field_calls 处理(见下)。
|
||
# 此处不注册正则规则,留空说明保持登记完整性。
|
||
|
||
# ── 2.10e focus(字段聚焦)──────────────────────────────────
|
||
# group.getField("X").focus() → focusField("X")
|
||
rules.append(RewriteRule(
|
||
name="focus",
|
||
pattern=re.compile(fref + NAV + r'focus\(\)'),
|
||
replacement=r'focusField(\1)',
|
||
))
|
||
|
||
# ── 2.10f setWidth / setHeight(字段尺寸)───────────────────
|
||
# group.getField("X").setWidth(w) → setFieldWidth("X", w)
|
||
rules.append(RewriteRule(
|
||
name="setWidth",
|
||
pattern=re.compile(fref + NAV + r'setWidth\(([^)]+)\)'),
|
||
replacement=r'setFieldWidth(\1, \2)',
|
||
))
|
||
rules.append(RewriteRule(
|
||
name="setHeight",
|
||
pattern=re.compile(fref + NAV + r'setHeight\(([^)]+)\)'),
|
||
replacement=r'setFieldHeight(\1, \2)',
|
||
))
|
||
|
||
# ── 2.10h reload(字段数据源刷新)──────────────────────────
|
||
# group.getField("X").reload() → reloadField("X")
|
||
rules.append(RewriteRule(
|
||
name="reload",
|
||
pattern=re.compile(fref + NAV + r'reload\(\)'),
|
||
replacement=r'reloadField(\1)',
|
||
))
|
||
|
||
# ── 2.10i setConvertedValue(转换后赋值)────────────────────
|
||
# group.getField("X").setConvertedValue(v) → setFieldConvertedValue("X", v)
|
||
rules.append(RewriteRule(
|
||
name="setConvertedValue",
|
||
pattern=re.compile(fref + NAV + r'setConvertedValue\(([^)]+)\)'),
|
||
replacement=r'setFieldConvertedValue(\1, \2)',
|
||
))
|
||
|
||
# ── 2.10j setNullSelectionItemId(空选项 id)────────────────
|
||
# group.getField("X").setNullSelectionItemId(v) → setFieldNullSelection("X", v)
|
||
rules.append(RewriteRule(
|
||
name="setNullSelectionItemId",
|
||
pattern=re.compile(fref + NAV + r'setNullSelectionItemId\(([^)]+)\)'),
|
||
replacement=r'setFieldNullSelection(\1, \2)',
|
||
))
|
||
|
||
# ── 2.10k removeItem(删下拉项)─────────────────────────────
|
||
# group.getField("X").removeItem(v) → removeFieldItem("X", v)
|
||
rules.append(RewriteRule(
|
||
name="removeItem",
|
||
pattern=re.compile(fref + NAV + r'removeItem\(([^)]+)\)'),
|
||
replacement=r'removeFieldItem(\1, \2)',
|
||
))
|
||
|
||
# ── 2.10l showDeleteButton(子表删除按钮显隐)───────────────
|
||
# group.getField("X").showDeleteButton(b) → setSubTableDeleteButtonVisible("X", b)
|
||
rules.append(RewriteRule(
|
||
name="showDeleteButton",
|
||
pattern=re.compile(fref + NAV + r'showDeleteButton\(([^)]+)\)'),
|
||
replacement=r'setSubTableDeleteButtonVisible(\1, \2)',
|
||
))
|
||
|
||
# ── 2.10m getModifyButton().setVisible / getDetailButton().setVisible ─
|
||
# group.getField("X").getModifyButton().setVisible(b)
|
||
# → setSubTableModifyButtonVisible("X", b)
|
||
rules.append(RewriteRule(
|
||
name="getModifyButton_setVisible",
|
||
pattern=re.compile(
|
||
fref + NAV + r'getModifyButton\(\)' + NAV + r'setVisible\(([^)]+)\)'),
|
||
replacement=r'setSubTableModifyButtonVisible(\1, \2)',
|
||
))
|
||
rules.append(RewriteRule(
|
||
name="getDetailButton_setVisible",
|
||
pattern=re.compile(
|
||
fref + NAV + r'getDetailButton\(\)' + NAV + r'setVisible\(([^)]+)\)'),
|
||
replacement=r'setSubTableDetailButtonVisible(\1, \2)',
|
||
))
|
||
|
||
# ── 2.11 group.setReadOnly (组级) ──────────────────────────
|
||
# group.setReadOnly(b) / group?.setReadOnly(b) → setGroupReadOnly(b)
|
||
rules.append(RewriteRule(
|
||
name="group_setReadOnly",
|
||
pattern=re.compile(r'\bgroup\s*\??\.\s*setReadOnly\(([^)]+)\)'),
|
||
replacement=r'setGroupReadOnly(\1)',
|
||
))
|
||
|
||
# ── 2.12 group.setEnabled (组级) ───────────────────────────
|
||
rules.append(RewriteRule(
|
||
name="group_setEnabled",
|
||
pattern=re.compile(r'\bgroup\s*\??\.\s*setEnabled\(([^)]+)\)'),
|
||
replacement=r'setGroupEnabled(\1)',
|
||
))
|
||
|
||
# ── 2.13 Notification.show ─────────────────────────────────
|
||
# Notification.show(msg) / Notification.show(msg, Type)
|
||
# → showToast(msg) / showToast(msg, type)
|
||
rules.append(RewriteRule(
|
||
name="Notification_show",
|
||
pattern=re.compile(
|
||
r'\bNotification\.show\(([^)]+)\)',
|
||
re.DOTALL
|
||
),
|
||
replacement=r'showToast(\1)',
|
||
))
|
||
|
||
# ── 2.14 enableButton ──────────────────────────────────────
|
||
# enableButton("BTN", b) — 已是 S2 形态,保持不变(作为无操作规则)
|
||
# 此处不改写,仅识别(不在 S3 剩余检测里误报)
|
||
|
||
# ── F2-3 规则族3: 深层访问家族 ─────────────────────────────
|
||
# 真实语料挖掘(2026-06-11): PARTIAL 残留 .comboBox / .table 访问共 17 处,
|
||
# 覆盖 8 个模板。能折叠到已有 facade 动词的两类:
|
||
#
|
||
# 3A. group.getField("X")?.comboBox.setValue(v) → setFieldValue("X", v)
|
||
# 语义等价:comboBox.setValue 即字段赋值,与 setFieldValue 语义相同。
|
||
# 语料命中: 7 处 / 4 模板(月度检查、季度检查系列)
|
||
# 负例保护: 仅当 .comboBox 后紧跟 .setValue( 时才改写;.comboBox.OTHER 不触发。
|
||
#
|
||
# 3B. group.getField("X")?.comboBox?.removeItem(v) → removeFieldItem("X", v)
|
||
# 语义等价: comboBox.removeItem 即字段下拉项移除,与 removeFieldItem 语义相同。
|
||
# 语料命中: 2 处 / 1 模板(季度检查整改)
|
||
# 负例保护: 仅当 .comboBox 后紧跟 ?.removeItem( 或 .removeItem( 时才改写。
|
||
#
|
||
# .table.getVisibleColumns / .table.setVisibleColumns 无 facade 等价,保留 PARTIAL。
|
||
|
||
# 3A: .comboBox.setValue → setFieldValue
|
||
rules.append(RewriteRule(
|
||
name="comboBox_setValue",
|
||
pattern=re.compile(
|
||
fref + NAV + r'comboBox\s*\??\.\s*setValue\s*\(([^)]+)\)'
|
||
),
|
||
replacement=r'setFieldValue(\1, \2)',
|
||
))
|
||
|
||
# 3B: .comboBox.removeItem → removeFieldItem
|
||
rules.append(RewriteRule(
|
||
name="comboBox_removeItem",
|
||
pattern=re.compile(
|
||
fref + NAV + r'comboBox\s*\??\.\s*removeItem\s*\(([^)]+)\)'
|
||
),
|
||
replacement=r'removeFieldItem(\1, \2)',
|
||
))
|
||
|
||
return rules
|
||
|
||
|
||
# 单例规则表(模块加载时编译一次)
|
||
REWRITE_RULES: List[RewriteRule] = _make_field_rules()
|
||
|
||
# ──────────────────────────────────────────────
|
||
# F2-3 规则族2: 动态按钮家族
|
||
#
|
||
# 目标模式(真实语料挖掘,2026-06-11,57 条 HARD new Button 脚本):
|
||
#
|
||
# 形态A(最常见,38 条):
|
||
# [final/def] fieldVar = group.getField("FIELD") -- 可能已被内联
|
||
# [final] Button btnVar = new Button("文案")
|
||
# btnVar?.addClickListener(new [Button.]ClickListener() {
|
||
# public void buttonClick([Button.]ClickEvent event) { <闭包体> }
|
||
# });
|
||
# fieldVar?.addButton(btnVar, N)
|
||
# → addFieldButton("FIELD", "文案", { <闭包体> }) -- N 对应按钮位置
|
||
# → 挂载位置参数 N 编码为 addFieldButton 第4参数(可选)
|
||
#
|
||
# 形态B(17 条):
|
||
# [final] Button btnVar = new Button("文案")
|
||
# btnVar?.addClickListener(new ClickListener() { ... })
|
||
# fieldVarOrExpr?.addButton(btnVar, N)
|
||
# 其中 fieldVar 来自 def fieldVar = group.getField("FIELD")
|
||
#
|
||
# 改写策略:
|
||
# 1. 找到 fieldVar.addButton(btnVar, N) 挂载行 → 确定 fieldName 和 btnVar
|
||
# 2. 向上找 Button btnVar = new Button("文案") 声明 → 得到文案
|
||
# 3. 找 btnVar?.addClickListener(new ClickListener(){ public void buttonClick(...){ ... }})
|
||
# 用平衡括号提取闭包体,展开为 { <体> }
|
||
# 4. 整体替换为 addFieldButton("FIELD", "文案", { <体> })
|
||
# 5. 清除原始 import 行(Button/ClickEvent/ClickListener)
|
||
#
|
||
# 安全约束(0 误改红线):
|
||
# - fieldVar 必须能追溯到 group.getField("LITERAL") 赋值,或挂载行本身含 getField
|
||
# - btnVar 必须有明确的 new Button("字面量文案") 声明(非变量文案不改)
|
||
# - addClickListener 必须用 new ClickListener()/new Button.ClickListener() 形态
|
||
# (不支持 Lambda/Groovy 闭包形态,真实库未见此形态)
|
||
# - addComponent(btn, N) 型(vl = opertor?.parent)不在此规则覆盖范围,保留 HARD
|
||
# ──────────────────────────────────────────────
|
||
|
||
# 匹配 Button/ClickListener/ClickEvent import 行(改写完成后可删除)
|
||
_BTN_IMPORT_RE = re.compile(
|
||
r'^[ \t]*import\s+com\.vaadin\.ui\.(?:Button|Button\.ClickEvent|Button\.ClickListener|'
|
||
r'Button\.ClickListener\.ClickEvent);\s*\n?',
|
||
re.MULTILINE,
|
||
)
|
||
_LISTENER_IMPORT_RE = re.compile(
|
||
r'^[ \t]*import\s+com\.vaadin\.(?:data\.Property\.ValueChangeListener|'
|
||
r'data\.Property\.ValueChangeEvent|ui\.Button\.ClickEvent|'
|
||
r'ui\.Button\.ClickListener);\s*\n?',
|
||
re.MULTILINE,
|
||
)
|
||
# F2-4 修复: Notification_show 规则改写后 Notification/Type import 不再需要
|
||
_NOTIF_IMPORT_RE = re.compile(
|
||
r'^[ \t]*import\s+com\.vaadin\.ui\.Notification(?:\.\w+)?;\s*\n?',
|
||
re.MULTILINE,
|
||
)
|
||
|
||
# F2-4b 修复: 扩展 import 剥离规则
|
||
# 以下类在 EIP4 classpath 不存在,必须剥除否则 Groovy 编译失败
|
||
# 规则:Vaadin 客户端类 + com.dsasp.client.* 全剥
|
||
# com.dsasp.server.common.util.EnviromentGet 不在 platform-legacy-core,剥
|
||
# com.dsasp.server.common.dataDic.* 在 platform-legacy-core 存在,不剥
|
||
_VAADIN_EXTRA_IMPORT_RE = re.compile(
|
||
r'^[ \t]*import\s+com\.vaadin\.(?:server\.VaadinService|ui\.PopupDateField);\s*\n?',
|
||
re.MULTILINE,
|
||
)
|
||
_DSASP_CLIENT_IMPORT_RE = re.compile(
|
||
r'^[ \t]*import\s+com\.dsasp\.client\.[\w\.]+;\s*\n?',
|
||
re.MULTILINE,
|
||
)
|
||
_ENVIROMENT_GET_IMPORT_RE = re.compile(
|
||
r'^[ \t]*import\s+com\.dsasp\.server\.common\.util\.EnviromentGet;\s*\n?',
|
||
re.MULTILINE,
|
||
)
|
||
|
||
# 匹配: [final] Button VAR = new Button("文案") 或 [def/final] Button VAR = new Button("文案")
|
||
_BTN_DECL_RE = re.compile(
|
||
r'^[ \t]*(?:final\s+)?(?:def\s+)?Button\s+(\w+)\s*=\s*new\s+Button\((["\'][^"\']+["\'])\)\s*;?[ \t]*(?://[^\n]*)?\n?',
|
||
re.MULTILINE,
|
||
)
|
||
|
||
# 匹配: btnVar?.addClickListener(new [Button.]ClickListener() {
|
||
_CLICK_LISTENER_HEAD_RE = re.compile(
|
||
r'(\w+)\s*\??\.\s*addClickListener\s*\(\s*new\s+(?:Button\.)?ClickListener\s*\(\s*\)\s*\{'
|
||
)
|
||
|
||
# 匹配: public void buttonClick([Button.]ClickEvent event) {
|
||
_BTN_CLICK_METHOD_RE = re.compile(
|
||
r'public\s+void\s+buttonClick\s*\(\s*(?:Button\.)?ClickEvent\s+\w+\s*\)\s*\{'
|
||
)
|
||
|
||
# 匹配 fieldVar 赋值行: [def/final/Object] VAR = group.getField("FIELD") / group.getField('FIELD')
|
||
_FIELD_VAR_ASSIGN_RE = re.compile(
|
||
r'^[ \t]*(?:def\s+|final\s+|Object\s+)*(\w+)\s*=\s*group\.getField\((["\'][^"\']+["\'])\)\s*;?[ \t]*(?://[^\n]*)?\n?',
|
||
re.MULTILINE,
|
||
)
|
||
|
||
# 匹配挂载行: fieldVar?.addButton(btnVar, N[, "icon.png", ...])
|
||
# 组1=fieldVar, 组2=btnVar, 组3+=后续参数(含位置 N)
|
||
_MOUNT_LINE_RE = re.compile(
|
||
r'^([ \t]*)(\w+)\s*\??\.\s*addButton\s*\(\s*(\w+)\s*,\s*([^)]+)\)\s*;?[ \t]*\n?',
|
||
re.MULTILINE,
|
||
)
|
||
|
||
|
||
def _extract_click_body(text: str, btn_var: str) -> Tuple[str, int, int]:
|
||
"""
|
||
从 text 中找 btnVar?.addClickListener(new ClickListener() { ... })
|
||
用平衡大括号提取监听器整块(含外层 {}),返回 (闭包体内容, 整块起始索引, 整块结束索引+1)。
|
||
失败返回 ('', -1, -1)。
|
||
"""
|
||
# 找 btnVar?.addClickListener(new ClickListener() {
|
||
pat = re.compile(
|
||
re.escape(btn_var) + r'\s*\??\.\s*addClickListener\s*\(\s*new\s+(?:Button\.)?ClickListener\s*\(\s*\)\s*\{'
|
||
)
|
||
m = pat.search(text)
|
||
if not m:
|
||
return '', -1, -1
|
||
|
||
# 整块起始:btnVar 的开头
|
||
block_start = m.start()
|
||
# 大括号配平从 { 开始
|
||
brace_open = m.end() - 1 # 指向 {
|
||
depth = 0
|
||
i = brace_open
|
||
n = len(text)
|
||
while i < n:
|
||
ch = text[i]
|
||
if ch == '{':
|
||
depth += 1
|
||
elif ch == '}':
|
||
depth -= 1
|
||
if depth == 0:
|
||
break
|
||
i += 1
|
||
if depth != 0:
|
||
return '', -1, -1
|
||
|
||
outer_close = i # 位置 i 是最外层 }
|
||
|
||
# 外层 } 之后可能有 ) 和 ; -- addClickListener(...) 的闭合
|
||
j = outer_close + 1
|
||
while j < n and text[j] in ' \t':
|
||
j += 1
|
||
if j < n and text[j] == ')':
|
||
j += 1
|
||
while j < n and text[j] in ' \t':
|
||
j += 1
|
||
if j < n and text[j] == ';':
|
||
j += 1
|
||
while j < n and text[j] in ' \t\n':
|
||
j += 1
|
||
block_end = j # 整个 addClickListener 语句结束位置(含换行)
|
||
|
||
# 提取 buttonClick 方法体
|
||
inner = text[brace_open + 1:outer_close]
|
||
m2 = _BTN_CLICK_METHOD_RE.search(inner)
|
||
if not m2:
|
||
# 没找到标准 buttonClick 方法,整个 inner 作为闭包体(容错)
|
||
body = inner.strip()
|
||
else:
|
||
# 找 buttonClick { ... } 的大括号
|
||
method_brace = inner.index('{', m2.end() - 1)
|
||
depth2 = 0
|
||
k = method_brace
|
||
while k < len(inner):
|
||
ch = inner[k]
|
||
if ch == '{':
|
||
depth2 += 1
|
||
elif ch == '}':
|
||
depth2 -= 1
|
||
if depth2 == 0:
|
||
break
|
||
k += 1
|
||
body = inner[method_brace + 1:k].strip()
|
||
|
||
return body, block_start, block_end
|
||
|
||
|
||
def _rewrite_dynamic_buttons(text: str) -> Tuple[str, int]:
|
||
"""
|
||
规则族2:动态按钮家族改写。
|
||
识别并折叠 new Button + addClickListener + fieldVar.addButton 三元组,
|
||
改写为 addFieldButton("FIELD", "文案", { 闭包体 })。
|
||
|
||
返回 (新文本, 改写次数)。
|
||
|
||
安全约束:
|
||
- 只改写能静态追溯到 group.getField("LITERAL") 的 fieldVar
|
||
- btnVar 必须有 new Button("字面量") 声明
|
||
- addClickListener 必须是 new [Button.]ClickListener() { ... } 形态
|
||
- vl.addComponent(btn, N) 型(opertor?.parent)不触发
|
||
- 每次只改写能完整匹配三元组的 btnVar;无法匹配则原样保留
|
||
"""
|
||
count = 0
|
||
|
||
# 先建立 fieldVar → fieldName 映射(从赋值行)
|
||
field_var_map: dict = {}
|
||
for m in _FIELD_VAR_ASSIGN_RE.finditer(text):
|
||
var, fname = m.group(1), m.group(2)
|
||
field_var_map[var] = fname
|
||
|
||
# 找所有 Button 声明(btnVar → 文案)
|
||
btn_decls: dict = {}
|
||
for m in _BTN_DECL_RE.finditer(text):
|
||
btn_decls[m.group(1)] = m.group(2)
|
||
|
||
if not btn_decls:
|
||
return text, 0
|
||
|
||
# 逐个挂载行处理(倒序,避免偏移问题)
|
||
mounts = list(_MOUNT_LINE_RE.finditer(text))
|
||
mounts.reverse()
|
||
|
||
working = text
|
||
for mount_m in mounts:
|
||
field_var = mount_m.group(2)
|
||
btn_var = mount_m.group(3)
|
||
pos_args = mount_m.group(4).strip() # 位置参数(N 或 N, "icon.png", ...)
|
||
|
||
# 确定字段名
|
||
if field_var in field_var_map:
|
||
field_name = field_var_map[field_var]
|
||
else:
|
||
# fieldVar 不在已知映射里(可能来自外层字段句柄),跳过
|
||
continue
|
||
|
||
# 确定按钮文案
|
||
if btn_var not in btn_decls:
|
||
continue
|
||
btn_label = btn_decls[btn_var]
|
||
|
||
# 提取 addClickListener 闭包体
|
||
body, cl_start, cl_end = _extract_click_body(working, btn_var)
|
||
if cl_start == -1:
|
||
# 没有标准 addClickListener 形态,不改写
|
||
continue
|
||
|
||
# 确保 addClickListener 块在挂载行之前
|
||
mount_start = working.find(mount_m.group(0))
|
||
if mount_start == -1:
|
||
continue
|
||
if cl_start >= mount_start:
|
||
# addClickListener 在挂载之后,不是预期三元组形态
|
||
continue
|
||
|
||
# 找 Button 声明行
|
||
btn_decl_m = None
|
||
for m in _BTN_DECL_RE.finditer(working):
|
||
if m.group(1) == btn_var:
|
||
btn_decl_m = m
|
||
break
|
||
if btn_decl_m is None:
|
||
continue
|
||
|
||
# 确保 Button 声明在 addClickListener 之前
|
||
if btn_decl_m.start() >= cl_start:
|
||
continue
|
||
|
||
# 构造替换文案
|
||
indent = mount_m.group(1)
|
||
# 简化 pos_args:只取第一个数字参数(按钮位置)
|
||
pos_num_m = re.match(r'^(\d+)', pos_args)
|
||
if pos_num_m:
|
||
pos_arg = pos_num_m.group(1)
|
||
facade = f'{indent}addFieldButton({field_name}, {btn_label}, {{\n{body}\n{indent}}}, {pos_arg})'
|
||
else:
|
||
facade = f'{indent}addFieldButton({field_name}, {btn_label}, {{\n{body}\n{indent}}})'
|
||
|
||
# 执行四处删除/替换(从后向前:挂载行、addClickListener 块、Button 声明、fieldVar 赋值行)
|
||
# 先替换挂载行
|
||
mount_full = mount_m.group(0)
|
||
new_working = working[:mount_start] + facade + '\n' + working[mount_start + len(mount_full):]
|
||
|
||
# 删除 addClickListener 块(cl_start 在 mount_start 之前,偏移不受影响)
|
||
new_working = new_working[:cl_start] + new_working[cl_end:]
|
||
|
||
# 重新定位 Button 声明行(cl 删除影响偏移,但 btn_decl 在 cl 之前,不受影响)
|
||
btn_full = btn_decl_m.group(0)
|
||
btn_pos = new_working.find(btn_full)
|
||
if btn_pos != -1:
|
||
new_working = new_working[:btn_pos] + new_working[btn_pos + len(btn_full):]
|
||
|
||
# 删除 fieldVar 赋值行(仅当该变量在剩余文本中不再出现时,避免误删多用途变量)
|
||
# 用词边界检查:剩余文本不含 fieldVar 引用则安全删除
|
||
field_var_ref_re = re.compile(r'\b' + re.escape(field_var) + r'\b')
|
||
# 找赋值行位置(重新扫描,因为文本已变化)
|
||
field_assign_remaining = None
|
||
for fm in _FIELD_VAR_ASSIGN_RE.finditer(new_working):
|
||
if fm.group(1) == field_var:
|
||
field_assign_remaining = fm
|
||
break
|
||
if field_assign_remaining is not None:
|
||
# 检查赋值行之后是否还有对 fieldVar 的引用
|
||
text_after_assign = new_working[field_assign_remaining.end():]
|
||
if not field_var_ref_re.search(text_after_assign):
|
||
fa_full = field_assign_remaining.group(0)
|
||
fa_pos = field_assign_remaining.start()
|
||
new_working = new_working[:fa_pos] + new_working[fa_pos + len(fa_full):]
|
||
|
||
working = new_working
|
||
count += 1
|
||
|
||
# 同步更新 field_var_map 和 btn_decls(文本已改,重新扫描)
|
||
field_var_map = {}
|
||
for m in _FIELD_VAR_ASSIGN_RE.finditer(working):
|
||
field_var_map[m.group(1)] = m.group(2)
|
||
btn_decls = {}
|
||
for m in _BTN_DECL_RE.finditer(working):
|
||
btn_decls[m.group(1)] = m.group(2)
|
||
|
||
# 清理 Vaadin Button import(改写完成后不再需要)
|
||
if count > 0:
|
||
# 只清理 Button 相关 import,保留其他 Vaadin import(安全)
|
||
working = re.sub(
|
||
r'^[ \t]*import\s+com\.vaadin\.ui\.Button(?:\.\w+)?;\s*\n?',
|
||
'', working, flags=re.MULTILINE
|
||
)
|
||
# F2-4 修复: 同步清理 Notification import(Notification_show 规则改写后无需 vaadin 类)
|
||
working = _NOTIF_IMPORT_RE.sub('', working)
|
||
|
||
return working, count
|
||
|
||
|
||
# ──────────────────────────────────────────────
|
||
# 2bis. 平衡括号字段调用预处理
|
||
# 处理参数含嵌套 [..]/(..) 的字段句柄方法(setFilter/setFilterMap),
|
||
# 正则的 [^)]+ 会在首个 ) 处截断,故用括号配平扫描。
|
||
# 形态: group.getField("X")[?.|.]<method>( ...balanced... )
|
||
# 映射: setFilter→setFieldFilter, setFilterMap→setFieldFilterMap
|
||
# ──────────────────────────────────────────────
|
||
_BALANCED_FIELD_VERBS = {
|
||
"setFilter": "setFieldFilter",
|
||
"setFilterMap": "setFieldFilterMap",
|
||
}
|
||
_BALANCED_HEAD_RE = re.compile(
|
||
r'group\.getField\((["\'][^"\']+["\'])\)\s*\??\.\s*(setFilter|setFilterMap)\('
|
||
)
|
||
|
||
|
||
def _match_balanced(text: str, open_idx: int) -> int:
|
||
"""从 text[open_idx]=='(' 起,返回配平的 ')' 索引;失败返回 -1。"""
|
||
depth = 0
|
||
i = open_idx
|
||
n = len(text)
|
||
while i < n:
|
||
ch = text[i]
|
||
if ch == '(':
|
||
depth += 1
|
||
elif ch == ')':
|
||
depth -= 1
|
||
if depth == 0:
|
||
return i
|
||
i += 1
|
||
return -1
|
||
|
||
|
||
def _rewrite_balanced_field_calls(text: str) -> Tuple[str, int]:
|
||
"""改写复杂参数字段调用(setFilter/setFilterMap)。返回 (新文本, 次数)。"""
|
||
count = 0
|
||
out = []
|
||
pos = 0
|
||
while True:
|
||
m = _BALANCED_HEAD_RE.search(text, pos)
|
||
if not m:
|
||
out.append(text[pos:])
|
||
break
|
||
field, verb = m.group(1), m.group(2)
|
||
open_idx = m.end() - 1 # 指向方法名后的 '('
|
||
close_idx = _match_balanced(text, open_idx)
|
||
if close_idx == -1:
|
||
# 括号不配平,放弃改写该处,原样输出并跳过
|
||
out.append(text[pos:m.end()])
|
||
pos = m.end()
|
||
continue
|
||
arg = text[open_idx + 1:close_idx]
|
||
facade = _BALANCED_FIELD_VERBS[verb]
|
||
out.append(text[pos:m.start()])
|
||
out.append(f'{facade}({field}, {arg})')
|
||
pos = close_idx + 1
|
||
count += 1
|
||
return ''.join(out), count
|
||
|
||
|
||
# ──────────────────────────────────────────────
|
||
# 2ter. 下拉选项填充 idiom → addFieldOption(平衡括号)
|
||
# 形态(改写后): getFieldDataSource("F")?.addItem(V).getItemProperty("des").setValue(D)
|
||
# 映射: addFieldOption("F", V, D)
|
||
# 说明: 真实库构造下拉选项的标准写法(250/271 形态一致,属性键恒为 "des")。
|
||
# 此为确定性 1:1 语句转换——把"向 F 字段的数据源加一个值/显示项"
|
||
# 折叠为 facade 调用,不臆测循环体,逐条安全。
|
||
# 前置: 需先把 `def ic = getFieldDataSource("F")` 句柄变量内联回字面形态
|
||
# (见 _inline_datasource_handles)。
|
||
# ──────────────────────────────────────────────
|
||
# 头: getFieldDataSource("F")?.addItem( —— 捕获字段名,定位 addItem 起始括号
|
||
_OPTION_HEAD_RE = re.compile(
|
||
r'getFieldDataSource\((["\'][^"\']+["\'])\)\s*\??\.\s*addItem\('
|
||
)
|
||
# addItem 参数闭合后紧跟: [?.|.]getItemProperty("des")[?.|.]setValue( D )
|
||
# 真实库 getItemProperty/setValue 之间同样存在 ?. 安全导航变体。
|
||
_OPTION_TAIL_RE = re.compile(
|
||
r'\s*\??\.\s*getItemProperty\(\s*["\']des["\']\s*\)\s*\??\.\s*setValue\('
|
||
)
|
||
|
||
|
||
def _rewrite_option_population(text: str) -> Tuple[str, int]:
|
||
"""改写下拉选项填充 idiom → addFieldOption。返回 (新文本, 次数)。"""
|
||
count = 0
|
||
out = []
|
||
pos = 0
|
||
while True:
|
||
m = _OPTION_HEAD_RE.search(text, pos)
|
||
if not m:
|
||
out.append(text[pos:])
|
||
break
|
||
field = m.group(1)
|
||
ai_open = m.end() - 1 # addItem 的 '('
|
||
ai_close = _match_balanced(text, ai_open)
|
||
if ai_close == -1:
|
||
out.append(text[pos:m.end()]); pos = m.end(); continue
|
||
value_arg = text[ai_open + 1:ai_close]
|
||
|
||
tail = _OPTION_TAIL_RE.match(text, ai_close + 1)
|
||
if not tail:
|
||
# 仅 addItem(...) 无 getItemProperty("des").setValue —— 不属本 idiom,跳过
|
||
out.append(text[pos:m.end()]); pos = m.end(); continue
|
||
sv_open = tail.end() - 1 # setValue 的 '('
|
||
sv_close = _match_balanced(text, sv_open)
|
||
if sv_close == -1:
|
||
out.append(text[pos:m.end()]); pos = m.end(); continue
|
||
desc_arg = text[sv_open + 1:sv_close]
|
||
|
||
out.append(text[pos:m.start()])
|
||
out.append(f'addFieldOption({field}, {value_arg}, {desc_arg})')
|
||
pos = sv_close + 1
|
||
count += 1
|
||
return ''.join(out), count
|
||
|
||
|
||
# 数据源句柄变量赋值行(改写后): def ic = getFieldDataSource("F");
|
||
_DS_ASSIGN_LINE_RE = re.compile(
|
||
r'^[ \t]*(?:def\s+|final\s+|var\s+|Object\s+)?(\w+)\s*=\s*'
|
||
r'(getFieldDataSource\(["\'][^"\']+["\']\))[ \t]*;?[ \t]*(?://[^\n]*)?$',
|
||
re.MULTILINE,
|
||
)
|
||
|
||
|
||
def _inline_datasource_handles(text: str) -> Tuple[str, List[str]]:
|
||
"""
|
||
将单赋值数据源句柄变量内联展开,使 addFieldOption 模式可匹配。
|
||
def ic = getFieldDataSource("F")
|
||
ic?.addItem(...)...
|
||
→ getFieldDataSource("F")?.addItem(...)...
|
||
复用与字段句柄内联相同的"持有者引用"语义(仅替换 var. / var?.)。
|
||
"""
|
||
inlined: List[str] = []
|
||
lines = text.split('\n')
|
||
result_lines = list(lines)
|
||
|
||
assignments: List[Tuple[int, str, str]] = []
|
||
for idx, line in enumerate(lines):
|
||
m = _DS_ASSIGN_LINE_RE.match(line)
|
||
if m:
|
||
assignments.append((idx, m.group(1), m.group(2)))
|
||
|
||
for assign_idx, var, fexpr in reversed(assignments):
|
||
ref_re = re.compile(r'\b' + re.escape(var) + r'\b(?=\s*\??\.)')
|
||
replaced_any = False
|
||
for i in range(assign_idx + 1, len(result_lines)):
|
||
cur = result_lines[i]
|
||
m2 = _DS_ASSIGN_LINE_RE.match(cur)
|
||
if m2 and m2.group(1) == var:
|
||
break
|
||
if ref_re.search(cur):
|
||
result_lines[i] = ref_re.sub(fexpr, cur)
|
||
replaced_any = True
|
||
if replaced_any:
|
||
result_lines[assign_idx] = ''
|
||
inlined.append(
|
||
f"内联数据源句柄变量 `{var}` → `{fexpr}`(原第 {assign_idx+1} 行)"
|
||
)
|
||
return '\n'.join(result_lines), inlined
|
||
|
||
|
||
# ──────────────────────────────────────────────
|
||
# 3. S3 残留检测(改写后仍有未处理的 Vaadin API)
|
||
#
|
||
# 判定原则: 凡仍能匹配 *未被改写的 Vaadin UI 句柄链* 即残留。
|
||
# - group.getField( 仍存在 → 必有未覆盖动词,残留。
|
||
# - group.setReadOnly / setEnabled(含 ?.)仍存在 → 残留。
|
||
# - 容器/Item 级数据填充 idiom(getContainerDataSource / addItem /
|
||
# getItemProperty / removeAllItems / setFilter)仍存在 → 残留。
|
||
# 这些直接操作 Vaadin Container/Item 数据模型,不在自动改写边界内,
|
||
# 诚实保留为 PARTIAL,不强行转换(避免错改)。
|
||
# 注意: facade 自身的 setFieldValue/getFieldValue 等 *不带句柄前缀* 的形态
|
||
# 不应触发残留,故这里只匹配 group.getField( 句柄链与容器/Item 链。
|
||
# ──────────────────────────────────────────────
|
||
RESIDUAL_S3_PATTERNS = [
|
||
# 任何残留的字段句柄链(含 ?.,含未覆盖动词)
|
||
re.compile(r'group\.getField\('),
|
||
# 组级残留(含安全导航)
|
||
re.compile(r'\bgroup\s*\??\.\s*setReadOnly\('),
|
||
re.compile(r'\bgroup\s*\??\.\s*setEnabled\('),
|
||
re.compile(r'\bgroup\s*\??\.\s*setVisible\('),
|
||
re.compile(r'\bNotification\.show\('),
|
||
# 容器 / Item 级数据填充 idiom(保留为人工,不自动转)
|
||
re.compile(r'\.getContainerDataSource\('),
|
||
re.compile(r'\.getPropertyDataSource\('),
|
||
re.compile(r'\.getItemProperty\('),
|
||
re.compile(r'\.addItem\('),
|
||
re.compile(r'\.removeAllItems\('),
|
||
re.compile(r'\.setFilter\('),
|
||
# 规则族2 改写后如仍残留 new Button(无法识别的挂载形态),降为 PARTIAL
|
||
re.compile(r'\bnew\s+Button\b'),
|
||
]
|
||
|
||
# ──────────────────────────────────────────────
|
||
# 4. 内联单赋值字段句柄变量(两遍处理)
|
||
#
|
||
# def f = group.getField("X") // 或 def fld = ...
|
||
# f.setVisible(true)
|
||
# →
|
||
# group.getField("X").setVisible(true)
|
||
# ──────────────────────────────────────────────
|
||
# 匹配单行字段句柄赋值:
|
||
# def f = group.getField("X")
|
||
# final fld = group.getField('Y')
|
||
# f = group.getField("Z")
|
||
# 使用 MULTILINE 在完整文本中逐行匹配,不依赖行末换行符
|
||
# 匹配字段句柄赋值行(允许行末分号 / 注释 / 普通点或安全导航不触发——仅裸取句柄)。
|
||
# 真实库 548 处赋值写成 `def isShare = group.getField("ISSHARE");`(带分号),
|
||
# 旧正则用 `$` 收尾不允许分号,导致全部漏内联。这里允许尾随 `;` 与空白。
|
||
_FIELD_ASSIGN_LINE_RE = re.compile(
|
||
r'^[ \t]*(?:def\s+|final\s+|String\s+|Object\s+|var\s+)?(\w+)\s*=\s*'
|
||
r'(group\.getField\(["\'][^"\']+["\']\))[ \t]*;?[ \t]*(?://[^\n]*)?$',
|
||
re.MULTILINE,
|
||
)
|
||
|
||
|
||
def _inline_field_handles(text: str) -> Tuple[str, List[str]]:
|
||
"""
|
||
将单赋值字段句柄变量内联展开。
|
||
返回 (展开后文本, 内联操作说明列表)。
|
||
只处理在赋值行之后、**下一个同名赋值之前**出现的引用。
|
||
|
||
引用替换同时覆盖普通点 `var.foo()` 与安全导航 `var?.foo()`:
|
||
真实库句柄变量后续多用 `?.`(如 isShare?.setReadOnly(...)),
|
||
内联时把 `var?.` 还原为 `group.getField("ISSHARE")?.`,
|
||
保留导航符交由后续字段规则统一改写。
|
||
"""
|
||
inlined: List[str] = []
|
||
lines = text.split('\n')
|
||
result_lines = list(lines)
|
||
|
||
# 收集所有赋值:(行号, 变量名, 字段表达式)
|
||
assignments: List[Tuple[int, str, str]] = []
|
||
for idx, line in enumerate(lines):
|
||
m = _FIELD_ASSIGN_LINE_RE.match(line)
|
||
if m:
|
||
assignments.append((idx, m.group(1), m.group(2)))
|
||
|
||
# 倒序处理(避免行号偏移影响索引)
|
||
for assign_idx, var, fexpr in reversed(assignments):
|
||
# 只替换作为"句柄持有者"的引用:var. 或 var?.(后面紧跟方法链),
|
||
# 不误伤把 var 当普通值用的场景(如 `if (var == null)`)。
|
||
# 替换时仅吃掉变量名,保留其后的 `.`/`?.`,故用零宽断言。
|
||
ref_re = re.compile(r'\b' + re.escape(var) + r'\b(?=\s*\??\.)')
|
||
replaced_any = False
|
||
for i in range(assign_idx + 1, len(result_lines)):
|
||
cur = result_lines[i]
|
||
# 遇到同名重赋值则停止
|
||
m2 = _FIELD_ASSIGN_LINE_RE.match(cur)
|
||
if m2 and m2.group(1) == var:
|
||
break
|
||
if ref_re.search(cur):
|
||
result_lines[i] = ref_re.sub(fexpr, cur)
|
||
replaced_any = True
|
||
if replaced_any:
|
||
# 删除赋值行(置为空行,保留行号结构)
|
||
result_lines[assign_idx] = ''
|
||
inlined.append(
|
||
f"内联字段句柄变量 `{var}` → `{fexpr}`(原第 {assign_idx+1} 行)"
|
||
)
|
||
return '\n'.join(result_lines), inlined
|
||
|
||
|
||
# ──────────────────────────────────────────────
|
||
# 5. 主改写入口
|
||
# ──────────────────────────────────────────────
|
||
@dataclass
|
||
class RewriteDetail:
|
||
rule_name: str
|
||
original: str
|
||
rewritten: str
|
||
count: int = 1
|
||
|
||
|
||
def rewrite_script(source: str) -> Tuple[str, List[RewriteDetail], str]:
|
||
"""
|
||
对输入的 Groovy 脚本文本执行 S3 改写。
|
||
|
||
返回:
|
||
(改写后文本, 改写明细列表, 分类标签)
|
||
分类标签: FULL_AUTO / PARTIAL / HARD / NO_S3
|
||
"""
|
||
details: List[RewriteDetail] = []
|
||
|
||
# ── 4.9 原始脚本预处理:修复已知源数据 bug ────────────────────
|
||
# F2-4b: 原始脚本中字符串字面量末尾有多余双引号(如 "...SQL 100"";),
|
||
# 这是上游数据入库时的编码问题,会导致 Groovy 编译失败。
|
||
# 规则:只修复 非空字符串内容(不跨行)后面跟了多余 """ 的模式。
|
||
# 关键约束:[^"\n]+ 排除换行,防止跨行匹配到合法的 def sql = ""; 语句。
|
||
source = re.sub(r'("[^"\n]+)""(;)', r'\1"\2', source)
|
||
|
||
# ── 5.0 规则族2: 动态按钮家族(先于 HARD 检测运行)──────────
|
||
# new Button + addClickListener + fieldVar.addButton(btnVar, N)
|
||
# → addFieldButton("FIELD", "文案", {闭包体}, N)
|
||
# 改写成功后 new Button 消失,不触发下面的 HARD 检测。
|
||
# 改写失败/不匹配形态:源文本不变,继续走正常 HARD 检测路径。
|
||
btn_rewrite_count = 0
|
||
if re.search(r'\bnew\s+Button\b', source):
|
||
source_after_btn, btn_rewrite_count = _rewrite_dynamic_buttons(source)
|
||
if btn_rewrite_count > 0:
|
||
details.append(RewriteDetail(
|
||
rule_name="dynamic_button",
|
||
original=f"命中 {btn_rewrite_count} 处 new Button 三元组",
|
||
rewritten="→ addFieldButton",
|
||
count=btn_rewrite_count,
|
||
))
|
||
source = source_after_btn
|
||
|
||
# ── 5.1 硬 S3 检测 ────────────────────────────────────────
|
||
hard_reasons = []
|
||
for pattern_str, reason in HARD_S3_PATTERNS:
|
||
if re.search(pattern_str, source):
|
||
hard_reasons.append(reason)
|
||
# 规则族2 改写后如果仍残留 new Button(无法识别形态),降级为 HARD 残留特征
|
||
if re.search(r'\bnew\s+Button\b', source):
|
||
hard_reasons.append("动态创建 Vaadin Button(无法自动改写形态)")
|
||
if hard_reasons:
|
||
details.append(RewriteDetail(
|
||
rule_name="HARD_DETECTION",
|
||
original="; ".join(hard_reasons),
|
||
rewritten="[人工处理]",
|
||
count=len(hard_reasons),
|
||
))
|
||
return source, details, "HARD"
|
||
|
||
# ── 5.2 无 S3 快检 ────────────────────────────────────────
|
||
def _has_s3(text: str) -> bool:
|
||
for pat in RESIDUAL_S3_PATTERNS:
|
||
if pat.search(text):
|
||
return True
|
||
# 还检查 Notification.show
|
||
if re.search(r'\bNotification\.show\(', text):
|
||
return True
|
||
return False
|
||
|
||
# 若规则族2 已成功改写(btn_rewrite_count > 0),跳过 NO_S3 快检——
|
||
# 改写后源文本已不含 S3 特征属正常,但应归为 FULL_AUTO 而非 NO_S3。
|
||
if not _has_s3(source) and btn_rewrite_count == 0:
|
||
return source, details, "NO_S3"
|
||
|
||
# ── 5.3 内联字段句柄变量(第一遍)────────────────────────
|
||
working, inline_notes = _inline_field_handles(source)
|
||
for note in inline_notes:
|
||
details.append(RewriteDetail(
|
||
rule_name="inline_field_handle",
|
||
original=note,
|
||
rewritten="[已内联]",
|
||
))
|
||
|
||
# ── 5.4 平衡括号字段调用(setFilter/setFilterMap 复杂参数)─
|
||
working, bcount = _rewrite_balanced_field_calls(working)
|
||
if bcount > 0:
|
||
details.append(RewriteDetail(
|
||
rule_name="balanced_setFilter",
|
||
original=f"命中 {bcount} 处",
|
||
rewritten="→ 已替换",
|
||
count=bcount,
|
||
))
|
||
|
||
# ── 5.5 应用规则表(第二遍)──────────────────────────────
|
||
for rule in REWRITE_RULES:
|
||
new_text, count = _apply_rule(working, rule)
|
||
if count > 0:
|
||
details.append(RewriteDetail(
|
||
rule_name=rule.name,
|
||
original=f"命中 {count} 处",
|
||
rewritten=f"→ 已替换",
|
||
count=count,
|
||
))
|
||
working = new_text
|
||
|
||
# ── 5.6 再次内联(处理可能被改写暴露的新变量引用)─────────
|
||
working2, inline_notes2 = _inline_field_handles(working)
|
||
for note in inline_notes2:
|
||
details.append(RewriteDetail(
|
||
rule_name="inline_field_handle_pass2",
|
||
original=note,
|
||
rewritten="[已内联 pass2]",
|
||
))
|
||
working = working2
|
||
|
||
# ── 5.7 再次应用规则(处理第二遍内联暴露的模式)──────────
|
||
if inline_notes2:
|
||
working, bcount2 = _rewrite_balanced_field_calls(working)
|
||
if bcount2 > 0:
|
||
details.append(RewriteDetail(
|
||
rule_name="balanced_setFilter_pass2",
|
||
original=f"命中 {bcount2} 处",
|
||
rewritten="→ 已替换",
|
||
count=bcount2,
|
||
))
|
||
for rule in REWRITE_RULES:
|
||
new_text, count = _apply_rule(working, rule)
|
||
if count > 0:
|
||
details.append(RewriteDetail(
|
||
rule_name=rule.name + "_pass2",
|
||
original=f"命中 {count} 处",
|
||
rewritten=f"→ 已替换",
|
||
count=count,
|
||
))
|
||
working = new_text
|
||
|
||
# ── 5.8 下拉选项填充 idiom(数据源句柄内联 + addFieldOption)─
|
||
# 此时 getContainerDataSource() 已被规则改写为 getFieldDataSource(),
|
||
# 先内联数据源句柄变量,再把 addItem().getItemProperty("des").setValue()
|
||
# 链折叠为 addFieldOption。
|
||
working, ds_notes = _inline_datasource_handles(working)
|
||
for note in ds_notes:
|
||
details.append(RewriteDetail(
|
||
rule_name="inline_datasource_handle",
|
||
original=note,
|
||
rewritten="[已内联数据源]",
|
||
))
|
||
working, opt_count = _rewrite_option_population(working)
|
||
if opt_count > 0:
|
||
details.append(RewriteDetail(
|
||
rule_name="addFieldOption",
|
||
original=f"命中 {opt_count} 处",
|
||
rewritten="→ 已折叠为 addFieldOption",
|
||
count=opt_count,
|
||
))
|
||
|
||
# ── 5.9 全局 Vaadin/Legacy import 清理 ──────────────────────────
|
||
# F2-4: Notification_show / dynamic_button 等规则改写后,vaadin Notification
|
||
# import 已无用;在分类前统一剥离,避免引擎编译失败。
|
||
working = _NOTIF_IMPORT_RE.sub('', working)
|
||
# F2-4b: Button/ClickEvent/ClickListener import 无条件剥除——
|
||
# dynamic_button 规则只在 new Button()+addClickListener 形态下改写并剥 import,
|
||
# 但 addButton(getField(...),N) 形态不触发改写器,其 Button import 仍残留。
|
||
# Button/ClickEvent/ClickListener 在 EIP4 classpath 不存在,统一剥除无副作用。
|
||
working = _BTN_IMPORT_RE.sub('', working)
|
||
working = _LISTENER_IMPORT_RE.sub('', working)
|
||
# F2-4b: 扩展剥离——VaadinService/PopupDateField/dsasp.client.*/EnviromentGet
|
||
# 均不在 EIP4 classpath,保留会导致 Groovy MultipleCompilationErrors
|
||
working = _VAADIN_EXTRA_IMPORT_RE.sub('', working)
|
||
working = _DSASP_CLIENT_IMPORT_RE.sub('', working)
|
||
working = _ENVIROMENT_GET_IMPORT_RE.sub('', working)
|
||
|
||
# ── 5.10 分类 ──────────────────────────────────────────────
|
||
if not _has_s3(working):
|
||
label = "FULL_AUTO"
|
||
else:
|
||
label = "PARTIAL"
|
||
|
||
return working, details, label
|
||
|
||
|
||
def _apply_rule(text: str, rule: RewriteRule) -> Tuple[str, int]:
|
||
"""应用单条规则,返回 (新文本, 替换次数)。"""
|
||
count = 0
|
||
|
||
def replacer(m: re.Match) -> str:
|
||
nonlocal count
|
||
count += 1
|
||
return m.expand(rule.replacement)
|
||
|
||
new_text = rule.pattern.sub(replacer, text)
|
||
return new_text, count
|
||
|
||
|
||
# ──────────────────────────────────────────────
|
||
# 6. CLI 入口(便于快速测试单文件)
|
||
# ──────────────────────────────────────────────
|
||
if __name__ == "__main__":
|
||
import sys
|
||
if len(sys.argv) < 2:
|
||
print("用法: python rewrite.py <groovy文件>")
|
||
sys.exit(1)
|
||
with open(sys.argv[1], encoding="utf-8") as fh:
|
||
src = fh.read()
|
||
result, dets, lbl = rewrite_script(src)
|
||
print(f"=== 分类: {lbl} ===")
|
||
for d in dets:
|
||
print(f" [{d.rule_name}] {d.original} {d.rewritten} (×{d.count})")
|
||
print("=== 改写结果 ===")
|
||
print(result)
|