arkanalyzer 1.0.86 → 1.0.88

package/lib/core/inference/abc/AbcInference.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- * Copyright (c) 2026 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
@@ -19,8 +19,12 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+var AbcInstanceInvokeExprInference_1, AbcExceptionRefInference_1;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AbcFieldRefInference = exports.AbcInferenceBuilder = exports.AbcMethodInference = void 0;
+exports.AbcExceptionRefInference = exports.AbcInstanceInvokeExprInference = exports.AbcFieldRefInference = exports.AbcInferenceBuilder = exports.AbcMethodInference = void 0;
 const ModelInference_1 = require("../ModelInference");
 const ModelUtils_1 = require("../../common/ModelUtils");
 const ArkMethod_1 = require("../../model/ArkMethod");
@@ -32,6 +36,12 @@ const TypeInference_1 = require("../../common/TypeInference");
 const Type_1 = require("../../base/Type");
 const Local_1 = require("../../base/Local");
 const Ref_1 = require("../../base/Ref");
+const Const_1 = require("../../common/Const");
+const path_1 = __importDefault(require("path"));
+const ArkField_1 = require("../../model/ArkField");
+const IRInference_1 = require("../../common/IRInference");
+const ArkClass_1 = require("../../model/ArkClass");
+const EtsConst_1 = require("../../common/EtsConst");
 class AbcImportInference extends ModelInference_1.ImportInfoInference {
     /**
      * get arkFile and assign to from file
@@ -43,7 +53,7 @@ class AbcImportInference extends ModelInference_1.ImportInfoInference {
             return;
         }
         let file;
-        if (/^([^@]*\/)([^\/]*)$/.test(from)) {
+        if (path_1.default.isAbsolute(from)) {
             const scene = fromInfo.getDeclaringArkFile().getScene();
             file = scene.getFile(new ArkSignature_1.FileSignature(fromInfo.getDeclaringArkFile().getProjectName(), from));
         }
@@ -158,7 +168,8 @@ class AbcStmtInference extends ModelInference_1.StmtInference {
                 target.setType(srcType);
                 return target.getUsedStmts();
             }
-            else if (target instanceof Ref_1.AbstractFieldRef) {
+            else if (target instanceof Ref_1.AbstractFieldRef && projectName === target.getFieldSignature().getDeclaringSignature()
+                .getDeclaringFileSignature().getProjectName()) {
                 target.getFieldSignature().setType(srcType);
             }
             else if (target instanceof Ref_1.ArkParameterRef) {
@@ -195,10 +206,100 @@ let AbcFieldRefInference = class AbcFieldRefInference extends ValueInference_1.F
                 return true;
             }
         }
+        const signature = value.getFieldSignature().getDeclaringSignature();
+        if (signature instanceof ArkSignature_1.ClassSignature && signature.getClassName().startsWith(Const_1.ANONYMOUS_CLASS_PREFIX)) {
+            return true;
+        }
         return super.preInfer(value, stmt);
     }
+    infer(value, stmt) {
+        const result = super.infer(value, stmt);
+        if (!result && value.getType() instanceof Type_1.UnknownType) {
+            const signature = value.getFieldSignature().getDeclaringSignature();
+            const scene = stmt.getCfg().getDeclaringMethod().getDeclaringArkFile().getScene();
+            if (signature instanceof ArkSignature_1.ClassSignature && signature.getDeclaringFileSignature().getProjectName() === scene.getProjectName()) {
+                const cls = scene.getClass(signature);
+                if (cls) {
+                    const field = new ArkField_1.ArkField();
+                    field.setDeclaringArkClass(cls);
+                    const fieldSignature = new ArkSignature_1.FieldSignature(value.getFieldSignature().getFieldName(), cls.getSignature(), Type_1.UnknownType.getInstance());
+                    field.setSignature(fieldSignature);
+                    cls.addField(field);
+                    value.setFieldSignature(fieldSignature);
+                }
+            }
+        }
+        return result;
+    }
 };
 AbcFieldRefInference = __decorate([
     (0, ValueInference_1.Bind)(ValueInference_1.InferLanguage.ABC)
 ], AbcFieldRefInference);
 exports.AbcFieldRefInference = AbcFieldRefInference;
+let AbcInstanceInvokeExprInference = AbcInstanceInvokeExprInference_1 = class AbcInstanceInvokeExprInference extends ValueInference_1.InstanceInvokeExprInference {
+    /**
+     * Performs inference on an instance invocation expression within the context of a statement
+     * Enhances the base implementation with real generic type inference and extension function support
+     * @param {ArkInstanceInvokeExpr} value - The invocation expression to infer
+     * @param {Stmt} stmt - The statement containing the invocation
+     * @returns {Value | undefined} Returns a new expression if transformed, undefined otherwise
+     */
+    infer(value, stmt) {
+        var _a;
+        const arkMethod = stmt.getCfg().getDeclaringMethod();
+        const result = (_a = IRInference_1.IRInference.inferInstanceMember(value.getBase().getType(), value, arkMethod, ValueInference_1.InstanceInvokeExprInference.inferInvokeExpr)) !== null && _a !== void 0 ? _a : this.processExtendFunc(value, arkMethod);
+        return !result || result === value ? undefined : result;
+    }
+    /**
+     * process Context function
+     * @param value
+     * @param arkMethod
+     */
+    processExtendFunc(value, arkMethod) {
+        var _a, _b;
+        if (value.getBase().getName() === AbcInstanceInvokeExprInference_1.CONTEXT) {
+            const scene = arkMethod.getDeclaringArkFile().getScene();
+            const signature = (_a = scene.getSdkGlobal(AbcInstanceInvokeExprInference_1.CONTEXT)) === null || _a === void 0 ? void 0 : _a.getSignature();
+            if (signature instanceof ArkSignature_1.AliasTypeSignature) {
+                const cls = (_b = scene.getMethod(signature.getDeclaringMethodSignature())) === null || _b === void 0 ? void 0 : _b.getDeclaringArkClass();
+                if (cls) {
+                    return IRInference_1.IRInference.inferInstanceMember(new Type_1.ClassType(cls.getSignature(), cls.getGenericsTypes()), value, arkMethod, ValueInference_1.InstanceInvokeExprInference.inferInvokeExpr);
+                }
+            }
+        }
+        return null;
+    }
+};
+AbcInstanceInvokeExprInference.CONTEXT = 'Context';
+AbcInstanceInvokeExprInference = AbcInstanceInvokeExprInference_1 = __decorate([
+    (0, ValueInference_1.Bind)(ValueInference_1.InferLanguage.ABC)
+], AbcInstanceInvokeExprInference);
+exports.AbcInstanceInvokeExprInference = AbcInstanceInvokeExprInference;
+let AbcExceptionRefInference = AbcExceptionRefInference_1 = class AbcExceptionRefInference extends ValueInference_1.ValueInference {
+    getValueName() {
+        return 'ArkCaughtExceptionRef';
+    }
+    preInfer(value, stmt) {
+        return TypeInference_1.TypeInference.isUnclearType(value.getType());
+    }
+    infer(value, stmt) {
+        var _a;
+        if (!AbcExceptionRefInference_1.ERROR_TYPE) {
+            const scene = stmt.getCfg().getDeclaringMethod().getDeclaringArkFile().getScene();
+            const err = (_a = scene.getSdkArkFiles().find(e => e.getName().endsWith(EtsConst_1.OHOS_BASE_FILE))) === null || _a === void 0 ? void 0 : _a.getClassWithName(EtsConst_1.BUSINESS_ERROR);
+            if (err instanceof ArkClass_1.ArkClass) {
+                AbcExceptionRefInference_1.ERROR_TYPE = new Type_1.ClassType(err.getSignature(), err.getGenericsTypes());
+                value.setType(AbcExceptionRefInference_1.ERROR_TYPE);
+            }
+        }
+        else {
+            value.setType(AbcExceptionRefInference_1.ERROR_TYPE);
+        }
+        return undefined;
+    }
+};
+AbcExceptionRefInference.ERROR_TYPE = null;
+AbcExceptionRefInference = AbcExceptionRefInference_1 = __decorate([
+    (0, ValueInference_1.Bind)(ValueInference_1.InferLanguage.ABC)
+], AbcExceptionRefInference);
+exports.AbcExceptionRefInference = AbcExceptionRefInference;

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

