arkanalyzer 1.0.28 → 1.0.30

package/lib/utils/callGraphUtils.js

@@ -92,15 +92,16 @@ class SceneManager {
     }
     getMethod(method) {
         let targetMethod = this._scene.getMethod(method);
-        if (targetMethod == null) {
-            // 支持SDK调用解析
-            let file = this._scene.getFile(method.getDeclaringClassSignature().getDeclaringFileSignature());
-            if (file) {
-                const methods = ModelUtils_1.ModelUtils.getAllMethodsInFile(file);
-                for (let methodUnderFile of methods) {
-                    if (method.toString() === methodUnderFile.getSignature().toString()) {
-                        return methodUnderFile;
-                    }
+        if (targetMethod != null) {
+            return targetMethod;
+        }
+        // 支持SDK调用解析
+        let file = this._scene.getFile(method.getDeclaringClassSignature().getDeclaringFileSignature());
+        if (file) {
+            const methods = ModelUtils_1.ModelUtils.getAllMethodsInFile(file);
+            for (let methodUnderFile of methods) {
+                if (method.toString() === methodUnderFile.getSignature().toString()) {
+                    return methodUnderFile;
                 }
             }
         }
@@ -110,14 +111,15 @@ class SceneManager {
         if (typeof arkClass.getClassName() === "undefined")
             return null;
         let classInstance = this._scene.getClass(arkClass);
-        if (classInstance == null) {
-            let sdkOrTargetProjectFile = this._scene.getFile(arkClass.getDeclaringFileSignature());
-            // TODO: support get sdk class, targetProject class waiting to be supported
-            if (sdkOrTargetProjectFile != null) {
-                for (let classUnderFile of ModelUtils_1.ModelUtils.getAllClassesInFile(sdkOrTargetProjectFile)) {
-                    if (classUnderFile.getSignature().toString() === arkClass.toString()) {
-                        return classUnderFile;
-                    }
+        if (classInstance != null) {
+            return classInstance;
+        }
+        let sdkOrTargetProjectFile = this._scene.getFile(arkClass.getDeclaringFileSignature());
+        // TODO: support get sdk class, targetProject class waiting to be supported
+        if (sdkOrTargetProjectFile != null) {
+            for (let classUnderFile of ModelUtils_1.ModelUtils.getAllClassesInFile(sdkOrTargetProjectFile)) {
+                if (classUnderFile.getSignature().toString() === arkClass.toString()) {
+                    return classUnderFile;
                 }
             }
         }
@@ -132,12 +134,13 @@ class SceneManager {
             if (tempClass == null)
                 continue;
             let firstLevelSubclasses = Array.from(tempClass.getExtendedClasses().values());
-            if (firstLevelSubclasses) {
-                for (let subclass of firstLevelSubclasses) {
-                    if (!isItemRegistered(subclass, extendedClasses, (a, b) => a.getSignature().toString() === b.getSignature().toString())) {
-                        // 子类未处理，加入到classList
-                        classList.push(subclass);
-                    }
+            if (!firstLevelSubclasses) {
+                continue;
+            }
+            for (let subclass of firstLevelSubclasses) {
+                if (!isItemRegistered(subclass, extendedClasses, (a, b) => a.getSignature().toString() === b.getSignature().toString())) {
+                    // 子类未处理，加入到classList
+                    classList.push(subclass);
                 }
             }
             // 当前类处理完毕，标记为已处理

package/lib/utils/entryMethodUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"entryMethodUtils.d.ts","sourceRoot":"","sources":["../../src/utils/entryMethodUtils.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAGzC,eAAO,MAAM,qBAAqB,EAAE,MAAM,EA2BvC,CAAC;AACJ,eAAO,MAAM,oBAAoB,EAAE,MAAM,EAiBtC,CAAC;AAEJ,eAAO,MAAM,+BAA+B,EAAE,MAAM,EAkBnD,CAAC;AAEF,MAAM,WAAW,cAAc;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;CACvB;AAED,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,GAAG,SAAS,GAAG,IAAI,CAcpF;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,SAAS,QAS5C"}
+{"version":3,"file":"entryMethodUtils.d.ts","sourceRoot":"","sources":["../../src/utils/entryMethodUtils.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAGzC,eAAO,MAAM,qBAAqB,EAAE,MAAM,EA2BvC,CAAC;AACJ,eAAO,MAAM,oBAAoB,EAAE,MAAM,EAiBtC,CAAC;AAEJ,eAAO,MAAM,+BAA+B,EAAE,MAAM,EAkBnD,CAAC;AAEF,MAAM,WAAW,cAAc;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;CACvB;AAED,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,GAAG,SAAS,GAAG,IAAI,CAkBpF;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,SAAS,QAS5C"}

package/lib/utils/entryMethodUtils.js

@@ -83,14 +83,17 @@ exports.COMPONENT_LIFECYCLE_METHOD_NAME = [
 ];
 function getCallbackMethodFromStmt(stmt, scene) {
     const invokeExpr = stmt.getInvokeExpr();
-    if (invokeExpr && invokeExpr.getMethodSignature().getDeclaringClassSignature().getClassName() === '' && exports.CALLBACK_METHOD_NAME.includes(invokeExpr.getMethodSignature().getMethodSubSignature().getMethodName())) {
-        for (const arg of invokeExpr.getArgs()) {
-            const argType = arg.getType();
-            if (argType instanceof Type_1.FunctionType) {
-                const cbMethod = scene.getMethod(argType.getMethodSignature());
-                if (cbMethod) {
-                    return cbMethod;
-                }
+    if (invokeExpr === undefined ||
+        invokeExpr.getMethodSignature().getDeclaringClassSignature().getClassName() !== '' ||
+        !exports.CALLBACK_METHOD_NAME.includes(invokeExpr.getMethodSignature().getMethodSubSignature().getMethodName())) {
+        return null;
+    }
+    for (const arg of invokeExpr.getArgs()) {
+        const argType = arg.getType();
+        if (argType instanceof Type_1.FunctionType) {
+            const cbMethod = scene.getMethod(argType.getMethodSignature());
+            if (cbMethod) {
+                return cbMethod;
             }
         }
     }

package/lib/utils/pathTransfer.d.ts

@@ -1,2 +1,3 @@
 export declare function transfer2UnixPath(path2Do: string): string;
+export declare function getArkAnalyzerModulePath(moduleName: string): string | null;
 //# sourceMappingURL=pathTransfer.d.ts.map

package/lib/utils/pathTransfer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pathTransfer.d.ts","sourceRoot":"","sources":["../../src/utils/pathTransfer.ts"],"names":[],"mappings":"AAiBA,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,UAEhD"}
+{"version":3,"file":"pathTransfer.d.ts","sourceRoot":"","sources":["../../src/utils/pathTransfer.ts"],"names":[],"mappings":"AAiBA,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,UAEhD;AAED,wBAAgB,wBAAwB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAM1E"}

package/lib/utils/pathTransfer.js

@@ -17,9 +17,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transfer2UnixPath = void 0;
+exports.getArkAnalyzerModulePath = exports.transfer2UnixPath = void 0;
 const path_1 = __importDefault(require("path"));
 function transfer2UnixPath(path2Do) {
     return path_1.default.posix.join(...path2Do.split(/\\/));
 }
 exports.transfer2UnixPath = transfer2UnixPath;
+function getArkAnalyzerModulePath(moduleName) {
+    try {
+        return path_1.default.dirname(path_1.default.dirname(require.resolve(moduleName)));
+    }
+    catch (e) {
+        return null;
+    }
+}
+exports.getArkAnalyzerModulePath = getArkAnalyzerModulePath;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "arkanalyzer",
-  "version": "1.0.28",
-  "commit_id": "877281e0",
+  "version": "1.0.30",
+  "commit_id": "564ef96e",
   "files": [
     "docs",
     "lib",