arkanalyzer 1.0.8 → 1.0.9

package/lib/callgraph/model/CallGraph.js

@@ -26,7 +26,7 @@ var CallGraphNodeKind;
     CallGraphNodeKind[CallGraphNodeKind["vitual"] = 1] = "vitual";
     CallGraphNodeKind[CallGraphNodeKind["intrinsic"] = 2] = "intrinsic";
     CallGraphNodeKind[CallGraphNodeKind["constructor"] = 3] = "constructor";
-})(CallGraphNodeKind = exports.CallGraphNodeKind || (exports.CallGraphNodeKind = {}));
+})(CallGraphNodeKind || (exports.CallGraphNodeKind = CallGraphNodeKind = {}));
 class CallSite {
     constructor(s, a, ce, cr) {
         this.callStmt = s;

package/lib/callgraph/pointerAnalysis/Pag.js

@@ -64,21 +64,21 @@ var PagEdgeKind;
     PagEdgeKind[PagEdgeKind["This"] = 4] = "This";
     PagEdgeKind[PagEdgeKind["Unknown"] = 5] = "Unknown";
     PagEdgeKind[PagEdgeKind["InterProceduralCopy"] = 6] = "InterProceduralCopy";
-})(PagEdgeKind = exports.PagEdgeKind || (exports.PagEdgeKind = {}));
+})(PagEdgeKind || (exports.PagEdgeKind = PagEdgeKind = {}));
 ;
 var StorageType;
 (function (StorageType) {
     StorageType[StorageType["APP_STORAGE"] = 0] = "APP_STORAGE";
     StorageType[StorageType["LOCAL_STORAGE"] = 1] = "LOCAL_STORAGE";
     StorageType[StorageType["Undefined"] = 2] = "Undefined";
-})(StorageType = exports.StorageType || (exports.StorageType = {}));
+})(StorageType || (exports.StorageType = StorageType = {}));
 ;
 var StorageLinkEdgeType;
 (function (StorageLinkEdgeType) {
     StorageLinkEdgeType[StorageLinkEdgeType["Property2Local"] = 0] = "Property2Local";
     StorageLinkEdgeType[StorageLinkEdgeType["Local2Property"] = 1] = "Local2Property";
     StorageLinkEdgeType[StorageLinkEdgeType["TwoWay"] = 2] = "TwoWay";
-})(StorageLinkEdgeType = exports.StorageLinkEdgeType || (exports.StorageLinkEdgeType = {}));
+})(StorageLinkEdgeType || (exports.StorageLinkEdgeType = StorageLinkEdgeType = {}));
 class PagEdge extends BaseGraph_1.BaseEdge {
     constructor(n, d, k, s) {
         super(n, d, k);
@@ -154,7 +154,7 @@ var PagNodeKind;
     PagNodeKind[PagNodeKind["Function"] = 5] = "Function";
     PagNodeKind[PagNodeKind["GlobalThis"] = 6] = "GlobalThis";
     PagNodeKind[PagNodeKind["ExportInfo"] = 7] = "ExportInfo";
-})(PagNodeKind = exports.PagNodeKind || (exports.PagNodeKind = {}));
+})(PagNodeKind || (exports.PagNodeKind = PagNodeKind = {}));
 class PagNode extends BaseGraph_1.BaseNode {
     constructor(id, cid = undefined, value, k, s) {
         super(id, k);

package/lib/core/base/Expr.js

@@ -710,7 +710,7 @@ var NormalBinaryOperator;
     // Logical
     NormalBinaryOperator["LogicalAnd"] = "&&";
     NormalBinaryOperator["LogicalOr"] = "||";
-})(NormalBinaryOperator = exports.NormalBinaryOperator || (exports.NormalBinaryOperator = {}));
+})(NormalBinaryOperator || (exports.NormalBinaryOperator = NormalBinaryOperator = {}));
 var RelationalBinaryOperator;
 (function (RelationalBinaryOperator) {
     RelationalBinaryOperator["LessThan"] = "<";
@@ -721,7 +721,7 @@ var RelationalBinaryOperator;
     RelationalBinaryOperator["InEquality"] = "!=";
     RelationalBinaryOperator["StrictEquality"] = "===";
     RelationalBinaryOperator["StrictInequality"] = "!==";
-})(RelationalBinaryOperator = exports.RelationalBinaryOperator || (exports.RelationalBinaryOperator = {}));
+})(RelationalBinaryOperator || (exports.RelationalBinaryOperator = RelationalBinaryOperator = {}));
 // 二元运算表达式
 class AbstractBinopExpr extends AbstractExpr {
     constructor(op1, op2, operator) {
@@ -1030,7 +1030,7 @@ var UnaryOperator;
     UnaryOperator["Neg"] = "-";
     UnaryOperator["BitwiseNot"] = "~";
     UnaryOperator["LogicalNot"] = "!";
-})(UnaryOperator = exports.UnaryOperator || (exports.UnaryOperator = {}));
+})(UnaryOperator || (exports.UnaryOperator = UnaryOperator = {}));
 // unary operation expression
 class ArkUnopExpr extends AbstractExpr {
     constructor(op, operator) {

package/lib/core/common/ArkError.js

@@ -25,4 +25,4 @@ var ArkErrorCode;
     ArkErrorCode[ArkErrorCode["CFG_HAS_UNREACHABLE_BLOCK"] = -5] = "CFG_HAS_UNREACHABLE_BLOCK";
     ArkErrorCode[ArkErrorCode["METHOD_SIGNATURE_UNDEFINED"] = -6] = "METHOD_SIGNATURE_UNDEFINED";
     ArkErrorCode[ArkErrorCode["METHOD_SIGNATURE_LINE_UNMATCHED"] = -7] = "METHOD_SIGNATURE_LINE_UNMATCHED";
-})(ArkErrorCode = exports.ArkErrorCode || (exports.ArkErrorCode = {}));
+})(ArkErrorCode || (exports.ArkErrorCode = ArkErrorCode = {}));

package/lib/core/common/ArkIRTransformer.d.ts

@@ -6,6 +6,7 @@ import { Stmt } from '../base/Stmt';
 import { AliasType, AliasTypeDeclaration } from '../base/Type';
 import { ArkMethod } from '../model/ArkMethod';
 import { FullPosition } from '../base/Position';
