homegraph 1.5.0 → 1.5.1

package/dist/extraction/languages/arkts.js

@@ -11,11 +11,14 @@
  * HarmonyOS multi-module projects (`build-profile.json5`) use
  * `Scene.analyseByModule` so each HAP/HSP/HAR is the atomic unit (like a file
  * for tree-sitter languages): symbols + ViewTree + **intra-module RTA** while
- * the module has BODIES. CFG does **not** stitch same-module calls (that
- * densified past unlimited RTA). Cross-module edges come from RTA with an exact
- * MethodSignature map, plus a CFG `%unk` bridge that recovers Class.method /
- * free functions from stmt text, UnclearReferenceType names, or PascalCase base
- * locals (import + unique target + fan-out blocklist). Deps load to SIGNATURES.
+ * the module has BODIES. Per-module RTA entries = DummyMain (Ability/Component
+ * lifecycle) **plus the module export surface** (exported functions and methods
+ * of exported classes), so non-UI libraries still grow reachable call edges.
+ * CFG does **not** stitch same-module calls (that densified past unlimited RTA).
+ * Cross-module edges come from RTA with an exact MethodSignature map, plus a
+ * CFG `%unk` bridge that recovers Class.method / free functions from stmt text,
+ * UnclearReferenceType names, or PascalCase base locals (import + unique target
+ * + fan-out blocklist). Deps load to SIGNATURES.
  *
  * Sync can re-index a **dirty module subset** (`primeArkTSBatch` + `changedFiles`)
  * via `ModuleAnalysisConfig.setTargetModuleIds`, instead of rebuilding every
@@ -73,6 +76,7 @@ exports.runIsolatedArkTSBatchEntry = runIsolatedArkTSBatchEntry;
 exports.primeArkTSBatch = primeArkTSBatch;
 exports.isArkTSBatchPersisted = isArkTSBatchPersisted;
 exports.resetArkTSBatch = resetArkTSBatch;
+exports.collectExportedRtaEntryPointsFromFiles = collectExportedRtaEntryPointsFromFiles;
 exports.stateDecoratorKinds = stateDecoratorKinds;
 exports.stateTransferViaForField = stateTransferViaForField;
 exports.isUnclearArkClassSignature = isUnclearArkClassSignature;
@@ -113,6 +117,7 @@ const context_1 = require("../context");
 const default_ignore_1 = require("../default-ignore");
 const extraction_version_1 = require("../extraction-version");
 const version_1 = require("../../mcp/version");
+const liveness_watchdog_1 = require("../../mcp/liveness-watchdog");
 const tree_sitter_helpers_1 = require("../tree-sitter-helpers");
 const wasm_runtime_flags_1 = require("../wasm-runtime-flags");
 const ignore_1 = __importDefault(require("ignore"));
@@ -1303,6 +1308,140 @@ function collectNonUiRtaEntryPointsFromFiles(files) {
     }
     return entries;
 }
+/**
+ * Methods another module can call into: module `export` surface as RTA entries.
+ * - exported function/method → itself
+ * - exported class/struct → all of its non-skip methods (with body)
+ * Skips `export … from` re-exports (not this module's IR).
+ */
+function collectExportedRtaEntryPointsFromFiles(files) {
+    const seen = new Set();
+    const out = [];
+    const addMethod = (method) => {
+        if (shouldSkipArkMethod(method))
+            return;
+        try {
+            if (!method.getCfg())
+                return;
+        }
+        catch {
+            return;
+        }
+        try {
+            const sig = method.getSignature();
+            const key = sig.toString();
+            if (seen.has(key))
+                return;
+            seen.add(key);
+            out.push(sig);
+        }
+        catch {
+            // signature unavailable
+        }
+    };
+    const addClass = (cls) => {
+        try {
+            for (const method of cls.getMethods(true)) {
+                addMethod(method);
+            }
+        }
+        catch {
+            // class IR unavailable
+        }
+    };
+    const visitExportInfos = (infos) => {
+        for (const info of infos) {
+            try {
+                if (info.getFrom?.())
+                    continue;
+            }
+            catch {
+                continue;
+            }
+            let arkExport;
+            try {
+                arkExport = info.getArkExport?.() ?? null;
+            }
+            catch {
+                continue;
+            }
+            if (!arkExport || typeof arkExport !== 'object')
+                continue;
+            const exp = arkExport;
+            // Prefer ExportType when present (METHOD=2, CLASS=1, NAME_SPACE=0).
+            let exportType;
+            try {
+                exportType = exp.getExportType?.();
+            }
+            catch {
+                exportType = undefined;
+            }
+            if (exportType === 2 || (exportType === undefined && typeof exp.getDeclaringArkClass === 'function' && typeof exp.getCfg === 'function')) {
+                addMethod(arkExport);
+                continue;
+            }
+            if (exportType === 1 || (exportType === undefined && typeof exp.getMethods === 'function')) {
+                addClass(arkExport);
+                continue;
+            }
+            if (exportType === 0 || typeof exp.getClasses === 'function') {
+                try {
+                    for (const cls of exp.getClasses?.() ?? []) {
+                        addClass(cls);
+                    }
+                }
+                catch {
+                    // ignore
+                }
+                const nested = exp.getExportInfos?.();
+                if (nested)
+                    visitExportInfos(nested);
+            }
+        }
+    };
+    for (const file of files) {
+        try {
+            visitExportInfos(file.getExportInfos());
+        }
+        catch {
+            // ignore
+        }
+        try {
+            for (const ns of file.getNamespaces()) {
+                try {
+                    visitExportInfos(ns.getExportInfos());
+                }
+                catch {
+                    // ignore
+                }
+            }
+        }
+        catch {
+            // ignore
+        }
+    }
+    return out;
+}
+/** Merge RTA entry signatures, preserving order and dropping duplicates. */
+function mergeRtaEntryPoints(...groups) {
+    const seen = new Set();
+    const out = [];
+    for (const group of groups) {
+        for (const sig of group) {
+            try {
+                const key = sig.toString();
+                if (seen.has(key))
+                    continue;
+                seen.add(key);
+                out.push(sig);
+            }
+            catch {
+                // ignore
+            }
+        }
+    }
+    return out;
+}
 function resolveRtaEntryPoints(scene) {
     return resolveRtaEntryPointsFromFiles(scene, scene.getFiles());
 }
