arkanalyzer 1.0.6 → 1.0.8

package/lib/Scene.js

@@ -77,7 +77,6 @@ class Scene {
         this.realProjectDir = '';
         this.moduleScenesMap = new Map();
         this.modulePath2NameMap = new Map();
-        this.globalImportInfos = [];
         this.moduleSdkMap = new Map();
         this.projectSdkMap = new Map();
         // values that are visible in curr scope
@@ -95,16 +94,58 @@ class Scene {
         this.ohPkgContent = {};
         this.buildStage = SceneBuildStage.BUILD_INIT;
     }
+    getOptions() {
+        return this.options;
+    }
+    clear() {
+        this.projectFiles = [];
+        this.moduleScenesMap.clear();
+        this.modulePath2NameMap.clear();
+        this.moduleSdkMap.clear();
+        this.projectSdkMap.clear();
+        this.filesMap.clear();
+        this.namespacesMap.clear();
+        this.classesMap.clear();
+        this.methodsMap.clear();
+        this.sdkArkFilesMap.clear();
+        this.sdkGlobalMap.clear();
+        this.ohPkgContentMap.clear();
+        this.ohPkgContent = {};
+    }
     getStage() {
         return this.buildStage;
     }
+    /**
+     * Build scene object according to the {@link SceneConfig}. This API implements 3 functions.
+     * First is to build scene object from {@link SceneConfig}, second is to generate {@link ArkFile}s,
+     * and the last is to collect project import infomation.
+     * @param sceneConfig - a sceneConfig object, which is usally defined by user or Json file.
+     * @example
+     * 1. Build Scene object from scene config
+
+     ```typescript
+     // build config
+     const projectDir = ... ...;
+     const sceneConfig = new SceneConfig();
+     sceneConfig.buildFromProjectDir(projectDir);
+
+     // build scene
+     const scene = new Scene();
+     scene.buildSceneFromProjectDir(sceneConfig);
+     ```
+     */
     buildSceneFromProjectDir(sceneConfig) {
         this.buildBasicInfo(sceneConfig);
         this.genArkFiles();
-        this.collectProjectImportInfos();
     }
+    /**
+     * Set the basic information of the scene using a config,
+     * such as the project's name, real path and files.
+     * @param sceneConfig - the config used to set the basic information of scene.
+     */
     buildBasicInfo(sceneConfig) {
         var _a;
+        this.options = sceneConfig.getOptions();
         this.projectName = sceneConfig.getTargetProjectName();
         this.realProjectDir = fs_1.default.realpathSync(sceneConfig.getTargetProjectDirectory());
         this.projectFiles = sceneConfig.getProjectFiles();
@@ -154,6 +195,9 @@ class Scene {
                 }
             }
         });
+        this.sdkArkFilesMap.forEach(file => {
+            this.inferFile(file);
+        });
     }
     addDefaultConstructors() {
         for (const file of this.getFiles()) {
@@ -187,23 +231,28 @@ class Scene {
             let arkFile = new ArkFile_1.ArkFile();
             arkFile.setScene(this);
             (0, ArkFileBuilder_1.buildArkFileFromFile)(file, this.realProjectDir, arkFile, this.projectName);
-            this.filesMap.set(arkFile.getFileSignature().toString(), arkFile);
+            this.filesMap.set(arkFile.getFileSignature().toMapKey(), arkFile);
         });
         this.buildAllMethodBody();
         this.addDefaultConstructors();
     }
     buildSdk(sdkName, sdkPath) {
-        const allFiles = (0, getAllFiles_1.getAllFiles)(sdkPath, ['.ets', '.ts']);
+        const allFiles = (0, getAllFiles_1.getAllFiles)(sdkPath, ['.ets', '.ts'], this.options.ignoreFileNames);
         allFiles.forEach((file) => {
             logger.info('=== parse sdk file:', file);
             let arkFile = new ArkFile_1.ArkFile();
             arkFile.setScene(this);
             (0, ArkFileBuilder_1.buildArkFileFromFile)(file, path_1.default.normalize(sdkPath), arkFile, sdkName);
             ModelUtils_1.ModelUtils.getAllClassesInFile(arkFile).forEach(cls => { var _a; return (_a = cls.getDefaultArkMethod()) === null || _a === void 0 ? void 0 : _a.buildBody(); });
-            const fileSig = arkFile.getFileSignature().toString();
+            const fileSig = arkFile.getFileSignature().toMapKey();
             this.sdkArkFilesMap.set(fileSig, arkFile);
+            ModelUtils_1.ModelUtils.buildGlobalMap(arkFile, this.sdkGlobalMap);
         });
     }