+export declare const DUMMY_INITIALIZER_STMT = "dummyInitializerStmt";
 type ValueAndStmts = {
     value: Value;
     valueOriginalPositions: FullPosition[];
@@ -16,12 +17,7 @@ export declare class DummyStmt extends Stmt {
     toString(): string;
 }
 export declare class ArkIRTransformer {
-    static readonly DUMMY_LOOP_INITIALIZER_STMT = "LoopInitializer";
-    static readonly DUMMY_CONDITIONAL_OPERATOR_IF_TRUE_STMT = "ConditionalOperatorIfTrue";
-    static readonly DUMMY_CONDITIONAL_OPERATOR_IF_FALSE_STMT = "ConditionalOperatorIfFalse";
-    static readonly DUMMY_CONDITIONAL_OPERATOR_END_STMT = "ConditionalOperatorEnd";
-    private conditionalOperatorNo;
-    private tempLocalNo;
+    private tempLocalIndex;
     private locals;
     private sourceFile;
     private declaringMethod;

package/lib/core/common/ArkIRTransformer.d.ts.map

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

package/lib/core/common/ArkIRTransformer.js

@@ -37,7 +37,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ArkIRTransformer = exports.DummyStmt = void 0;
+exports.ArkIRTransformer = exports.DummyStmt = exports.DUMMY_INITIALIZER_STMT = void 0;
 const Expr_1 = require("../base/Expr");
 const Ref_1 = require("../base/Ref");
 const ts = __importStar(require("ohos-typescript"));
@@ -62,6 +62,7 @@ const TSConst_1 = require("./TSConst");
 const builderUtils_1 = require("../model/builder/builderUtils");
 const Const_1 = require("./Const");
 const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER, 'ArkIRTransformer');
+exports.DUMMY_INITIALIZER_STMT = 'dummyInitializerStmt';
 class DummyStmt extends Stmt_1.Stmt {
     constructor(text) {
         super();
@@ -74,8 +75,7 @@ class DummyStmt extends Stmt_1.Stmt {
 exports.DummyStmt = DummyStmt;
 class ArkIRTransformer {
     constructor(sourceFile, declaringMethod) {
-        this.conditionalOperatorNo = 0;
-        this.tempLocalNo = 0;
+        this.tempLocalIndex = 0;
         this.locals = new Map();
         this.inBuilderMethod = false;
         this.aliasTypeMap = new Map();
@@ -277,7 +277,7 @@ class ArkIRTransformer {
         if (forStatement.initializer) {
             stmts.push(...this.tsNodeToValueAndStmts(forStatement.initializer).stmts);
         }
-        const dummyInitializerStmt = new DummyStmt(ArkIRTransformer.DUMMY_LOOP_INITIALIZER_STMT);
+        const dummyInitializerStmt = new DummyStmt(exports.DUMMY_INITIALIZER_STMT);
         stmts.push(dummyInitializerStmt);
         if (forStatement.condition) {
             const { value: conditionValue, stmts: conditionStmts, } = this.conditionToValueAndStmts(forStatement.condition);
@@ -387,7 +387,7 @@ class ArkIRTransformer {
     }
     whileStatementToStmts(whileStatement) {
         const stmts = [];
-        const dummyInitializerStmt = new DummyStmt(ArkIRTransformer.DUMMY_LOOP_INITIALIZER_STMT);
+        const dummyInitializerStmt = new DummyStmt(exports.DUMMY_INITIALIZER_STMT);
         stmts.push(dummyInitializerStmt);
         const { value: conditionExpr, stmts: conditionStmts, } = this.conditionToValueAndStmts(whileStatement.expression);
         stmts.push(...conditionStmts);
@@ -569,29 +569,23 @@ class ArkIRTransformer {
         };
     }
     conditionalExpressionToValueAndStmts(conditionalExpression) {
+        // TODO: separated by blocks
         const stmts = [];
-        const currConditionalOperatorIndex = this.conditionalOperatorNo++;
         const { value: conditionValue, valueOriginalPositions: conditionPositions, stmts: conditionStmts, } = this.conditionToValueAndStmts(conditionalExpression.condition);
         stmts.push(...conditionStmts);
         const ifStmt = new Stmt_1.ArkIfStmt(conditionValue);
         ifStmt.setOperandOriginalPositions(conditionPositions);
         stmts.push(ifStmt);
-        stmts.push(new DummyStmt(ArkIRTransformer.DUMMY_CONDITIONAL_OPERATOR_IF_TRUE_STMT + currConditionalOperatorIndex));
         const { value: whenTrueValue, valueOriginalPositions: whenTruePositions, stmts: whenTrueStmts } = this.tsNodeToValueAndStmts(conditionalExpression.whenTrue);
         stmts.push(...whenTrueStmts);
-        const resultLocal = this.generateTempLocal();
-        const assignStmtWhenTrue = new Stmt_1.ArkAssignStmt(resultLocal, whenTrueValue);
-        const resultLocalPosition = [whenTruePositions[0]];
-        assignStmtWhenTrue.setOperandOriginalPositions([...resultLocalPosition, ...whenTruePositions]);
-        stmts.push(assignStmtWhenTrue);
-        stmts.push(new DummyStmt(ArkIRTransformer.DUMMY_CONDITIONAL_OPERATOR_IF_FALSE_STMT + currConditionalOperatorIndex));
+        const { value: resultValue, valueOriginalPositions: resultPositions, stmts: tempStmts, } = this.generateAssignStmtForValue(whenTrueValue, whenTruePositions);
+        stmts.push(...tempStmts);
         const { value: whenFalseValue, valueOriginalPositions: whenFalsePositions, stmts: whenFalseStmts, } = this.tsNodeToValueAndStmts(conditionalExpression.whenFalse);
         stmts.push(...whenFalseStmts);
-        const assignStmt = new Stmt_1.ArkAssignStmt(resultLocal, whenFalseValue);
-        assignStmt.setOperandOriginalPositions([...resultLocalPosition, ...whenFalsePositions]);
+        const assignStmt = new Stmt_1.ArkAssignStmt(resultValue, whenFalseValue);
+        assignStmt.setOperandOriginalPositions([...resultPositions, ...whenFalsePositions]);
         stmts.push(assignStmt);
-        stmts.push(new DummyStmt(ArkIRTransformer.DUMMY_CONDITIONAL_OPERATOR_END_STMT + currConditionalOperatorIndex));
-        return { value: resultLocal, valueOriginalPositions: resultLocalPosition, stmts: stmts };
+        return { value: resultValue, valueOriginalPositions: resultPositions, stmts: stmts };
     }
     objectLiteralExpresionToValueAndStmts(objectLiteralExpression) {
         const declaringArkClass = this.declaringMethod.getDeclaringArkClass();
@@ -1454,8 +1448,8 @@ class ArkIRTransformer {
         return local;
     }
     generateTempLocal(localType = Type_1.UnknownType.getInstance()) {
-        const tempLocalName = Const_1.TEMP_LOCAL_PREFIX + this.tempLocalNo;
-        this.tempLocalNo++;
+        const tempLocalName = Const_1.TEMP_LOCAL_PREFIX + this.tempLocalIndex;
+        this.tempLocalIndex++;
         const tempLocal = new Local_1.Local(tempLocalName, localType);
         this.locals.set(tempLocalName, tempLocal);
         return tempLocal;
@@ -1713,7 +1707,3 @@ class ArkIRTransformer {
     }
 }
 exports.ArkIRTransformer = ArkIRTransformer;
-ArkIRTransformer.DUMMY_LOOP_INITIALIZER_STMT = 'LoopInitializer';
-ArkIRTransformer.DUMMY_CONDITIONAL_OPERATOR_IF_TRUE_STMT = 'ConditionalOperatorIfTrue';
-ArkIRTransformer.DUMMY_CONDITIONAL_OPERATOR_IF_FALSE_STMT = 'ConditionalOperatorIfFalse';
-ArkIRTransformer.DUMMY_CONDITIONAL_OPERATOR_END_STMT = 'ConditionalOperatorEnd';

package/lib/core/common/Builtin.js

@@ -57,7 +57,7 @@ Builtin.BUILT_IN_CLASSES = _a.buildBuiltInClasses();
 // signature for built-in class
 Builtin.DUMMY_PROJECT_NAME = 'ES2015';
 Builtin.DUMMY_FILE_NAME = 'BuiltinClass';
-Builtin.BUILT_IN_CLASSES_FILE_SIGNATURE = Builtin.buildBuiltInClassesFileSignature();
+Builtin.BUILT_IN_CLASSES_FILE_SIGNATURE = _a.buildBuiltInClassesFileSignature();
 Builtin.OBJECT_CLASS_SIGNATURE = _a.buildBuiltInClassSignature(_a.OBJECT);
 Builtin.ARRAY_CLASS_SIGNATURE = _a.buildBuiltInClassSignature(_a.ARRAY);
 Builtin.SET_CLASS_SIGNATURE = _a.buildBuiltInClassSignature(_a.SET);

package/lib/core/common/CfgBuilder.d.ts

@@ -123,19 +123,7 @@ export declare class CfgBuilder {
         locals: Set<Local>;
         aliasTypeMap: Map<string, [AliasType, AliasTypeDeclaration]>;
     };
-    private linkBasicBlocks;
-    private rebuildBlocksInConditionalOperator;
-    private traverseAndRebuildConditionalOperator;
-    private findConditionalOperator;
-    private adjustSuccessorOfConditionalOperator;
-    private removeUnnecessaryBlocksInConditionalOperator;
-    private replaceTempResultcursively;
-    private isNewDefLocal;
-    private rebuildBlocksInLoop;
-    private doesPrevBlockBuilderContainLoop;
     private insertBeforeConditionBlockBuilder;
-    private findIteratorIdx;
-    private adjustIncrementorStmts;
 }
 export {};
 //# sourceMappingURL=CfgBuilder.d.ts.map

package/lib/core/common/CfgBuilder.d.ts.map

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

package/lib/core/common/CfgBuilder.js

@@ -39,7 +39,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CfgBuilder = void 0;
 const ts = __importStar(require("ohos-typescript"));
-const Local_1 = require("../base/Local");
 const Stmt_1 = require("../base/Stmt");
 const BasicBlock_1 = require("../graph/BasicBlock");
 const Cfg_1 = require("../graph/Cfg");
@@ -1033,31 +1032,7 @@ class CfgBuilder {
             blockBuilderToCfgBlock.set(this.blocks[i], blockInCfg);
         }
         let currBlockId = this.blocks.length;
-        this.linkBasicBlocks(blockBuilderToCfgBlock);
-        this.rebuildBlocksInLoop(blockBuilderToCfgBlock, blocksContainLoopCondition, cfg);
-        this.rebuildBlocksInConditionalOperator(cfg);
-        for (const blockBuilder of this.blocks) {
-            if (blockBuilder.id === -1) {
-                blockBuilder.id = currBlockId++;
-                const block = blockBuilderToCfgBlock.get(blockBuilder);
-                block.setId(blockBuilder.id);
-            }
-        }
-        for (const block of cfg.getBlocks()) {
-            if (block.getId() === -1) {
-                block.setId(currBlockId++);
-            }
-        }
-        for (const stmt of cfg.getStmts()) {
-            stmt.setCfg(cfg);
-        }
-        return {
-            cfg: cfg,
-            locals: arkIRTransformer.getLocals(),
-            aliasTypeMap: arkIRTransformer.getAliasTypeMap(),
-        };
-    }
-    linkBasicBlocks(blockBuilderToCfgBlock) {
+        // link blocks
         for (const [blockBuilder, cfgBlock] of blockBuilderToCfgBlock) {
             for (const successorBlockBuilder of blockBuilder.nexts) {
                 if (!blockBuilderToCfgBlock.get(successorBlockBuilder)) {
@@ -1074,204 +1049,7 @@ class CfgBuilder {
                 cfgBlock.addPredecessorBlock(predecessorBlock);
             }
         }
-    }
-    rebuildBlocksInConditionalOperator(cfg) {
-        var _a;
-        for (const basicBlock of cfg.getBlocks()) {
-            const stmts = Array.from(basicBlock.getStmts());
-            const stmtCnt = stmts.length;
-            let endPos = -1;
-            for (let i = stmtCnt - 1; i >= 0; i--) {
-                const stmt = stmts[i];
-                if (stmt instanceof ArkIRTransformer_1.DummyStmt && ((_a = stmt.toString()) === null || _a === void 0 ? void 0 : _a.startsWith(ArkIRTransformer_1.ArkIRTransformer.DUMMY_CONDITIONAL_OPERATOR_END_STMT))) {
-                    endPos = i;
-                    break;
-                }
-            }
-            if (endPos === -1) {
-                continue;
-            }
-            const { topBlock, bottomBlocks, allBlocks, } = this.traverseAndRebuildConditionalOperator(stmts, 0, endPos);
-            basicBlock.getStmts().splice(topBlock.getStmts().length);
-            const succBlocksOfIfBlock = topBlock.getSuccessors();
-            succBlocksOfIfBlock.forEach((block) => {
-                block.setPredecessorBlock(0, basicBlock);
-            });
-            const conditionalOperatorBlockSet = new Set(allBlocks);
-            this.adjustSuccessorOfConditionalOperator(basicBlock, succBlocksOfIfBlock, stmts, bottomBlocks, endPos, conditionalOperatorBlockSet);
-            conditionalOperatorBlockSet.forEach((block) => {
-                if (block !== topBlock) {
-                    cfg.addBlock(block);
-                }
-            });
-        }
-    }
-    traverseAndRebuildConditionalOperator(stmts, beginPos, endPos) {
-        const { ifTruePos, ifFalsePos, conditionalOperatorEndPos } = this.findConditionalOperator(stmts, beginPos, endPos);
-        if (ifTruePos === -1) {
-            const block = new BasicBlock_1.BasicBlock();
-            block.getStmts().push(...stmts.slice(beginPos, endPos + 1));
-            return { topBlock: block, bottomBlocks: [], allBlocks: [block] };
-        }
-        const allBlocks = [];
-        const topBlock = new BasicBlock_1.BasicBlock();
-        topBlock.getStmts().push(...stmts.slice(beginPos, ifTruePos));
-        allBlocks.push(topBlock);
-        const { topBlock: ifTrueTopBlock, bottomBlocks: ifTrueBottomBlocks, allBlocks: ifTrueAllBlocks, } = this.traverseAndRebuildConditionalOperator(stmts, ifTruePos + 1, ifFalsePos - 1);
-        allBlocks.push(...ifTrueAllBlocks);
-        const { topBlock: ifFalseTopBlock, bottomBlocks: ifFalseBottomBlocks, allBlocks: ifFalseAllBlocks, } = this.traverseAndRebuildConditionalOperator(stmts, ifFalsePos + 1, conditionalOperatorEndPos - 1);
-        allBlocks.push(...ifFalseAllBlocks);
-        topBlock.addSuccessorBlock(ifTrueTopBlock);
-        topBlock.addSuccessorBlock(ifFalseTopBlock);
-        ifTrueTopBlock.addPredecessorBlock(topBlock);
-        ifFalseTopBlock.addPredecessorBlock(topBlock);
-        let bottomBlocks = [];
-        bottomBlocks.push(...(ifTrueBottomBlocks.length > 0 ? ifTrueBottomBlocks : [ifTrueTopBlock]));
-        bottomBlocks.push(...(ifFalseBottomBlocks.length > 0 ? ifFalseBottomBlocks : [ifFalseTopBlock]));
-        if (conditionalOperatorEndPos !== endPos) {
-            const bottomBlock = new BasicBlock_1.BasicBlock();
-            bottomBlock.getStmts().push(...stmts.slice(conditionalOperatorEndPos + 1, endPos + 1));
-            bottomBlocks.forEach(block => {
-                block.addSuccessorBlock(bottomBlock);
-                bottomBlock.addPredecessorBlock(block);
-            });
-            bottomBlocks = [bottomBlock];
-            allBlocks.push(bottomBlock);
-        }
-        return { topBlock: topBlock, bottomBlocks: bottomBlocks, allBlocks: allBlocks };
-    }
-    findConditionalOperator(stmts, beginPos, endPos) {
-        let ifTruePos = -1;
-        let ifFalsePos = -1;
-        let conditionalOperatorEndPos = -1;
-        let currConditionalOperatorNo = '';
-        for (let i = beginPos; i <= endPos; i++) {
-            const stmt = stmts[i];
-            if (stmt instanceof ArkIRTransformer_1.DummyStmt) {
-                if (stmt.toString()
-                    .startsWith(ArkIRTransformer_1.ArkIRTransformer.DUMMY_CONDITIONAL_OPERATOR_IF_TRUE_STMT) && ifTruePos === -1) {
-                    ifTruePos = i;
-                    currConditionalOperatorNo =
-                        stmt.toString().replace(ArkIRTransformer_1.ArkIRTransformer.DUMMY_CONDITIONAL_OPERATOR_IF_TRUE_STMT, '');
-                }
-                else if (stmt.toString() === ArkIRTransformer_1.ArkIRTransformer.DUMMY_CONDITIONAL_OPERATOR_IF_FALSE_STMT + currConditionalOperatorNo) {
-                    ifFalsePos = i;
-                }
-                else if (stmt.toString() === ArkIRTransformer_1.ArkIRTransformer.DUMMY_CONDITIONAL_OPERATOR_END_STMT + currConditionalOperatorNo) {
-                    conditionalOperatorEndPos = i;
-                }
-            }
-        }
-        return { ifTruePos: ifTruePos, ifFalsePos: ifFalsePos, conditionalOperatorEndPos: conditionalOperatorEndPos };
-    }
-    adjustSuccessorOfConditionalOperator(currBasicBlock, succBlocksOfIfBlock, stmts, bottomBlocks, conditionalOperatorEndPos, conditionalOperatorBlockSet) {
-        const oldSuccBlocks = Array.from(currBasicBlock.getSuccessors());
-        currBasicBlock.getSuccessors().splice(0, oldSuccBlocks.length, ...succBlocksOfIfBlock);
-        oldSuccBlocks.forEach((succBlock) => {
-            const originalPreds = succBlock.getPredecessors();
-            for (let i = 0; i < originalPreds.length; i++) {
-                if (originalPreds[i] === currBasicBlock) {
-                    succBlock.getPredecessors().splice(i, 1);
-                    break;
-                }
-            }
-        });
-        if (conditionalOperatorEndPos === stmts.length - 1) {
-            oldSuccBlocks.forEach((oldSuccBlock) => {
-                bottomBlocks.forEach((bottomBlock) => {
-                    bottomBlock.addSuccessorBlock(oldSuccBlock);
-                    oldSuccBlock.addSuccessorBlock(bottomBlock);
-                });
-            });
-        }
-        else {
-            const insertSuccBlock = new BasicBlock_1.BasicBlock();
-            insertSuccBlock.getStmts().push(...stmts.slice(conditionalOperatorEndPos + 1, stmts.length));
-            oldSuccBlocks.forEach((oldSuccBlock) => {
-                insertSuccBlock.addSuccessorBlock(oldSuccBlock);
-                oldSuccBlock.addPredecessorBlock(insertSuccBlock);
-            });
-            bottomBlocks.forEach((bottomBlock) => {
-                bottomBlock.addSuccessorBlock(insertSuccBlock);
-                insertSuccBlock.addPredecessorBlock(bottomBlock);
-            });
-            conditionalOperatorBlockSet.add(insertSuccBlock);
-            this.removeUnnecessaryBlocksInConditionalOperator(insertSuccBlock, conditionalOperatorBlockSet);
-        }
-    }
-    removeUnnecessaryBlocksInConditionalOperator(bottomBlock, allBlocks) {
-        const firstStmtInBottom = bottomBlock.getStmts()[0];
-        if (!(firstStmtInBottom instanceof Stmt_1.ArkAssignStmt)) {
-            return;
-        }
-        const targetValue = firstStmtInBottom.getLeftOp();
-        const tempResultValue = firstStmtInBottom.getRightOp();
-        if (!(targetValue instanceof Local_1.Local && IRUtils_1.IRUtils.isTempLocal(tempResultValue))) {
-            return;
-        }
-        bottomBlock.remove(firstStmtInBottom);
-        const oldPredecessors = bottomBlock.getPredecessors();
-        const newPredecessors = [];
-        for (const predecessor of oldPredecessors) {
-            newPredecessors.push(...this.replaceTempResultcursively(predecessor, targetValue, tempResultValue, allBlocks));
-        }
-        bottomBlock.getPredecessors().splice(0, oldPredecessors.length, ...newPredecessors);
-        newPredecessors.forEach((newPredecessor) => {
-            newPredecessor.setSuccessorBlock(0, bottomBlock);
-        });
-    }
-    replaceTempResultcursively(currBottomBlock, targetLocal, tempResultLocal, allBlocks) {
-        const stmts = currBottomBlock.getStmts();
-        const stmtsCnt = stmts.length;
-        let tempResultReassignStmt = null;
-        for (let i = stmtsCnt - 1; i >= 0; i--) {
-            const stmt = stmts[i];
-            if (stmt instanceof Stmt_1.ArkAssignStmt && stmt.getLeftOp() === tempResultLocal) {
-                if (IRUtils_1.IRUtils.isTempLocal(stmt.getRightOp()) && this.isNewDefLocal(stmt.getRightOp(), stmts, i)) {
-                    tempResultReassignStmt = stmt;
-                }
-                else {
-                    stmt.setLeftOp(targetLocal);
-                }
-            }
-        }
-        let newBottomBlocks = [];
-        if (tempResultReassignStmt) {
-            const oldPredecessors = currBottomBlock.getPredecessors();
-            const newPredecessors = [];
-            const prevTempResultLocal = tempResultReassignStmt.getRightOp();
-            for (const predecessor of oldPredecessors) {
-                newPredecessors.push(...this.replaceTempResultcursively(predecessor, targetLocal, prevTempResultLocal, allBlocks));
-            }
-            currBottomBlock.remove(tempResultReassignStmt);
-            if (currBottomBlock.getStmts().length === 0) {
-                // remove this block
-                newBottomBlocks = newPredecessors;
-                allBlocks.delete(currBottomBlock);
-            }
-            else {
-                currBottomBlock.getPredecessors().splice(0, oldPredecessors.length, ...newPredecessors);
-                newPredecessors.forEach((newPredecessor) => {
-                    newPredecessor.setSuccessorBlock(0, currBottomBlock);
-                });
-                newBottomBlocks = [currBottomBlock];
-            }
-        }
-        else {
-            newBottomBlocks = [currBottomBlock];
-        }
-        return newBottomBlocks;
-    }
-    isNewDefLocal(local, stmts, pos) {
-        for (let i = pos - 1; i >= 0; i++) {
-            const stmt = stmts[i];
-            if (stmt instanceof Stmt_1.ArkAssignStmt && stmt.getLeftOp() === local) {
-                return false;
-            }
-        }
-        return true;
-    }
-    rebuildBlocksInLoop(blockBuilderToCfgBlock, blocksContainLoopCondition, cfg) {
+        // put statements within loop in right position
         for (const blockBuilder of blocksContainLoopCondition) {
             if (!blockBuilderToCfgBlock.get(blockBuilder)) {
                 continue;
@@ -1280,11 +1058,38 @@ class CfgBuilder {
             const blockId = block.getId();
             const stmts = block.getStmts();
             const stmtsCnt = stmts.length;
-            const { ifStmtIdx, iteratorNextStmtIdx, dummyInitializerStmtIdx } = this.findIteratorIdx(stmts);
+            let ifStmtIdx = -1;
+            let iteratorNextStmtIdx = -1;
+            let dummyInitializerStmtIdx = -1;
+            for (let i = 0; i < stmtsCnt; i++) {
+                const stmt = stmts[i];
+                if (stmt instanceof Stmt_1.ArkAssignStmt && stmt.getRightOp() instanceof Expr_1.AbstractInvokeExpr) {
+                    const invokeExpr = stmt.getRightOp();
+                    if (invokeExpr.getMethodSignature().getMethodSubSignature().getMethodName() === Builtin_1.Builtin.ITERATOR_NEXT) {
+                        iteratorNextStmtIdx = i;
+                        continue;
+                    }
+                }
+                if (stmt.toString() === ArkIRTransformer_1.DUMMY_INITIALIZER_STMT) {
+                    dummyInitializerStmtIdx = i;
+                    continue;
+                }
+                if (stmt instanceof Stmt_1.ArkIfStmt) {
+                    ifStmtIdx = i;
+                    break;
+                }
+            }
             if (iteratorNextStmtIdx !== -1 || dummyInitializerStmtIdx !== -1) {
+                // put statements into block before condition
                 const lastStmtIdxBeforeCondition = iteratorNextStmtIdx !== -1 ? iteratorNextStmtIdx : dummyInitializerStmtIdx;
                 const stmtsInsertBeforeCondition = stmts.slice(0, lastStmtIdxBeforeCondition);
-                let prevBlockBuilderContainsLoop = this.doesPrevBlockBuilderContainLoop(blockBuilder, blockId, blocksContainLoopCondition);
+                let prevBlockBuilderContainsLoop = false;
+                for (const prevBlockBuilder of blockBuilder.lasts) {
+                    if (prevBlockBuilder.id < blockId && blocksContainLoopCondition.has(prevBlockBuilder)) {
+                        prevBlockBuilderContainsLoop = true;
+                        break;
+                    }
+                }
                 if (prevBlockBuilderContainsLoop) {
                     // should create an extra block when previous block contains loop condition
                     this.insertBeforeConditionBlockBuilder(blockBuilderToCfgBlock, blockBuilder, stmtsInsertBeforeCondition, false, cfg);
@@ -1296,7 +1101,23 @@ class CfgBuilder {
                 }
                 if (dummyInitializerStmtIdx !== -1 && ifStmtIdx !== stmtsCnt - 1) {
                     // put incrementor statements into block which reenters condition
-                    this.adjustIncrementorStmts(stmts, ifStmtIdx, blockBuilder, blockId, blockBuilderToCfgBlock, blocksContainLoopCondition, cfg);
+                    const stmtsReenterCondition = stmts.slice(ifStmtIdx + 1);
+                    const blockBuildersReenterCondition = [];
+                    for (const prevBlockBuilder of blockBuilder.lasts) {
+                        const prevBlock = blockBuilderToCfgBlock.get(prevBlockBuilder);
+                        if (prevBlock.getId() > blockId) {
+                            blockBuildersReenterCondition.push(prevBlockBuilder);
+                        }
+                    }
+                    if (blockBuildersReenterCondition.length > 1 || blocksContainLoopCondition.has(blockBuildersReenterCondition[0])) {
+                        // put incrementor statements into an extra block
+                        this.insertBeforeConditionBlockBuilder(blockBuilderToCfgBlock, blockBuilder, stmtsReenterCondition, true, cfg);
+                    }
+                    else {
+                        // put incrementor statements into prev reenter block
+                        const blockReenterCondition = blockBuilderToCfgBlock.get(blockBuildersReenterCondition[0]);
+                        blockReenterCondition === null || blockReenterCondition === void 0 ? void 0 : blockReenterCondition.getStmts().push(...stmtsReenterCondition);
+                    }
                 }
                 else if (iteratorNextStmtIdx !== -1) {
                     // put statements which get value of iterator into block after condition
@@ -1311,16 +1132,21 @@ class CfgBuilder {
                 stmts.splice(ifStmtIdx - firstStmtIdxInCondition + 1);
             }
         }
-    }
-    doesPrevBlockBuilderContainLoop(currBlockBuilder, currBlockId, blocksContainLoopCondition) {
-        let prevBlockBuilderContainsLoop = false;
-        for (const prevBlockBuilder of currBlockBuilder.lasts) {
-            if (prevBlockBuilder.id < currBlockId && blocksContainLoopCondition.has(prevBlockBuilder)) {
-                prevBlockBuilderContainsLoop = true;
-                break;
+        for (const blockBuilder of this.blocks) {
+            if (blockBuilder.id === -1) {
+                blockBuilder.id = currBlockId++;
+                const block = blockBuilderToCfgBlock.get(blockBuilder);
+                block.setId(blockBuilder.id);
             }
         }
-        return prevBlockBuilderContainsLoop;
+        for (const stmt of cfg.getStmts()) {
+            stmt.setCfg(cfg);
+        }
+        return {
+            cfg: cfg,
+            locals: arkIRTransformer.getLocals(),
+            aliasTypeMap: arkIRTransformer.getAliasTypeMap(),
+        };
     }
     insertBeforeConditionBlockBuilder(blockBuilderToCfgBlock, conditionBlockBuilder, stmtsInsertBeforeCondition, collectReenter, cfg) {
         const blockId = conditionBlockBuilder.id;
@@ -1384,54 +1210,5 @@ class CfgBuilder {
         cfg.addBlock(blockInsertBeforeCondition);
         blockBuilderToCfgBlock.set(blockBuilderInsertBeforeCondition, blockInsertBeforeCondition);
     }
-    findIteratorIdx(stmts) {
-        let ifStmtIdx = -1;
-        let iteratorNextStmtIdx = -1;
-        let dummyInitializerStmtIdx = -1;
-        const stmtsCnt = stmts.length;
-        for (let i = 0; i < stmtsCnt; i++) {
-            const stmt = stmts[i];
-            if (stmt instanceof Stmt_1.ArkAssignStmt && stmt.getRightOp() instanceof Expr_1.AbstractInvokeExpr) {
-                const invokeExpr = stmt.getRightOp();
-                if (invokeExpr.getMethodSignature().getMethodSubSignature()
-                    .getMethodName() === Builtin_1.Builtin.ITERATOR_NEXT) {
-                    iteratorNextStmtIdx = i;
-                    continue;
-                }
-            }
-            if (stmt.toString() === ArkIRTransformer_1.ArkIRTransformer.DUMMY_LOOP_INITIALIZER_STMT) {
-                dummyInitializerStmtIdx = i;
-                continue;
-            }
-            if (stmt instanceof Stmt_1.ArkIfStmt) {
-                ifStmtIdx = i;
-                break;
-            }
-        }
-        return {
-            ifStmtIdx: ifStmtIdx,
-            iteratorNextStmtIdx: iteratorNextStmtIdx,
-            dummyInitializerStmtIdx: dummyInitializerStmtIdx,
-        };
-    }
-    adjustIncrementorStmts(stmts, ifStmtIdx, currBlockBuilder, currBlockId, blockBuilderToCfgBlock, blocksContainLoopCondition, cfg) {
-        const stmtsReenterCondition = stmts.slice(ifStmtIdx + 1);
-        const blockBuildersReenterCondition = [];
-        for (const prevBlockBuilder of currBlockBuilder.lasts) {
-            const prevBlock = blockBuilderToCfgBlock.get(prevBlockBuilder);
-            if (prevBlock.getId() > currBlockId) {
-                blockBuildersReenterCondition.push(prevBlockBuilder);
-            }
-        }
-        if (blockBuildersReenterCondition.length > 1 || blocksContainLoopCondition.has(blockBuildersReenterCondition[0])) {
-            // put incrementor statements into an extra block
-            this.insertBeforeConditionBlockBuilder(blockBuilderToCfgBlock, currBlockBuilder, stmtsReenterCondition, true, cfg);
-        }
-        else {
-            // put incrementor statements into prev reenter block
-            const blockReenterCondition = blockBuilderToCfgBlock.get(blockBuildersReenterCondition[0]);
-            blockReenterCondition === null || blockReenterCondition === void 0 ? void 0 : blockReenterCondition.getStmts().push(...stmtsReenterCondition);
-        }
-    }
 }
 exports.CfgBuilder = CfgBuilder;

package/lib/core/common/IRUtils.d.ts

@@ -9,6 +9,5 @@ export declare class IRUtils {
     static generateTextForStmt(scene: Scene): void;
     static setLeadingComments(metadata: Stmt | ArkBaseModel, node: ts.Node, sourceFile: ts.SourceFile, options: SceneOptions): void;
     static getLeadingComments(node: ts.Node, sourceFile: ts.SourceFile, options: SceneOptions): string[];
-    static isTempLocal(value: Value): boolean;
 }
 //# sourceMappingURL=IRUtils.d.ts.map

package/lib/core/common/IRUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"IRUtils.d.ts","sourceRoot":"","sources":["../../../src/core/common/IRUtils.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,MAAM,iBAAiB,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE5C,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAIrD,qBAAa,OAAO;WACF,kBAAkB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO;WAczC,mBAAmB,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;WAWvC,kBAAkB,CAC5B,QAAQ,EAAE,IAAI,GAAG,YAAY,EAC7B,IAAI,EAAE,EAAE,CAAC,IAAI,EACb,UAAU,EAAE,EAAE,CAAC,UAAU,EACzB,OAAO,EAAE,YAAY,GACtB,IAAI;WAOO,kBAAkB,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,YAAY,GAAG,MAAM,EAAE;WAa7F,WAAW,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO;CAGnD"}
+{"version":3,"file":"IRUtils.d.ts","sourceRoot":"","sources":["../../../src/core/common/IRUtils.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,MAAM,iBAAiB,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE5C,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,qBAAa,OAAO;IAChB,MAAM,CAAC,kBAAkB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO;IAchD,MAAM,CAAC,mBAAmB,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAW9C,MAAM,CAAC,kBAAkB,CACrB,QAAQ,EAAE,IAAI,GAAG,YAAY,EAC7B,IAAI,EAAE,EAAE,CAAC,IAAI,EACb,UAAU,EAAE,EAAE,CAAC,UAAU,EACzB,OAAO,EAAE,YAAY,GACtB,IAAI;IAOP,MAAM,CAAC,kBAAkB,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,YAAY,GAAG,MAAM,EAAE;CAYvG"}

package/lib/core/common/IRUtils.js

@@ -22,8 +22,6 @@ const Expr_1 = require("../base/Expr");
 const Ref_1 = require("../base/Ref");
 const ohos_typescript_1 = __importDefault(require("ohos-typescript"));
 const ArkMetadata_1 = require("../model/ArkMetadata");
-const Local_1 = require("../base/Local");
-const Const_1 = require("./Const");
 class IRUtils {
     static moreThanOneAddress(value) {
         if (value instanceof Expr_1.AbstractBinopExpr ||
@@ -64,8 +62,5 @@ class IRUtils {
         }
         return comments;
     }
-    static isTempLocal(value) {
-        return value instanceof Local_1.Local && value.getName().startsWith(Const_1.NAME_PREFIX);
-    }
 }
 exports.IRUtils = IRUtils;

package/lib/core/model/ArkBaseModel.js

@@ -81,7 +81,7 @@ var ModifierType;
     ModifierType[ModifierType["OUT"] = 4096] = "OUT";
     ModifierType[ModifierType["OVERRIDE"] = 8192] = "OVERRIDE";
     ModifierType[ModifierType["DECLARE"] = 16384] = "DECLARE";
-})(ModifierType = exports.ModifierType || (exports.ModifierType = {}));
+})(ModifierType || (exports.ModifierType = ModifierType = {}));
 exports.MODIFIER_TYPE_MASK = 0xffff;
 const MODIFIER_TYPE_STRINGS = [
     'private',

package/lib/core/model/ArkClass.js

@@ -30,7 +30,7 @@ var ClassCategory;
     ClassCategory[ClassCategory["ENUM"] = 3] = "ENUM";
     ClassCategory[ClassCategory["TYPE_LITERAL"] = 4] = "TYPE_LITERAL";
     ClassCategory[ClassCategory["OBJECT"] = 5] = "OBJECT";
-})(ClassCategory = exports.ClassCategory || (exports.ClassCategory = {}));
+})(ClassCategory || (exports.ClassCategory = ClassCategory = {}));
 /**
  * @category core/model
  */

package/lib/core/model/ArkExport.js

@@ -27,7 +27,7 @@ var ExportType;
     ExportType[ExportType["LOCAL"] = 3] = "LOCAL";
     ExportType[ExportType["TYPE"] = 4] = "TYPE";
     ExportType[ExportType["UNKNOWN"] = 9] = "UNKNOWN";
-})(ExportType = exports.ExportType || (exports.ExportType = {}));
+})(ExportType || (exports.ExportType = ExportType = {}));
 /**
  * @category core/model
  */

package/lib/core/model/ArkField.js

@@ -27,7 +27,7 @@ var FieldCategory;
     FieldCategory[FieldCategory["ENUM_MEMBER"] = 5] = "ENUM_MEMBER";
     FieldCategory[FieldCategory["INDEX_SIGNATURE"] = 6] = "INDEX_SIGNATURE";
     FieldCategory[FieldCategory["GET_ACCESSOR"] = 7] = "GET_ACCESSOR";
-})(FieldCategory = exports.FieldCategory || (exports.FieldCategory = {}));
+})(FieldCategory || (exports.FieldCategory = FieldCategory = {}));
 /**
  * @category core/model
  */

package/lib/core/model/ArkMetadata.js

@@ -18,7 +18,7 @@ exports.ArkMetadata = exports.ArkMetadataKind = void 0;
 var ArkMetadataKind;
 (function (ArkMetadataKind) {
     ArkMetadataKind[ArkMetadataKind["LEADING_COMMENTS"] = 0] = "LEADING_COMMENTS";
-})(ArkMetadataKind = exports.ArkMetadataKind || (exports.ArkMetadataKind = {}));
+})(ArkMetadataKind || (exports.ArkMetadataKind = ArkMetadataKind = {}));
 /**
  * ArkMetadata
  * @example

package/lib/utils/CfgStructualAnalysis.js

@@ -28,7 +28,7 @@ var CodeBlockType;
     CodeBlockType[CodeBlockType["WHILE"] = 7] = "WHILE";
     CodeBlockType[CodeBlockType["FOR"] = 8] = "FOR";
     CodeBlockType[CodeBlockType["COMPOUND_END"] = 9] = "COMPOUND_END";
-})(CodeBlockType = exports.CodeBlockType || (exports.CodeBlockType = {}));
+})(CodeBlockType || (exports.CodeBlockType = CodeBlockType = {}));
 class AbstractFlowGraph {
     constructor(cfg) {
         this.nodes = [];

package/lib/utils/entryMethodUtils.js

@@ -21,14 +21,14 @@ exports.addCfg2Stmt = exports.getCallbackMethodFromStmt = exports.getAbilities =
 const path_1 = __importDefault(require("path"));
 const Type_1 = require("../core/base/Type");
 exports.LIFECYCLE_METHOD_NAME = [
-    'onCreate',
-    'onDestroy',
-    'onWindowStageCreate',
-    'onWindowStageDestroy',
-    'onForeground',
-    'onBackground',
-    'onBackup',
-    'onRestore',
+    'onCreate', // 组件实例创建
+    'onDestroy', // 组件实例销毁
+    'onWindowStageCreate', // 窗口创建
+    'onWindowStageDestroy', // 窗口销毁
+    'onForeground', // 应用进入前台
+    'onBackground', // 应用进入后台
+    'onBackup', // 应用数据备份
+    'onRestore', // 应用数据恢复
     'onContinue',
     'onNewWant',
     'onDump',
@@ -49,21 +49,21 @@ exports.LIFECYCLE_METHOD_NAME = [
     'onWindowStageWillDestroy',
 ];
 exports.CALLBACK_METHOD_NAME = [
-    "onClick",
-    "onTouch",
-    "onAppear",
-    "onDisAppear",
-    "onDragStart",
-    "onDragEnter",
-    "onDragMove",
-    "onDragLeave",
-    "onDrop",
-    "onKeyEvent",
-    "onFocus",
-    "onBlur",
-    "onHover",
-    "onMouse",
-    "onAreaChange",
+    "onClick", // 点击事件，当用户点击组件时触发
+    "onTouch", // 触摸事件，当手指在组件上按下、滑动、抬起时触发
+    "onAppear", // 组件挂载显示时触发
+    "onDisAppear", // 组件卸载消失时触发
+    "onDragStart", // 拖拽开始事件，当组件被长按后开始拖拽时触发
+    "onDragEnter", // 拖拽进入组件范围时触发
+    "onDragMove", // 拖拽在组件范围内移动时触发
+    "onDragLeave", // 拖拽离开组件范围内时触发
+    "onDrop", // 拖拽释放目标，当在本组件范围内停止拖拽行为时触发
+    "onKeyEvent", // 按键事件，当组件获焦后，按键动作触发
+    "onFocus", // 焦点事件，当组件获取焦点时触发
+    "onBlur", // 当组件失去焦点时触发的回调
+    "onHover", // 鼠标悬浮事件，鼠标进入或退出组件时触发
+    "onMouse", // 鼠标事件，当鼠标按键点击或在组件上移动时触发
+    "onAreaChange", // 组件区域变化事件，组件尺寸、位置变化时触发
     "onVisibleAreaChange", // 组件可见区域变化事件，组件在屏幕中的显示区域面积变化时触发
 ];
 exports.COMPONENT_LIFECYCLE_METHOD_NAME = [

package/lib/utils/logger.js

@@ -23,14 +23,14 @@ var LOG_LEVEL;
     LOG_LEVEL["INFO"] = "INFO";
     LOG_LEVEL["DEBUG"] = "DEBUG";
     LOG_LEVEL["TRACE"] = "TRACE";
-})(LOG_LEVEL = exports.LOG_LEVEL || (exports.LOG_LEVEL = {}));
+})(LOG_LEVEL || (exports.LOG_LEVEL = LOG_LEVEL = {}));
 var LOG_MODULE_TYPE;
 (function (LOG_MODULE_TYPE) {
     LOG_MODULE_TYPE["DEFAULT"] = "default";
     LOG_MODULE_TYPE["ARKANALYZER"] = "ArkAnalyzer";
     LOG_MODULE_TYPE["HOMECHECK"] = "HomeCheck";
     LOG_MODULE_TYPE["TOOL"] = "Tool";
-})(LOG_MODULE_TYPE = exports.LOG_MODULE_TYPE || (exports.LOG_MODULE_TYPE = {}));
+})(LOG_MODULE_TYPE || (exports.LOG_MODULE_TYPE = LOG_MODULE_TYPE = {}));
 class ConsoleLogger {
     static configure(logFilePath, arkanalyzer_level = LOG_LEVEL.ERROR, tool_level = LOG_LEVEL.INFO) {
         (0, log4js_1.configure)({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arkanalyzer",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "files": [
     "docs",
     "lib",

package/docs/IR2ts-stmt.md

@@ -1,81 +0,0 @@
-```Mermaid
-classDiagram
-    class TransformerContext {
-        getDeclaringArkNamespace(): ArkNamespace | undefined;
-        getMethod(signature: MethodSignature): ArkMethod | null;
-        getClass(signature: ClassSignature): ArkClass | null;
-        getPrinter(): ArkCodeBuffer;
-        transTemp2Code(temp: Local): string;
-    }
-
-    <<Interface>> TransformerContext
-
-    class StmtPrinterContext {
-        getStmtReader(): StmtReader;
-        setSkipStmt(stmt: Stmt): void;
-
-        setTempCode(temp: string, code: string): void;
-        hasTempVisit(temp: string): boolean;
-        setTempVisit(temp: string): void;
-    }   
-    StmtPrinterContext --|> TransformerContext
-    <<Interface>> StmtPrinterContext
-
-    class SourceStmt {
-        constructor(context: StmtPrinterContext, original: Stmt);
-        getLine(): number;
-        dump(): string;
-    }
-    <<Abstract>> SourceStmt
-    SourceStmt --> StmtPrinterContext
-
-    class SourceAssignStmt {
-
-    }
-    SourceAssignStmt --|> SourceStmt
-
-    class SourceInvokeStmt {
-
-    }
-
-    SourceInvokeStmt --|> SourceStmt
-
-    class SourceIfStmt {
-
-    }
-    SourceIfStmt --|> SourceStmt
-
-    class SourceWhileStmt {
-
-    }
-
-    SourceWhileStmt --|> SourceStmt
-
-    class SourceForStmt {
-
-    }
-    SourceForStmt --|> SourceStmt
-    class SourceDoWhileStmt {
-
-    }
-    SourceDoWhileStmt --|> SourceStmt
-
-    class SourceDoStmt {
-
-    }
-    SourceDoStmt --|> SourceStmt
-
-    class SourceBody {
-
-    }
-    SourceBody --|> StmtPrinterContext
-    SourceBody --> SourceStmt
-
-    class AbstractFlowGraph {
-
-    }
-
-    AbstractFlowGraph o-- BasicBlock
-
-    SourceBody --> AbstractFlowGraph
-```

package/docs/IR2ts.md

@@ -1,82 +0,0 @@
-```Mermaid
-classDiagram
-    class ArkCodeBuffer {
-        write(s: string) this
-        toString() string
-    }
-
-    class ArkStream {
-        write(s: string) this
-        close() void
-    }
-
-    ArkStream --|> ArkCodeBuffer
-
-    class Printer {
-        abstract dump(): string
-    }
-    <<Abstract>> Printer
-    Printer --> ArkCodeBuffer
-
-
-    class DotMethodPrinter {
-        constructor(method: ArkMethod)
-        dump(): string
-    }
-    DotMethodPrinter --|> Printer
-
-    class SourceFilePrinter {
-        constructor(arkFile: ArkFile)
-        public dump(): string
-    }
-    SourceFilePrinter --|> Printer
-
-    class SourceBase {
-        constructor(arkFile: ArkFile, indent: string = '')
-    }
-
-    SourceBase --|> Printer
-
-    class SourceNamespace {
-        constructor(ns: ArkNamespace, indent: string = '')
-    }
-
-    SourceNamespace --|> SourceBase
-
-    class SourceClass {
-        constructor(cls: ArkClass, indent: string = '')
-    }
-
-    SourceClass --|> SourceBase
-
-    class SourceField {
-        constructor(field: ArkField, indent: string = '', initializer: Map<string, string>)
-    }
-
-    SourceField --|> SourceBase
-
-    class SourceMethod {
-        constructor(method: ArkMethod, indent: string = '')
-    }
-
-    SourceMethod --|> SourceBase
-
-    class SourceExportInfo {
-        constructor(info: ExportInfo, indent: string = '')
-    }
-
-    SourceExportInfo --|> SourceBase
-
-    class SourceImportInfo {
-        constructor(info: ImportInfo, indent: string = '')
-    }
-    SourceImportInfo --|> SourceBase
-
-    class TransformerContext {
-        getPrinter(): ArkCodeBuffer
-        transTemp2Code(temp: Local): string
-    }
-
-    <<Interface>> TransformerContext
-    SourceBase --|> TransformerContext
-```