arkanalyzer 1.0.29 → 1.0.30

package/lib/utils/CfgStructualAnalysis.js

@@ -145,22 +145,25 @@ class AbstractFlowGraph {
             this.structTypes.set(region, rtype);
             let blocks = new Set();
             for (const s of nset) {
-                if (!this.structOf.has(s)) {
-                    this.structOf.set(s, region);
-                }
-                if (this.structBlocks.has(s)) {
-                    for (const b of this.structBlocks.get(s)) {
-                        blocks.add(b);
-                    }
-                }
-                else {
-                    blocks.add(s);
-                }
+                this.handleRegion(s, region, blocks);
             }
             this.structBlocks.set(region, blocks);
             this.loopMap.set(region.header, region);
         }
     }
+    handleRegion(s, region, blocks) {
+        if (!this.structOf.has(s)) {
+            this.structOf.set(s, region);
+        }
+        if (this.structBlocks.has(s)) {
+            for (const b of this.structBlocks.get(s)) {
+                blocks.add(b);
+            }
+        }
+        else {
+            blocks.add(s);
+        }
+    }
     prepareBuildLoops() {
         let dom = this.buildDominator();
         let loops = [];
@@ -590,22 +593,23 @@ class AbstractFlowGraph {
     reduce(rtype, nodeSet) {
         let region = this.createRegion(rtype, nodeSet);
         region === null || region === void 0 ? void 0 : region.replace();
-        if (region) {
-            this.structTypes.set(region, rtype);
-            let blocks = new Set();
-            for (const s of nodeSet) {
-                this.structOf.set(s, region);
-                if (this.structBlocks.has(s)) {
-                    for (const b of this.structBlocks.get(s)) {
-                        blocks.add(b);
-                    }
-                }
-                else {
-                    blocks.add(s);
+        if (region === undefined) {
+            return undefined;
+        }
+        this.structTypes.set(region, rtype);
+        let blocks = new Set();
+        for (const s of nodeSet) {
+            this.structOf.set(s, region);
+            if (this.structBlocks.has(s)) {
+                for (const b of this.structBlocks.get(s)) {
+                    blocks.add(b);
                 }
             }
-            this.structBlocks.set(region, blocks);
+            else {
+                blocks.add(s);
+            }
         }
+        this.structBlocks.set(region, blocks);
         return region;
     }
     setIntersect(a, b) {

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

@@ -1 +1 @@
-{"version":3,"file":"FileUtils.d.ts","sourceRoot":"","sources":["../../src/utils/FileUtils.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAIjD,qBAAa,SAAS;IAClB,gBAAuB,WAAW;;;MAGjC;WAEa,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;WASzC,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;WASrC,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;WAIrC,iBAAiB,CAAC,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;WA4BxE,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,QAAQ;CAc1F;AAED,qBAAa,UAAU;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;gBAED,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;CAIzC;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,GAAG,CAAC,MAAM,CAAqB,GAAG,MAAM,CA0BrH"}
+{"version":3,"file":"FileUtils.d.ts","sourceRoot":"","sources":["../../src/utils/FileUtils.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAIjD,qBAAa,SAAS;IAClB,gBAAuB,WAAW;;;MAGjC;WAEa,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;WASzC,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;WASrC,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;WAIrC,iBAAiB,CAAC,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC;WA8BlG,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,QAAQ;CAc1F;AAED,qBAAa,UAAU;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;gBAED,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;CAIzC;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,GAAG,CAAC,MAAM,CAAqB,GAAG,MAAM,CA0BrH"}

package/lib/utils/FileUtils.js

@@ -79,19 +79,21 @@ class FileUtils {
             }
         });
         ohPkgContentMap.forEach((content, filePath) => {
-            if (content.dependencies) {
-                Object.entries(content.dependencies).forEach(([name, value]) => {
-                    if (!moduleMap.get(name)) {
-                        const modulePath = path_1.default.resolve(path_1.default.dirname(filePath), value.replace('file:', ''));
-                        const key = path_1.default.resolve(modulePath, EtsConst_1.OH_PACKAGE_JSON5);
-                        const target = ohPkgContentMap.get(key);
-                        if (target) {
-                            moduleMap.set(name, new ModulePath(modulePath, target.main ?
-                                path_1.default.resolve(modulePath, target.main) : ''));
-                        }
-                    }
-                });
+            if (!content.dependencies) {
+                return;
             }
+            Object.entries(content.dependencies).forEach(([name, value]) => {
+                if (moduleMap.get(name)) {
+                    return;
+                }
+                const modulePath = path_1.default.resolve(path_1.default.dirname(filePath), value.replace('file:', ''));
+                const key = path_1.default.resolve(modulePath, EtsConst_1.OH_PACKAGE_JSON5);
+                const target = ohPkgContentMap.get(key);
+                if (target) {
+                    moduleMap.set(name, new ModulePath(modulePath, target.main ?
+                        path_1.default.resolve(modulePath, target.main) : ''));
+                }
+            });
         });
         return moduleMap;
     }

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

@@ -1 +1 @@
-{"version":3,"file":"callGraphUtils.d.ts","sourceRoot":"","sources":["../../src/utils/callGraphUtils.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAM7E,qBAAa,sBAAsB;IAC/B,OAAO,CAAC,SAAS,CAAyB;IAC1C,OAAO,CAAC,cAAc,CAAyB;IAE/C,IAAI,QAAQ,IAAI,eAAe,EAAE,CAEhC;IAED,IAAI,QAAQ,CAAC,IAAI,EAAE,eAAe,EAAE,EAEnC;IAED,IAAI,aAAa,IAAI,eAAe,EAAE,CAErC;IAED,IAAI,aAAa,CAAC,IAAI,EAAE,eAAe,EAAE,EAExC;IAEM,cAAc,CAAC,SAAS,EAAE,eAAe,GAAG,eAAe,GAAG,SAAS;IAIvE,mBAAmB,CAAC,SAAS,EAAE,eAAe,GAAG,OAAO;IAKxD,aAAa,CAAC,SAAS,EAAE,eAAe,GAAG,IAAI;IAU/C,kBAAkB,CAAC,SAAS,EAAE,eAAe,GAAG,IAAI;IAUpD,kBAAkB,CAAC,SAAS,EAAE,eAAe,GAAG,IAAI;IAIpD,uBAAuB,CAAC,SAAS,EAAE,eAAe,GAAG,IAAI;CAGnE;AAED,qBAAa,YAAY;IACrB,OAAO,CAAC,MAAM,CAAS;IAEvB,IAAI,KAAK,IAAI,KAAK,CAEjB;IAED,IAAI,KAAK,CAAC,KAAK,EAAE,KAAK,EAErB;IAEM,SAAS,CAAC,MAAM,EAAE,eAAe,GAAG,SAAS,GAAG,IAAI;IAiBpD,QAAQ,CAAC,QAAQ,EAAE,cAAc,GAAG,QAAQ,GAAG,IAAI;IAkBnD,kBAAkB,CAAC,QAAQ,EAAE,cAAc,GAAG,QAAQ,EAAE;CAmClE;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,OAAO,GAAG,OAAO,CAOtG;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAY5D;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,GAAG,CAAC,eAAe,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,eAAe,EAAE,eAAe,EAAE,CAAC,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAsB1I;AAED,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAO/D"}
+{"version":3,"file":"callGraphUtils.d.ts","sourceRoot":"","sources":["../../src/utils/callGraphUtils.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAM7E,qBAAa,sBAAsB;IAC/B,OAAO,CAAC,SAAS,CAAyB;IAC1C,OAAO,CAAC,cAAc,CAAyB;IAE/C,IAAI,QAAQ,IAAI,eAAe,EAAE,CAEhC;IAED,IAAI,QAAQ,CAAC,IAAI,EAAE,eAAe,EAAE,EAEnC;IAED,IAAI,aAAa,IAAI,eAAe,EAAE,CAErC;IAED,IAAI,aAAa,CAAC,IAAI,EAAE,eAAe,EAAE,EAExC;IAEM,cAAc,CAAC,SAAS,EAAE,eAAe,GAAG,eAAe,GAAG,SAAS;IAIvE,mBAAmB,CAAC,SAAS,EAAE,eAAe,GAAG,OAAO;IAKxD,aAAa,CAAC,SAAS,EAAE,eAAe,GAAG,IAAI;IAU/C,kBAAkB,CAAC,SAAS,EAAE,eAAe,GAAG,IAAI;IAUpD,kBAAkB,CAAC,SAAS,EAAE,eAAe,GAAG,IAAI;IAIpD,uBAAuB,CAAC,SAAS,EAAE,eAAe,GAAG,IAAI;CAGnE;AAED,qBAAa,YAAY;IACrB,OAAO,CAAC,MAAM,CAAS;IAEvB,IAAI,KAAK,IAAI,KAAK,CAEjB;IAED,IAAI,KAAK,CAAC,KAAK,EAAE,KAAK,EAErB;IAEM,SAAS,CAAC,MAAM,EAAE,eAAe,GAAG,SAAS,GAAG,IAAI;IAkBpD,QAAQ,CAAC,QAAQ,EAAE,cAAc,GAAG,QAAQ,GAAG,IAAI;IAmBnD,kBAAkB,CAAC,QAAQ,EAAE,cAAc,GAAG,QAAQ,EAAE;CAqClE;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,OAAO,GAAG,OAAO,CAOtG;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAY5D;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,GAAG,CAAC,eAAe,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,eAAe,EAAE,eAAe,EAAE,CAAC,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAsB1I;AAED,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAO/D"}

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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "arkanalyzer",
-  "version": "1.0.29",
-  "commit_id": "48e41990",
+  "version": "1.0.30",
+  "commit_id": "564ef96e",
   "files": [
     "docs",
     "lib",