+    /**
+     * Build the scene for harmony project. It resolves the file path of the project first, and then fetches dependencies from this file.
+     * Next, build a `ModuleScene` for this project to generate {@link ArkFile}. Finally, it build bodies of all methods, generate extended classes, and add DefaultConstructors.
+     */
     buildScene4HarmonyProject() {
         this.modulePath2NameMap.forEach((value, key) => {
             const moduleOhPkgFilePath = path_1.default.resolve(key, './oh-package.json5');
@@ -213,8 +262,8 @@ class Scene {
             }
         });
         this.modulePath2NameMap.forEach((value, key) => {
-            let moduleScene = new ModuleScene();
-            moduleScene.ModuleScenBuilder(value, key, this);
+            let moduleScene = new ModuleScene(this);
+            moduleScene.ModuleSceneBuilder(value, key);
             this.moduleScenesMap.set(value, moduleScene);
         });
         this.buildAllMethodBody();
@@ -258,14 +307,27 @@ class Scene {
                 });
             }
         }
-        let moduleScene = new ModuleScene();
-        moduleScene.ModuleScenBuilder(moduleName, modulePath, this);
+        let moduleScene = new ModuleScene(this);
+        moduleScene.ModuleSceneBuilder(moduleName, modulePath);
         this.moduleScenesMap.set(moduleName, moduleScene);
         this.buildAllMethodBody();
     }
+    /**
+     * Get the absolute path of current project.
+     * @returns The real project's directiory.
+     * @example
+     * 1. get real project directory, such as:
+     ```typescript
+     let projectDir = projectScene.getRealProjectDir();
+     ```
+     */
     getRealProjectDir() {
         return this.realProjectDir;
     }
+    /**
+     * Returns the **string** name of the project.
+     * @returns The name of the project.
+     */
     getProjectName() {
         return this.projectName;
     }
