@harmonyos-arkts/d2h 0.1.11 → 0.1.12

package/skills/d2h-hypium-forge/scripts/inject_resource_ids.py

@@ -1,114 +1,114 @@
-#!/usr/bin/env python3
-"""
-inject_resource_ids.py — 资源化文案工程的 ID 注入器（DFT-010 场景）。
-
-流程：target 文本 → string.json 资源名 → 全工程搜 $r('app.string.X') 引用点
-     → 组件属性链内注入 .id('tc_<file>_<hash>')（幂等，已有 tc_ id 复用）
-
-输出 injected_ids.json（target → id 映射，供脚本生成器消费）
-用法: inject_resource_ids.py <harmony_root> <targets_json文件或逗号分隔> [--cases cases.json]
-"""
-import argparse
-import json
-import os
-import re
-import hashlib
-
-
-def build_res_map(root):
-    res_map = {}
-    for dp, _d, files in os.walk(root):
-        if 'oh_modules' in dp or '/build' in dp or '.testdesign' in dp or '.hypium_forge' in dp:
-            continue
-        for f in files:
-            if f == 'string.json':
-                try:
-                    for item in json.load(open(os.path.join(dp, f), encoding='utf-8')).get('string', []):
-                        res_map.setdefault(item['value'], item['name'])
-                except Exception:
-                    pass
-    return res_map
-
-
-def collect_src(root):
-    out = []
-    for dp, _d, files in os.walk(root):
-        if 'oh_modules' in dp or '/build' in dp or '.testdesign' in dp or '.hypium_forge' in dp:
-            continue
-        for f in files:
-            if f.endswith('.ets'):
-                out.append(os.path.join(dp, f))
-    return out
-
-
-ID_RE = re.compile(r"\.id\('tc_[a-z0-9_]+'\)")
-
-
-def inject_in_file(sf, rx):
-    """在 sf 中找 rx 引用行，属性链内注入 id；返回 (tid or None)。幂等。"""
-    src = open(sf, encoding='utf-8', errors='ignore').read()
-    lines = src.split('\n')
-    for i, ln in enumerate(lines):
-        if rx.search(ln):
-            seg = '\n'.join(lines[i:i + 12])
-            m = ID_RE.search(seg)
-            if m:
-                return m.group(0)[5:-2]  # 已有 → 复用
-            for k in range(i, min(len(lines), i + 10)):
-                if re.match(r'^\s*\.[a-zA-Z]', lines[k]):
-                    indent = re.match(r'(\s*)', lines[k]).group(1)
-                    tid = 'tc_' + os.path.splitext(os.path.basename(sf))[0].lower() + '_' + \
-                          hashlib.md5(ln.encode()).hexdigest()[:6]
-                    lines.insert(k, f"{indent}.id('{tid}')")
-                    open(sf, 'w', encoding='utf-8').write('\n'.join(lines))
-                    return tid
-    return None
-
-
-def main():
-    ap = argparse.ArgumentParser()
-    ap.add_argument('root')
-    ap.add_argument('--cases', help='forge 格式 cases.json（取 target）')
-    ap.add_argument('--targets', help='逗号分隔 target 列表（二选一）')
-    ap.add_argument('--out', default=None)
-    args = ap.parse_args()
-
-    targets = []
-    if args.cases:
-        for c in json.load(open(args.cases, encoding='utf-8')):
-            for s in c.get('steps', []):
-                t = s.get('target')
-                if t and not t.startswith('请输入') and t != '数量':
-                    targets.append(t)
-    else:
-        targets = args.targets.split(',')
-    targets = list(dict.fromkeys(targets))
-
-    res_map = build_res_map(args.root)
-    src_files = collect_src(args.root)
-
-    injected, unresolved = {}, []
-    for t in targets:
-        resname = res_map.get(t)
-        tid = None
-        if resname:
-            rx = re.compile(r"\$r\(\s*['\"]app\.string\." + re.escape(resname) + r"['\"]")
-            for sf in src_files:
-                tid = inject_in_file(sf, rx)
-                if tid:
-                    injected[t] = tid
-                    break
-        if not tid:
-            unresolved.append(t)
-
-    out = args.out or os.path.join(args.root, '.hypium_forge', 'injected_ids.json')
-    json.dump(injected, open(out, 'w', encoding='utf-8'), ensure_ascii=False, indent=1)
-    print(f'资源命中注入: {len(injected)} / 未解析: {len(unresolved)} → {out}')
-    for t, tid in sorted(injected.items()):
-        print(f'  + {t} → {tid}')
-    if unresolved:
-        print('未解析（动态文案/图标按钮，脚本走文本/兜底定位）:', unresolved[:15])
-
-
-if __name__ == '__main__':
-    main()
+#!/usr/bin/env python3
+"""
+inject_resource_ids.py — 资源化文案工程的 ID 注入器（DFT-010 场景）。
+
+流程：target 文本 → string.json 资源名 → 全工程搜 $r('app.string.X') 引用点
+     → 组件属性链内注入 .id('tc_<file>_<hash>')（幂等，已有 tc_ id 复用）
+
+输出 injected_ids.json（target → id 映射，供脚本生成器消费）
+用法: inject_resource_ids.py <harmony_root> <targets_json文件或逗号分隔> [--cases cases.json]
+"""
+import argparse
+import json
+import os
+import re
+import hashlib
+
+
+def build_res_map(root):
+    res_map = {}
+    for dp, _d, files in os.walk(root):
+        if 'oh_modules' in dp or '/build' in dp or '.testdesign' in dp or '.hypium_forge' in dp:
+            continue
+        for f in files:
+            if f == 'string.json':
+                try:
+                    for item in json.load(open(os.path.join(dp, f), encoding='utf-8')).get('string', []):
+                        res_map.setdefault(item['value'], item['name'])
+                except Exception:
+                    pass
+    return res_map
+
+
+def collect_src(root):
+    out = []
+    for dp, _d, files in os.walk(root):
+        if 'oh_modules' in dp or '/build' in dp or '.testdesign' in dp or '.hypium_forge' in dp:
+            continue
+        for f in files:
+            if f.endswith('.ets'):
+                out.append(os.path.join(dp, f))
+    return out
+
+
+ID_RE = re.compile(r"\.id\('tc_[a-z0-9_]+'\)")
+
+
+def inject_in_file(sf, rx):
+    """在 sf 中找 rx 引用行，属性链内注入 id；返回 (tid or None)。幂等。"""
+    src = open(sf, encoding='utf-8', errors='ignore').read()
+    lines = src.split('\n')
+    for i, ln in enumerate(lines):
+        if rx.search(ln):
+            seg = '\n'.join(lines[i:i + 12])
+            m = ID_RE.search(seg)
+            if m:
+                return m.group(0)[5:-2]  # 已有 → 复用
+            for k in range(i, min(len(lines), i + 10)):
+                if re.match(r'^\s*\.[a-zA-Z]', lines[k]):
+                    indent = re.match(r'(\s*)', lines[k]).group(1)
+                    tid = 'tc_' + os.path.splitext(os.path.basename(sf))[0].lower() + '_' + \
+                          hashlib.md5(ln.encode()).hexdigest()[:6]
+                    lines.insert(k, f"{indent}.id('{tid}')")
+                    open(sf, 'w', encoding='utf-8').write('\n'.join(lines))
+                    return tid
+    return None
+
+
+def main():
+    ap = argparse.ArgumentParser()
+    ap.add_argument('root')
+    ap.add_argument('--cases', help='forge 格式 cases.json（取 target）')
+    ap.add_argument('--targets', help='逗号分隔 target 列表（二选一）')
+    ap.add_argument('--out', default=None)
+    args = ap.parse_args()
+
+    targets = []
+    if args.cases:
+        for c in json.load(open(args.cases, encoding='utf-8')):
+            for s in c.get('steps', []):
+                t = s.get('target')
+                if t and not t.startswith('请输入') and t != '数量':
+                    targets.append(t)
+    else:
+        targets = args.targets.split(',')
+    targets = list(dict.fromkeys(targets))
+
+    res_map = build_res_map(args.root)
+    src_files = collect_src(args.root)
+
+    injected, unresolved = {}, []
+    for t in targets:
+        resname = res_map.get(t)
+        tid = None
+        if resname:
+            rx = re.compile(r"\$r\(\s*['\"]app\.string\." + re.escape(resname) + r"['\"]")
+            for sf in src_files:
+                tid = inject_in_file(sf, rx)
+                if tid:
+                    injected[t] = tid
+                    break
+        if not tid:
+            unresolved.append(t)
+
+    out = args.out or os.path.join(args.root, '.hypium_forge', 'injected_ids.json')
+    json.dump(injected, open(out, 'w', encoding='utf-8'), ensure_ascii=False, indent=1)
+    print(f'资源命中注入: {len(injected)} / 未解析: {len(unresolved)} → {out}')
+    for t, tid in sorted(injected.items()):
+        print(f'  + {t} → {tid}')
+    if unresolved:
+        print('未解析（动态文案/图标按钮，脚本走文本/兜底定位）:', unresolved[:15])
+
+
+if __name__ == '__main__':
+    main()