@@ -2054,6 +2193,10 @@ class ArkTSAdapter {
         if (dummyMain) {
             this.indexArkanalyzerDummyMain(dummyMain);
         }
+        // Export surface = cross-module call-ins; seed them as RTA entries so
+        // non-UI libraries (Manager.getInstance → …) grow intra-module edges
+        // without waiting for a Component DummyMain to reach them.
+        entryPoints = mergeRtaEntryPoints(entryPoints, collectExportedRtaEntryPointsFromFiles(files));
         if (entryPoints.length === 0)
             return;
         let callGraph;
@@ -3072,8 +3215,15 @@ function emptyArkTSBatchIndex(errors) {
  * HomeGraph structures in the callback, let ArkAnalyzer evict under memoryLimitMB.
  * When `targetModuleSrcPaths` is set, only those modules are BODIES targets
  * (deps still load at SIGNATURES) — used for incremental sync.
+ *
+ * Runs with the #850 liveness watchdog suspended: ArkAnalyzer's native BODIES
+ * load between module callbacks routinely exceeds the 60s heartbeat window on
+ * large Harmony projects, and there is no JS yield point inside that span.
  */
 function buildArkTSIndexByModule(rootDir, scannedFiles, options) {
+    return (0, liveness_watchdog_1.runWithoutLivenessWatchdog)(() => buildArkTSIndexByModuleInner(rootDir, scannedFiles, options));
+}
+function buildArkTSIndexByModuleInner(rootDir, scannedFiles, options) {
     const errors = [];
     const memoryLimitMB = resolveArkTSSceneMemoryLimitMB();
     const sceneConfig = buildSceneConfig(rootDir, { memoryLimitMB });
@@ -3181,22 +3331,25 @@ function buildArkTSIndexByModule(rootDir, scannedFiles, options) {
     }
 }
 function buildArkTSIndexFull(rootDir, scannedFiles, priorErrors = []) {
-    const { scene, errors } = tryBuildArkScene(rootDir);
-    const allErrors = [...priorErrors, ...errors];
-    if (!scene) {
-        return emptyArkTSBatchIndex(allErrors);
-    }
-    try {
-        const adapter = new ArkTSAdapter(rootDir, scannedFiles);
-        const index = adapter.build(scene);
-        index.errors.push(...allErrors);
-        return index;
-    }
-    catch (e) {
-        const message = e instanceof Error ? e.message : String(e);
-        allErrors.push({ message: `ArkTS adapter failed: ${message}`, severity: 'error' });
-        return emptyArkTSBatchIndex(allErrors);
-    }
+    // Full Scene build is the same opaque native stall as analyseByModule.
+    return (0, liveness_watchdog_1.runWithoutLivenessWatchdog)(() => {
+        const { scene, errors } = tryBuildArkScene(rootDir);
+        const allErrors = [...priorErrors, ...errors];
+        if (!scene) {
+            return emptyArkTSBatchIndex(allErrors);
+        }
+        try {
+            const adapter = new ArkTSAdapter(rootDir, scannedFiles);
+            const index = adapter.build(scene);
+            index.errors.push(...allErrors);
+            return index;
+        }
+        catch (e) {
+            const message = e instanceof Error ? e.message : String(e);
+            allErrors.push({ message: `ArkTS adapter failed: ${message}`, severity: 'error' });
+            return emptyArkTSBatchIndex(allErrors);
+        }
+    });
 }
 function buildArkTSIndex(rootDir, scannedFiles) {
     if (shouldUseModularArkTSBuild(rootDir)) {