@@ -275,19 +337,71 @@ class Scene {
     getSdkGlobal(globalName) {
         return this.sdkGlobalMap.get(globalName) || null;
     }
+    /**
+     * Returns the file based on its signature.
+     * If no file can be found according to the input signature, **null** will be returned.
+     * A typical {@link ArkFile} contains: file's name (i.e., its relative path), project's name,
+     * project's dir, file's signature etc.
+     * @param fileSignature - the signature of file.
+     * @returns a file defined by ArkAnalyzer. **null** will be returned if no file could be found.
+     * @example
+     * 1. get ArkFile based on file signature.
+
+     ```typescript
+     if (...) {
+     const fromSignature = new FileSignature();
+     fromSignature.setProjectName(im.getDeclaringArkFile().getProjectName());
+     fromSignature.setFileName(fileName);
+     return scene.getFile(fromSignature);
+     }
+     ```
+     */
     getFile(fileSignature) {
         if (this.projectName === fileSignature.getProjectName()) {
-            return this.filesMap.get(fileSignature.toString()) || null;
+            return this.filesMap.get(fileSignature.toMapKey()) || null;
         }
         else {
-            return this.sdkArkFilesMap.get(fileSignature.toString()) || null;
+            return this.sdkArkFilesMap.get(fileSignature.toMapKey()) || null;
         }
     }
+    setFile(file) {
+        this.filesMap.set(file.getFileSignature().toMapKey(), file);
+    }
+    hasSdkFile(fileSignature) {
+        return this.sdkArkFilesMap.has(fileSignature.toMapKey());
+    }
+    /**
+     * Get files of a {@link Scene}. Generally, a project includes several ets/ts files that define the different class. We need to generate {@link ArkFile} objects from these ets/ts files.
+     * @returns The array of {@link ArkFile} from `scene.filesMap.values()`.
+     * @example
+     * 1. In inferSimpleTypes() to check arkClass and arkMethod.
+     * ```typescript
+     * public inferSimpleTypes() {
+     *   for (let arkFile of this.getFiles()) {
+     *       for (let arkClass of arkFile.getClasses()) {
+     *           for (let arkMethod of arkClass.getMethods()) {
+     *           // ... ...;
+     *           }
+     *       }
+     *   }
+     * }
+     * ```
+     * 2. To iterate each method
+     * ```typescript
+     * for (const file of this.getFiles()) {
+     *     for (const cls of file.getClasses()) {
+     *         for (const method of cls.getMethods()) {
+     *             // ... ...
+     *         }
+     *     }
+     * }
+     *```
+     */
     getFiles() {
         return Array.from(this.filesMap.values());
     }
-    getSdkArkFilesMap() {
-        return this.sdkArkFilesMap;
+    getSdkArkFiles() {
+        return Array.from(this.sdkArkFilesMap.values());
     }
     getModuleSdkMap() {
         return this.moduleSdkMap;
@@ -295,23 +409,25 @@ class Scene {
     getProjectSdkMap() {
         return this.projectSdkMap;
     }
-    getFilesMap() {
-        return this.filesMap;
-    }
     getNamespace(namespaceSignature) {
+        var _a;
         if (this.projectName === namespaceSignature.getDeclaringFileSignature().getProjectName()) {
-            return this.getNamespacesMap().get(namespaceSignature.toString()) || null;
+            return this.getNamespacesMap().get(namespaceSignature.toMapKey()) || null;
         }
         else {
-            const arkFile = this.sdkArkFilesMap.get(namespaceSignature.getDeclaringFileSignature().toString());
+            const arkFile = this.getFile(namespaceSignature.getDeclaringFileSignature());
+            const parentNs = namespaceSignature.getDeclaringNamespaceSignature();
+            if (parentNs) {
+                return ((_a = arkFile === null || arkFile === void 0 ? void 0 : arkFile.getNamespace(parentNs)) === null || _a === void 0 ? void 0 : _a.getNamespace(namespaceSignature)) || null;
+            }
             return (arkFile === null || arkFile === void 0 ? void 0 : arkFile.getNamespace(namespaceSignature)) || null;
         }
     }
     getNamespacesMap() {
-        if (this.namespacesMap.size == 0) {
+        if (this.namespacesMap.size === 0) {
             for (const file of this.getFiles()) {
                 ModelUtils_1.ModelUtils.getAllNamespacesInFile(file).forEach((namespace) => {
-                    this.namespacesMap.set(namespace.getNamespaceSignature().toString(), namespace);
+                    this.namespacesMap.set(namespace.getNamespaceSignature().toMapKey(), namespace);
                 });
             }
         }
@@ -320,13 +436,18 @@ class Scene {
     getNamespaces() {
         return Array.from(this.getNamespacesMap().values());
     }
+    /**
+     * Returns the class according to the input class signature.
+     * @param classSignature - signature of the class to be obtained.
+     * @returns A class.
+     */
     getClass(classSignature, refresh) {
         var _a;
         if (this.projectName === classSignature.getDeclaringFileSignature().getProjectName()) {
-            return this.getClassesMap(refresh).get(classSignature.toString()) || null;
+            return this.getClassesMap(refresh).get(classSignature.toMapKey()) || null;
         }
         else {
-            const arkFile = this.sdkArkFilesMap.get(classSignature.getDeclaringFileSignature().toString());
+            const arkFile = this.getFile(classSignature.getDeclaringFileSignature());
             const namespaceSignature = classSignature.getDeclaringNamespaceSignature();
             if (namespaceSignature) {
                 return ((_a = arkFile === null || arkFile === void 0 ? void 0 : arkFile.getNamespace(namespaceSignature)) === null || _a === void 0 ? void 0 : _a.getClass(classSignature)) || null;
@@ -339,12 +460,12 @@ class Scene {
             this.classesMap.clear();
             for (const file of this.getFiles()) {
                 for (const cls of file.getClasses()) {
-                    this.classesMap.set(cls.getSignature().toString(), cls);
+                    this.classesMap.set(cls.getSignature().toMapKey(), cls);
                 }
             }
             for (const namespace of this.getNamespacesMap().values()) {
                 for (const cls of namespace.getClasses()) {
-                    this.classesMap.set(cls.getSignature().toString(), cls);
+                    this.classesMap.set(cls.getSignature().toMapKey(), cls);
                 }
             }
         }
@@ -356,7 +477,7 @@ class Scene {
     getMethod(methodSignature, refresh) {
         var _a;
         if (this.projectName === methodSignature.getDeclaringClassSignature().getDeclaringFileSignature().getProjectName()) {
-            return this.getMethodsMap(refresh).get(methodSignature.toString()) || null;
+            return this.getMethodsMap(refresh).get(methodSignature.toMapKey()) || null;
         }
         else {
             return ((_a = this.getClass(methodSignature.getDeclaringClassSignature())) === null || _a === void 0 ? void 0 : _a.getMethod(methodSignature)) || null;
@@ -367,17 +488,54 @@ class Scene {
             this.methodsMap.clear();
             for (const cls of this.getClassesMap().values()) {
                 for (const method of cls.getMethods(true)) {
-                    this.methodsMap.set(method.getSignature().toString(), method);
+                    this.methodsMap.set(method.getSignature().toMapKey(), method);
                 }
             }
         }
         return this.methodsMap;
     }
+    /**
+     * Returns the method associated with the method signature.
+     * If no method is associated with this signature, **null** will be returned.
+     * An {@link ArkMethod} includes:
+     * - Name: the **string** name of method.
+     * - Code: the **string** code of the method.
+     * - Line: a **number** indicating the line location, initialized as -1.
+     * - Column: a **number** indicating the column location, initialized as -1.
+     * - Parameters & Types of parameters: the parameters of method and their types.
+     * - View tree: the view tree of the method.
+     * - ...
+     *
+     * @param methodSignature - the signature of method.
+     * @returns The method associated with the method signature.
+     * @example
+     * 1. get method from getMethod.
+
+     ```typescript
+     const methodSignatures = this.CHA.resolveCall(xxx, yyy);
+     for (const methodSignature of methodSignatures) {
+     const method = this.scene.getMethod(methodSignature);
+     ... ...
+     }
+     ```
+     */
     getMethods(refresh) {
         return Array.from(this.getMethodsMap(refresh).values());
     }
     addToMethodsMap(method) {
-        this.methodsMap.set(method.getSignature().toString(), method);
+        this.methodsMap.set(method.getSignature().toMapKey(), method);
+    }
+    removeMethod(method) {
+        return this.methodsMap.delete(method.getSignature().toMapKey());
+    }
+    removeClass(arkClass) {
+        return this.classesMap.delete(arkClass.getSignature().toMapKey());
+    }
+    removeNamespace(namespace) {
+        return this.namespacesMap.delete(namespace.getSignature().toMapKey());
+    }
+    removeFile(file) {
+        return this.filesMap.delete(file.getFileSignature().toMapKey());
     }
     hasMainMethod() {
         return false;
@@ -412,28 +570,46 @@ class Scene {
         return callGraph;
     }
     /**
-     * inference type for each non-default method
-     * because default and generated method was finished
+     * Infer type for each non-default method. It infers the type of each field/local/reference.
+     * For example, the statement `let b = 5;`, the type of local `b` is `NumberType`; and for the statement `let s = 'hello';`, the type of local `s` is `StringType`. The detailed types are defined in the Type.ts file.
+     * @example
+     * 1. Infer the type of each class field and method field.
+
+     ```typescript
+     const scene = new Scene();
+     scene.buildSceneFromProjectDir(sceneConfig);
+     scene.inferTypes();
+     ```
      */
     inferTypes() {
-        this.sdkArkFilesMap.forEach(file => {
-            ModelUtils_1.ModelUtils.buildGlobalMap(file, this.sdkGlobalMap);
-        });
-        this.filesMap.forEach(file => {
-            ModelUtils_1.ModelUtils.getAllClassesInFile(file).forEach(arkClass => {
-                TypeInference_1.TypeInference.inferGenericType(arkClass.getGenericsTypes(), arkClass);
-                arkClass.getFields().forEach(arkField => TypeInference_1.TypeInference.inferTypeInArkField(arkField));
-                const defaultArkMethod = arkClass.getDefaultArkMethod();
-                if (defaultArkMethod) {
-                    TypeInference_1.TypeInference.inferTypeInMethod(defaultArkMethod);
-                }
-                arkClass.getMethods().forEach(arkMethod => TypeInference_1.TypeInference.inferTypeInMethod(arkMethod));
-            });
-        });
+        this.filesMap.forEach(file => this.inferFile(file));
+        this.getClasses(true);
         this.getMethodsMap(true);
     }
+    inferFile(file) {
+        ModelUtils_1.ModelUtils.getAllClassesInFile(file).forEach(arkClass => {
+            TypeInference_1.TypeInference.inferGenericType(arkClass.getGenericsTypes(), arkClass);
+            const defaultArkMethod = arkClass.getDefaultArkMethod();
+            if (defaultArkMethod) {
+                TypeInference_1.TypeInference.inferTypeInMethod(defaultArkMethod);
+            }
+            arkClass.getFields().forEach(arkField => TypeInference_1.TypeInference.inferTypeInArkField(arkField));
+            arkClass.getMethods().forEach(arkMethod => TypeInference_1.TypeInference.inferTypeInMethod(arkMethod));
+        });
+    }
     /**
+     * Iterate all assignment statements in methods,
+     * and set the type of left operand based on the type of right operand
+     * if the left operand is a local variable as well as an unknown.
      * @Deprecated
+     * @example
+     * 1. Infer simple type when scene building.
+
+     ```typescript
+     let scene = new Scene();
+     scene.buildSceneFromProjectDir(config);
+     scene.inferSimpleTypes();
+     ```
      */
     inferSimpleTypes() {
         for (let arkFile of this.getFiles()) {
@@ -444,13 +620,6 @@ class Scene {
             }
         }
     }
-    collectProjectImportInfos() {
-        this.getFiles().forEach((arkFile) => {
-            arkFile.getImportInfos().forEach((importInfo) => {
-                this.globalImportInfos.push(importInfo);
-            });
-        });
-    }
     getClassMap() {
         var _a, _b, _c, _d;
         const classMap = new Map();
@@ -475,7 +644,7 @@ class Scene {
                     nsClass.push(arkClass);
                 }
                 classMap.set(ns.getNamespaceSignature(), nsClass);
-                if (ns.getNamespaces().length == 0) {
+                if (ns.getNamespaces().length === 0) {
                     finalNamespaces.push(ns);
                 }
                 else {
@@ -533,7 +702,7 @@ class Scene {
                     try {
                         // 遗留问题：只统计了项目文件的namespace，没统计sdk文件内部的引入
                         const importNameSpaceClasses = classMap.get(importNameSpace.getNamespaceSignature());
-                        importClasses.push(...importNameSpaceClasses.filter(c => !importClasses.includes(c) && c.getName() != '_DEFAULT_ARK_CLASS'));
+                        importClasses.push(...importNameSpaceClasses.filter(c => !importClasses.includes(c) && c.getName() !== Const_1.DEFAULT_ARK_CLASS_NAME));
                     }
                     catch (_e) {
                     }
@@ -545,14 +714,14 @@ class Scene {
             const namespaceStack = [...file.getNamespaces()];
             for (const ns of namespaceStack) {
                 const nsClasses = classMap.get(ns.getNamespaceSignature());
-                nsClasses.push(...fileClasses.filter(c => !nsClasses.includes(c) && c.getName() != '_DEFAULT_ARK_CLASS'));
+                nsClasses.push(...fileClasses.filter(c => !nsClasses.includes(c) && c.getName() !== Const_1.DEFAULT_ARK_CLASS_NAME));
             }
             while (namespaceStack.length > 0) {
                 const ns = namespaceStack.shift();
                 const nsClasses = classMap.get(ns.getNamespaceSignature());
                 for (const nsns of ns.getNamespaces()) {
                     const nsnsClasses = classMap.get(nsns.getNamespaceSignature());
-                    nsnsClasses.push(...nsClasses.filter(c => !nsnsClasses.includes(c) && c.getName() != '_DEFAULT_ARK_CLASS'));
+                    nsnsClasses.push(...nsClasses.filter(c => !nsnsClasses.includes(c) && c.getName() !== Const_1.DEFAULT_ARK_CLASS_NAME));
                     namespaceStack.push(nsns);
                 }
             }
@@ -568,7 +737,7 @@ class Scene {
             const finalNamespaces = [];
             const globalLocals = [];
             (_b = (_a = file.getDefaultClass()) === null || _a === void 0 ? void 0 : _a.getDefaultArkMethod().getBody()) === null || _b === void 0 ? void 0 : _b.getLocals().forEach(local => {
-                if (local.getDeclaringStmt() && local.getName() != 'this' && local.getName()[0] != '$') {
+                if (local.getDeclaringStmt() && local.getName() !== 'this' && local.getName()[0] !== '$') {
                     globalLocals.push(local);
                 }
             });
@@ -582,12 +751,12 @@ class Scene {
                 const ns = namespaceStack.shift();
                 const nsGlobalLocals = [];
                 (_c = ns.getDefaultClass().getDefaultArkMethod().getBody()) === null || _c === void 0 ? void 0 : _c.getLocals().forEach(local => {
-                    if (local.getDeclaringStmt() && local.getName() != 'this' && local.getName()[0] != '$') {
+                    if (local.getDeclaringStmt() && local.getName() !== 'this' && local.getName()[0] !== '$') {
                         nsGlobalLocals.push(local);
                     }
                 });
                 globalVariableMap.set(ns.getNamespaceSignature(), nsGlobalLocals);
-                if (ns.getNamespaces().length == 0) {
+                if (ns.getNamespaces().length === 0) {
                     finalNamespaces.push(ns);
                 }
                 else {
@@ -644,7 +813,7 @@ class Scene {
                     try {
                         // 遗留问题：只统计了项目文件，没统计sdk文件内部的引入
                         const importNameSpaceClasses = globalVariableMap.get(importNameSpace.getNamespaceSignature());
-                        importLocals.push(...importNameSpaceClasses.filter(c => !importLocals.includes(c) && c.getName() != '_DEFAULT_ARK_CLASS'));
+                        importLocals.push(...importNameSpaceClasses.filter(c => !importLocals.includes(c) && c.getName() !== Const_1.DEFAULT_ARK_CLASS_NAME));
                     }
                     catch (_h) {
                     }
@@ -683,7 +852,7 @@ class Scene {
     getStaticInitMethods() {
         const staticInitMethods = [];
         for (const method of Array.from(this.getMethodsMap(true).values())) {
-            if (method.getName() == Const_1.STATIC_INIT_METHOD_NAME) {
+            if (method.getName() === Const_1.STATIC_INIT_METHOD_NAME) {
                 staticInitMethods.push(method);
             }
         }
@@ -701,17 +870,16 @@ class Scene {
 }
 exports.Scene = Scene;
 class ModuleScene {
-    constructor() {
-        this.projectScene = new Scene();
+    constructor(projectScene) {
         this.moduleName = '';
         this.modulePath = '';
         this.moduleOhPkgFilePath = '';
         this.ohPkgContent = {};
+        this.projectScene = projectScene;
     }
-    ModuleScenBuilder(moduleName, modulePath, projectScene, recursively = false) {
+    ModuleSceneBuilder(moduleName, modulePath, recursively = false) {
         this.moduleName = moduleName;
         this.modulePath = modulePath;
-        this.projectScene = projectScene;
         this.getModuleOhPkgFilePath();
         if (this.moduleOhPkgFilePath) {
             this.ohPkgContent = (0, json5parser_1.fetchDependenciesFromFile)(this.moduleOhPkgFilePath);
@@ -747,14 +915,13 @@ class ModuleScene {
         return this.ohPkgContent;
     }
     genArkFiles() {
-        (0, getAllFiles_1.getAllFiles)(this.modulePath, ['.ets', '.ts']).forEach((file) => {
+        (0, getAllFiles_1.getAllFiles)(this.modulePath, ['.ets', '.ts'], this.projectScene.getOptions().ignoreFileNames).forEach((file) => {
             logger.info('=== parse file:', file);
             let arkFile = new ArkFile_1.ArkFile();
             arkFile.setScene(this.projectScene);
             arkFile.setModuleScene(this);
             (0, ArkFileBuilder_1.buildArkFileFromFile)(file, this.projectScene.getRealProjectDir(), arkFile, this.projectScene.getProjectName());
-            const fileSig = arkFile.getFileSignature().toString();
-            this.projectScene.getFilesMap().set(fileSig, arkFile);
+            this.projectScene.setFile(arkFile);
         });
     }
 }

package/lib/callgraph/algorithm/AbstractAnalysis.d.ts

@@ -20,9 +20,10 @@ export declare abstract class AbstractAnalysis {
     protected abstract preProcessMethod(funcID: FuncID): CallSite[];
     resolveInvokeExpr(invokeExpr: AbstractInvokeExpr): ArkMethod | undefined;
     getClassHierarchy(arkClass: ArkClass): ArkClass[];
-    start(displayGeneratedMethod: Boolean): void;
+    start(displayGeneratedMethod: boolean): void;
     protected init(): void;
     protected processMethod(methodID: FuncID): CallSite[];
     protected getParamAnonymousMethod(invokeExpr: AbstractInvokeExpr): MethodSignature[];
+    protected addCallGraphEdge(caller: FuncID, callee: ArkMethod | null, cs: CallSite, displayGeneratedMethod: boolean): void;
 }
 //# sourceMappingURL=AbstractAnalysis.d.ts.map

package/lib/callgraph/algorithm/AbstractAnalysis.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AbstractAnalysis.d.ts","sourceRoot":"","sources":["../../../src/callgraph/algorithm/AbstractAnalysis.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAE5C,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAiB,MAAM,oBAAoB,CAAC;AAChF,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAIrE,8BAAsB,gBAAgB;IAClC,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC;IACvB,SAAS,CAAC,EAAE,EAAG,SAAS,CAAC;IACzB,SAAS,CAAC,SAAS,EAAG,gBAAgB,CAAC;IACvC,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAM;IAClC,SAAS,CAAC,eAAe,EAAG,GAAG,CAAC,MAAM,CAAC,CAAC;gBAE5B,CAAC,EAAE,KAAK;IAIb,QAAQ,IAAI,KAAK;IAIjB,YAAY,IAAI,SAAS;IAIhC,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,GAAG,QAAQ,EAAE;IAClF,SAAS,CAAC,QAAQ,CAAC,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,EAAE;IAExD,iBAAiB,CAAC,UAAU,EAAE,kBAAkB,GAAG,SAAS,GAAG,SAAS;IAOxE,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,GAAG,QAAQ,EAAE;IAiBjD,KAAK,CAAC,sBAAsB,EAAE,OAAO,GAAG,IAAI;IAiCnD,SAAS,CAAC,IAAI,IAAI,IAAI;IAOtB,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,QAAQ,EAAE;IAsBrD,SAAS,CAAC,uBAAuB,CAAC,UAAU,EAAE,kBAAkB,GAAG,eAAe,EAAE;CAYvF"}
+{"version":3,"file":"AbstractAnalysis.d.ts","sourceRoot":"","sources":["../../../src/callgraph/algorithm/AbstractAnalysis.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAE5C,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAiB,MAAM,oBAAoB,CAAC;AAChF,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAIrE,8BAAsB,gBAAgB;IAClC,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC;IACvB,SAAS,CAAC,EAAE,EAAG,SAAS,CAAC;IACzB,SAAS,CAAC,SAAS,EAAG,gBAAgB,CAAC;IACvC,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAM;IAClC,SAAS,CAAC,eAAe,EAAG,GAAG,CAAC,MAAM,CAAC,CAAC;gBAE5B,CAAC,EAAE,KAAK;IAIb,QAAQ,IAAI,KAAK;IAIjB,YAAY,IAAI,SAAS;IAIhC,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,GAAG,QAAQ,EAAE;IAClF,SAAS,CAAC,QAAQ,CAAC,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,EAAE;IAExD,iBAAiB,CAAC,UAAU,EAAE,kBAAkB,GAAG,SAAS,GAAG,SAAS;IAOxE,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,GAAG,QAAQ,EAAE;IAgBjD,KAAK,CAAC,sBAAsB,EAAE,OAAO,GAAG,IAAI;IA8BnD,SAAS,CAAC,IAAI,IAAI,IAAI;IAOtB,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,QAAQ,EAAE;IAsBrD,SAAS,CAAC,uBAAuB,CAAC,UAAU,EAAE,kBAAkB,GAAG,eAAe,EAAE;IAapF,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,GAAG,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,sBAAsB,EAAE,OAAO,GAAG,IAAI;CAU5H"}

package/lib/callgraph/algorithm/AbstractAnalysis.js

@@ -62,7 +62,6 @@ class AbstractAnalysis {
         // TODO: remove abstract class
         let classWorkList = [arkClass];
         // TODO: check class with no super Class
-        // let classHierarchy: ArkClass[] = [arkClass.getSuperClass()]
         let classHierarchy = [];
         while (classWorkList.length > 0) {
             // TODO: no dumplicated check, TS doesn't allow multi extend
@@ -74,10 +73,10 @@ class AbstractAnalysis {
     }
     start(displayGeneratedMethod) {
         this.init();
-        while (this.workList.length != 0) {
+        while (this.workList.length !== 0) {
             const method = this.workList.shift();
             const cgNode = this.cg.getNode(method);
-            if (this.processedMethod.has(method) || cgNode.getIsSdkMethod()) {
+            if (this.processedMethod.has(method) || cgNode.isSdkMethod()) {
                 continue;
             }
             // pre process for RTA only
@@ -87,10 +86,7 @@ class AbstractAnalysis {
             this.processMethod(method).forEach((cs) => {
                 var _a;
                 let me = this.cg.getArkMethodByFuncID(cs.calleeFuncID);
-                // check if need to display generated method
-                if (displayGeneratedMethod || (me === null || me === void 0 ? void 0 : me.isGenerated())) {
-                    this.cg.addDynamicCallEdge(method, cs.calleeFuncID, cs.callStmt);
-                }
+                this.addCallGraphEdge(method, me, cs, displayGeneratedMethod);
                 if (!this.processedMethod.has(cs.calleeFuncID)) {
                     this.workList.push(cs.calleeFuncID);
                     logger.info(`New workList item ${cs.calleeFuncID}: ${(_a = this.cg.getArkMethodByFuncID(cs.calleeFuncID)) === null || _a === void 0 ? void 0 : _a.getSignature().toString()}`);
@@ -133,5 +129,16 @@ class AbstractAnalysis {
         });
         return paramMethod;
     }
+    addCallGraphEdge(caller, callee, cs, displayGeneratedMethod) {
+        // check if need to display generated method
+        if (!callee) {
+            logger.error(`FuncID has no method ${cs.calleeFuncID}`);
+        }
+        else {
+            if (displayGeneratedMethod || !(callee === null || callee === void 0 ? void 0 : callee.isGenerated())) {
+                this.cg.addDynamicCallEdge(caller, cs.calleeFuncID, cs.callStmt);
+            }
+        }
+    }
 }
 exports.AbstractAnalysis = AbstractAnalysis;

package/lib/callgraph/algorithm/ClassHierarchyAnalysis.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ClassHierarchyAnalysis.d.ts","sourceRoot":"","sources":["../../../src/callgraph/algorithm/ClassHierarchyAnalysis.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAE5C,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAGtD,qBAAa,sBAAuB,SAAQ,gBAAgB;gBAE5C,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,SAAS;IAKhC,WAAW,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,GAAG,QAAQ,EAAE;IAyDtE,SAAS,CAAC,gBAAgB,IAAI,QAAQ,EAAE;CAI3C"}
+{"version":3,"file":"ClassHierarchyAnalysis.d.ts","sourceRoot":"","sources":["../../../src/callgraph/algorithm/ClassHierarchyAnalysis.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAE5C,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,qBAAa,sBAAuB,SAAQ,gBAAgB;gBAE5C,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,SAAS;IAKhC,WAAW,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,GAAG,QAAQ,EAAE;IAwDtE,SAAS,CAAC,gBAAgB,IAAI,QAAQ,EAAE;CAI3C"}

package/lib/callgraph/algorithm/ClassHierarchyAnalysis.js

@@ -18,7 +18,6 @@ exports.ClassHierarchyAnalysis = void 0;
 const Expr_1 = require("../../core/base/Expr");
 const CallGraph_1 = require("../model/CallGraph");
 const AbstractAnalysis_1 = require("./AbstractAnalysis");
-const TSConst_1 = require("../../core/common/TSConst");
 class ClassHierarchyAnalysis extends AbstractAnalysis_1.AbstractAnalysis {
     constructor(scene, cg) {
         super(scene);
@@ -40,14 +39,13 @@ class ClassHierarchyAnalysis extends AbstractAnalysis_1.AbstractAnalysis {
         }
         if (invokeExpr instanceof Expr_1.ArkStaticInvokeExpr) {
             // get specific method
-            // resolveResult.push(calleeMethod.getSignature())
             resolveResult.push(new CallGraph_1.CallSite(invokeStmt, undefined, this.cg.getCallGraphNodeByMethod(calleeMethod.getSignature()).getID(), callerMethod));
         }
         else {
             let declareClass = calleeMethod.getDeclaringArkClass();
             // TODO: super class method should be placed at the end
             this.getClassHierarchy(declareClass).forEach((arkClass) => {
-                if (arkClass.getModifiers().has(TSConst_1.ABSTRACT_KEYWORD)) {
+                if (arkClass.isAbstract()) {
                     return;
                 }
                 let possibleCalleeMethod = arkClass.getMethodWithName(calleeMethod.getName());
@@ -56,7 +54,7 @@ class ClassHierarchyAnalysis extends AbstractAnalysis_1.AbstractAnalysis {
                     // remove the generated method in extended classes
                     return;
                 }
-                if (possibleCalleeMethod && !possibleCalleeMethod.getModifiers().has(TSConst_1.ABSTRACT_KEYWORD)) {
+                if (possibleCalleeMethod && !possibleCalleeMethod.isAbstract()) {
                     resolveResult.push(new CallGraph_1.CallSite(invokeStmt, undefined, this.cg.getCallGraphNodeByMethod(possibleCalleeMethod.getSignature()).getID(), callerMethod));
                 }
             });

package/lib/callgraph/algorithm/RapidTypeAnalysis.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RapidTypeAnalysis.d.ts","sourceRoot":"","sources":["../../../src/callgraph/algorithm/RapidTypeAnalysis.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAE5C,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAOtD,qBAAa,iBAAkB,SAAQ,gBAAgB;IAEnD,OAAO,CAAC,gBAAgB,CAAkC;IAE1D,OAAO,CAAC,YAAY,CAA2F;gBAEnG,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,SAAS;IAKhC,WAAW,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,GAAG,QAAQ,EAAE;IA4DtE,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,EAAE;IAqBtD,OAAO,CAAC,+BAA+B;IA4BhC,eAAe,CAAC,QAAQ,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI;CAKxG"}
+{"version":3,"file":"RapidTypeAnalysis.d.ts","sourceRoot":"","sources":["../../../src/callgraph/algorithm/RapidTypeAnalysis.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAE5C,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAMtD,qBAAa,iBAAkB,SAAQ,gBAAgB;IAEnD,OAAO,CAAC,gBAAgB,CAAkC;IAE1D,OAAO,CAAC,YAAY,CAA2F;gBAEnG,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,SAAS;IAKhC,WAAW,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,GAAG,QAAQ,EAAE;IA4DtE,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,EAAE;IAqBtD,OAAO,CAAC,+BAA+B;IA4BhC,eAAe,CAAC,QAAQ,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI;CAKxG"}