package/skills/d2h-hypium-forge/scripts/lint_asserts.py

@@ -1,80 +1,80 @@
-#!/usr/bin/env python3
-"""lint_asserts.py — 断言强度门禁（白盒直写形态，2026-09-29 none 臂对照实证落地）。
-
-背景：none 臂（无 skill）LLM 凭通用能力达成 34% 强断言（hilog 防污染/dump Toast 轮询/
-剪贴板），B 线（抄模板）仅 15%——模板能力边界效应。本门禁把下限固化：
-  - 强断言步骤占比 ≥ 30%（默认阈值），低于即 FAIL
-  - vacuous 用例点名（纯点击链、无任何值级断言）——对应 assert_audit.py 语义（.py 版）
-
-值级断言原语：checked/unchecked/enabled/equals/text_equals/text_absent/toast_text_seen/
-hilog_tail(关键字)/pasteboard/剪贴板/_dump_layout 断言性使用/text_contains/count
-用法: python3 lint_asserts.py --dir testcases [--threshold 30]
-"""
-import argparse
-import glob
-import os
-import re
-import sys
-
-STRONG_CALLS = re.compile(
-    r'\b(checked|unchecked|enabled\(|disabled|text_equals|text_absent|toast_text_seen|'
-    r'hilog_clear|hilog_tail|pasteboard|剪贴板|text_contains|find_all_components\s*\(\s*BY\.)'
-    r'[^)]*\)|\bchecked\s*\(\s*True\)|assert\s')
-STEP_PAT = re.compile(r'^\s*(?:Step\(|step_shot\(|#)', re.M)
-ACTION_PAT = re.compile(r'\b(id_click|text_click|click_text|click_tab|id_input|d\.touch|press_back|swipe|scroll_click)\b')
-
-
-STRONG_STEP_WORDS = ('断言', '校验', 'equals', 'checked', 'absent', 'toast', 'hilog',
-                     '剪贴板', 'pasteboard', '包含', '等于', '消失', '翻转为', '已开启', '已关闭',
-                     '一致性', '业务数据', '关键字', 'dump')
-
-
-VALUE_CALLS = re.compile(
-    r'\b(text_equals|text_absent|toast_text_seen|hilog_clear|hilog_tail|pasteboard|'
-    r'find_all_components|checked\s*\(|asserts?\s*\.|\.assert)')
-
-
-def audit_file(path):
-    """双轨审计（两种白盒写法都覆盖）：
-    轨1 Step 结构：Step 描述含值级断言语义词 = 强步骤；
-    轨2 无 Step（内联代码）：值级断言调用数 / (值级调用+动作调用) 为强度。"""
-    src = open(path, encoding='utf-8').read()
-    steps_all = re.findall(r'Step\(\s*"([^"]+)"', src)
-    value_calls = len(VALUE_CALLS.findall(src))
-    if steps_all:
-        strong = sum(1 for t in steps_all if any(w in t.lower() for w in STRONG_STEP_WORDS))
-        return len(steps_all), 0, strong, strong > 0 or value_calls > 0
-    actions = len(ACTION_PAT.findall(src))
-    return value_calls + actions, 0, value_calls, value_calls > 0
-
-
-def main():
-    ap = argparse.ArgumentParser()
-    ap.add_argument('--dir', required=True)
-    ap.add_argument('--threshold', type=int, default=30)
-    args = ap.parse_args()
-    total_steps = total_strong = vacuous = n = 0
-    vacuous_list = []
-    for p in sorted(glob.glob(os.path.join(args.dir, 'TC*.py'))):
-        steps, marks, strong_steps, has_value = audit_file(p)
-        n += 1
-        total_steps += steps
-        total_strong += (strong_steps or marks)
-        if not has_value:
-            vacuous += 1
-            vacuous_list.append(os.path.basename(p))
-    pct = round(total_strong / total_steps * 100, 1) if total_steps else 0
-    print(f'断言强度: 强断言 {total_strong}/{total_steps} 步 = {pct}%（下限 {args.threshold}%）')
-    if vacuous_list:
-        print(f'⚠ vacuous 用例（无任何值级断言）{vacuous} 个: {", ".join(vacuous_list[:8])}')
-    if n and pct < args.threshold:
-        print(f'✗ FAIL：断言强度 {pct}% < {args.threshold}%——按场景目的补值级断言（最佳区间 40~70%）'
-              f'（Toast→toast_text_seen；系统事件→hilog 轮询+用例前 hilog_clear；'
-              f'状态→checked；文案→text_equals；消失→text_absent）后重检')
-        sys.exit(1)
-    print('✓ PASS')
-    sys.exit(0)
-
-
-if __name__ == '__main__':
-    main()
+#!/usr/bin/env python3
+"""lint_asserts.py — 断言强度门禁（白盒直写形态，2026-09-29 none 臂对照实证落地）。
+
+背景：none 臂（无 skill）LLM 凭通用能力达成 34% 强断言（hilog 防污染/dump Toast 轮询/
+剪贴板），B 线（抄模板）仅 15%——模板能力边界效应。本门禁把下限固化：
+  - 强断言步骤占比 ≥ 30%（默认阈值），低于即 FAIL
+  - vacuous 用例点名（纯点击链、无任何值级断言）——对应 assert_audit.py 语义（.py 版）
+
+值级断言原语：checked/unchecked/enabled/equals/text_equals/text_absent/toast_text_seen/
+hilog_tail(关键字)/pasteboard/剪贴板/_dump_layout 断言性使用/text_contains/count
+用法: python3 lint_asserts.py --dir testcases [--threshold 30]
+"""
+import argparse
+import glob
+import os
+import re
+import sys
+
+STRONG_CALLS = re.compile(
+    r'\b(checked|unchecked|enabled\(|disabled|text_equals|text_absent|toast_text_seen|'
+    r'hilog_clear|hilog_tail|pasteboard|剪贴板|text_contains|find_all_components\s*\(\s*BY\.)'
+    r'[^)]*\)|\bchecked\s*\(\s*True\)|assert\s')
+STEP_PAT = re.compile(r'^\s*(?:Step\(|step_shot\(|#)', re.M)
+ACTION_PAT = re.compile(r'\b(id_click|text_click|click_text|click_tab|id_input|d\.touch|press_back|swipe|scroll_click)\b')
+
+
+STRONG_STEP_WORDS = ('断言', '校验', 'equals', 'checked', 'absent', 'toast', 'hilog',
+                     '剪贴板', 'pasteboard', '包含', '等于', '消失', '翻转为', '已开启', '已关闭',
+                     '一致性', '业务数据', '关键字', 'dump')
+
+
+VALUE_CALLS = re.compile(
+    r'\b(text_equals|text_absent|toast_text_seen|hilog_clear|hilog_tail|pasteboard|'
+    r'find_all_components|checked\s*\(|asserts?\s*\.|\.assert)')
+
+
+def audit_file(path):
+    """双轨审计（两种白盒写法都覆盖）：
+    轨1 Step 结构：Step 描述含值级断言语义词 = 强步骤；
+    轨2 无 Step（内联代码）：值级断言调用数 / (值级调用+动作调用) 为强度。"""
+    src = open(path, encoding='utf-8').read()
+    steps_all = re.findall(r'Step\(\s*"([^"]+)"', src)
+    value_calls = len(VALUE_CALLS.findall(src))
+    if steps_all:
+        strong = sum(1 for t in steps_all if any(w in t.lower() for w in STRONG_STEP_WORDS))
+        return len(steps_all), 0, strong, strong > 0 or value_calls > 0
+    actions = len(ACTION_PAT.findall(src))
+    return value_calls + actions, 0, value_calls, value_calls > 0
+
+
+def main():
+    ap = argparse.ArgumentParser()
+    ap.add_argument('--dir', required=True)
+    ap.add_argument('--threshold', type=int, default=30)
+    args = ap.parse_args()
+    total_steps = total_strong = vacuous = n = 0
+    vacuous_list = []
+    for p in sorted(glob.glob(os.path.join(args.dir, 'TC*.py'))):
+        steps, marks, strong_steps, has_value = audit_file(p)
+        n += 1
+        total_steps += steps
+        total_strong += (strong_steps or marks)
+        if not has_value:
+            vacuous += 1
+            vacuous_list.append(os.path.basename(p))
+    pct = round(total_strong / total_steps * 100, 1) if total_steps else 0
+    print(f'断言强度: 强断言 {total_strong}/{total_steps} 步 = {pct}%（下限 {args.threshold}%）')
+    if vacuous_list:
+        print(f'⚠ vacuous 用例（无任何值级断言）{vacuous} 个: {", ".join(vacuous_list[:8])}')
+    if n and pct < args.threshold:
+        print(f'✗ FAIL：断言强度 {pct}% < {args.threshold}%——按场景目的补值级断言（最佳区间 40~70%）'
+              f'（Toast→toast_text_seen；系统事件→hilog 轮询+用例前 hilog_clear；'
+              f'状态→checked；文案→text_equals；消失→text_absent）后重检')
+        sys.exit(1)
+    print('✓ PASS')
+    sys.exit(0)
+
+
+if __name__ == '__main__':
+    main()

