arkanalyzer 1.0.21 → 1.0.23

package/lib/core/common/SdkUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Copyright (c) 2024-2025 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
@@ -18,13 +18,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SdkUtils = void 0;
+const ArkExport_1 = require("../model/ArkExport");
 const EtsConst_1 = require("./EtsConst");
 const TSConst_1 = require("./TSConst");
 const Const_1 = require("./Const");
 const ArkClass_1 = require("../model/ArkClass");
 const ArkSignature_1 = require("../model/ArkSignature");
 const ModelUtils_1 = require("./ModelUtils");
+const Local_1 = require("../base/Local");
 const path_1 = __importDefault(require("path"));
+const IRInference_1 = require("./IRInference");
+const Type_1 = require("../base/Type");
+const ArkNamespace_1 = require("../model/ArkNamespace");
 class SdkUtils {
     static buildGlobalMap(file, globalMap) {
         var _a, _b, _c, _d;
@@ -36,6 +41,7 @@ class SdkUtils {
         if (!isGlobalPath) {
             return;
         }
+        IRInference_1.IRInference.inferFile(file);
         ModelUtils_1.ModelUtils.getAllClassesInFile(file).forEach(cls => {
             if (!cls.isAnonymousClass() && !cls.isDefaultArkClass()) {
                 SdkUtils.loadClass(globalMap, cls);
@@ -49,11 +55,12 @@ class SdkUtils {
         const defaultArkMethod = file.getDefaultClass().getDefaultArkMethod();
         (_b = defaultArkMethod === null || defaultArkMethod === void 0 ? void 0 : defaultArkMethod.getBody()) === null || _b === void 0 ? void 0 : _b.getLocals().forEach(local => {
             const name = local.getName();
-            if (name !== TSConst_1.THIS_NAME && !name.startsWith(Const_1.TEMP_LOCAL_PREFIX) && !name.endsWith(EtsConst_1.COMPONENT_INSTANCE)) {
+            if (name !== TSConst_1.THIS_NAME && !name.startsWith(Const_1.TEMP_LOCAL_PREFIX)) {
                 this.loadGlobalLocal(local, defaultArkMethod, globalMap);
             }
         });
         (_d = (_c = defaultArkMethod === null || defaultArkMethod === void 0 ? void 0 : defaultArkMethod.getBody()) === null || _c === void 0 ? void 0 : _c.getAliasTypeMap()) === null || _d === void 0 ? void 0 : _d.forEach(a => globalMap.set(a[0].getName(), a[0]));
+        ModelUtils_1.ModelUtils.getAllNamespacesInFile(file).forEach(ns => globalMap.set(ns.getName(), ns));
     }
     static loadClass(globalMap, cls) {
         const old = globalMap.get(cls.getName());
@@ -74,11 +81,12 @@ class SdkUtils {
     static loadGlobalLocal(local, defaultArkMethod, globalMap) {
         const name = local.getName();
         local.setSignature(new ArkSignature_1.LocalSignature(name, defaultArkMethod.getSignature()));
-        if (defaultArkMethod.getDeclaringArkFile().getScene().getOptions().isScanAbc) {
+        const scene = defaultArkMethod.getDeclaringArkFile().getScene();
+        if (scene.getOptions().isScanAbc) {
             const instance = globalMap.get(name + 'Interface');
             const attr = globalMap.get(name + EtsConst_1.COMPONENT_ATTRIBUTE);
             if (attr instanceof ArkClass_1.ArkClass && instance instanceof ArkClass_1.ArkClass) {
-                instance.getMethods().forEach(m => attr.addMethod(m));
+                instance.getMethods().filter(m => !instance.getMethodWithName(m.getName())).forEach(m => attr.addMethod(m));
                 globalMap.set(name, attr);
                 return;
             }
@@ -87,6 +95,12 @@ class SdkUtils {
         if (!old) {
             globalMap.set(name, local);
         }
+        else if (old instanceof ArkClass_1.ArkClass && local.getType() instanceof Type_1.ClassType) {
+            const localConstructor = scene.getClass(local.getType().getClassSignature());
+            if (localConstructor) {
+                localConstructor.getMethods().filter(m => !old.getMethodWithName(m.getName())).forEach(m => old.addMethod(m));
+            }
+        }
     }
     static copyMethod(from, to) {
         from.getMethods().forEach(method => {
@@ -101,5 +115,13 @@ class SdkUtils {
             }
         });
     }
+    static computeGlobalThis(leftOp, arkMethod) {
+        const globalThis = arkMethod.getDeclaringArkFile().getScene().getSdkGlobal(TSConst_1.GLOBAL_THIS_NAME);
+        if (globalThis instanceof ArkNamespace_1.ArkNamespace) {
+            const exportInfo = new ArkExport_1.ExportInfo.Builder().exportClauseName(leftOp.getFieldName())
+                .arkExport(new Local_1.Local(leftOp.getFieldName(), leftOp.getType())).build();
+            globalThis.addExportInfo(exportInfo);
+        }
+    }
 }
 exports.SdkUtils = SdkUtils;

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

@@ -5,6 +5,8 @@ export declare const GLOBAL_THIS_NAME: string;
 export declare const DEFAULT = "default";
 export declare const ALL = "*";
 export declare const IMPORT = "import";
+export declare const PROMISE = "Promise";
+export declare const FUNCTION = "Function";
 export declare const DECLARE_KEYWORD = "DeclareKeyword";
 export declare const NULL_KEYWORD = "null";
 export declare const UNDEFINED_KEYWORD = "undefined";

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

@@ -1 +1 @@
-{"version":3,"file":"TSConst.d.ts","sourceRoot":"","sources":["../../../src/core/common/TSConst.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,gBAAgB,gBAAgB,CAAC;AAC9C,eAAO,MAAM,UAAU,UAAU,CAAC;AAClC,eAAO,MAAM,SAAS,SAAS,CAAC;AAChC,eAAO,MAAM,gBAAgB,EAAE,MAAqB,CAAA;AAEpD,eAAO,MAAM,OAAO,YAAY,CAAC;AAEjC,eAAO,MAAM,GAAG,MAAM,CAAC;AAEvB,eAAO,MAAM,MAAM,WAAW,CAAC;AAG/B,eAAO,MAAM,eAAe,mBAAmB,CAAC;AAChD,eAAO,MAAM,YAAY,SAAS,CAAC;AACnC,eAAO,MAAM,iBAAiB,cAAc,CAAC;AAC7C,eAAO,MAAM,WAAW,QAAQ,CAAC;AACjC,eAAO,MAAM,eAAe,YAAY,CAAC;AACzC,eAAO,MAAM,eAAe,YAAY,CAAC;AACzC,eAAO,MAAM,cAAc,WAAW,CAAC;AACvC,eAAO,MAAM,cAAc,WAAW,CAAC;AACvC,eAAO,MAAM,YAAY,SAAS,CAAC;AACnC,eAAO,MAAM,aAAa,UAAU,CAAC;AACrC,eAAO,MAAM,aAAa,kBAAkB,CAAC"}
+{"version":3,"file":"TSConst.d.ts","sourceRoot":"","sources":["../../../src/core/common/TSConst.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,gBAAgB,gBAAgB,CAAC;AAC9C,eAAO,MAAM,UAAU,UAAU,CAAC;AAClC,eAAO,MAAM,SAAS,SAAS,CAAC;AAChC,eAAO,MAAM,gBAAgB,EAAE,MAAqB,CAAA;AAEpD,eAAO,MAAM,OAAO,YAAY,CAAC;AAEjC,eAAO,MAAM,GAAG,MAAM,CAAC;AAEvB,eAAO,MAAM,MAAM,WAAW,CAAC;AAC/B,eAAO,MAAM,OAAO,YAAY,CAAC;AACjC,eAAO,MAAM,QAAQ,aAAa,CAAC;AAGnC,eAAO,MAAM,eAAe,mBAAmB,CAAC;AAChD,eAAO,MAAM,YAAY,SAAS,CAAC;AACnC,eAAO,MAAM,iBAAiB,cAAc,CAAC;AAC7C,eAAO,MAAM,WAAW,QAAQ,CAAC;AACjC,eAAO,MAAM,eAAe,YAAY,CAAC;AACzC,eAAO,MAAM,eAAe,YAAY,CAAC;AACzC,eAAO,MAAM,cAAc,WAAW,CAAC;AACvC,eAAO,MAAM,cAAc,WAAW,CAAC;AACvC,eAAO,MAAM,YAAY,SAAS,CAAC;AACnC,eAAO,MAAM,aAAa,UAAU,CAAC;AACrC,eAAO,MAAM,aAAa,kBAAkB,CAAC"}

package/lib/core/common/TSConst.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Copyright (c) 2024-2025 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.TSCONFIG_JSON = exports.NEVER_KEYWORD = exports.VOID_KEYWORD = exports.STRING_KEYWORD = exports.NUMBER_KEYWORD = exports.BOOLEAN_KEYWORD = exports.UNKNOWN_KEYWORD = exports.ANY_KEYWORD = exports.UNDEFINED_KEYWORD = exports.NULL_KEYWORD = exports.DECLARE_KEYWORD = exports.IMPORT = exports.ALL = exports.DEFAULT = exports.GLOBAL_THIS_NAME = exports.THIS_NAME = exports.SUPER_NAME = exports.CONSTRUCTOR_NAME = void 0;
+exports.TSCONFIG_JSON = exports.NEVER_KEYWORD = exports.VOID_KEYWORD = exports.STRING_KEYWORD = exports.NUMBER_KEYWORD = exports.BOOLEAN_KEYWORD = exports.UNKNOWN_KEYWORD = exports.ANY_KEYWORD = exports.UNDEFINED_KEYWORD = exports.NULL_KEYWORD = exports.DECLARE_KEYWORD = exports.FUNCTION = exports.PROMISE = exports.IMPORT = exports.ALL = exports.DEFAULT = exports.GLOBAL_THIS_NAME = exports.THIS_NAME = exports.SUPER_NAME = exports.CONSTRUCTOR_NAME = void 0;
 exports.CONSTRUCTOR_NAME = 'constructor';
 exports.SUPER_NAME = 'super';
 exports.THIS_NAME = 'this';
@@ -22,6 +22,8 @@ exports.GLOBAL_THIS_NAME = 'globalThis';
 exports.DEFAULT = 'default';
 exports.ALL = '*';
 exports.IMPORT = 'import';
+exports.PROMISE = 'Promise';
+exports.FUNCTION = 'Function';
 // ast const
 exports.DECLARE_KEYWORD = 'DeclareKeyword';
 exports.NULL_KEYWORD = 'null';

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

@@ -5,8 +5,7 @@ import { ArkExport } from '../model/ArkExport';
 import { ArkClass } from '../model/ArkClass';
 import { ArkField } from '../model/ArkField';
 import { Value } from '../base/Value';
-import { MethodSignature } from '../model/ArkSignature';
-import { MethodParameter } from '../model/builder/ArkMethodBuilder';
+import { MethodSignature, MethodSubSignature } from '../model/ArkSignature';
 export declare class TypeInference {
     static inferTypeInArkField(arkField: ArkField): void;
     /**
@@ -21,6 +20,7 @@ export declare class TypeInference {
      */
     static inferUnclearedType(leftOpType: Type, declaringArkClass: ArkClass, rightType?: Type): Type | null | undefined;
     static inferTypeInMethod(arkMethod: ArkMethod): void;
+    private static resolveStmt;
     /**
      * @Deprecated
      * @param arkMethod
@@ -47,6 +47,7 @@ export declare class TypeInference {
      * @param arkMethod
      */
     static resolveArkAssignStmt(stmt: Stmt, arkMethod: ArkMethod): void;
+    private static resolveLeftOp;
     private static setValueType;
     static isUnclearType(type: Type | null | undefined): boolean;
     private static hasUnclearReferenceType;
@@ -55,6 +56,7 @@ export declare class TypeInference {
     static inferValueType(value: Value, arkMethod: ArkMethod): Type | null;
     private static inferParameterType;
     static inferSignatureReturnType(oldSignature: MethodSignature, arkMethod: ArkMethod): void;
+    private static inferReturnType;
     static inferGenericType(types: GenericType[] | undefined, arkClass: ArkClass): void;
     /**
      * Infer type for a given {@link UnclearReferenceType} type.
@@ -98,6 +100,7 @@ export declare class TypeInference {
     static inferDynamicImportType(from: string, arkClass: ArkClass): Type | null;
     static replaceTypeWithReal(type: Type, realTypes?: Type[]): Type;
     static replaceAliasType(type: Type): Type;
-    static inferFunctionType(argType: FunctionType, params: MethodParameter[] | undefined, realTypes: Type[] | undefined): void;
+    static inferFunctionType(argType: FunctionType, paramSubSignature: MethodSubSignature | undefined, realTypes: Type[] | undefined): void;
+    private static resolveArkReturnStmt;
 }
 //# sourceMappingURL=TypeInference.d.ts.map

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

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

package/lib/core/common/TypeInference.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Copyright (c) 2024-2025 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
@@ -52,11 +52,14 @@ const ArkNamespace_1 = require("../model/ArkNamespace");
 const TSConst_1 = require("./TSConst");
 const ModelUtils_1 = require("./ModelUtils");
 const Builtin_1 = require("./Builtin");
+const ArkSignature_1 = require("../model/ArkSignature");
 const Const_1 = require("./Const");
 const ValueUtil_1 = require("./ValueUtil");
 const ArkImport_1 = require("../model/ArkImport");
 const IRInference_1 = require("./IRInference");
 const TypeExpr_1 = require("../base/TypeExpr");
+const SdkUtils_1 = require("./SdkUtils");
+const ArkBaseModel_1 = require("../model/ArkBaseModel");
 const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER, 'TypeInference');
 class TypeInference {
     static inferTypeInArkField(arkField) {
@@ -66,10 +69,7 @@ class TypeInference {
         const method = (_a = arkClass.getMethodWithName(Const_1.INSTANCE_INIT_METHOD_NAME)) !== null && _a !== void 0 ? _a : arkClass.getMethodWithName(TSConst_1.CONSTRUCTOR_NAME);
         for (const stmt of stmts) {
             if (method) {
-                this.resolveTypeExprsInStmt(stmt, method);
-                this.resolveExprsInStmt(stmt, method);
-                this.resolveFieldRefsInStmt(stmt, method);
-                this.resolveArkAssignStmt(stmt, method);
+                this.resolveStmt(stmt, method);
             }
         }
         const beforeType = arkField.getType();
@@ -160,21 +160,31 @@ class TypeInference {
             s.getMethodSubSignature().getParameters().forEach(p => {
                 this.inferParameterType(p, arkMethod);
             });
-            this.inferSignatureReturnType(s, arkMethod);
         });
         const body = arkMethod.getBody();
         if (!body) {
+            signatures.forEach(s => this.inferSignatureReturnType(s, arkMethod));
             return;
         }
         const cfg = body.getCfg();
         for (const block of cfg.getBlocks()) {
             for (const stmt of block.getStmts()) {
-                this.resolveTypeExprsInStmt(stmt, arkMethod);
-                this.resolveExprsInStmt(stmt, arkMethod);
-                this.resolveFieldRefsInStmt(stmt, arkMethod);
-                this.resolveArkAssignStmt(stmt, arkMethod);
+                this.resolveStmt(stmt, arkMethod);
             }
         }
+        signatures.forEach(s => this.inferSignatureReturnType(s, arkMethod));
+    }
+    static resolveStmt(stmt, arkMethod) {
+        try {
+            this.resolveTypeExprsInStmt(stmt, arkMethod);
+            this.resolveExprsInStmt(stmt, arkMethod);
+            this.resolveFieldRefsInStmt(stmt, arkMethod);
+            this.resolveArkAssignStmt(stmt, arkMethod);
+            this.resolveArkReturnStmt(stmt, arkMethod);
+        }
+        catch (e) {
+            logger.warn('stmt is not correct: ' + stmt.toString());
+        }
     }
     /**
      * @Deprecated
@@ -200,7 +210,8 @@ class TypeInference {
     static resolveExprsInStmt(stmt, arkMethod) {
         for (const expr of stmt.getExprs()) {
             const newExpr = expr.inferType(arkMethod);
-            if (stmt.containsInvokeExpr() && expr instanceof Expr_1.ArkInstanceInvokeExpr && newExpr instanceof Expr_1.ArkStaticInvokeExpr) {
+            if (stmt.containsInvokeExpr() && ((expr instanceof Expr_1.ArkInstanceInvokeExpr && newExpr instanceof Expr_1.ArkStaticInvokeExpr) ||
+                newExpr instanceof Expr_1.ArkPtrInvokeExpr)) {
                 stmt.replaceUse(expr, newExpr);
             }
         }
@@ -280,25 +291,25 @@ class TypeInference {
      * @param arkMethod
      */
     static resolveArkAssignStmt(stmt, arkMethod) {
-        var _a;
         if (!(stmt instanceof Stmt_1.ArkAssignStmt)) {
             return;
         }
         const arkClass = arkMethod.getDeclaringArkClass();
         const rightOp = stmt.getRightOp();
+        if (rightOp instanceof Local_1.Local && rightOp.getType() instanceof Type_1.UnknownType) {
+            IRInference_1.IRInference.inferLocal(rightOp, arkMethod);
+        }
         let rightType = rightOp.getType();
         if (this.isUnclearType(rightType)) {
             rightType = this.inferUnclearedType(rightType, arkClass);
             if (rightType) {
                 this.setValueType(rightOp, rightType);
             }
-            else {
-                if (rightOp instanceof Local_1.Local) {
-                    IRInference_1.IRInference.inferLocal(rightOp, arkMethod);
-                    rightType = rightOp.getType();
-                }
-            }
         }
+        TypeInference.resolveLeftOp(stmt, arkClass, rightType, arkMethod);
+    }
+    static resolveLeftOp(stmt, arkClass, rightType, arkMethod) {
+        var _a;
         const leftOp = stmt.getLeftOp();
         let leftType = leftOp.getType();
         if (this.isUnclearType(leftType)) {
@@ -310,6 +321,9 @@ class TypeInference {
                 leftType = newLeftType;
             }
         }
+        else if (leftOp instanceof Local_1.Local && leftOp.getName() === TSConst_1.THIS_NAME) {
+            leftType = rightType;
+        }
         if (leftType && !this.isUnclearType(leftType)) {
             this.setValueType(leftOp, leftType);
             if (leftOp instanceof Local_1.Local && ((_a = stmt.getOriginalText()) === null || _a === void 0 ? void 0 : _a.startsWith(leftOp.getName()))) {
@@ -321,6 +335,12 @@ class TypeInference {
             if (rightType) {
                 IRInference_1.IRInference.inferRightWithSdkType(leftType, rightType, arkClass);
             }
+            if (leftOp instanceof Ref_1.AbstractFieldRef) {
+                const declaringSignature = leftOp.getFieldSignature().getDeclaringSignature();
+                if (declaringSignature instanceof ArkSignature_1.NamespaceSignature && declaringSignature.getNamespaceName() === TSConst_1.GLOBAL_THIS_NAME) {
+                    SdkUtils_1.SdkUtils.computeGlobalThis(leftOp, arkMethod);
+                }
+            }
         }
     }
     static setValueType(value, type) {
@@ -332,20 +352,23 @@ class TypeInference {
         }
     }
     static isUnclearType(type) {
+        var _a;
         // TODO: For UnionType, IntersectionType and TupleType, it should recurse check every item of them.
         if (!type || type instanceof Type_1.UnknownType || type instanceof Type_1.UnclearReferenceType
             || type instanceof Type_1.NullType || type instanceof Type_1.UndefinedType) {
             return true;
         }
-        else if (type instanceof Type_1.ClassType
-            && type.getClassSignature().getDeclaringFileSignature().getFileName() === Const_1.UNKNOWN_FILE_NAME) {
+        else if (type instanceof Type_1.ClassType && (type.getClassSignature().getDeclaringFileSignature().getFileName() === Const_1.UNKNOWN_FILE_NAME ||
+            (type.getClassSignature().getDeclaringFileSignature().getFileName() === Builtin_1.Builtin.DUMMY_FILE_NAME &&
+                ((_a = type.getRealGenericTypes()) === null || _a === void 0 ? void 0 : _a.find(t => t instanceof Type_1.GenericType))))) {
             return true;
         }
         else if (type instanceof Type_1.UnionType || type instanceof Type_1.IntersectionType || type instanceof Type_1.TupleType) {
             return !!type.getTypes().find(t => this.hasUnclearReferenceType(t));
         }
         else if (type instanceof Type_1.ArrayType) {
-            return this.hasUnclearReferenceType(type.getBaseType());
+            const baseType = type.getBaseType();
+            return this.hasUnclearReferenceType(baseType) || baseType instanceof Type_1.AnyType || baseType instanceof Type_1.GenericType;
         }
         else if (type instanceof Type_1.AliasType) {
             return this.isUnclearType(type.getOriginalType());
@@ -430,14 +453,19 @@ class TypeInference {
     }
     static inferParameterType(param, arkMethod) {
         let pType = param.getType();
-        const type = TypeInference.inferUnclearedType(pType, arkMethod.getDeclaringArkClass());
-        if (type) {
-            param.setType(type);
+        const arkClass = arkMethod.getDeclaringArkClass();
+        let type;
+        if (pType instanceof TypeExpr_1.AbstractTypeExpr) {
+            pType.inferType(arkMethod);
+        }
+        else if (param.getName() === 'value' && arkClass.hasComponentDecorator() && arkMethod.getName() === TSConst_1.CONSTRUCTOR_NAME) {
+            type = this.parseArkExport2Type(arkClass);
         }
         else {
-            if (pType instanceof TypeExpr_1.AbstractTypeExpr) {
-                pType.inferType(arkMethod);
-            }
+            type = TypeInference.inferUnclearedType(pType, arkClass);
+        }
+        if (type) {
+            param.setType(type);
         }
     }
     static inferSignatureReturnType(oldSignature, arkMethod) {
@@ -463,21 +491,35 @@ class TypeInference {
             oldSignature.getMethodSubSignature().setReturnType(newReturnType);
         }
         else if (arkMethod.getBody()) {
-            const typeMap = new Map();
-            for (let returnValue of arkMethod.getReturnValues()) {
-                const type = returnValue.getType();
-                if (type instanceof Type_1.UnionType) {
-                    type.flatType().filter(t => !TypeInference.isUnclearType(t)).forEach(t => typeMap.set(t.toString(), t));
-                }
-                else if (!TypeInference.isUnclearType(type)) {
-                    typeMap.set(type.toString(), type);
-                }
+            const returnType = TypeInference.inferReturnType(arkMethod);
+            if (returnType) {
+                oldSignature.getMethodSubSignature().setReturnType(returnType);
             }
-            if (typeMap.size > 0) {
-                const types = Array.from(typeMap.values());
-                oldSignature.getMethodSubSignature().setReturnType(types.length === 1 ? types[0] : new Type_1.UnionType(types));
+        }
+    }
+    static inferReturnType(arkMethod) {
+        const typeMap = new Map();
+        for (let returnValue of arkMethod.getReturnValues()) {
+            const type = returnValue.getType();
+            if (type instanceof Type_1.UnionType) {
+                type.flatType().filter(t => !TypeInference.isUnclearType(t)).forEach(t => typeMap.set(t.toString(), t));
+            }
+            else if (!TypeInference.isUnclearType(type)) {
+                typeMap.set(type.toString(), type);
+            }
+        }
+        if (typeMap.size > 0) {
+            const types = Array.from(typeMap.values());
+            let returnType = types.length === 1 ? types[0] : new Type_1.UnionType(types);
+            if (arkMethod.containsModifier(ArkBaseModel_1.ModifierType.ASYNC)) {
+                const promise = arkMethod.getDeclaringArkFile().getScene().getSdkGlobal(TSConst_1.PROMISE);
+                if (promise instanceof ArkClass_1.ArkClass) {
+                    returnType = new Type_1.ClassType(promise.getSignature(), [returnType]);
+                }
             }
+            return returnType;
         }
+        return null;
     }
     static inferGenericType(types, arkClass) {
         types === null || types === void 0 ? void 0 : types.forEach(type => {
@@ -512,7 +554,7 @@ class TypeInference {
         if (urType.getName() === Builtin_1.Builtin.ARRAY) {
             return new Type_1.ArrayType((_a = realTypes[0]) !== null && _a !== void 0 ? _a : Type_1.AnyType.getInstance(), 1);
         }
-        let type = this.inferUnclearRefName(urType.getName(), arkClass);
+        const type = this.inferUnclearRefName(urType.getName(), arkClass);
         return type ? this.replaceTypeWithReal(type, realTypes) : null;
     }
     /**
@@ -591,10 +633,6 @@ class TypeInference {
             if (!arkClass) {
                 return propertyAndType;
             }
-            if (arkClass.isAnonymousClass()) {
-                const fieldType = this.inferUnclearRefName(fieldName, arkClass);
-                return fieldType ? [null, fieldType] : null;
-            }
             const property = ModelUtils_1.ModelUtils.findPropertyInClass(fieldName, arkClass);
             let propertyType = null;
             if (property instanceof ArkField_1.ArkField) {
@@ -606,6 +644,10 @@ class TypeInference {
             if (propertyType) {
                 propertyAndType = [property, propertyType];
             }
+            else if (arkClass.isAnonymousClass()) {
+                const fieldType = this.inferUnclearRefName(fieldName, arkClass);
+                propertyAndType = fieldType ? [null, fieldType] : null;
+            }
         }
         else if (baseType instanceof Type_1.AnnotationNamespaceType) {
             const namespace = declareClass.getDeclaringArkFile().getScene().getNamespace(baseType.getNamespaceSignature());
@@ -703,7 +745,7 @@ class TypeInference {
         }
         else if (type instanceof Type_1.TupleType && realTypes) {
             let replacedTypes = [];
-            type.getTypes().forEach(t => { replacedTypes.push(this.replaceTypeWithReal(t, realTypes)); });
+            type.getTypes().forEach(t => replacedTypes.push(this.replaceTypeWithReal(t, realTypes)));
             return new Type_1.TupleType(replacedTypes);
         }
         else if (type instanceof Type_1.GenericType) {
@@ -727,7 +769,13 @@ class TypeInference {
         }
         return aliasType;
     }
-    static inferFunctionType(argType, params, realTypes) {
+    static inferFunctionType(argType, paramSubSignature, realTypes) {
+        const returnType = argType.getMethodSignature().getMethodSubSignature().getReturnType();
+        const declareType = paramSubSignature === null || paramSubSignature === void 0 ? void 0 : paramSubSignature.getReturnType();
+        if (declareType instanceof Type_1.GenericType && realTypes && !this.isUnclearType(returnType)) {
+            realTypes[declareType.getIndex()] = returnType;
+        }
+        const params = paramSubSignature === null || paramSubSignature === void 0 ? void 0 : paramSubSignature.getParameters();
         if (!params) {
             return;
         }
@@ -744,5 +792,18 @@ class TypeInference {
             }
         });
     }
+    static resolveArkReturnStmt(stmt, arkMethod) {
+        var _a;
+        if (!(stmt instanceof Stmt_1.ArkReturnStmt)) {
+            return;
+        }
+        let returnType = arkMethod.getSignature().getType();
+        if (returnType instanceof Type_1.ClassType && returnType.getClassSignature().getClassName() === TSConst_1.PROMISE) {
+            returnType = (_a = returnType.getRealGenericTypes()) === null || _a === void 0 ? void 0 : _a.at(0);
+        }
+        if (returnType) {
+            IRInference_1.IRInference.inferRightWithSdkType(returnType, stmt.getOp().getType(), arkMethod.getDeclaringArkClass());
+        }
+    }
 }
 exports.TypeInference = TypeInference;

package/lib/core/graph/builder/ViewTreeBuilder.d.ts

@@ -181,6 +181,7 @@ export declare class ViewTreeImpl extends TreeNodeStack implements ViewTree {
      * @param expr
      */
     private parseInstanceInvokeExpr;
+    private parsePtrInvokeExpr;
     /**
      * $temp3 = View.create($temp2);
      * $temp4 = View.pop();

package/lib/core/graph/builder/ViewTreeBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ViewTreeBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/graph/builder/ViewTreeBuilder.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAUjD,OAAO,EAAE,mBAAmB,EAAc,MAAM,gBAAgB,CAAC;AACjE,OAAO,EAAgC,IAAI,EAAE,MAAM,iBAAiB,CAAC;AACrE,OAAO,EAA2B,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAiBhE,OAAO,EAAE,QAAQ,EAAiB,MAAM,sBAAsB,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAG3E,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAoLrD,cAAM,gBAAiB,YAAW,YAAY;IAC1C,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,eAAe,GAAG,mBAAmB,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;IACjF,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,eAAe,GAAG,mBAAmB,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;IACtF,WAAW,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC3B,MAAM,EAAE,YAAY,GAAG,IAAI,CAAC;IAC5B,QAAQ,EAAE,gBAAgB,EAAE,CAAC;IAC7B,cAAc,CAAC,EAAE,eAAe,GAAG,cAAc,GAAG,SAAS,CAAC;IAC9D,SAAS,CAAC,EAAE,eAAe,GAAG,cAAc,GAAG,SAAS,CAAC;IACzD,mBAAmB,CAAC,EAAE,GAAG,CAAC,QAAQ,EAAE,SAAS,GAAG,QAAQ,CAAC,GAAG,SAAS,CAAC;IACtE,YAAY,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAC;IACpC,OAAO,CAAC,EAAE,eAAe,GAAG,SAAS,CAAC;IACtC,OAAO,CAAC,IAAI,CAAmB;gBAEnB,IAAI,EAAE,MAAM;IAUxB;;;OAGG;IACI,SAAS,IAAI,OAAO;IAI3B;;OAEG;IACI,cAAc,IAAI,OAAO;IAIhC;;;OAGG;IACI,iBAAiB,IAAI,OAAO;IAInC;;;;;;OAMG;IACI,IAAI,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,OAAO,EAAE,OAAO,GAAE,GAAG,CAAC,YAAY,CAAa,GAAG,OAAO;WAiBzF,qBAAqB,IAAI,gBAAgB;WAMzC,iBAAiB,IAAI,gBAAgB;WAMrC,sBAAsB,IAAI,gBAAgB;IAMjD,8BAA8B,CAAC,OAAO,EAAE,SAAS,GAAG,IAAI;IAiBxD,eAAe,IAAI,OAAO;IAM1B,KAAK,CAAC,MAAM,EAAE,gBAAgB,EAAE,GAAG,GAAE,GAAG,CAAC,gBAAgB,EAAE,gBAAgB,CAAa,GAAG,gBAAgB;IAwB3G,OAAO,CAAC,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,IAAI,GAAG,IAAI;IAOpD,OAAO,CAAC,eAAe;IA+BvB,OAAO,CAAC,aAAa;IA4Bd,gBAAgB,CAAC,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,IAAI,GAAG,IAAI;CAShE;AAED,cAAM,aAAa;IACf,SAAS,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI,CAAQ;IAC/C,SAAS,CAAC,KAAK,EAAE,gBAAgB,EAAE,CAAC;;IAMpC;;OAEG;IACI,IAAI,CAAC,IAAI,EAAE,gBAAgB;IAWlC;;OAEG;IACI,GAAG;IAIV;;OAEG;IACI,GAAG,IAAI,gBAAgB,GAAG,IAAI;IAIrC;;OAEG;IACI,OAAO,IAAI,OAAO;IAIzB;;OAEG;IACI,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAW9C;;OAEG;IACI,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa;IAWtD,OAAO,CAAC,SAAS;IAYjB,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;CAG/C;AAED,qBAAa,YAAa,SAAQ,aAAc,YAAW,QAAQ;IAC/D,OAAO,CAAC,MAAM,CAAY;IAC1B,OAAO,CAAC,eAAe,CAAU;IACjC,OAAO,CAAC,WAAW,CAAmC;IACtD,OAAO,CAAC,UAAU,CAAgC;IAElD;;OAEG;gBACS,MAAM,EAAE,SAAS;IAQ7B;;;OAGG;IACI,OAAO,IAAI,YAAY,GAAG,IAAI;IAKrC;;;OAGG;IACI,cAAc,IAAI,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;IAKzD;;OAEG;IACI,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAI1C;;OAEG;IACI,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,SAAS;IAIpE;;OAEG;IACH,OAAO,CAAC,aAAa;IAmBrB;;OAEG;IACH,OAAO,CAAC,aAAa;IAIrB;;OAEG;IACI,aAAa,CAAC,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY;IAQxD;;OAEG;IACH,OAAO,CAAC,YAAY;IAIpB,OAAO,CAAC,oBAAoB;IAe5B;;OAEG;IACI,oBAAoB,IAAI,QAAQ;IAIvC;;OAEG;IACH,OAAO,CAAC,UAAU;IAelB;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAgC1B;;OAEG;IACH,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,iBAAiB;IAkBzB;;OAEG;IACH,OAAO,CAAC,cAAc;IA0BtB;;OAEG;IACH,OAAO,CAAC,sBAAsB;IAiC9B,OAAO,CAAC,qBAAqB;IAmB7B;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAS3B;;OAEG;IACH,OAAO,CAAC,sBAAsB;IAO9B,OAAO,CAAC,6BAA6B;IA4BrC,OAAO,CAAC,sBAAsB;IA4D9B,OAAO,CAAC,2BAA2B;IAmDnC,OAAO,CAAC,uBAAuB;IA0B/B,OAAO,CAAC,qBAAqB;IAsB7B,OAAO,CAAC,oBAAoB;IAiB5B,OAAO,CAAC,sBAAsB;IAK9B,OAAO,CAAC,wBAAwB,CAU7B;IAEH,OAAO,CAAC,oBAAoB;IAkB5B,OAAO,CAAC,qBAAqB;IAkC7B;;;;;OAKG;IACH,OAAO,CAAC,uBAAuB;IAgD/B;;;;;;;;;;;;;OAaG;IACH,OAAO,CAAC,eAAe;IAmBvB,OAAO,CAAC,eAAe;IASvB,OAAO,CAAC,oBAAoB;CAmB/B;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,SAAS,GAAG,QAAQ,CAEzD"}
+{"version":3,"file":"ViewTreeBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/graph/builder/ViewTreeBuilder.ts"],"names":[],"mappings":"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"}

package/lib/core/graph/builder/ViewTreeBuilder.js

@@ -62,6 +62,9 @@ function backtraceLocalInitValue(value) {
         else if (rightOp instanceof Ref_1.ArkInstanceFieldRef && rightOp.getBase().getName().startsWith(Const_1.TEMP_LOCAL_PREFIX)) {
             return backtraceLocalInitValue(rightOp.getBase());
         }
+        else if (rightOp instanceof Ref_1.ArkArrayRef) {
+            return backtraceLocalInitValue(rightOp.getBase());
+        }
         return rightOp;
     }
     return value;
@@ -988,6 +991,45 @@ class ViewTreeImpl extends TreeNodeStack {
         }
         return undefined;
     }
+    parsePtrInvokeExpr(local2Node, stmt, expr) {
+        let temp = expr.getFuncPtrLocal();
+        if (temp instanceof Local_1.Local && local2Node.has(temp)) {
+            let component = local2Node.get(temp);
+            if ((component === null || component === void 0 ? void 0 : component.name) === EtsConst_1.COMPONENT_REPEAT &&
+                expr.getMethodSignature().getMethodSubSignature().getMethodName() === 'each') {
+                let arg = expr.getArg(0);
+                let type = arg.getType();
+                if (type instanceof Type_1.FunctionType) {
+                    let method = this.findMethod(type.getMethodSignature());
+                    this.buildViewTreeFromCfg(method === null || method === void 0 ? void 0 : method.getCfg());
+                }
+                this.pop();
+            }
+            else {
+                component === null || component === void 0 ? void 0 : component.addStmt(this, stmt);
+            }
+            return component;
+        }
+        else if (temp instanceof Ref_1.ArkInstanceFieldRef) {
+            let name = temp.getBase().getName();
+            if (name.startsWith(Const_1.TEMP_LOCAL_PREFIX)) {
+                let initValue = backtraceLocalInitValue(temp.getBase());
+                if (initValue instanceof Ref_1.ArkThisRef) {
+                    name = 'this';
+                }
+            }
+            let methodName = temp.getFieldName();
+            let field = this.getDeclaringArkClass().getFieldWithName(methodName);
+            if (name === 'this' && (field === null || field === void 0 ? void 0 : field.hasBuilderParamDecorator())) {
+                return this.addBuilderParamNode(field);
+            }
+            let method = this.findMethod(expr.getMethodSignature());
+            if (name === 'this' && (method === null || method === void 0 ? void 0 : method.hasBuilderDecorator())) {
+                return this.addBuilderNode(method);
+            }
+        }
+        return undefined;
+    }
     /**
      * $temp3 = View.create($temp2);
      * $temp4 = View.pop();
@@ -1015,6 +1057,9 @@ class ViewTreeImpl extends TreeNodeStack {
         else if (right instanceof Expr_1.ArkInstanceInvokeExpr) {
             component = this.parseInstanceInvokeExpr(local2Node, stmt, right);
         }
+        else if (right instanceof Expr_1.ArkPtrInvokeExpr) {
+            component = this.parsePtrInvokeExpr(local2Node, stmt, right);
+        }
         if (component) {
             local2Node.set(left, component);
         }
@@ -1027,6 +1072,9 @@ class ViewTreeImpl extends TreeNodeStack {
         else if (expr instanceof Expr_1.ArkInstanceInvokeExpr) {
             this.parseInstanceInvokeExpr(local2Node, stmt, expr);
         }
+        else if (expr instanceof Expr_1.ArkPtrInvokeExpr) {
+            this.parsePtrInvokeExpr(local2Node, stmt, expr);
+        }
     }
     buildViewTreeFromCfg(cfg, local2Node = new Map()) {
         if (!cfg) {

package/lib/core/model/ArkClass.d.ts

@@ -1,7 +1,7 @@
 import { GenericType, Type } from '../base/Type';
 import { ViewTree } from '../graph/ViewTree';
 import { ArkField } from './ArkField';
-import { ArkFile } from './ArkFile';
+import { ArkFile, Language } from './ArkFile';
 import { ArkMethod } from './ArkMethod';
 import { ArkNamespace } from './ArkNamespace';
 import { ClassSignature, FieldSignature, FileSignature, MethodSignature, NamespaceSignature } from './ArkSignature';
@@ -47,6 +47,10 @@ export declare class ArkClass extends ArkBaseModel implements ArkExport {
     private indexSignatureNumber;
     private viewTree?;
     constructor();
+    /**
+     * Returns the program language of the file where this class defined.
+     */
+    getLanguage(): Language;
     /**
      * Returns the **string**name of this class.
      * @returns The name of this class.
@@ -152,7 +156,12 @@ export declare class ArkClass extends ArkBaseModel implements ArkExport {
     getMethod(methodSignature: MethodSignature): ArkMethod | null;
     getMethodWithName(methodName: string): ArkMethod | null;
     getStaticMethodWithName(methodName: string): ArkMethod | null;
-    addMethod(method: ArkMethod): void;
+    /**
+     * add a method in class.
+     * when a nested method with declare name, add both the declare origin name and signature name
+     * %${declare name}$${outer method name} in class.
+     */
+    addMethod(method: ArkMethod, originName?: string): void;
     setDefaultArkMethod(defaultMethod: ArkMethod): void;
     getDefaultArkMethod(): ArkMethod | null;
     setViewTree(viewTree: ViewTree): void;