@@ -19,10 +19,22 @@ export declare enum ModifierType {
     OVERRIDE = 8192,
     DECLARE = 16384,
     TYPE = 32768,
-    LAZY = 65536
+    LAZY = 65536,
+    AUTO = 1048576,
+    EXTERN = 2097152,
+    FRIEND = 4194304,
+    VIRTUAL = 8388608,
+    PURE_VIRTUAL = 16777216,
+    INLINE = 33554432,
+    MUTABLE = 67108864,
+    EXPLICIT = 134217728,
+    CONSTEXPR = 268435456,
+    VOLATILE = 536870912,
+    NOEXCEPT = 1073741824
 }
 export declare const MODIFIER_TYPE_MASK = 65535;
 export declare function modifierKind2Enum(kind: ts.SyntaxKind): ModifierType;
+export declare function modifierKind2CxxEnum(kind: string): ModifierType;
 export declare function modifiers2stringArray(modifiers: number): string[];
 export declare abstract class ArkBaseModel {
     protected modifiers?: number;
@@ -42,6 +54,7 @@ export declare abstract class ArkBaseModel {
     isAbstract(): boolean;
     isExport(): boolean;
     isDefault(): boolean;
+    isPureVirtual(): boolean;
     /** @deprecated Use {@link isExport} instead. */
     isExported(): boolean;
     isDeclare(): boolean;

package/lib/core/model/ArkBaseModel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ArkBaseModel.d.ts","sourceRoot":"","sources":["../../../src/core/model/ArkBaseModel.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,MAAM,iBAAiB,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE9C,OAAO,EAAE,QAAQ,EAAgB,MAAM,oBAAoB,CAAC;AAE5D,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAqB9E,oBAAY,YAAY;IACpB,OAAO,IAAI;IACX,SAAS,IAAS;IAClB,MAAM,IAAS;IACf,MAAM,IAAS;IACf,MAAM,KAAS;IACf,QAAQ,KAAS;IACjB,KAAK,KAAS;IACd,KAAK,MAAS;IACd,QAAQ,MAAS;IACjB,OAAO,MAAS;IAChB,EAAE,OAAU;IACZ,QAAQ,OAAU;IAClB,GAAG,OAAU;IACb,QAAQ,OAAU;IAClB,OAAO,QAAU;IACjB,IAAI,QAAU;IACd,IAAI,QAAU;CACjB;AAED,eAAO,MAAM,kBAAkB,QAAS,CAAC;AAwCzC,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,GAAG,YAAY,CAEnE;AAED,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,CASjE;AAED,8BAAsB,YAAY;IAC9B,SAAS,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC7B,SAAS,CAAC,UAAU,CAAC,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;IACtC,SAAS,CAAC,QAAQ,CAAC,EAAE,WAAW,CAAC;IAE1B,WAAW,CAAC,IAAI,EAAE,eAAe,GAAG,eAAe,GAAG,SAAS;IAI/D,WAAW,CAAC,IAAI,EAAE,eAAe,EAAE,KAAK,EAAE,eAAe,GAAG,IAAI;IAOhE,YAAY,IAAI,MAAM;IAOtB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAMrC,WAAW,CAAC,QAAQ,EAAE,YAAY,GAAG,MAAM,GAAG,IAAI;IAIlD,cAAc,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI;IAO5C,QAAQ,IAAI,OAAO;IAInB,WAAW,IAAI,OAAO;IAItB,SAAS,IAAI,OAAO;IAIpB,QAAQ,IAAI,OAAO;IAInB,UAAU,IAAI,OAAO;IAIrB,UAAU,IAAI,OAAO;IAIrB,QAAQ,IAAI,OAAO;IAInB,SAAS,IAAI,OAAO;IAI3B,gDAAgD;IACzC,UAAU,IAAI,OAAO;IAIrB,SAAS,IAAI,OAAO;IAIpB,gBAAgB,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO;IAQrD,aAAa,IAAI,SAAS,EAAE;IAO5B,aAAa,CAAC,UAAU,EAAE,GAAG,CAAC,SAAS,CAAC,GAAG,IAAI;IAM/C,YAAY,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI;IAOxC,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAQnC,mBAAmB,IAAI,OAAO;IAI9B,kBAAkB,IAAI,SAAS,EAAE;IASjC,wBAAwB,IAAI,OAAO;IAInC,iBAAiB,IAAI,OAAO;IAI5B,qBAAqB,IAAI,OAAO;IAIhC,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,OAAO;IAYxD,SAAS,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,QAAQ;aAkBpC,QAAQ,IAAI,QAAQ;CACvC"}
+{"version":3,"file":"ArkBaseModel.d.ts","sourceRoot":"","sources":["../../../src/core/model/ArkBaseModel.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,MAAM,iBAAiB,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE9C,OAAO,EAAE,QAAQ,EAAgB,MAAM,oBAAoB,CAAC;AAE5D,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAqB9E,oBAAY,YAAY;IACpB,OAAO,IAAI;IACX,SAAS,IAAS;IAClB,MAAM,IAAS;IACf,MAAM,IAAS;IACf,MAAM,KAAS;IACf,QAAQ,KAAS;IACjB,KAAK,KAAS;IACd,KAAK,MAAS;IACd,QAAQ,MAAS;IACjB,OAAO,MAAS;IAChB,EAAE,OAAU;IACZ,QAAQ,OAAU;IAClB,GAAG,OAAU;IACb,QAAQ,OAAU;IAClB,OAAO,QAAU;IACjB,IAAI,QAAU;IACd,IAAI,QAAU;IAGd,IAAI,UAAU;IACd,MAAM,UAAU;IAChB,MAAM,UAAU;IAChB,OAAO,UAAU;IACjB,YAAY,WAAU;IACtB,MAAM,WAAU;IAChB,OAAO,WAAU;IACjB,QAAQ,YAAU;IAClB,SAAS,YAAU;IACnB,QAAQ,YAAU;IAClB,QAAQ,aAAU;CACrB;AAED,eAAO,MAAM,kBAAkB,QAAS,CAAC;AAgFzC,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,GAAG,YAAY,CAEnE;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,CAE/D;AAED,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,CASjE;AAED,8BAAsB,YAAY;IAC9B,SAAS,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC7B,SAAS,CAAC,UAAU,CAAC,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;IACtC,SAAS,CAAC,QAAQ,CAAC,EAAE,WAAW,CAAC;IAE1B,WAAW,CAAC,IAAI,EAAE,eAAe,GAAG,eAAe,GAAG,SAAS;IAI/D,WAAW,CAAC,IAAI,EAAE,eAAe,EAAE,KAAK,EAAE,eAAe,GAAG,IAAI;IAOhE,YAAY,IAAI,MAAM;IAOtB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAMrC,WAAW,CAAC,QAAQ,EAAE,YAAY,GAAG,MAAM,GAAG,IAAI;IAIlD,cAAc,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI;IAO5C,QAAQ,IAAI,OAAO;IAInB,WAAW,IAAI,OAAO;IAItB,SAAS,IAAI,OAAO;IAIpB,QAAQ,IAAI,OAAO;IAInB,UAAU,IAAI,OAAO;IAIrB,UAAU,IAAI,OAAO;IAIrB,QAAQ,IAAI,OAAO;IAInB,SAAS,IAAI,OAAO;IAKpB,aAAa,IAAI,OAAO;IAI/B,gDAAgD;IACzC,UAAU,IAAI,OAAO;IAIrB,SAAS,IAAI,OAAO;IAIpB,gBAAgB,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO;IAQrD,aAAa,IAAI,SAAS,EAAE;IAO5B,aAAa,CAAC,UAAU,EAAE,GAAG,CAAC,SAAS,CAAC,GAAG,IAAI;IAM/C,YAAY,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI;IAOxC,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAQnC,mBAAmB,IAAI,OAAO;IAI9B,kBAAkB,IAAI,SAAS,EAAE;IASjC,wBAAwB,IAAI,OAAO;IAInC,iBAAiB,IAAI,OAAO;IAI5B,qBAAqB,IAAI,OAAO;IAIhC,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,OAAO;IAYxD,SAAS,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,QAAQ;aAkBpC,QAAQ,IAAI,QAAQ;CACvC"}

package/lib/core/model/ArkBaseModel.js

@@ -40,7 +40,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ArkBaseModel = exports.modifiers2stringArray = exports.modifierKind2Enum = exports.MODIFIER_TYPE_MASK = exports.ModifierType = void 0;
+exports.ArkBaseModel = exports.modifiers2stringArray = exports.modifierKind2CxxEnum = exports.modifierKind2Enum = exports.MODIFIER_TYPE_MASK = exports.ModifierType = void 0;
 const ohos_typescript_1 = __importDefault(require("ohos-typescript"));
 const EtsConst_1 = require("../common/EtsConst");
 const ArkError_1 = require("../common/ArkError");
@@ -83,6 +83,18 @@ var ModifierType;
     ModifierType[ModifierType["DECLARE"] = 16384] = "DECLARE";
     ModifierType[ModifierType["TYPE"] = 32768] = "TYPE";
     ModifierType[ModifierType["LAZY"] = 65536] = "LAZY";
+    // The following are CXX specific modifiers.
+    ModifierType[ModifierType["AUTO"] = 1048576] = "AUTO";
+    ModifierType[ModifierType["EXTERN"] = 2097152] = "EXTERN";
+    ModifierType[ModifierType["FRIEND"] = 4194304] = "FRIEND";
+    ModifierType[ModifierType["VIRTUAL"] = 8388608] = "VIRTUAL";
+    ModifierType[ModifierType["PURE_VIRTUAL"] = 16777216] = "PURE_VIRTUAL";
+    ModifierType[ModifierType["INLINE"] = 33554432] = "INLINE";
+    ModifierType[ModifierType["MUTABLE"] = 67108864] = "MUTABLE";
+    ModifierType[ModifierType["EXPLICIT"] = 134217728] = "EXPLICIT";
+    ModifierType[ModifierType["CONSTEXPR"] = 268435456] = "CONSTEXPR";
+    ModifierType[ModifierType["VOLATILE"] = 536870912] = "VOLATILE";
+    ModifierType[ModifierType["NOEXCEPT"] = 1073741824] = "NOEXCEPT";
 })(ModifierType = exports.ModifierType || (exports.ModifierType = {}));
 exports.MODIFIER_TYPE_MASK = 0xffff;
 const MODIFIER_TYPE_STRINGS = [
@@ -102,6 +114,45 @@ const MODIFIER_TYPE_STRINGS = [
     'override',
     'declare',
 ];
+/**
+ *Map the C++modifier keyword to the corresponding modifier type enumeration value
+ *
+ *This constant defines a Map object, which is used to map the modifier keyword string in C++language to
+ *The corresponding ModifierType enumeration value is convenient for type identification and processing during code analysis and conversion.
+ *
+ *Included modifier mapping relationship:
+ *- virtual ->ModifierType.VIRTUAL: virtual function modifier
+ *- const ->ModifierType.CONST: constant modifier
+ *- private ->ModifierType.PRIVATE: private access modifier
+ *- protected ->ModifierType.PROTECTED: protect access modifier
+ *- public ->ModifierType.PUBLIC: public access modifier
+ *- extern ->ModifierType.EXTERN: external link modifier
+ *- friend ->ModifierType.FRIEND: Friend modifier
+ *- override ->ModifierType.OVERRIDE: override modifier
+ *- static ->ModifierType.STATIC: static modifier
+ *- pure virtual ->ModifierType.PURE_VIRTUAL: pure virtual function modifier
+ *- abstract ->ModifierType.ABSTRACT: abstract class modifier (implemented through pure virtual function in C++)
+ */
+const MODIFIER_KIND_2_ENUM_CXX = new Map([
+    ['virtual', ModifierType.VIRTUAL],
+    ['const', ModifierType.CONST],
+    ['private', ModifierType.PRIVATE],
+    ['protected', ModifierType.PROTECTED],
+    ['public', ModifierType.PUBLIC],
+    ['extern', ModifierType.EXTERN],
+    ['friend', ModifierType.FRIEND],
+    ['override', ModifierType.OVERRIDE],
+    ['static', ModifierType.STATIC],
+    ['pure virtual', ModifierType.PURE_VIRTUAL],
+    // In C++, a class with pure virtual functions is an abstract class. This sets a modifier to correspond to the abstract class in TypeScript.
+    ['abstract', ModifierType.ABSTRACT],
+    ['inline', ModifierType.INLINE],
+    ['mutable', ModifierType.MUTABLE],
+    ['explicit', ModifierType.EXPLICIT],
+    ['constexpr', ModifierType.CONSTEXPR],
+    ['volatile', ModifierType.VOLATILE],
+    ['noexcept', ModifierType.NOEXCEPT],
+]);
 const MODIFIER_KIND_2_ENUM = new Map([
     [ohos_typescript_1.default.SyntaxKind.AbstractKeyword, ModifierType.ABSTRACT],
     [ohos_typescript_1.default.SyntaxKind.AccessorKeyword, ModifierType.ACCESSOR],
@@ -125,6 +176,10 @@ function modifierKind2Enum(kind) {
     return MODIFIER_KIND_2_ENUM.get(kind);
 }
 exports.modifierKind2Enum = modifierKind2Enum;
+function modifierKind2CxxEnum(kind) {
+    return MODIFIER_KIND_2_ENUM_CXX.get(kind);
+}
+exports.modifierKind2CxxEnum = modifierKind2CxxEnum;
 function modifiers2stringArray(modifiers) {
     let strs = [];
     for (let idx = 0; idx < MODIFIER_TYPE_STRINGS.length; idx++) {
@@ -192,6 +247,10 @@ class ArkBaseModel {
     isDefault() {
         return this.containsModifier(ModifierType.DEFAULT);
     }
+    /* Determine whether a method is a pure virtual method in C++. */
+    isPureVirtual() {
+        return this.containsModifier(ModifierType.PURE_VIRTUAL);
+    }
     /** @deprecated Use {@link isExport} instead. */
     isExported() {
         return this.isExport();
@@ -273,7 +332,7 @@ class ArkBaseModel {
         }
         logger.error(`class fields: ${errs.join(',')} is undefined.`);
         return {
-            errCode: ArkError_1.ArkErrorCode.CLASS_INSTANCE_FIELD_UNDEFINDED,
+            errCode: ArkError_1.ArkErrorCode.CLASS_INSTANCE_FIELD_UNDEFINED,
             errMsg: `${errs.join(',')} is undefined.`,
         };
     }

package/lib/core/model/ArkBody.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ArkBody.d.ts","sourceRoot":"","sources":["../../../src/core/model/ArkBody.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAGtD,qBAAa,OAAO;IAChB,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,WAAW,CAAC,CAAqB;IACzC,OAAO,CAAC,GAAG,CAAM;IACjB,OAAO,CAAC,YAAY,CAAC,CAAmD;IACxE,OAAO,CAAC,KAAK,CAAC,CAAS;gBAEX,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,SAAS,EAAE,sBAAsB,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,IAAI,EAAE;IAQlH,SAAS,IAAI,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC;IAI/B,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,GAAG,IAAI;IAOnC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,IAAI;IAI1C,cAAc,IAAI,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,SAAS;IAIhD,cAAc,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,IAAI;IAIjD,MAAM,IAAI,GAAG;IAIb,MAAM,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI;IAItB,eAAe,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC,SAAS,EAAE,sBAAsB,CAAC,CAAC,GAAG,SAAS;IAI/E,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAQlD,QAAQ,IAAI,IAAI,EAAE,GAAG,SAAS;IAI9B,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,GAAG,IAAI;CAQ1D"}
+{"version":3,"file":"ArkBody.d.ts","sourceRoot":"","sources":["../../../src/core/model/ArkBody.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAGtD,qBAAa,OAAO;IAChB,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,WAAW,CAAC,CAAqB;IACzC,OAAO,CAAC,GAAG,CAAM;IACjB,OAAO,CAAC,YAAY,CAAC,CAAmD;IACxE,OAAO,CAAC,KAAK,CAAC,CAAS;gBAEX,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,SAAS,EAAE,sBAAsB,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,IAAI,EAAE;IAQlH,SAAS,IAAI,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC;IAI/B,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,GAAG,IAAI;IAKnC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,IAAI;IAI1C,cAAc,IAAI,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,SAAS;IAIhD,cAAc,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,IAAI;IAIjD,MAAM,IAAI,GAAG;IAIb,MAAM,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI;IAItB,eAAe,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC,SAAS,EAAE,sBAAsB,CAAC,CAAC,GAAG,SAAS;IAI/E,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAQlD,QAAQ,IAAI,IAAI,EAAE,GAAG,SAAS;IAI9B,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,GAAG,IAAI;CAQ1D"}

package/lib/core/model/ArkBody.js

@@ -28,9 +28,7 @@ class ArkBody {
         return this.locals;
     }
     setLocals(locals) {
-        if (!this.locals) {
-            this.locals = new Map();
-        }
+        this.locals.clear();
         locals.forEach(local => this.locals.set(local.getName(), local));
     }
     addLocal(name, local) {

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

@@ -15,7 +15,13 @@ export declare enum ClassCategory {
     INTERFACE = 2,
     ENUM = 3,
     TYPE_LITERAL = 4,
-    OBJECT = 5
+    OBJECT = 5,
+    UNION = 6
+}
+export interface heritageClassWithInfo {
+    baseClass: ArkClass | undefined | null;
+    isVirtual: boolean;
+    access: string;
 }
 /**
  * @category core/model
@@ -46,6 +52,8 @@ export declare class ArkClass extends ArkBaseModel implements ArkExport {
     private anonymousMethodNumber;
     private indexSignatureNumber;
     private viewTree?;
+    private ts2cxxFuncMap;
+    private classDeclareSignature?;
     constructor();
     /**
      * Returns the program language of the file where this class defined.
@@ -96,6 +104,7 @@ export declare class ArkClass extends ArkBaseModel implements ArkExport {
     setDeclaringArkNamespace(declaringArkNamespace: ArkNamespace | undefined): void;
     isDefaultArkClass(): boolean;
     isAnonymousClass(): boolean;
+    isLibraryClass(): boolean;
     /**
      * Returns the signature of current class (i.e., {@link ClassSignature}).
      * The {@link ClassSignature} can uniquely identify a class, according to which we can find the class from the scene.
@@ -105,12 +114,15 @@ export declare class ArkClass extends ArkBaseModel implements ArkExport {
     setSignature(classSig: ClassSignature): void;
     getSuperClassName(): string;
     addHeritageClassName(className: string): void;
+    addHeritageClassNameWithInfo(className: string, classInfo: heritageClassWithInfo): void;
     /**
      * Returns the superclass of this class.
+     * If the superclass is defined in this project, then its category must not be INTERFACE.
+     * If the superclass is from the 3rd party library, then its category could be INTERFACE.
      * @returns The superclass of this class.
      */
     getSuperClass(): ArkClass | null;
-    private getHeritageClass;
+    getHeritageClass(heritageClassName: string): ArkClass | null;
     getAllHeritageClasses(): ArkClass[];
     getExtendedClasses(): Map<string, ArkClass>;
     addExtendedClass(extendedClass: ArkClass): void;
@@ -154,6 +166,13 @@ export declare class ArkClass extends ArkBaseModel implements ArkExport {
      */
     getMethods(generated?: boolean): ArkMethod[];
     getMethod(methodSignature: MethodSignature): ArkMethod | null;
+    /**
+     * Find a method that matches the specified signature
+     * @ param mtd - Ark method object to check
+     * @ param methodSignature - the method signature to match
+     * @ returns If a matching method is found, the method object will be returned; otherwise, null will be returned
+     */
+    private findMatchingMethod;
     getMethodWithName(methodName: string): ArkMethod | null;
     getStaticMethodWithName(methodName: string): ArkMethod | null;
     /**
@@ -240,5 +259,9 @@ export declare class ArkClass extends ArkBaseModel implements ArkExport {
     removeField(field: ArkField): boolean;
     removeMethod(method: ArkMethod): boolean;
     validate(): ArkError;
+    addTs2cxxFuncMapElement(funcName: string, methods: ArkMethod[]): void;
+    getTs2cxxFuncMap(): Map<string, ArkMethod[]>;
+    getDeclareSignature(): ClassSignature | undefined;
+    setDeclareSignature(classSig: ClassSignature): void;
 }
 //# sourceMappingURL=ArkClass.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ArkClass.d.ts","sourceRoot":"","sources":["../../../src/core/model/ArkClass.ts"],"names":[],"mappings":"AAeA,OAAO,EAAa,WAAW,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,aAAa,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpH,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAIpD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAM9C,oBAAY,aAAa;IACrB,KAAK,IAAI;IACT,MAAM,IAAI;IACV,SAAS,IAAI;IACb,IAAI,IAAI;IACR,YAAY,IAAI;IAChB,MAAM,IAAI;CACb;AAED;;GAEG;AACH,qBAAa,QAAS,SAAQ,YAAa,YAAW,SAAS;IAC3D,OAAO,CAAC,QAAQ,CAAiB;IACjC,OAAO,CAAC,IAAI,CAAC,CAAS;IACtB,OAAO,CAAC,OAAO,CAAc;IAE7B,OAAO,CAAC,gBAAgB,CAAW;IACnC,OAAO,CAAC,qBAAqB,CAA2B;IACxD,OAAO,CAAC,cAAc,CAAkB;IACxC;;;;OAIG;IACH,OAAO,CAAC,eAAe,CAA4F;IAEnH,OAAO,CAAC,aAAa,CAAC,CAAgB;IACtC,OAAO,CAAC,SAAS,CAAC,CAAS;IAC3B,OAAO,CAAC,aAAa,CAA0B;IAG/C,OAAO,CAAC,OAAO,CAA4D;IAC3E,OAAO,CAAC,MAAM,CAAsD;IACpE,OAAO,CAAC,eAAe,CAAsD;IAC7E,OAAO,CAAC,aAAa,CAA4D;IACjF,OAAO,CAAC,YAAY,CAAsD;IAE1E,OAAO,CAAC,kBAAkB,CAA8B;IACxD,OAAO,CAAC,gBAAgB,CAA8B;IAEtD,OAAO,CAAC,qBAAqB,CAAa;IAC1C,OAAO,CAAC,oBAAoB,CAAa;IAEzC,OAAO,CAAC,QAAQ,CAAC,CAAW;;IAM5B;;OAEG;IACI,WAAW,IAAI,QAAQ;IAI9B;;;OAGG;IACI,OAAO,IAAI,MAAM;IAIxB;;;OAGG;IACI,OAAO,IAAI,MAAM,GAAG,SAAS;IAI7B,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAIlC;;;OAGG;IACI,OAAO,IAAI,MAAM;IAIjB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAIlC;;;OAGG;IACI,SAAS,IAAI,MAAM;IAInB,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAI/B,WAAW,IAAI,aAAa;IAI5B,WAAW,CAAC,QAAQ,EAAE,aAAa,GAAG,IAAI;IAIjD;;;;;;;;;OASG;IACI,mBAAmB,IAAI,OAAO;IAI9B,mBAAmB,CAAC,gBAAgB,EAAE,OAAO,GAAG,IAAI;IAI3D;;;OAGG;IACI,wBAAwB,IAAI,YAAY,GAAG,SAAS;IAIpD,wBAAwB,CAAC,qBAAqB,EAAE,YAAY,GAAG,SAAS,GAAG,IAAI;IAI/E,iBAAiB,IAAI,OAAO;IAI5B,gBAAgB,IAAI,OAAO;IAIlC;;;;OAIG;IACI,YAAY,IAAI,cAAc;IAI9B,YAAY,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI;IAI5C,iBAAiB,IAAI,MAAM;IAI3B,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAIpD;;;OAGG;IACI,aAAa,IAAI,QAAQ,GAAG,IAAI;IAQvC,OAAO,CAAC,gBAAgB;IAuBjB,qBAAqB,IAAI,QAAQ,EAAE;IAWnC,kBAAkB,IAAI,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC;IAI3C,gBAAgB,CAAC,aAAa,EAAE,QAAQ,GAAG,IAAI;IAI/C,4BAA4B,IAAI,MAAM,EAAE;IAOxC,uBAAuB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO;IAIvD,uBAAuB,CAAC,aAAa,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI;IAQtE;;;;;OAKG;IACI,QAAQ,CAAC,cAAc,EAAE,cAAc,GAAG,QAAQ,GAAG,IAAI;IASzD,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI;IAIpD,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI;IAIjE;;;OAGG;IACI,SAAS,IAAI,QAAQ,EAAE;IAMvB,QAAQ,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI;IAQ/B,SAAS,CAAC,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI;IAMnC,YAAY,IAAI,IAAI,EAAE,GAAG,SAAS;IAIlC,gBAAgB,IAAI,WAAW,EAAE,GAAG,SAAS;IAI7C,cAAc,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI;IAO/C;;;;;;;;;;;;;;;OAeG;IACI,UAAU,CAAC,SAAS,CAAC,EAAE,OAAO,GAAG,SAAS,EAAE;IAO5C,SAAS,CAAC,eAAe,EAAE,eAAe,GAAG,SAAS,GAAG,IAAI;IAqB7D,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAYvD,uBAAuB,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAYpE;;;;OAIG;IACI,SAAS,CAAC,MAAM,EAAE,SAAS,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI;IAY9D;;;;;OAKG;IACH,OAAO,CAAC,eAAe;IAqBvB;;;;;OAKG;IACI,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,EAAE;IAI1D;;;;;OAKG;IACI,wBAAwB,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,EAAE;IAIhE;;;;;OAKG;IACI,qBAAqB,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,EAAE;IAKtD,mBAAmB,CAAC,aAAa,EAAE,SAAS,GAAG,IAAI;IAKnD,mBAAmB,IAAI,SAAS,GAAG,IAAI;IAIvC,WAAW,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAI5C;;;;;;;;;;;;;;;OAeG;IACI,WAAW,IAAI,QAAQ,GAAG,SAAS;IAI1C;;;;;;;;;;;;;;;;OAgBG;IACI,WAAW,IAAI,OAAO;IAItB,eAAe,CAAC,QAAQ,EAAE,GAAG,CAAC,aAAa,GAAG,kBAAkB,EAAE,QAAQ,EAAE,CAAC,GAAG,QAAQ,EAAE;IAkB1F,iBAAiB,CAAC,SAAS,EAAE,GAAG,CAAC,aAAa,GAAG,kBAAkB,EAAE,KAAK,EAAE,CAAC,GAAG,KAAK,EAAE;IAOvF,wBAAwB,IAAI,MAAM;IAIlC,uBAAuB,IAAI,MAAM;IAIxC,aAAa,IAAI,UAAU;IAIpB,qBAAqB,IAAI,SAAS;IAIlC,mBAAmB,IAAI,SAAS;IAIhC,qBAAqB,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI;IAIjD,mBAAmB,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI;IAI/C,WAAW,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO;IAOrC,YAAY,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO;IAWxC,QAAQ,IAAI,QAAQ;CAG9B"}
+{"version":3,"file":"ArkClass.d.ts","sourceRoot":"","sources":["../../../src/core/model/ArkClass.ts"],"names":[],"mappings":"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"}

package/lib/core/model/ArkClass.js

@@ -56,6 +56,8 @@ var ClassCategory;
     ClassCategory[ClassCategory["ENUM"] = 3] = "ENUM";
     ClassCategory[ClassCategory["TYPE_LITERAL"] = 4] = "TYPE_LITERAL";
     ClassCategory[ClassCategory["OBJECT"] = 5] = "OBJECT";
+    // The following are CXX specific categories.
+    ClassCategory[ClassCategory["UNION"] = 6] = "UNION";
 })(ClassCategory = exports.ClassCategory || (exports.ClassCategory = {}));
 /**
  * @category core/model
@@ -81,6 +83,8 @@ class ArkClass extends ArkBaseModel_1.ArkBaseModel {
         this.staticInitMethod = new ArkMethod_1.ArkMethod();
         this.anonymousMethodNumber = 0;
         this.indexSignatureNumber = 0;
+        // In order to record the mapping between arkTS and CPP functions
+        this.ts2cxxFuncMap = new Map();
     }
     /**
      * Returns the program language of the file where this class defined.
@@ -164,6 +168,10 @@ class ArkClass extends ArkBaseModel_1.ArkBaseModel {
     isAnonymousClass() {
         return this.getName().startsWith(Const_1.ANONYMOUS_CLASS_PREFIX);
     }
+    isLibraryClass() {
+        const file = this.getDeclaringArkFile();
+        return file.getProjectName() !== file.getScene().getProjectName();
+    }
     /**
      * Returns the signature of current class (i.e., {@link ClassSignature}).
      * The {@link ClassSignature} can uniquely identify a class, according to which we can find the class from the scene.
@@ -181,23 +189,34 @@ class ArkClass extends ArkBaseModel_1.ArkBaseModel {
     addHeritageClassName(className) {
         this.heritageClasses.set(className, undefined);
     }
+    addHeritageClassNameWithInfo(className, classInfo) {
+        this.heritageClasses.set(className, classInfo);
+    }
     /**
      * Returns the superclass of this class.
+     * If the superclass is defined in this project, then its category must not be INTERFACE.
+     * If the superclass is from the 3rd party library, then its category could be INTERFACE.
      * @returns The superclass of this class.
      */
     getSuperClass() {
         const heritageClass = this.getHeritageClass(this.getSuperClassName());
-        if (heritageClass && heritageClass.getCategory() !== ClassCategory.INTERFACE) {
-            return heritageClass;
+        if (heritageClass) {
+            if (heritageClass.getCategory() !== ClassCategory.INTERFACE) {
+                return heritageClass;
+            }
+            if (heritageClass.isLibraryClass()) {
+                return heritageClass;
+            }
         }
         return null;
     }
     getHeritageClass(heritageClassName) {
-        var _a;
+        var _a, _b, _c;
         if (!heritageClassName) {
             return null;
         }
-        let superClass = this.heritageClasses.get(heritageClassName);
+        let superClassWithInfo = this.heritageClasses.get(heritageClassName);
+        let superClass = superClassWithInfo === null || superClassWithInfo === void 0 ? void 0 : superClassWithInfo.baseClass;
         if (superClass === undefined) {
             let type = (_a = TypeInference_1.TypeInference.inferUnclearRefName(heritageClassName, this)) !== null && _a !== void 0 ? _a : TypeInference_1.TypeInference.inferUnclearRefName(heritageClassName, this.getDeclaringArkFile().getDefaultClass());
             if (type) {
@@ -210,16 +229,28 @@ class ArkClass extends ArkBaseModel_1.ArkBaseModel {
                     this.realTypes = realGenericTypes;
                 }
             }
-            this.heritageClasses.set(heritageClassName, superClass || null);
+            superClassWithInfo = {
+                baseClass: superClass,
+                isVirtual: (_b = superClassWithInfo === null || superClassWithInfo === void 0 ? void 0 : superClassWithInfo.isVirtual) !== null && _b !== void 0 ? _b : false,
+                access: (_c = superClassWithInfo === null || superClassWithInfo === void 0 ? void 0 : superClassWithInfo.access) !== null && _c !== void 0 ? _c : 'private',
+            };
+            this.heritageClasses.set(heritageClassName, superClassWithInfo);
         }
-        return superClass || null;
+        return (superClassWithInfo === null || superClassWithInfo === void 0 ? void 0 : superClassWithInfo.baseClass) || null;
     }
     getAllHeritageClasses() {
         const result = [];
         this.heritageClasses.forEach((v, k) => {
             const heritage = v !== null && v !== void 0 ? v : this.getHeritageClass(k);
             if (heritage) {
-                result.push(heritage);
+                // C++ feature: inheritance may carry extra metadata (e.g., virtual inheritance/access),
+                // so we may get `heritageClassWithInfo` and must extract `baseClass`.
+                if ('baseClass' in heritage && heritage.baseClass) {
+                    result.push(heritage.baseClass);
+                }
+                else if (heritage instanceof ArkClass) {
+                    result.push(heritage);
+                }
             }
         });
         return result;
@@ -323,21 +354,35 @@ class ArkClass extends ArkBaseModel_1.ArkBaseModel {
         return [...new Set(allMethods)];
     }
     getMethod(methodSignature) {
-        var _a;
         const methodName = methodSignature.getMethodSubSignature().getMethodName();
-        const methodSearched = (_a = this.getMethodWithName(methodName)) !== null && _a !== void 0 ? _a : this.getStaticMethodWithName(methodName);
-        if (methodSearched === null) {
+        const methodsWithSameName = this.getAllMethodsWithName(methodName);
+        if (methodsWithSameName.length === 0) {
             return null;
         }
-        const implSignature = methodSearched.getImplementationSignature();
+        for (const mtd of methodsWithSameName) {
+            let methodMatched = this.findMatchingMethod(mtd, methodSignature);
+            if (methodMatched) {
+                return methodMatched;
+            }
+        }
+        return null;
+    }
+    /**
+     * Find a method that matches the specified signature
+     * @ param mtd - Ark method object to check
+     * @ param methodSignature - the method signature to match
+     * @ returns If a matching method is found, the method object will be returned; otherwise, null will be returned
+     */
+    findMatchingMethod(mtd, methodSignature) {
+        const implSignature = mtd.getImplementationSignature();
         if (implSignature !== null && implSignature.isMatch(methodSignature)) {
-            return methodSearched;
+            return mtd;
         }
-        const declareSignatures = methodSearched.getDeclareSignatures();
+        const declareSignatures = mtd.getDeclareSignatures();
         if (declareSignatures !== null) {
             for (let i = 0; i < declareSignatures.length; i++) {
                 if (declareSignatures[i].isMatch(methodSignature)) {
-                    return methodSearched;
+                    return mtd;
                 }
             }
         }
@@ -485,22 +530,7 @@ class ArkClass extends ArkBaseModel_1.ArkBaseModel {
         return this.viewTree !== undefined;
     }
     getStaticFields(classMap) {
-        const fields = [];
-        let classes = [];
-        if (this.declaringArkNamespace) {
-            classes = classMap.get(this.declaringArkNamespace.getNamespaceSignature());
-        }
-        else {
-            classes = classMap.get(this.declaringArkFile.getFileSignature());
-        }
-        for (const arkClass of classes) {
-            for (const field of arkClass.getFields()) {
-                if (field.isStatic()) {
-                    fields.push(field);
-                }
-            }
-        }
-        return fields;
+        return Array.from(this.staticFields.values());
     }
     getGlobalVariable(globalMap) {
         if (this.declaringArkNamespace) {
@@ -549,5 +579,17 @@ class ArkClass extends ArkBaseModel_1.ArkBaseModel {
     validate() {
         return this.validateFields(['declaringArkFile', 'category', 'classSignature']);
     }
+    addTs2cxxFuncMapElement(funcName, methods) {
+        this.ts2cxxFuncMap.set(funcName, methods);
+    }
+    getTs2cxxFuncMap() {
+        return this.ts2cxxFuncMap;
+    }
+    getDeclareSignature() {
+        return this.classDeclareSignature;
+    }
+    setDeclareSignature(classSig) {
+        this.classDeclareSignature = classSig;
+    }
 }
 exports.ArkClass = ArkClass;

package/lib/core/model/ArkField.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ArkField.d.ts","sourceRoot":"","sources":["../../../src/core/model/ArkField.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAiB,MAAM,YAAY,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,YAAY,EAAgB,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAErC,oBAAY,aAAa;IACrB,oBAAoB,IAAI;IACxB,mBAAmB,IAAI;IACvB,8BAA8B,IAAI;IAClC,iBAAiB,IAAI;IACrB,kBAAkB,IAAI;IACtB,WAAW,IAAI;IACf,eAAe,IAAI;IACnB,YAAY,IAAI;IAChB,kBAAkB,IAAI;CACzB;AAED;;GAEG;AACH,qBAAa,QAAS,SAAQ,YAAY;IACtC,OAAO,CAAC,IAAI,CAAc;IAC1B,OAAO,CAAC,QAAQ,CAAiB;IAEjC,OAAO,CAAC,cAAc,CAAY;IAClC,OAAO,CAAC,aAAa,CAAkB;IACvC,OAAO,CAAC,gBAAgB,CAAkB;IAE1C,OAAO,CAAC,cAAc,CAAkB;IACxC,OAAO,CAAC,cAAc,CAAC,CAAkB;IAEzC,OAAO,CAAC,WAAW,CAAc;;IAMjC;;OAEG;IACI,WAAW,IAAI,QAAQ;IAIvB,oBAAoB,IAAI,QAAQ;IAIhC,oBAAoB,CAAC,cAAc,EAAE,QAAQ,GAAG,IAAI;IAI3D;;;OAGG;IACI,OAAO,IAAI,MAAM;IAIjB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI3B,WAAW,IAAI,aAAa;IAI5B,WAAW,CAAC,QAAQ,EAAE,aAAa,GAAG,IAAI;IAI1C,OAAO,IAAI,MAAM;IAIjB,OAAO,IAAI,IAAI;IAIf,YAAY,IAAI,cAAc;IAI9B,YAAY,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI;IAInD;;;OAGG;IACI,cAAc,IAAI,IAAI,EAAE;IAIxB,cAAc,CAAC,WAAW,EAAE,IAAI,EAAE,GAAG,IAAI;IAIzC,gBAAgB,CAAC,aAAa,EAAE,OAAO,GAAG,IAAI;IAI9C,mBAAmB,CAAC,gBAAgB,EAAE,OAAO,GAAG,IAAI;IAIpD,gBAAgB,IAAI,OAAO;IAI3B,mBAAmB,IAAI,OAAO;IAI9B,iBAAiB,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI;IAIzD;;;OAGG;IACI,iBAAiB,IAAI,eAAe;IAIpC,QAAQ,IAAI,QAAQ;IAKpB,QAAQ,IAAI,OAAO;CAW7B"}
+{"version":3,"file":"ArkField.d.ts","sourceRoot":"","sources":["../../../src/core/model/ArkField.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAiB,MAAM,YAAY,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,YAAY,EAAgB,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAErC,oBAAY,aAAa;IACrB,oBAAoB,IAAI;IACxB,mBAAmB,IAAI;IACvB,8BAA8B,IAAI;IAClC,iBAAiB,IAAI;IACrB,kBAAkB,IAAI;IACtB,WAAW,IAAI;IACf,eAAe,IAAI;IACnB,YAAY,IAAI;IAChB,kBAAkB,IAAI;CACzB;AAED;;GAEG;AACH,qBAAa,QAAS,SAAQ,YAAY;IACtC,OAAO,CAAC,IAAI,CAAc;IAC1B,OAAO,CAAC,QAAQ,CAAiB;IAEjC,OAAO,CAAC,cAAc,CAAY;IAClC,OAAO,CAAC,aAAa,CAAkB;IACvC,OAAO,CAAC,gBAAgB,CAAkB;IAE1C,OAAO,CAAC,cAAc,CAAkB;IACxC,OAAO,CAAC,cAAc,CAAC,CAAkB;IAEzC,OAAO,CAAC,WAAW,CAAc;;IAMjC;;OAEG;IACI,WAAW,IAAI,QAAQ;IAIvB,oBAAoB,IAAI,QAAQ;IAIhC,oBAAoB,CAAC,cAAc,EAAE,QAAQ,GAAG,IAAI;IAI3D;;;OAGG;IACI,OAAO,IAAI,MAAM;IAIjB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI3B,WAAW,IAAI,aAAa;IAI5B,WAAW,CAAC,QAAQ,EAAE,aAAa,GAAG,IAAI;IAI1C,OAAO,IAAI,MAAM;IAIjB,OAAO,IAAI,IAAI;IAIf,YAAY,IAAI,cAAc;IAI9B,YAAY,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI;IAInD;;;OAGG;IACI,cAAc,IAAI,IAAI,EAAE;IAIxB,cAAc,CAAC,WAAW,EAAE,IAAI,EAAE,GAAG,IAAI;IAIzC,gBAAgB,CAAC,aAAa,EAAE,OAAO,GAAG,IAAI;IAI9C,mBAAmB,CAAC,gBAAgB,EAAE,OAAO,GAAG,IAAI;IAIpD,gBAAgB,IAAI,OAAO;IAI3B,mBAAmB,IAAI,OAAO;IAI9B,iBAAiB,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI;IAIzD;;;OAGG;IACI,iBAAiB,IAAI,eAAe;IAIpC,QAAQ,IAAI,QAAQ;IAKpB,QAAQ,IAAI,OAAO;CAa7B"}

package/lib/core/model/ArkField.js

@@ -122,7 +122,9 @@ class ArkField extends ArkBaseModel_1.ArkBaseModel {
         if (!this.containsModifier(ArkBaseModel_1.ModifierType.PUBLIC) &&
             !this.containsModifier(ArkBaseModel_1.ModifierType.PRIVATE) &&
             !this.containsModifier(ArkBaseModel_1.ModifierType.PROTECTED) &&
-            this.getDeclaringArkClass().getCategory() === ArkClass_1.ClassCategory.CLASS) {
+            (this.getDeclaringArkClass().getCategory() === ArkClass_1.ClassCategory.CLASS ||
+                this.getDeclaringArkClass().getCategory() === ArkClass_1.ClassCategory.INTERFACE ||
+                this.getDeclaringArkClass().getCategory() === ArkClass_1.ClassCategory.OBJECT)) {
             return true;
         }
         return this.containsModifier(ArkBaseModel_1.ModifierType.PUBLIC);

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

@@ -33,6 +33,7 @@ export declare class ArkFile {
     private fileSignature;
     private ohPackageJson5Path;
     private anonymousClassNumber;
+    private anonymousNamespaceNumber;
     private ast;
     constructor(language: Language);
     /**
@@ -87,7 +88,8 @@ export declare class ArkFile {
      * @returns A class. If there is no class, the return will be a **null**.
      */
     getClass(classSignature: ClassSignature): ArkClass | null;
-    getClassWithName(Class: string): ArkClass | null;
+    getClassWithName(className: string): ArkClass | null;
+    private findClassInNamespace;
     getClasses(): ArkClass[];
     addNamespace(namespace: ArkNamespace): void;
     /**
@@ -145,6 +147,7 @@ export declare class ArkFile {
     setFileSignature(fileSignature: FileSignature): void;
     getAllNamespacesUnderThisFile(): ArkNamespace[];
     getAnonymousClassNumber(): number;
+    getAnonymousNamespaceNumber(): number;
     getAST(): ts.SourceFile | null;
     setAST(value: ts.SourceFile | null): void;
 }