arkanalyzer 1.0.7 → 1.0.9

package/lib/save/source/SourceTransformer.js

@@ -74,10 +74,11 @@ class SourceTransformer {
         invokeExpr.getArgs().forEach((v) => {
             args.push(this.valueToString(v));
         });
+        let genericCode = this.genericTypesToString(invokeExpr.getRealGenericTypes());
         if (SourceUtils_1.SourceUtils.isComponentAttributeInvoke(invokeExpr) && this.context.isInBuilderMethod()) {
-            return `.${methodName}(${args.join(', ')})`;
+            return `.${methodName}${genericCode}(${args.join(', ')})`;
         }
-        return `${this.valueToString(invokeExpr.getBase())}.${methodName}(${args.join(', ')})`;
+        return `${this.valueToString(invokeExpr.getBase())}.${methodName}${genericCode}(${args.join(', ')})`;
     }
     staticInvokeExprToString(invokeExpr) {
         let methodSignature = invokeExpr.getMethodSignature();
@@ -92,6 +93,7 @@ class SourceTransformer {
         invokeExpr.getArgs().forEach((v) => {
             args.push(this.valueToString(v));
         });
+        let genericCode = this.genericTypesToString(invokeExpr.getRealGenericTypes());
         if (this.context.isInBuilderMethod()) {
             if (className === EtsConst_1.COMPONENT_CUSTOMVIEW) {
                 if (methodName === EtsConst_1.COMPONENT_CREATE_FUNCTION) {
@@ -109,7 +111,7 @@ class SourceTransformer {
                 if (className === EtsConst_1.COMPONENT_IF) {
                     return `if (${args.join(', ')})`;
                 }
-                return `${className}(${args.join(', ')})`;
+                return `${className}${genericCode}(${args.join(', ')})`;
             }
             if (SourceUtils_1.SourceUtils.isComponentIfBranchInvoke(invokeExpr)) {
                 let arg0 = invokeExpr.getArg(0);
@@ -125,9 +127,19 @@ class SourceTransformer {
             }
         }
         if (className && className.length > 0) {
-            return `${className}.${methodName}(${args.join(', ')})`;
+            return `${className}.${methodName}${genericCode}(${args.join(', ')})`;
         }
-        return `${methodName}(${args.join(', ')})`;
+        return `${methodName}${genericCode}(${args.join(', ')})`;
+    }
+    genericTypesToString(types) {
+        if (!types) {
+            return '';
+        }
+        let code = this.typeArrayToString(types);
+        if (code.length > 0) {
+            return `<${code}>`;
+        }
+        return '';
     }
     typeArrayToString(types, split = ', ') {
         let typesStr = [];
@@ -264,21 +276,13 @@ class SourceTransformer {
     }
     typeToString(type) {
         if (type instanceof Type_1.LiteralType) {
-            let literalName = type.getLiteralName();
-            if (typeof literalName === 'string' && literalName.endsWith('Keyword')) {
-                return literalName.substring(0, literalName.length - 'Keyword'.length).toLowerCase();
-            }
-            return `${literalName}`;
+            return this.literalType2string(type);
         }
         if (type instanceof Type_1.PrimitiveType) {
             return type.getName();
         }
         if (type instanceof Type_1.UnionType) {
-            let typesStr = [];
-            for (const member of type.getTypes()) {
-                typesStr.push(this.typeToString(member));
-            }
-            return typesStr.join(' | ');
+            return this.unionType2string(type);
         }
         if (type instanceof Type_1.UnknownType) {
             return 'any';
@@ -287,29 +291,10 @@ class SourceTransformer {
             return 'void';
         }
         if (type instanceof Type_1.ClassType) {
-            let name = type.getClassSignature().getClassName();
-            if (SourceUtils_1.SourceUtils.isDefaultClass(name)) {
-                return 'any';
-            }
-            if (SourceUtils_1.SourceUtils.isAnonymousClass(name)) {
-                let cls = this.context.getClass(type.getClassSignature());
-                if (cls && cls.getCategory() === ArkClass_1.ClassCategory.TYPE_LITERAL) {
-                    return this.anonymousClassToString(cls, this.context.getPrinter().getIndent());
-                }
-                return 'Object';
-            }
-            return name;
+            return this.classType2string(type);
         }
         if (type instanceof Type_1.ArrayType) {
-            const dimensions = [];
-            for (let i = 0; i < type.getDimension(); i++) {
-                dimensions.push('[]');
-            }
-            let baseType = type.getBaseType();
-            if (baseType instanceof Type_1.UnionType) {
-                return `(${this.typeToString(baseType)})${dimensions.join('')}`;
-            }
-            return `${this.typeToString(baseType)}${dimensions.join('')}`;
+            return this.arrayType2string(type);
         }
         if (type instanceof Type_1.FunctionType) {
             let methodSignature = type.getMethodSignature();
@@ -319,11 +304,7 @@ class SourceTransformer {
             }
         }
         if (type instanceof Type_1.UnclearReferenceType) {
-            let genericTypes = type.getGenericTypes();
-            if (genericTypes.length > 0) {
-                return `${type.getName()}<${genericTypes.join(', ')}>`;
-            }
-            return type.getName();
+            return this.unclearReferenceType2string(type);
         }
         if (type instanceof Type_1.GenericType) {
             return type.getName();
@@ -334,5 +315,55 @@ class SourceTransformer {
         logger.info(`valueToString ${type.constructor} not support.`);
         return type.toString();
     }
+    literalType2string(type) {
+        let literalName = type.getLiteralName();
+        if (typeof literalName === 'string' && literalName.endsWith('Keyword')) {
+            return literalName.substring(0, literalName.length - 'Keyword'.length).toLowerCase();
+        }
+        return `${literalName}`;
+    }
+    unionType2string(type) {
+        let typesStr = [];
+        for (const member of type.getTypes()) {
+            typesStr.push(this.typeToString(member));
+        }
+        return typesStr.join(' | ');
+    }
+    arrayType2string(type) {
+        const dimensions = [];
+        for (let i = 0; i < type.getDimension(); i++) {
+            dimensions.push('[]');
+        }
+        let baseType = type.getBaseType();
+        if (baseType instanceof Type_1.UnionType) {
+            return `(${this.typeToString(baseType)})${dimensions.join('')}`;
+        }
+        return `${this.typeToString(baseType)}${dimensions.join('')}`;
+    }
+    unclearReferenceType2string(type) {
+        let genericTypes = type.getGenericTypes();
+        if (genericTypes.length > 0) {
+            return `${type.getName()}<${genericTypes.join(', ')}>`;
+        }
+        return type.getName();
+    }
+    classType2string(type) {
+        let name = type.getClassSignature().getClassName();
+        if (SourceUtils_1.SourceUtils.isDefaultClass(name)) {
+            return 'any';
+        }
+        if (SourceUtils_1.SourceUtils.isAnonymousClass(name)) {
+            let cls = this.context.getClass(type.getClassSignature());
+            if (cls && cls.getCategory() === ArkClass_1.ClassCategory.TYPE_LITERAL) {
+                return this.anonymousClassToString(cls, this.context.getPrinter().getIndent());
+            }
+            return 'Object';
+        }
+        let genericTypes = type.getRealGenericTypes();
+        if (genericTypes && genericTypes.length > 0) {
+            return `${name}<${genericTypes.join(', ')}>`;
+        }
+        return name;
+    }
 }
 exports.SourceTransformer = SourceTransformer;

package/lib/save/source/SourceUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SourceUtils.d.ts","sourceRoot":"","sources":["../../../src/save/source/SourceUtils.ts"],"names":[],"mappings":"AAgBA,OAAO,EACH,qBAAqB,EAErB,mBAAmB,EACnB,oBAAoB,EACvB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAiB,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAS3D,OAAO,EAAE,QAAQ,EAAiB,MAAM,2BAA2B,CAAC;AAGpE,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAK7D,eAAO,MAAM,wBAAwB,MAAM,CAAC;AAE5C,qBAAa,WAAW;IACpB,OAAc,uBAAuB,sBAQlC;WAEW,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;WAIvC,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;WAIrC,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;WAIxC,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;WAI1C,iBAAiB,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,EAAE,EAAE,EAAE,oBAAoB,GAAG,OAAO;WAqBvE,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;WAI7B,aAAa,CAAC,GAAG,EAAE,QAAQ,GAAG,MAAM;WAOpC,cAAc,CAAC,UAAU,EAAE,mBAAmB,GAAG,OAAO;WAcxD,iBAAiB,CAAC,UAAU,EAAE,mBAAmB,GAAG,OAAO;WAc3D,0BAA0B,CACpC,UAAU,EAAE,qBAAqB,EACjC,OAAO,GAAE,GAAG,CAAC,qBAAqB,CAAa,GAChD,OAAO;WA2BI,yBAAyB,CAAC,UAAU,EAAE,mBAAmB,GAAG,OAAO;WAUnE,uBAAuB,CAAC,UAAU,EAAE,mBAAmB,GAAG,OAAO;WAajE,4BAA4B,CACtC,cAAc,EAAE,cAAc,EAC9B,SAAS,EAAE,YAAY,GAAG,SAAS,GACpC,MAAM;WAeK,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;WAevC,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;CAY7C"}
+{"version":3,"file":"SourceUtils.d.ts","sourceRoot":"","sources":["../../../src/save/source/SourceUtils.ts"],"names":[],"mappings":"AAgBA,OAAO,EACH,qBAAqB,EAErB,mBAAmB,EACnB,oBAAoB,EACvB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAiB,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAS3D,OAAO,EAAE,QAAQ,EAAiB,MAAM,2BAA2B,CAAC;AAGpE,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAM7D,eAAO,MAAM,wBAAwB,MAAM,CAAC;AAE5C,qBAAa,WAAW;IACpB,OAAc,uBAAuB,sBAQlC;WAEW,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;WAIvC,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;WAIrC,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;WAIxC,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;WAI1C,iBAAiB,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,EAAE,EAAE,EAAE,oBAAoB,GAAG,OAAO;WAqBvE,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;WAI7B,aAAa,CAAC,GAAG,EAAE,QAAQ,GAAG,MAAM;WAOpC,cAAc,CAAC,UAAU,EAAE,mBAAmB,GAAG,OAAO;WAcxD,iBAAiB,CAAC,UAAU,EAAE,mBAAmB,GAAG,OAAO;WAc3D,0BAA0B,CACpC,UAAU,EAAE,qBAAqB,EACjC,OAAO,GAAE,GAAG,CAAC,qBAAqB,CAAa,GAChD,OAAO;WA2BI,yBAAyB,CAAC,UAAU,EAAE,mBAAmB,GAAG,OAAO;WAUnE,uBAAuB,CAAC,UAAU,EAAE,mBAAmB,GAAG,OAAO;WAajE,4BAA4B,CACtC,cAAc,EAAE,cAAc,EAC9B,SAAS,EAAE,YAAY,GAAG,SAAS,GACpC,MAAM;WAeK,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;WAevC,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;CAY7C"}

package/lib/save/source/SourceUtils.js

@@ -50,6 +50,7 @@ const ArkClass_1 = require("../../core/model/ArkClass");
 const logger_1 = __importStar(require("../../utils/logger"));
 const Const_1 = require("../../core/common/Const");
 const ohos_typescript_1 = __importDefault(require("ohos-typescript"));
+const Const_2 = require("../../core/common/Const");
 const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER, 'SourceUtils');
 exports.CLASS_CATEGORY_COMPONENT = 100;
 class SourceUtils {
@@ -60,7 +61,7 @@ class SourceUtils {
         return name === Const_1.DEFAULT_ARK_CLASS_NAME;
     }
     static isAnonymousMethod(name) {
-        return name.startsWith('AnonymousMethod-');
+        return name.startsWith(Const_1.ANONYMOUS_METHOD_PREFIX);
     }
     static isConstructorMethod(name) {
         return name === 'constructor';
@@ -83,7 +84,7 @@ class SourceUtils {
         return leftOp.getName() === op1.getName() && operator === op && op2.getValue() === '1';
     }
     static isTemp(name) {
-        return name.startsWith('$temp');
+        return name.startsWith(Const_2.TEMP_LOCAL_PREFIX);
     }
     static getOriginType(cls) {
         if (cls.hasComponentDecorator()) {

package/lib/transformer/StaticSingleAssignmentFormer.js

@@ -119,7 +119,7 @@ class StaticSingleAssignmentFormer {
                 }
             }
             for (const phi of phis) {
-                cfg.insertBefore(block.getHead(), phi);
+                cfg.insertBefore(phi, block.getHead());
             }
         }
     }

package/lib/utils/CfgStructualAnalysis.d.ts

@@ -32,6 +32,7 @@ export declare class AbstractFlowGraph {
     private buildDominator;
     private getBackEdges;
     private naturalLoop;
+    private isSelfLoopNode;
     private isForLoopIncNode;
     private isValidInBlocks;
     private isIfRegion;

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

@@ -1 +1 @@
-{"version":3,"file":"CfgStructualAnalysis.d.ts","sourceRoot":"","sources":["../../src/utils/CfgStructualAnalysis.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CfgStructualAnalysis.d.ts","sourceRoot":"","sources":["../../src/utils/CfgStructualAnalysis.ts"],"names":[],"mappings":"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"}

package/lib/utils/CfgStructualAnalysis.js

@@ -145,12 +145,15 @@ class AbstractFlowGraph {
         let dom = this.buildDominator();
         let loops = [];
         for (const header of this.nodes) {
-            let innermost = undefined;
+            let innermost;
             let longest = 0;
             let backEdges = this.getBackEdges(dom, header);
             if (backEdges.size === 0) {
                 continue;
             }
+            if (this.isSelfLoopNode(header)) {
+                loops.push(new Set([header]));
+            }
             for (const start of backEdges) {
                 let loop = this.naturalLoop(start, header);
                 if (!innermost || loop.size > longest) {
@@ -218,6 +221,21 @@ class AbstractFlowGraph {
         }
         return loop;
     }
+    isSelfLoopNode(node) {
+        let inSucc = false;
+        let inPred = false;
+        for (const pred of node.getPred()) {
+            if (pred === node) {
+                inPred = true;
+            }
+        }
+        for (const succ of node.getSucc()) {
+            if (succ === node) {
+                inSucc = true;
+            }
+        }
+        return inSucc && inPred;
+    }
     isForLoopIncNode(node) {
         for (const loop of this.loopMap.values()) {
             if (loop.getType() === RegionType.FOR_LOOP_REGION) {
@@ -401,6 +419,9 @@ class AbstractFlowGraph {
         }
         if (new Set(node.getPred()).has(node) && new Set(node.getSucc()).has(node)) {
             nodeSet.add(node);
+            if (inLoop) {
+                return region === null || region === void 0 ? void 0 : region.getType();
+            }
             return RegionType.SELF_LOOP_REGION;
         }
         if (node.getSucc().length !== 2) {
@@ -440,11 +461,15 @@ class AbstractFlowGraph {
         return undefined;
     }
     cyclicRegionType(nodeSet) {
-        var _a, _b;
+        var _a, _b, _c;
         let nodes = Array.from(nodeSet);
         let header = nodes[0];
         if (nodeSet.size === 1) {
-            return RegionType.SELF_LOOP_REGION;
+            let tail = (_a = nodes[0].getBlock()) === null || _a === void 0 ? void 0 : _a.getTail();
+            if (tail instanceof Stmt_1.ArkIfStmt) {
+                return RegionType.DO_WHILE_LOOP_REGION;
+            }
+            return RegionType.WHILE_LOOP_REGION;
         }
         let back = nodes[1];
         // exit loop from back
@@ -458,7 +483,7 @@ class AbstractFlowGraph {
             }
         }
         // for
-        if (back.getSucc().length === 1 && ((_b = (_a = back.getBlock()) === null || _a === void 0 ? void 0 : _a.getStmts()) === null || _b === void 0 ? void 0 : _b.length) === 1) {
+        if (back.getSucc().length === 1 && ((_c = (_b = back.getBlock()) === null || _b === void 0 ? void 0 : _b.getStmts()) === null || _c === void 0 ? void 0 : _c.length) === 1) {
             let isForLoop = true;
             for (const pred of header.getPred()) {
                 if (nodeSet.has(pred) && pred !== back) {
@@ -715,7 +740,12 @@ class NaturalLoopRegion extends Region {
         super(nset, type);
         let nodes = Array.from(nset);
         this.header = nodes[0];
-        this.back = nodes[1];
+        if (nset.size > 1) {
+            this.back = nodes[1];
+        }
+        else {
+            this.back = nodes[0];
+        }
         this.control = new Set([this.header]);
     }
     replace() {
@@ -794,7 +824,9 @@ class WhileLoopRegion extends NaturalLoopRegion {
     }
     traversal(callback) {
         this.header.traversal(callback, CodeBlockType.WHILE);
-        this.back.traversal(callback, CodeBlockType.NORMAL);
+        if (this.header !== this.back) {
+            this.back.traversal(callback, CodeBlockType.NORMAL);
+        }
         callback(undefined, CodeBlockType.COMPOUND_END);
     }
     getExitNode() {
@@ -809,7 +841,9 @@ class DoWhileLoopRegion extends NaturalLoopRegion {
     }
     traversal(callback) {
         callback(undefined, CodeBlockType.DO);
-        this.header.traversal(callback, CodeBlockType.NORMAL);
+        if (this.header !== this.back) {
+            this.header.traversal(callback, CodeBlockType.NORMAL);
+        }
         this.back.traversal(callback, CodeBlockType.DO_WHILE);
     }
     getExitNode() {

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;IAmBpD,QAAQ,CAAC,QAAQ,EAAE,cAAc,GAAG,QAAQ,GAAG,IAAI;IAmBnD,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;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"}

package/lib/utils/callGraphUtils.js

@@ -94,14 +94,12 @@ class SceneManager {
         let targetMethod = this._scene.getMethod(method);
         if (targetMethod == null) {
             // 支持SDK调用解析
-            let sdkMap = this.scene.getSdkArkFilesMap();
-            for (let file of sdkMap.values()) {
-                if (file.getFileSignature().toString() === method.getDeclaringClassSignature().getDeclaringFileSignature().toString()) {
-                    const methods = ModelUtils_1.ModelUtils.getAllMethodsInFile(file);
-                    for (let methodUnderFile of methods) {
-                        if (method.toString() === methodUnderFile.getSignature().toString()) {
-                            return methodUnderFile;
-                        }
+            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;
                     }
                 }
             }
@@ -113,8 +111,7 @@ class SceneManager {
             return null;
         let classInstance = this._scene.getClass(arkClass);
         if (classInstance == null) {
-            let sdkOrTargetProjectFile = this._scene.getSdkArkFilesMap()
-                .get(arkClass.getDeclaringFileSignature().toString());
+            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)) {

package/lib/utils/crypto_utils.d.ts

@@ -0,0 +1,6 @@
+export declare class CryptoUtils {
+    static sha256(content: string): string;
+    static hash(content: string, algorithm: string): string;
+    static hashcode(content: string): number;
+}
+//# sourceMappingURL=crypto_utils.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"crypto_utils.d.ts","sourceRoot":"","sources":["../../src/utils/crypto_utils.ts"],"names":[],"mappings":"AAiBA,qBAAa,WAAW;WAEN,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;WAI/B,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM;WAIhD,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;CAOlD"}

package/lib/utils/crypto_utils.js

@@ -0,0 +1,57 @@
+"use strict";
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CryptoUtils = void 0;
+const crypto = __importStar(require("crypto"));
+class CryptoUtils {
+    static sha256(content) {
+        return this.hash(content, 'sha256');
+    }
+    static hash(content, algorithm) {
+        return crypto.createHash(algorithm).update(content).digest('base64url');
+    }
+    static hashcode(content) {
+        let h = 0;
+        for (let i = 0; i < content.length; i++) {
+            h = Math.imul(31, h) + content.charCodeAt(i) | 0;
+        }
+        return h;
+    }
+}
+exports.CryptoUtils = CryptoUtils;

package/lib/utils/getAllFiles.d.ts

@@ -6,5 +6,5 @@
  * @param visited: Set<string> 用来存放已经访问过的路径，避免递归栈溢出，可不传，默认为空数组
  * @return string[] 提取出的文件的原始路径数组
  */
-export declare function getAllFiles(srcPath: string, exts: string[], filenameArr?: string[], visited?: Set<string>): string[];
+export declare function getAllFiles(srcPath: string, exts: string[], ignore?: string[], filenameArr?: string[], visited?: Set<string>): string[];
 //# sourceMappingURL=getAllFiles.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"getAllFiles.d.ts","sourceRoot":"","sources":["../../src/utils/getAllFiles.ts"],"names":[],"mappings":"AAoBA;;;;;;;GAOG;AACH,wBAAgB,WAAW,CACzB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EAAE,EACd,WAAW,GAAE,MAAM,EAAO,EAC1B,OAAO,GAAE,GAAG,CAAC,MAAM,CAAqB,GACvC,MAAM,EAAE,CAuCV"}
+{"version":3,"file":"getAllFiles.d.ts","sourceRoot":"","sources":["../../src/utils/getAllFiles.ts"],"names":[],"mappings":"AAoBA;;;;;;;GAOG;AACH,wBAAgB,WAAW,CACzB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EAAE,EACd,MAAM,GAAE,MAAM,EAAO,EACrB,WAAW,GAAE,MAAM,EAAO,EAC1B,OAAO,GAAE,GAAG,CAAC,MAAM,CAAqB,GACvC,MAAM,EAAE,CAoCV"}

package/lib/utils/getAllFiles.js

@@ -53,7 +53,8 @@ const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER,
  * @param visited: Set<string> 用来存放已经访问过的路径，避免递归栈溢出，可不传，默认为空数组
  * @return string[] 提取出的文件的原始路径数组
  */
-function getAllFiles(srcPath, exts, filenameArr = [], visited = new Set()) {
+function getAllFiles(srcPath, exts, ignore = [], filenameArr = [], visited = new Set()) {
+    let ignoreFiles = new Set(ignore);
     // 如果源目录不存在，直接结束程序
     if (!fs_1.default.existsSync(srcPath)) {
         logger.error(`Input directory is not exist, please check!`);
@@ -67,9 +68,7 @@ function getAllFiles(srcPath, exts, filenameArr = [], visited = new Set()) {
     visited.add(realSrc);
     // 遍历src，判断文件类型
     fs_1.default.readdirSync(realSrc).forEach(filename => {
-        if (filename === 'oh_modules' ||
-            filename === 'node_modules' ||
-            filename === 'hviforfile.ts') {
+        if (ignoreFiles.has(filename)) {
             return;
         }
         // 拼接文件的绝对路径
@@ -77,7 +76,7 @@ function getAllFiles(srcPath, exts, filenameArr = [], visited = new Set()) {
         //TODO: 增加排除文件后缀和目录
         // 如果是目录，递归提取
         if (fs_1.default.statSync(realFile).isDirectory()) {
-            getAllFiles(realFile, exts, filenameArr, visited);
+            getAllFiles(realFile, exts, ignore, filenameArr, visited);
         }
         else {
             // 如果是文件，则判断其扩展名是否在给定的扩展名数组中

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "arkanalyzer",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "files": [
     "docs",
-    "lib"
+    "lib",
+    "config"
   ],
   "main": "lib/index.js",
   "scripts": {