deveco_hmigbot 0.1.1 → 0.1.2

package/manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "hmigbot",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "engineVersion": "0.5.1-pure",
   "skills": [
     "migrate-core"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "deveco_hmigbot",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Android→HarmonyOS migration suite for DevEco Code: /hmigbot command, migrate-core skill, workflow engine, agents",
   "type": "module",
   "license": "MIT",

package/skills/migrate-core/scripts/closure/check-api-guards.mjs

@@ -181,11 +181,16 @@ let builderStateByValue = 0;
   for (const [f, c] of codes) {
     const state = new Set([...c.matchAll(STATE_DECOR)].map(m => m[1]));
     if (!state.size) continue;
-    const names = new Set(globalBuilders);
-    for (const m of c.matchAll(BUILDER_FN_M)) if (m[2].trim() && m[1] !== 'function') names.add(m[1]);
+    // 同名撞车防护：裸调用 name( 只认本文件声明或 import 进来的全局 builder；this.name( 只认本文件的 @Builder 方法
+    const localGlobals = new Set([...c.matchAll(BUILDER_FN_G)].filter(m => m[2].trim()).map(m => m[1]));
+    const imported = new Set([...c.matchAll(/import\s*\{([^}]*)\}\s*from/g)].flatMap(m => m[1].split(',').map(x => x.trim().split(/\s+as\s+/).pop()).filter(Boolean)));
+    const methods = new Set([...c.matchAll(BUILDER_FN_M)].filter(m => m[2].trim() && m[1] !== 'function').map(m => m[1]));
+    const names = new Set([...globalBuilders].filter(n => localGlobals.has(n) || imported.has(n)).concat([...methods]));
     for (const name of names) {
       for (const m of c.matchAll(new RegExp(`(?<![\\w$.])(?:this\\.)?${name}\\s*\\(`, 'g'))) {
         if (/@Builder\s*(?:export\s+)?(?:function\s+)?(?:(?:private|public|protected|static)\s+)*$/.test(c.slice(Math.max(0, m.index - 60), m.index))) continue;
+        const viaThis = m[0].startsWith('this.');
+        if (viaThis ? !methods.has(name) : !(localGlobals.has(name) || imported.has(name))) continue;
         const a = callArgs(c, m.index + m[0].length - 1); if (!a) continue;
         const bad = a.map(x => x.trim()).filter(t => t && !t.startsWith('{') && !/=>/.test(t) && !/^function\b/.test(t) && [...t.matchAll(/\bthis\.([\w$]+)/g)].some(mm => state.has(mm[1])));
         if (!bad.length) continue;