arkanalyzer 1.0.81 → 1.0.83

package/lib/core/common/DummyMainCreater.js

@@ -32,6 +32,11 @@ const ArkSignatureBuilder_1 = require("../model/builder/ArkSignatureBuilder");
 const TSConst_1 = require("./TSConst");
 const ArkMethodBuilder_1 = require("../model/builder/ArkMethodBuilder");
 const ValueUtil_1 = require("./ValueUtil");
+const Const_1 = require("./Const");
+const Ref_1 = require("../base/Ref");
+const EtsConst_1 = require("./EtsConst");
+const COMPONENT_BASE_CLASSES = ['CustomComponent', 'ViewPU'];
+const ABILITY_BASE_CLASSES = ['UIExtensionAbility', 'Ability', 'FormExtensionAbility', 'UIAbility', 'BackupExtensionAbility'];
 /**
 收集所有的onCreate，onStart等函数，构造一个虚拟函数，具体为：
 %statInit()
@@ -57,96 +62,90 @@ return
  */
 class DummyMainCreater {
     constructor(scene) {
+        // entryMethods includes all UIAbility and Component lifecycle methods as well as all callback methods, but exclude the start and end methods
         this.entryMethods = [];
+        this.entryClasses = [];
+        this.abilityCreateMethods = [];
+        this.abilityStageCreateMethods = [];
+        this.abilityStageDestroyMethods = [];
+        this.abilityDestroyMethods = [];
+        this.componentAppearMethods = [];
+        this.componentDisappearMethods = [];
+        this.componentDetachedMethods = [];
+        // every declaring class of method in entryMethods have its instance local which is used to be the base of instance invoke expr
         this.classLocalMap = new Map();
         this.dummyMain = new ArkMethod_1.ArkMethod();
         this.tempLocalIndex = 0;
+        this.tempBlockIndex = 0;
         this.scene = scene;
         // Currently get entries from module.json5 can't visit all of abilities
-        // Todo: handle ablity/component jump, then get entries from module.json5
-        this.entryMethods = this.getMethodsFromAllAbilities();
-        this.entryMethods.push(...this.getEntryMethodsFromComponents());
-        this.entryMethods.push(...this.getCallbackMethods());
+        // Todo: handle ability/component jump, then get entries from module.json5
+        this.getMethodsFromAllAbilities();
+        this.getEntryMethodsFromComponents();
+        this.getCallbackMethods();
     }
     setEntryMethods(methods) {
         this.entryMethods = methods;
     }
     createDummyMain() {
         var _a;
-        const dummyMainFile = new ArkFile_1.ArkFile(ArkFile_1.Language.JAVASCRIPT);
+        // step1: create dummy file
+        const dummyMainFile = new ArkFile_1.ArkFile(ArkFile_1.Language.ARKTS1_1);
         dummyMainFile.setScene(this.scene);
-        const dummyMainFileSignature = new ArkSignature_1.FileSignature(this.scene.getProjectName(), '@dummyFile');
+        const dummyMainFileSignature = new ArkSignature_1.FileSignature(this.scene.getProjectName(), Const_1.DUMMY_FILE);
         dummyMainFile.setFileSignature(dummyMainFileSignature);
         this.scene.setFile(dummyMainFile);
+        // step2: create dummy class
         const dummyMainClass = new ArkClass_1.ArkClass();
         dummyMainClass.setDeclaringArkFile(dummyMainFile);
-        const dummyMainClassSignature = new ArkSignature_1.ClassSignature('@dummyClass', dummyMainClass.getDeclaringArkFile().getFileSignature(), ((_a = dummyMainClass.getDeclaringArkNamespace()) === null || _a === void 0 ? void 0 : _a.getSignature()) || null);
+        const dummyMainClassSignature = new ArkSignature_1.ClassSignature(Const_1.DUMMY_CLASS, dummyMainClass.getDeclaringArkFile().getFileSignature(), ((_a = dummyMainClass.getDeclaringArkNamespace()) === null || _a === void 0 ? void 0 : _a.getSignature()) || null);
         dummyMainClass.setSignature(dummyMainClassSignature);
         dummyMainFile.addArkClass(dummyMainClass);
-        this.dummyMain = new ArkMethod_1.ArkMethod();
+        // step3: create dummy method
         this.dummyMain.setDeclaringArkClass(dummyMainClass);
-        const methodSubSignature = ArkSignatureBuilder_1.ArkSignatureBuilder.buildMethodSubSignatureFromMethodName('@dummyMain');
+        const methodSubSignature = ArkSignatureBuilder_1.ArkSignatureBuilder.buildMethodSubSignatureFromMethodName(Const_1.DUMMY_METHOD);
         const methodSignature = new ArkSignature_1.MethodSignature(this.dummyMain.getDeclaringArkClass().getSignature(), methodSubSignature);
         this.dummyMain.setImplementationSignature(methodSignature);
         this.dummyMain.setLineCol(0);
+        this.dummyMain.setIsGeneratedFlag(true);
         (0, ArkMethodBuilder_1.checkAndUpdateMethod)(this.dummyMain, dummyMainClass);
         dummyMainClass.addMethod(this.dummyMain);
-        let defaultMethods = [];
-        for (const method of this.entryMethods) {
-            if (method.getDeclaringArkClass().isDefaultArkClass() || method.isStatic()) {
-                defaultMethods.push(method);
+        this.scene.addToMethodsMap(this.dummyMain);
+        // step4: create instance local for each class
+        for (const cls of this.entryClasses) {
+            if (cls.isDefaultArkClass()) {
                 continue;
             }
-            const declaringArkClass = method.getDeclaringArkClass();
-            let newLocal = null;
-            for (const local of this.classLocalMap.values()) {
-                if ((local === null || local === void 0 ? void 0 : local.getType()).getClassSignature() === declaringArkClass.getSignature()) {
-                    newLocal = local;
-                    break;
-                }
-            }
+            let newLocal = this.classLocalMap.get(cls);
             if (!newLocal) {
-                newLocal = new Local_1.Local('%' + this.tempLocalIndex, new Type_1.ClassType(declaringArkClass.getSignature()));
-                this.tempLocalIndex++;
+                newLocal = new Local_1.Local('%' + this.tempLocalIndex++, new Type_1.ClassType(cls.getSignature()));
+                this.classLocalMap.set(cls, newLocal);
             }
-            this.classLocalMap.set(method, newLocal);
-        }
-        for (const defaultMethod of defaultMethods) {
-            this.classLocalMap.set(defaultMethod, null);
         }
-        const localSet = new Set(Array.from(this.classLocalMap.values()).filter((value) => value !== null));
-        const dummyBody = new ArkBody_1.ArkBody(localSet, this.createDummyMainCfg());
-        this.dummyMain.setBody(dummyBody);
+        // step5: create dummy method body
+        const localSet = new Set(this.classLocalMap.values());
+        const dummyCfg = new Cfg_1.Cfg();
+        this.dummyMain.setBody(new ArkBody_1.ArkBody(localSet, dummyCfg));
+        dummyCfg.setDeclaringMethod(this.dummyMain);
+        this.createDummyMainCfg();
         this.addCfg2Stmt();
-        this.scene.addToMethodsMap(this.dummyMain);
     }
-    addStaticInit(dummyCfg, firstBlock) {
-        let isStartingStmt = true;
+    addStaticInit(firstBlock) {
         for (const method of this.scene.getStaticInitMethods()) {
             const staticInvokeExpr = new Expr_1.ArkStaticInvokeExpr(method.getSignature(), []);
             const invokeStmt = new Stmt_1.ArkInvokeStmt(staticInvokeExpr);
-            if (isStartingStmt) {
-                dummyCfg.setStartingStmt(invokeStmt);
-                isStartingStmt = false;
-            }
             firstBlock.addStmt(invokeStmt);
         }
     }
     addClassInit(firstBlock) {
-        const locals = Array.from(new Set(this.classLocalMap.values()));
-        for (const local of locals) {
-            if (!local) {
-                continue;
-            }
-            let clsType = local.getType();
-            let cls = this.scene.getClass(clsType.getClassSignature());
-            const assStmt = new Stmt_1.ArkAssignStmt(local, new Expr_1.ArkNewExpr(clsType));
+        for (const [cls, local] of this.classLocalMap) {
+            const assStmt = new Stmt_1.ArkAssignStmt(local, new Expr_1.ArkNewExpr(cls.getSignature().getType()));
             firstBlock.addStmt(assStmt);
             local.setDeclaringStmt(assStmt);
             let consMtd = cls.getMethodWithName(TSConst_1.CONSTRUCTOR_NAME);
             if (consMtd) {
                 let ivkExpr = new Expr_1.ArkInstanceInvokeExpr(local, consMtd.getSignature(), []);
-                let ivkStmt = new Stmt_1.ArkInvokeStmt(ivkExpr);
+                let ivkStmt = new Stmt_1.ArkAssignStmt(local, ivkExpr);
                 firstBlock.addStmt(ivkStmt);
             }
         }
@@ -184,64 +183,84 @@ class DummyMainCreater {
             count++;
             const condition = new Expr_1.ArkConditionExpr(countLocal, new Constant_1.Constant(count.toString(), Type_1.NumberType.getInstance()), Expr_1.RelationalBinaryOperator.Equality);
             const ifStmt = new Stmt_1.ArkIfStmt(condition);
-            const ifBlock = new BasicBlock_1.BasicBlock();
+            const ifBlock = new BasicBlock_1.BasicBlock(this.tempBlockIndex++);
             ifBlock.addStmt(ifStmt);
             dummyCfg.addBlock(ifBlock);
             for (const block of lastBlocks) {
-                ifBlock.addPredecessorBlock(block);
-                block.addSuccessorBlock(ifBlock);
-            }
-            const invokeBlock = new BasicBlock_1.BasicBlock();
-            const paramLocals = [];
-            this.addParamInit(method, paramLocals, invokeBlock);
-            const local = this.classLocalMap.get(method);
-            let invokeExpr;
-            if (local) {
-                invokeExpr = new Expr_1.ArkInstanceInvokeExpr(local, method.getSignature(), paramLocals);
-            }
-            else {
-                invokeExpr = new Expr_1.ArkStaticInvokeExpr(method.getSignature(), paramLocals);
+                this.linkBlocks(block, ifBlock);
             }
-            const invokeStmt = new Stmt_1.ArkInvokeStmt(invokeExpr);
-            invokeBlock.addStmt(invokeStmt);
+            const invokeBlock = new BasicBlock_1.BasicBlock(this.tempBlockIndex++);
+            this.addMethodsInvokeStmt(invokeBlock, [method]);
             dummyCfg.addBlock(invokeBlock);
-            ifBlock.addSuccessorBlock(invokeBlock);
-            invokeBlock.addPredecessorBlock(ifBlock);
+            this.linkBlocks(ifBlock, invokeBlock);
             lastBlocks = [ifBlock, invokeBlock];
         }
         for (const block of lastBlocks) {
-            block.addSuccessorBlock(whileBlock);
-            whileBlock.addPredecessorBlock(block);
+            this.linkBlocks(block, whileBlock);
         }
     }
     createDummyMainCfg() {
-        const dummyCfg = new Cfg_1.Cfg();
-        dummyCfg.setDeclaringMethod(this.dummyMain);
-        const firstBlock = new BasicBlock_1.BasicBlock();
-        this.addStaticInit(dummyCfg, firstBlock);
+        const dummyCfg = this.dummyMain.getCfg();
+        // step1: create the first block which includes:
+        // 1. all static invoke of static init methods
+        // 2. all class new expr
+        // 3. all instance invoke of instance init methods
+        // 4. all start lifecycle methods in sequence
+        const firstBlock = new BasicBlock_1.BasicBlock(this.tempBlockIndex++);
+        const dummyClassType = new Type_1.ClassType(this.dummyMain.getDeclaringArkClass().getSignature());
+        const startingStmt = new Stmt_1.ArkAssignStmt(new Local_1.Local(TSConst_1.THIS_NAME, dummyClassType), new Ref_1.ArkThisRef(dummyClassType));
+        firstBlock.addStmt(startingStmt);
+        dummyCfg.setStartingStmt(startingStmt);
+        this.addStaticInit(firstBlock);
         this.addClassInit(firstBlock);
+        this.addMethodsInvokeStmt(firstBlock, this.abilityCreateMethods);
+        this.addMethodsInvokeStmt(firstBlock, this.abilityStageCreateMethods);
+        this.addMethodsInvokeStmt(firstBlock, this.componentAppearMethods);
         const countLocal = new Local_1.Local('count', Type_1.NumberType.getInstance());
+        this.dummyMain.getBody().addLocal(countLocal.getName(), countLocal);
         const zero = ValueUtil_1.ValueUtil.getOrCreateNumberConst(0);
         const countAssignStmt = new Stmt_1.ArkAssignStmt(countLocal, zero);
-        const truE = ValueUtil_1.ValueUtil.getBooleanConstant(true);
-        const conditionTrue = new Expr_1.ArkConditionExpr(truE, zero, Expr_1.RelationalBinaryOperator.Equality);
-        const whileStmt = new Stmt_1.ArkIfStmt(conditionTrue);
         firstBlock.addStmt(countAssignStmt);
         dummyCfg.addBlock(firstBlock);
-        dummyCfg.setStartingStmt(firstBlock.getHead());
-        const whileBlock = new BasicBlock_1.BasicBlock();
+        // step2: create the while condition block
+        const whileBlock = new BasicBlock_1.BasicBlock(this.tempBlockIndex++);
+        const conditionTrue = new Expr_1.ArkConditionExpr(ValueUtil_1.ValueUtil.getBooleanConstant(true), ValueUtil_1.ValueUtil.getBooleanConstant(false), Expr_1.RelationalBinaryOperator.InEquality);
+        const whileStmt = new Stmt_1.ArkIfStmt(conditionTrue);
         whileBlock.addStmt(whileStmt);
         dummyCfg.addBlock(whileBlock);
-        firstBlock.addSuccessorBlock(whileBlock);
-        whileBlock.addPredecessorBlock(firstBlock);
+        this.linkBlocks(firstBlock, whileBlock);
+        // step3: create the following cfgs
         this.addBranches(whileBlock, countLocal, dummyCfg);
+        // step4: create the last return block
+        const returnBlock = new BasicBlock_1.BasicBlock(this.tempBlockIndex++);
+        this.addMethodsInvokeStmt(returnBlock, this.componentDisappearMethods);
+        this.addMethodsInvokeStmt(returnBlock, this.abilityStageDestroyMethods);
+        this.addMethodsInvokeStmt(returnBlock, this.componentDetachedMethods);
+        this.addMethodsInvokeStmt(returnBlock, this.abilityDestroyMethods);
         const returnStmt = new Stmt_1.ArkReturnVoidStmt();
-        const returnBlock = new BasicBlock_1.BasicBlock();
         returnBlock.addStmt(returnStmt);
         dummyCfg.addBlock(returnBlock);
-        whileBlock.addSuccessorBlock(returnBlock);
-        returnBlock.addPredecessorBlock(whileBlock);
-        return dummyCfg;
+        this.linkBlocks(whileBlock, returnBlock);
+    }
+    addMethodsInvokeStmt(block, methods) {
+        for (const method of methods) {
+            const paramLocals = [];
+            this.addParamInit(method, paramLocals, block);
+            const local = this.classLocalMap.get(method.getDeclaringArkClass());
+            let invokeExpr;
+            if (local) {
+                invokeExpr = new Expr_1.ArkInstanceInvokeExpr(local, method.getSignature(), paramLocals);
+            }
+            else {
+                invokeExpr = new Expr_1.ArkStaticInvokeExpr(method.getSignature(), paramLocals);
+            }
+            const invokeStmt = new Stmt_1.ArkInvokeStmt(invokeExpr);
+            block.addStmt(invokeStmt);
+        }
+    }
+    linkBlocks(firstBlock, nextBlock) {
+        firstBlock.addSuccessorBlock(nextBlock);
+        nextBlock.addPredecessorBlock(firstBlock);
     }
     addCfg2Stmt() {
         const cfg = this.dummyMain.getCfg();
@@ -258,26 +277,37 @@ class DummyMainCreater {
         return this.dummyMain;
     }
     getEntryMethodsFromComponents() {
-        const COMPONENT_BASE_CLASSES = ['CustomComponent', 'ViewPU'];
-        let methods = [];
         this.scene
             .getClasses()
             .filter(cls => {
             if (COMPONENT_BASE_CLASSES.includes(cls.getSuperClassName())) {
                 return true;
             }
-            if (cls.hasDecorator('Component')) {
-                return true;
-            }
-            return false;
+            return cls.hasDecorator(EtsConst_1.COMPONENT);
         })
             .forEach(cls => {
-            methods.push(...cls.getMethods().filter(mtd => entryMethodUtils_1.COMPONENT_LIFECYCLE_METHOD_NAME.includes(mtd.getName())));
+            this.entryClasses.push(cls);
+            for (const mtd of cls.getMethods()) {
+                const name = mtd.getName();
+                if (name === Const_1.COMPONENT_START_METHOD) {
+                    this.componentAppearMethods.push(mtd);
+                    continue;
+                }
+                if (name === Const_1.COMPONENT_DISAPPEAR_METHOD) {
+                    this.componentDisappearMethods.push(mtd);
+                    continue;
+                }
+                if (name === Const_1.COMPONENT_DETACHED_METHOD) {
+                    this.componentDetachedMethods.push(mtd);
+                    continue;
+                }
+                if (entryMethodUtils_1.COMPONENT_LIFECYCLE_METHOD_NAME.includes(name)) {
+                    this.entryMethods.push(mtd);
+                }
+            }
         });
-        return methods;
     }
     classInheritsAbility(arkClass) {
-        const ABILITY_BASE_CLASSES = ['UIExtensionAbility', 'Ability', 'FormExtensionAbility', 'UIAbility', 'BackupExtensionAbility'];
         if (ABILITY_BASE_CLASSES.includes(arkClass.getSuperClassName())) {
             return true;
         }
@@ -291,17 +321,36 @@ class DummyMainCreater {
         return false;
     }
     getMethodsFromAllAbilities() {
-        let methods = [];
         this.scene
             .getClasses()
             .filter(cls => this.classInheritsAbility(cls))
             .forEach(cls => {
-            methods.push(...cls.getMethods().filter(mtd => entryMethodUtils_1.LIFECYCLE_METHOD_NAME.includes(mtd.getName())));
+            this.entryClasses.push(cls);
+            for (const mtd of cls.getMethods()) {
+                const name = mtd.getName();
+                if (name === Const_1.ABILITY_CREATE_METHOD) {
+                    this.abilityCreateMethods.push(mtd);
+                    continue;
+                }
+                if (name === Const_1.ABILITY_STAGE_CREATE_METHOD) {
+                    this.abilityStageCreateMethods.push(mtd);
+                    continue;
+                }
+                if (name === Const_1.ABILITY_STAGE_DESTROY_METHOD) {
+                    this.abilityStageDestroyMethods.push(mtd);
+                    continue;
+                }
+                if (name === Const_1.ABILITY_DESTROY_METHOD) {
+                    this.abilityDestroyMethods.push(mtd);
+                    continue;
+                }
+                if (entryMethodUtils_1.LIFECYCLE_METHOD_NAME.includes(name)) {
+                    this.entryMethods.push(mtd);
+                }
+            }
         });
-        return methods;
     }
     getCallbackMethods() {
-        const callbackMethods = [];
         this.scene.getMethods().forEach(method => {
             if (!method.getCfg()) {
                 return;
@@ -311,12 +360,101 @@ class DummyMainCreater {
                 .getStmts()
                 .forEach(stmt => {
                 const cbMethod = (0, entryMethodUtils_1.getCallbackMethodFromStmt)(stmt, this.scene);
-                if (cbMethod && !callbackMethods.includes(cbMethod)) {
-                    callbackMethods.push(cbMethod);
+                if (cbMethod && !this.entryMethods.includes(cbMethod)) {
+                    this.entryMethods.push(cbMethod);
                 }
             });
         });
-        return callbackMethods;
+    }
+    /**
+     * Analysis the coverage of files, methods, stmts when starting from the dummy main method according to the given call graph.
+     * @param callGraph - the call graph create within ArkAnalyzer
+     * @param generated - whether to include the generated methods
+     */
+    analysisCoverage(callGraph, generated = true) {
+        const analysis = new CoverageAnalysis(this.scene, this.dummyMain, callGraph, generated);
+        return analysis.calculateCoverage();
     }
 }
 exports.DummyMainCreater = DummyMainCreater;
+class CoverageAnalysis {
+    constructor(scene, entry, callGraph, generated = true) {
+        this.visitedFiles = new Set();
+        this.visitedMethods = new Set();
+        this.visitedStmts = new Set();
+        this.scene = scene;
+        this.callGraph = callGraph;
+        this.entry = entry;
+        this.totalFiles = new Set(scene.getFiles());
+        this.totalMethods = new Set();
+        this.totalFiles.forEach(file => {
+            file.getClasses().forEach(cls => {
+                cls.getMethods(generated).forEach(method => {
+                    this.totalMethods.add(method);
+                });
+            });
+        });
+        // if entry method is dummy main, then it is also generated, but still need to include it
+        this.totalMethods.add(entry);
+        this.totalStmts = new Set();
+        this.totalMethods.forEach(method => {
+            var _a;
+            (_a = method.getCfg()) === null || _a === void 0 ? void 0 : _a.getStmts().forEach(stmt => {
+                this.totalStmts.add(stmt);
+            });
+        });
+    }
+    addVisitedFile(file) {
+        this.visitedFiles.add(file);
+    }
+    addVisitedMethod(method) {
+        this.visitedMethods.add(method);
+    }
+    addVisitedStmt(stmt) {
+        this.visitedStmts.add(stmt);
+    }
+    calculateCoverage() {
+        this.goThroughMethod(this.entry);
+        return {
+            filesCoverage: this.visitedFiles.size / this.totalFiles.size,
+            methodsCoverage: this.visitedMethods.size / this.totalMethods.size,
+            stmtsCoverage: this.visitedStmts.size / this.totalStmts.size,
+            totalFiles: this.totalFiles.size,
+            totalMethods: this.totalMethods.size,
+            totalStmts: this.totalStmts.size,
+            visitedFiles: this.visitedFiles.size,
+            visitedMethods: this.visitedMethods.size,
+            visitedStmts: this.visitedStmts.size,
+        };
+    }
+    /**
+     * Scan all invoke stmts of the given method, and go through all callee methods of this given method recursively.
+     * @param method
+     * @private
+     */
+    goThroughMethod(method) {
+        var _a;
+        const file = method.getDeclaringArkFile();
+        if (!this.totalFiles.has(file) || !this.totalMethods.has(method) || this.visitedMethods.has(method)) {
+            return;
+        }
+        this.addVisitedMethod(method);
+        this.addVisitedFile(file);
+        const stmts = (_a = method.getCfg()) === null || _a === void 0 ? void 0 : _a.getStmts();
+        if (!stmts) {
+            return;
+        }
+        stmts.forEach(stmt => {
+            this.addVisitedStmt(stmt);
+        });
+        const node = this.callGraph.getCallGraphNodeByMethod(method.getSignature());
+        for (const outEdge of node.getOutgoingEdges()) {
+            const calleeSig = outEdge.getDstNode().getMethod();
+            const callee = this.scene.getMethod(calleeSig);
+            if (!callee) {
+                continue;
+            }
+            this.goThroughMethod(callee);
+        }
+    }
+}

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

@@ -72,4 +72,5 @@ export declare const CALL_BACK: string;
 export declare const ON_OFF: Set<string>;
 export declare const OH_PACKAGE_JSON5 = "oh-package.json5";
 export declare const BUILD_PROFILE_JSON5 = "build-profile.json5";
+export declare const COMPONENT: string;
 //# sourceMappingURL=EtsConst.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"EtsConst.d.ts","sourceRoot":"","sources":["../../../src/core/common/EtsConst.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAy4BhC,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,MAAkB,CAAC;AACpD,eAAO,MAAM,uBAAuB,EAAE,MAAsB,CAAC;AAE7D,eAAO,MAAM,wBAAwB,EAAE,GAAG,CAAC,MAAM,CAAkG,CAAC;AAEpJ,eAAO,MAAM,wBAAwB,EAAE,GAAG,CAAC,MAAM,CAqD/C,CAAC;AAEH,eAAO,MAAM,mBAAmB,EAAE,GAAG,CAAC,MAAM,CAAqE,CAAC;AAClH,eAAO,MAAM,eAAe,EAAE,MAAgB,CAAC;AAC/C,eAAO,MAAM,iBAAiB,EAAE,MAAkB,CAAC;AACnD,eAAO,MAAM,uBAAuB,EAAE,MAAuB,CAAC;AAC9D,eAAO,MAAM,kBAAkB,EAAE,MAAmB,CAAC;AAErD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE1D;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE1D;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE7D;AAED,eAAO,MAAM,yBAAyB,EAAE,MAAiB,CAAC;AAC1D,eAAO,MAAM,sBAAsB,EAAE,MAAc,CAAC;AACpD,eAAO,MAAM,oBAAoB,EAAE,MAAe,CAAC;AACnD,eAAO,MAAM,gBAAgB,EAAE,MAAiB,CAAC;AAEjD,eAAO,MAAM,YAAY,EAAE,MAAa,CAAC;AACzC,eAAO,MAAM,mBAAmB,EAAE,MAAmB,CAAC;AACtD,eAAO,MAAM,yBAAyB,EAAE,MAAiB,CAAC;AAC1D,eAAO,MAAM,wBAAwB,EAAE,MAAgB,CAAC;AAExD,eAAO,MAAM,2BAA2B,EAAE,GAAG,CAAC,MAAM,CAAwF,CAAC;AAE7I,eAAO,MAAM,gBAAgB,EAAE,MAAiB,CAAC;AACjD,eAAO,MAAM,kBAAkB,EAAE,MAAmB,CAAC;AAErD,eAAO,MAAM,mBAAmB,EAAE,MAAoB,CAAC;AACvD,eAAO,MAAM,SAAS,EAAE,MAAmB,CAAC;AAC5C,eAAO,MAAM,MAAM,EAAE,GAAG,CAAC,MAAM,CAA0B,CAAC;AAE1D,eAAO,MAAM,gBAAgB,qBAAqB,CAAC;AACnD,eAAO,MAAM,mBAAmB,wBAAwB,CAAC"}
+{"version":3,"file":"EtsConst.d.ts","sourceRoot":"","sources":["../../../src/core/common/EtsConst.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAy4BhC,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,MAAkB,CAAC;AACpD,eAAO,MAAM,uBAAuB,EAAE,MAAsB,CAAC;AAE7D,eAAO,MAAM,wBAAwB,EAAE,GAAG,CAAC,MAAM,CAAkG,CAAC;AAEpJ,eAAO,MAAM,wBAAwB,EAAE,GAAG,CAAC,MAAM,CAqD/C,CAAC;AAEH,eAAO,MAAM,mBAAmB,EAAE,GAAG,CAAC,MAAM,CAAqE,CAAC;AAClH,eAAO,MAAM,eAAe,EAAE,MAAgB,CAAC;AAC/C,eAAO,MAAM,iBAAiB,EAAE,MAAkB,CAAC;AACnD,eAAO,MAAM,uBAAuB,EAAE,MAAuB,CAAC;AAC9D,eAAO,MAAM,kBAAkB,EAAE,MAAmB,CAAC;AAErD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE1D;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE1D;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE7D;AAED,eAAO,MAAM,yBAAyB,EAAE,MAAiB,CAAC;AAC1D,eAAO,MAAM,sBAAsB,EAAE,MAAc,CAAC;AACpD,eAAO,MAAM,oBAAoB,EAAE,MAAe,CAAC;AACnD,eAAO,MAAM,gBAAgB,EAAE,MAAiB,CAAC;AAEjD,eAAO,MAAM,YAAY,EAAE,MAAa,CAAC;AACzC,eAAO,MAAM,mBAAmB,EAAE,MAAmB,CAAC;AACtD,eAAO,MAAM,yBAAyB,EAAE,MAAiB,CAAC;AAC1D,eAAO,MAAM,wBAAwB,EAAE,MAAgB,CAAC;AAExD,eAAO,MAAM,2BAA2B,EAAE,GAAG,CAAC,MAAM,CAAwF,CAAC;AAE7I,eAAO,MAAM,gBAAgB,EAAE,MAAiB,CAAC;AACjD,eAAO,MAAM,kBAAkB,EAAE,MAAmB,CAAC;AAErD,eAAO,MAAM,mBAAmB,EAAE,MAAoB,CAAC;AACvD,eAAO,MAAM,SAAS,EAAE,MAAmB,CAAC;AAC5C,eAAO,MAAM,MAAM,EAAE,GAAG,CAAC,MAAM,CAA0B,CAAC;AAE1D,eAAO,MAAM,gBAAgB,qBAAqB,CAAC;AACnD,eAAO,MAAM,mBAAmB,wBAAwB,CAAC;AACzD,eAAO,MAAM,SAAS,EAAE,MAAoB,CAAC"}

package/lib/core/common/EtsConst.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- * Copyright (c) 2024-2025 Huawei Device Co., Ltd.
+ * Copyright (c) 2024-2026 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
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BUILD_PROFILE_JSON5 = exports.OH_PACKAGE_JSON5 = exports.ON_OFF = exports.CALL_BACK = exports.COMPONENT_ATTRIBUTE = exports.COMPONENT_INSTANCE = exports.COMPONENT_COMMON = exports.SPECIAL_CONTAINER_COMPONENT = exports.COMPONENT_BUILD_FUNCTION = exports.COMPONENT_BRANCH_FUNCTION = exports.COMPONENT_IF_BRANCH = exports.COMPONENT_IF = exports.COMPONENT_REPEAT = exports.COMPONENT_CUSTOMVIEW = exports.COMPONENT_POP_FUNCTION = exports.COMPONENT_CREATE_FUNCTION = exports.isEtsContainerComponent = exports.isEtsSystemComponent = exports.isEtsAtomicComponent = exports.COMPONENT_BEHAVIOR = exports.BUILDER_PARAM_DECORATOR = exports.BUILDER_DECORATOR = exports.ENTRY_DECORATOR = exports.COMPONENT_DECORATOR = exports.BUILDIN_ATOMIC_COMPONENT = exports.BUILDIN_SYSTEM_COMPONENT = exports.COMPONENT_LAZY_FOR_EACH = exports.COMPONENT_FOR_EACH = exports.ETS_COMPILER_OPTIONS = void 0;
+exports.COMPONENT = exports.BUILD_PROFILE_JSON5 = exports.OH_PACKAGE_JSON5 = exports.ON_OFF = exports.CALL_BACK = exports.COMPONENT_ATTRIBUTE = exports.COMPONENT_INSTANCE = exports.COMPONENT_COMMON = exports.SPECIAL_CONTAINER_COMPONENT = exports.COMPONENT_BUILD_FUNCTION = exports.COMPONENT_BRANCH_FUNCTION = exports.COMPONENT_IF_BRANCH = exports.COMPONENT_IF = exports.COMPONENT_REPEAT = exports.COMPONENT_CUSTOMVIEW = exports.COMPONENT_POP_FUNCTION = exports.COMPONENT_CREATE_FUNCTION = exports.isEtsContainerComponent = exports.isEtsSystemComponent = exports.isEtsAtomicComponent = exports.COMPONENT_BEHAVIOR = exports.BUILDER_PARAM_DECORATOR = exports.BUILDER_DECORATOR = exports.ENTRY_DECORATOR = exports.COMPONENT_DECORATOR = exports.BUILDIN_ATOMIC_COMPONENT = exports.BUILDIN_SYSTEM_COMPONENT = exports.COMPONENT_LAZY_FOR_EACH = exports.COMPONENT_FOR_EACH = exports.ETS_COMPILER_OPTIONS = void 0;
 exports.ETS_COMPILER_OPTIONS = {
     ets: {
         emitDecorators: [
@@ -1011,3 +1011,4 @@ exports.CALL_BACK = 'Callback';
 exports.ON_OFF = new Set(['on', 'off']);
 exports.OH_PACKAGE_JSON5 = 'oh-package.json5';
 exports.BUILD_PROFILE_JSON5 = 'build-profile.json5';
+exports.COMPONENT = 'Component';

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

@@ -17,13 +17,6 @@ export declare class IRInference {
     static inferStaticInvokeExpr(expr: ArkStaticInvokeExpr, arkMethod: ArkMethod): AbstractInvokeExpr;
     static inferStaticInvokeExprByMethodName(methodName: string, arkMethod: ArkMethod, expr: AbstractInvokeExpr): AbstractInvokeExpr;
     static inferInstanceInvokeExpr(expr: ArkInstanceInvokeExpr, arkMethod: ArkMethod): AbstractInvokeExpr;
-    /**
-     * process arkUI function with Annotation @Extend @Styles @AnimatableExtend
-     * @param expr
-     * @param arkMethod
-     * @param methodName
-     */
-    static processExtendFunc(expr: AbstractInvokeExpr, arkMethod: ArkMethod, methodName: string): AbstractInvokeExpr | null;
     static inferFieldRef(ref: ArkInstanceFieldRef, arkMethod: ArkMethod): AbstractRef;
     private static inferBase;
     static inferThisLocal(arkMethod: ArkMethod): Local | null;

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

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

package/lib/core/common/IRInference.js

@@ -195,7 +195,7 @@ class IRInference {
         return expr;
     }
     static inferInstanceInvokeExpr(expr, arkMethod) {
-        var _a, _b, _c;
+        var _a, _b;
         const arkClass = arkMethod.getDeclaringArkClass();
         TypeInference_1.TypeInference.inferRealGenericTypes(expr.getRealGenericTypes(), arkClass);
         this.inferBase(expr, arkMethod);
@@ -218,7 +218,7 @@ class IRInference {
             return expr;
         }
         expr.getArgs().forEach(arg => TypeInference_1.TypeInference.inferValueType(arg, arkMethod));
-        let result = (_c = this.inferInvokeExpr(expr, baseType, methodName, scene)) !== null && _c !== void 0 ? _c : this.processExtendFunc(expr, arkMethod, methodName);
+        let result = this.inferInvokeExpr(expr, baseType, methodName, scene);
         if (result) {
             this.inferArgs(result, arkMethod);
             return result;
@@ -226,30 +226,6 @@ class IRInference {
         logger.warn('invoke ArkInstanceInvokeExpr MethodSignature type fail: ', expr.toString());
         return expr;
     }
-    /**
-     * process arkUI function with Annotation @Extend @Styles @AnimatableExtend
-     * @param expr
-     * @param arkMethod
-     * @param methodName
-     */
-    static processExtendFunc(expr, arkMethod, methodName) {
-        var _a, _b;
-        const type = TypeInference_1.TypeInference.inferBaseType(methodName, arkMethod.getDeclaringArkClass());
-        if (type instanceof Type_1.FunctionType) {
-            const methodSignature = type.getMethodSignature();
-            // because of last stmt is ArkReturnVoidStmt, the ArkInvokeStmt at -2 before ArkReturnVoidStmt.
-            const stmts = (_b = (_a = arkMethod.getDeclaringArkFile().getScene().getMethod(methodSignature)) === null || _a === void 0 ? void 0 : _a.getCfg()) === null || _b === void 0 ? void 0 : _b.getStmts();
-            if (stmts) {
-                const endStmt = stmts[stmts.length - 2];
-                if (endStmt instanceof Stmt_1.ArkInvokeStmt) {
-                    methodSignature.getMethodSubSignature().setReturnType(endStmt.getInvokeExpr().getType());
-                }
-            }
-            expr.setMethodSignature(methodSignature);
-            return expr;
-        }
-        return null;
-    }
     static inferFieldRef(ref, arkMethod) {
         this.inferBase(ref, arkMethod);
         const baseType = TypeInference_1.TypeInference.replaceAliasType(ref.getBase().getType());
@@ -707,7 +683,10 @@ class IRInference {
                 baseType = new Type_1.ClassType(arrayClass.getSignature());
             }
         }
-        let { staticFlag, signature } = IRInference.genFieldSignature(fieldName, baseType, ref, arkMethod);
+        let { staticFlag, signature, value } = IRInference.genFieldSignature(fieldName, baseType, ref, arkMethod);
+        if (value) {
+            return value;
+        }
         if (!signature) {
             return null;
         }
@@ -728,6 +707,11 @@ class IRInference {
         let signature = null;
         if (baseType instanceof Type_1.ClassType) {
             const property = (_a = propertyAndType === null || propertyAndType === void 0 ? void 0 : propertyAndType[0]) !== null && _a !== void 0 ? _a : IRInference.findPropertyFormChildrenClass(fieldName, arkClass, baseType);
+            if (property instanceof ArkMethod_1.ArkMethod && property.getName().startsWith(Const_1.GETTER_PREFIX) && ref instanceof Ref_1.ArkInstanceFieldRef) {
+                const expr = property.isStatic() ? new Expr_1.ArkStaticInvokeExpr(property.getSignature(), [])
+                    : new Expr_1.ArkInstanceInvokeExpr(ref.getBase(), property.getSignature(), []);
+                return { staticFlag: staticFlag, signature: signature, value: expr };
+            }
             staticFlag = baseType.getClassSignature().getClassName() === Const_1.DEFAULT_ARK_CLASS_NAME ||
                 ((property instanceof ArkField_1.ArkField || property instanceof ArkMethod_1.ArkMethod) && property.isStatic());
             if (property instanceof ArkField_1.ArkField && property.getCategory() !== ArkField_1.FieldCategory.ENUM_MEMBER &&

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

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