chore: 工具迁入正式工程 + 工程 README + 根目录草稿报告入 ignore
- eip4-poc/tools/{s3_rewriter,loadtest} → tools/(P4 改写器种子与压测 harness 随工程演进,PoC 冻结)
- 新增工程 README(模块图/纪律/常用命令/自举说明)
- 根目录 parity-reports/ 为 CLI 默认输出草稿,入 .gitignore(正式报告在 platform-parity/parity-reports/)
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
776
tools/s3_rewriter/rewrite.py
Normal file
776
tools/s3_rewriter/rewrite.py
Normal file
@@ -0,0 +1,776 @@
|
||||
"""
|
||||
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 检测模式(命中即整条转人工)
|
||||
# ──────────────────────────────────────────────
|
||||
HARD_S3_PATTERNS: List[Tuple[str, str]] = [
|
||||
# 动态创建 Vaadin 组件
|
||||
(r"\bnew\s+(Window|Button|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 组件"),
|
||||
(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 剩余检测里误报)
|
||||
|
||||
return rules
|
||||
|
||||
|
||||
# 单例规则表(模块加载时编译一次)
|
||||
REWRITE_RULES: List[RewriteRule] = _make_field_rules()
|
||||
|
||||
# ──────────────────────────────────────────────
|
||||
# 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\('),
|
||||
]
|
||||
|
||||
# ──────────────────────────────────────────────
|
||||
# 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] = []
|
||||
|
||||
# ── 5.1 硬 S3 检测 ────────────────────────────────────────
|
||||
hard_reasons = []
|
||||
for pattern_str, reason in HARD_S3_PATTERNS:
|
||||
if re.search(pattern_str, source):
|
||||
hard_reasons.append(reason)
|
||||
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
|
||||
|
||||
if not _has_s3(source):
|
||||
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 分类 ──────────────────────────────────────────────
|
||||
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)
|
||||
Reference in New Issue
Block a user