package/skills/d2h-hypium-forge/scripts/lint_locate.py

@@ -1,60 +1,60 @@
-#!/usr/bin/env python3
-"""lint_locate.py — 脚本定位方式自检门禁（铁律①的执行期强制）。
-
-统计 testcases/*.py 的定位调用（id_click 等 BY.key 原语 vs text_click/click_text），
-text 定位占比超阈值（默认 20%）即 FAIL 并列出改写建议（ids.json 有映射优先）。
-写完脚本后必须先过本门禁再执行。
-
-用法: python3 lint_locate.py --dir testcases [--ids ids.json] [--threshold 20]
-"""
-import argparse
-import glob
-import json
-import os
-import re
-import sys
-
-KEY_PRIMS = r'\bid_click\(|BY\.key\('
-TEXT_PRIMS = r'\btext_click\(|\bclick_text\(|BY\.text\((?![^)]*CONTAINS)|find_component\(\s*BY\.text'
-
-
-def main():
-    ap = argparse.ArgumentParser()
-    ap.add_argument('--dir', required=True)
-    ap.add_argument('--ids', default=None)
-    ap.add_argument('--threshold', type=int, default=20)
-    args = ap.parse_args()
-    ids = {}
-    if args.ids and os.path.exists(args.ids):
-        ids = json.load(open(args.ids, encoding='utf-8'))
-    total_key = total_text = 0
-    offenders = []
-    for p in sorted(glob.glob(os.path.join(args.dir, 'TC*.py'))):
-        src = open(p, encoding='utf-8').read()
-        k = len(re.findall(KEY_PRIMS, src))
-        t = len(re.findall(TEXT_PRIMS, src))
-        total_key += k
-        total_text += t
-        if t > k:
-            hint = ''
-            m = re.findall(r'(?:text_click|click_text)\(\s*d\s*,\s*[\'"]([^\'"]+)[\'"]', src)
-            mapped = [f"{x} → {ids[x]}" for x in m if x in ids][:3]
-            if mapped:
-                hint = ' | ids.json 有映射: ' + '; '.join(mapped)
-            offenders.append(f"{os.path.basename(p)}: key={k} text={t}{hint}")
-    total = total_key + total_text
-    pct = round(total_key / total * 100) if total else 100
-    print(f"定位统计: BY.key={total_key} / text={total_text} → key 占比 {pct}%（阈值 ≥{100 - args.threshold}%）")
-    if offenders:
-        print(f"text 主导的脚本 {len(offenders)} 个：")
-        for o in offenders[:15]:
-            print('  -', o)
-    if total and pct < 100 - args.threshold:
-        print(f"✗ FAIL：text 定位占比 {100 - pct}% > {args.threshold}% —— 须把 ids.json 有映射的 text_click 改写为 id_click 后重过门禁")
-        sys.exit(1)
-    print('✓ PASS')
-    sys.exit(0)
-
-
-if __name__ == '__main__':
-    main()
+#!/usr/bin/env python3
+"""lint_locate.py — 脚本定位方式自检门禁（铁律①的执行期强制）。
+
+统计 testcases/*.py 的定位调用（id_click 等 BY.key 原语 vs text_click/click_text），
+text 定位占比超阈值（默认 20%）即 FAIL 并列出改写建议（ids.json 有映射优先）。
+写完脚本后必须先过本门禁再执行。
+
+用法: python3 lint_locate.py --dir testcases [--ids ids.json] [--threshold 20]
+"""
+import argparse
+import glob
+import json
+import os
+import re
+import sys
+
+KEY_PRIMS = r'\bid_click\(|BY\.key\('
+TEXT_PRIMS = r'\btext_click\(|\bclick_text\(|BY\.text\((?![^)]*CONTAINS)|find_component\(\s*BY\.text'
+
+
+def main():
+    ap = argparse.ArgumentParser()
+    ap.add_argument('--dir', required=True)
+    ap.add_argument('--ids', default=None)
+    ap.add_argument('--threshold', type=int, default=20)
+    args = ap.parse_args()
+    ids = {}
+    if args.ids and os.path.exists(args.ids):
+        ids = json.load(open(args.ids, encoding='utf-8'))
+    total_key = total_text = 0
+    offenders = []
+    for p in sorted(glob.glob(os.path.join(args.dir, 'TC*.py'))):
+        src = open(p, encoding='utf-8').read()
+        k = len(re.findall(KEY_PRIMS, src))
+        t = len(re.findall(TEXT_PRIMS, src))
+        total_key += k
+        total_text += t
+        if t > k:
+            hint = ''
+            m = re.findall(r'(?:text_click|click_text)\(\s*d\s*,\s*[\'"]([^\'"]+)[\'"]', src)
+            mapped = [f"{x} → {ids[x]}" for x in m if x in ids][:3]
+            if mapped:
+                hint = ' | ids.json 有映射: ' + '; '.join(mapped)
+            offenders.append(f"{os.path.basename(p)}: key={k} text={t}{hint}")
+    total = total_key + total_text
+    pct = round(total_key / total * 100) if total else 100
+    print(f"定位统计: BY.key={total_key} / text={total_text} → key 占比 {pct}%（阈值 ≥{100 - args.threshold}%）")
+    if offenders:
+        print(f"text 主导的脚本 {len(offenders)} 个：")
+        for o in offenders[:15]:
+            print('  -', o)
+    if total and pct < 100 - args.threshold:
+        print(f"✗ FAIL：text 定位占比 {100 - pct}% > {args.threshold}% —— 须把 ids.json 有映射的 text_click 改写为 id_click 后重过门禁")
+        sys.exit(1)
+    print('✓ PASS')
+    sys.exit(0)
+
+
+if __name__ == '__main__':
+    main()