arkanalyzer 1.0.93 → 2.0.0-beta1

package/lib/core/model/builder/ArkClassBuilder.d.ts

@@ -3,13 +3,16 @@ import { ArkMethod } from '../ArkMethod';
 import { ArkNamespace } from '../ArkNamespace';
 import ts from 'ohos-typescript';
 import { ArkClass } from '../ArkClass';
+import { ClassSignature } from '../ArkSignature';
 export type ClassLikeNode = ts.ClassDeclaration | ts.InterfaceDeclaration | ts.EnumDeclaration | ts.ClassExpression | ts.TypeLiteralNode | ts.StructDeclaration | ts.ObjectLiteralExpression;
-export declare function buildDefaultArkClassFromArkFile(arkFile: ArkFile, defaultClass: ArkClass, astRoot: ts.SourceFile): void;
-export declare function buildDefaultArkClassFromArkNamespace(arkNamespace: ArkNamespace, defaultClass: ArkClass, nsNode: ts.ModuleDeclaration, sourceFile: ts.SourceFile): void;
+export declare function buildClassSignature(node: ClassLikeNode, declaringInstance: ArkFile | ArkNamespace | ArkMethod): ClassSignature;
+export declare function buildDefaultArkClassFromArkFile(defaultClass: ArkClass, astRoot: ts.SourceFile): void;
 export declare function buildNormalArkClassFromArkMethod(clsNode: ClassLikeNode, cls: ArkClass, sourceFile: ts.SourceFile, declaringMethod?: ArkMethod): void;
 export declare function buildNormalArkClassFromArkFile(clsNode: ClassLikeNode, arkFile: ArkFile, cls: ArkClass, sourceFile: ts.SourceFile, declaringMethod?: ArkMethod): void;
-export declare function buildNormalArkClassFromArkNamespace(clsNode: ClassLikeNode, arkNamespace: ArkNamespace, cls: ArkClass, sourceFile: ts.SourceFile, declaringMethod?: ArkMethod): void;
+export declare function buildNormalArkClassFromArkNamespace(clsNode: ClassLikeNode, cls: ArkClass, sourceFile: ts.SourceFile, declaringMethod?: ArkMethod): void;
+export declare function buildDefaultArkClass(cls: ArkClass, sourceFile: ts.SourceFile, node?: ts.ModuleDeclaration): void;
 export declare function buildNormalArkClass(clsNode: ClassLikeNode, cls: ArkClass, sourceFile: ts.SourceFile, declaringMethod?: ArkMethod): void;
 export declare function init4InstanceInitMethod(cls: ArkClass): void;
 export declare function init4StaticInitMethod(cls: ArkClass): void;
+export declare function registerTypeAliasTypeLiteral(node: ts.TypeAliasDeclaration): void;
 //# sourceMappingURL=ArkClassBuilder.d.ts.map

package/lib/core/model/builder/ArkClassBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ArkClassBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/ArkClassBuilder.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,EAAmE,MAAM,iBAAiB,CAAC;AAClG,OAAO,EAAE,QAAQ,EAAiB,MAAM,aAAa,CAAC;AA4CtD,MAAM,MAAM,aAAa,GACnB,EAAE,CAAC,gBAAgB,GACnB,EAAE,CAAC,oBAAoB,GACvB,EAAE,CAAC,eAAe,GAClB,EAAE,CAAC,eAAe,GAClB,EAAE,CAAC,eAAe,GAClB,EAAE,CAAC,iBAAiB,GACpB,EAAE,CAAC,uBAAuB,CAAC;AAUjC,wBAAgB,+BAA+B,CAAC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,CAAC,UAAU,GAAG,IAAI,CAItH;AAED,wBAAgB,oCAAoC,CAChD,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,QAAQ,EACtB,MAAM,EAAE,EAAE,CAAC,iBAAiB,EAC5B,UAAU,EAAE,EAAE,CAAC,UAAU,GAC1B,IAAI,CAIN;AAED,wBAAgB,gCAAgC,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,eAAe,CAAC,EAAE,SAAS,GAAG,IAAI,CAOpJ;AAED,wBAAgB,8BAA8B,CAC1C,OAAO,EAAE,aAAa,EACtB,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,QAAQ,EACb,UAAU,EAAE,EAAE,CAAC,UAAU,EACzB,eAAe,CAAC,EAAE,SAAS,GAC5B,IAAI,CAQN;AAED,wBAAgB,mCAAmC,CAC/C,OAAO,EAAE,aAAa,EACtB,YAAY,EAAE,YAAY,EAC1B,GAAG,EAAE,QAAQ,EACb,UAAU,EAAE,EAAE,CAAC,UAAU,EACzB,eAAe,CAAC,EAAE,SAAS,GAC5B,IAAI,CASN;AAmBD,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,eAAe,CAAC,EAAE,SAAS,GAAG,IAAI,CA0BvI;AAED,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,QAAQ,GAAG,IAAI,CAa3D;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,QAAQ,GAAG,IAAI,CAgBzD"}
+{"version":3,"file":"ArkClassBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/ArkClassBuilder.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,EAAmE,MAAM,iBAAiB,CAAC;AAClG,OAAO,EAAE,QAAQ,EAAiB,MAAM,aAAa,CAAC;AAkBtD,OAAO,EAAE,cAAc,EAAuD,MAAM,iBAAiB,CAAC;AAgBtG,MAAM,MAAM,aAAa,GACnB,EAAE,CAAC,gBAAgB,GACnB,EAAE,CAAC,oBAAoB,GACvB,EAAE,CAAC,eAAe,GAClB,EAAE,CAAC,eAAe,GAClB,EAAE,CAAC,eAAe,GAClB,EAAE,CAAC,iBAAiB,GACpB,EAAE,CAAC,uBAAuB,CAAC;AA+BjC,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,aAAa,EAAE,iBAAiB,EAAE,OAAO,GAAG,YAAY,GAAG,SAAS,GAAG,cAAc,CAmB9H;AAED,wBAAgB,+BAA+B,CAAC,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,CAAC,UAAU,GAAG,IAAI,CAGpG;AAED,wBAAgB,gCAAgC,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,eAAe,CAAC,EAAE,SAAS,GAAG,IAAI,CAQpJ;AAED,wBAAgB,8BAA8B,CAC1C,OAAO,EAAE,aAAa,EACtB,OAAO,EAAE,OAAO,EAChB,GAAG,EAAE,QAAQ,EACb,UAAU,EAAE,EAAE,CAAC,UAAU,EACzB,eAAe,CAAC,EAAE,SAAS,GAC5B,IAAI,CAON;AAED,wBAAgB,mCAAmC,CAC/C,OAAO,EAAE,aAAa,EACtB,GAAG,EAAE,QAAQ,EACb,UAAU,EAAE,EAAE,CAAC,UAAU,EACzB,eAAe,CAAC,EAAE,SAAS,GAC5B,IAAI,CAMN;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,iBAAiB,GAAG,IAAI,CAKhH;AAQD,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,eAAe,CAAC,EAAE,SAAS,GAAG,IAAI,CA0BvI;AAED,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,QAAQ,GAAG,IAAI,CAW3D;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,QAAQ,GAAG,IAAI,CAYzD;AA+GD,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,EAAE,CAAC,oBAAoB,GAAG,IAAI,CAIhF"}

package/lib/core/model/builder/ArkClassBuilder.js

@@ -40,9 +40,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.init4StaticInitMethod = exports.init4InstanceInitMethod = exports.buildNormalArkClass = exports.buildNormalArkClassFromArkNamespace = exports.buildNormalArkClassFromArkFile = exports.buildNormalArkClassFromArkMethod = exports.buildDefaultArkClassFromArkNamespace = exports.buildDefaultArkClassFromArkFile = void 0;
+exports.registerTypeAliasTypeLiteral = exports.init4StaticInitMethod = exports.init4InstanceInitMethod = exports.buildNormalArkClass = exports.buildDefaultArkClass = exports.buildNormalArkClassFromArkNamespace = exports.buildNormalArkClassFromArkFile = exports.buildNormalArkClassFromArkMethod = exports.buildDefaultArkClassFromArkFile = exports.buildClassSignature = void 0;
 const ArkField_1 = require("../ArkField");
+const ArkFile_1 = require("../ArkFile");
 const ArkMethod_1 = require("../ArkMethod");
+const ArkNamespace_1 = require("../ArkNamespace");
 const logger_1 = __importStar(require("../../../utils/logger"));
 const ohos_typescript_1 = __importDefault(require("ohos-typescript"));
 const ArkClass_1 = require("../ArkClass");
@@ -66,23 +68,63 @@ const Constant_1 = require("../../base/Constant");
 const ValueUtil_1 = require("../../common/ValueUtil");
 const Local_1 = require("../../base/Local");
 const ArkMetadata_1 = require("../ArkMetadata");
+const SignatureCanonicalizerRegistry_1 = require("../../common/SignatureCanonicalizerRegistry");
 const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER, 'ArkClassBuilder');
-function buildDefaultArkClassFromArkFile(arkFile, defaultClass, astRoot) {
-    defaultClass.setDeclaringArkFile(arkFile);
+function newGenClassName(declaringName, declaringInstance) {
+    if (!declaringName) {
+        let num;
+        if (declaringInstance instanceof ArkFile_1.ArkFile) {
+            num = declaringInstance.getAnonymousClassNumber();
+        }
+        else if (declaringInstance instanceof ArkNamespace_1.ArkNamespace) {
+            num = declaringInstance.getAnonymousClassNumber();
+        }
+        else {
+            num = declaringInstance.getDeclaringArkFile().getAnonymousClassNumber();
+        }
+        declaringName = Const_1.ANONYMOUS_CLASS_PREFIX + num;
+    }
+    let suffix = '';
+    if (declaringInstance instanceof ArkMethod_1.ArkMethod) {
+        const methodClass = declaringInstance.getDeclaringArkClass().getName();
+        const methodName = declaringInstance.getName();
+        suffix = `${Const_1.ANONYMOUS_CLASS_DELIMITER}${methodClass}${Const_1.NESTED_CLASS_METHOD_DELIMITER}${methodName}`;
+    }
+    return declaringName + suffix;
+}
+function buildClassSignature(node, declaringInstance) {
+    let className;
+    if (ohos_typescript_1.default.isTypeLiteralNode(node) || ohos_typescript_1.default.isObjectLiteralExpression(node)) {
+        className = '';
+    }
+    else {
+        className = newGenClassName(node.name ? (0, StringUtils_1.cloneText)(node.name.text) : '', declaringInstance);
+    }
+    let declaringFileID;
+    let declaringNsID;
+    if (declaringInstance instanceof ArkFile_1.ArkFile) {
+        declaringFileID = declaringInstance.getFileSigID();
+    }
+    else if (declaringInstance instanceof ArkNamespace_1.ArkNamespace) {
+        declaringFileID = declaringInstance.getDeclaringFileID();
+        declaringNsID = declaringInstance.getNamespaceSigID();
+    }
+    else {
+        declaringFileID = declaringInstance.getDeclaringArkFileID();
+    }
+    return new ArkSignature_1.ClassSignature(className, declaringFileID, declaringNsID);
+}
+exports.buildClassSignature = buildClassSignature;
+function buildDefaultArkClassFromArkFile(defaultClass, astRoot) {
     defaultClass.setCategory(ArkClass_1.ClassCategory.CLASS);
     buildDefaultArkClass(defaultClass, astRoot);
 }
 exports.buildDefaultArkClassFromArkFile = buildDefaultArkClassFromArkFile;
-function buildDefaultArkClassFromArkNamespace(arkNamespace, defaultClass, nsNode, sourceFile) {
-    defaultClass.setDeclaringArkNamespace(arkNamespace);
-    defaultClass.setDeclaringArkFile(arkNamespace.getDeclaringArkFile());
-    buildDefaultArkClass(defaultClass, sourceFile, nsNode);
-}
-exports.buildDefaultArkClassFromArkNamespace = buildDefaultArkClassFromArkNamespace;
 function buildNormalArkClassFromArkMethod(clsNode, cls, sourceFile, declaringMethod) {
     const namespace = cls.getDeclaringArkNamespace();
     if (namespace) {
-        buildNormalArkClassFromArkNamespace(clsNode, namespace, cls, sourceFile, declaringMethod);
+        buildNormalArkClassFromArkNamespace(clsNode, cls, sourceFile, declaringMethod);
+        namespace.addArkClass(cls);
     }
     else {
         buildNormalArkClassFromArkFile(clsNode, cls.getDeclaringArkFile(), cls, sourceFile, declaringMethod);
@@ -90,7 +132,6 @@ function buildNormalArkClassFromArkMethod(clsNode, cls, sourceFile, declaringMet
 }
 exports.buildNormalArkClassFromArkMethod = buildNormalArkClassFromArkMethod;
 function buildNormalArkClassFromArkFile(clsNode, arkFile, cls, sourceFile, declaringMethod) {
-    cls.setDeclaringArkFile(arkFile);
     const { line, character } = ohos_typescript_1.default.getLineAndCharacterOfPosition(sourceFile, clsNode.getStart(sourceFile));
     const endPos = ohos_typescript_1.default.getLineAndCharacterOfPosition(sourceFile, clsNode.getEnd());
     cls.setOriginFullPosition(new Position_1.FullPosition(line + 1, character + 1, endPos.line + 1, endPos.character + 1));
@@ -98,25 +139,22 @@ function buildNormalArkClassFromArkFile(clsNode, arkFile, cls, sourceFile, decla
     arkFile.addArkClass(cls);
 }
 exports.buildNormalArkClassFromArkFile = buildNormalArkClassFromArkFile;
-function buildNormalArkClassFromArkNamespace(clsNode, arkNamespace, cls, sourceFile, declaringMethod) {
-    cls.setDeclaringArkNamespace(arkNamespace);
-    cls.setDeclaringArkFile(arkNamespace.getDeclaringArkFile());
+function buildNormalArkClassFromArkNamespace(clsNode, cls, sourceFile, declaringMethod) {
     const { line, character } = ohos_typescript_1.default.getLineAndCharacterOfPosition(sourceFile, clsNode.getStart(sourceFile));
     const endPos = ohos_typescript_1.default.getLineAndCharacterOfPosition(sourceFile, clsNode.getEnd());
     cls.setOriginFullPosition(new Position_1.FullPosition(line + 1, character + 1, endPos.line + 1, endPos.character + 1));
     buildNormalArkClass(clsNode, cls, sourceFile, declaringMethod);
-    arkNamespace.addArkClass(cls);
 }
 exports.buildNormalArkClassFromArkNamespace = buildNormalArkClassFromArkNamespace;
 function buildDefaultArkClass(cls, sourceFile, node) {
-    var _a;
-    const defaultArkClassSignature = new ArkSignature_1.ClassSignature(Const_1.DEFAULT_ARK_CLASS_NAME, cls.getDeclaringArkFile().getFileSignature(), ((_a = cls.getDeclaringArkNamespace()) === null || _a === void 0 ? void 0 : _a.getSignature()) || null);
+    const defaultArkClassSignature = new ArkSignature_1.ClassSignature(Const_1.DEFAULT_ARK_CLASS_NAME, cls.getDeclaringFileID(), cls.getDeclaringArkNamespaceID());
     cls.setSignature(defaultArkClassSignature);
     genDefaultArkMethod(cls, sourceFile, node);
 }
+exports.buildDefaultArkClass = buildDefaultArkClass;
 function genDefaultArkMethod(cls, sourceFile, node) {
-    let defaultMethod = new ArkMethod_1.ArkMethod();
-    (0, ArkMethodBuilder_1.buildDefaultArkMethodFromArkClass)(cls, defaultMethod, sourceFile, node);
+    let defaultMethod = new ArkMethod_1.ArkMethod(cls.getClassSigID());
+    (0, ArkMethodBuilder_1.buildDefaultArkMethodFromArkClass)(defaultMethod, sourceFile, node);
     cls.setDefaultArkMethod(defaultMethod);
 }
 function buildNormalArkClass(clsNode, cls, sourceFile, declaringMethod) {
@@ -148,13 +186,11 @@ function buildNormalArkClass(clsNode, cls, sourceFile, declaringMethod) {
 }
 exports.buildNormalArkClass = buildNormalArkClass;
 function init4InstanceInitMethod(cls) {
-    const instanceInit = new ArkMethod_1.ArkMethod();
-    instanceInit.setDeclaringArkClass(cls);
-    instanceInit.setIsGeneratedFlag(true);
     const methodSubSignature = ArkSignatureBuilder_1.ArkSignatureBuilder.buildMethodSubSignatureFromMethodName(Const_1.INSTANCE_INIT_METHOD_NAME);
     methodSubSignature.setReturnType(Type_1.VoidType.getInstance());
-    const methodSignature = new ArkSignature_1.MethodSignature(instanceInit.getDeclaringArkClass().getSignature(), methodSubSignature);
-    instanceInit.setImplementationSignature(methodSignature);
+    const methodSignature = new ArkSignature_1.MethodSignature(cls.getClassSigID(), methodSubSignature);
+    const instanceInit = new ArkMethod_1.ArkMethod(cls.getClassSigID(), methodSignature);
+    instanceInit.setIsGeneratedFlag(true);
     instanceInit.setImplOriginFullPosition(new Position_1.FullPosition(0, 0, 0, 0));
     (0, ArkMethodBuilder_1.checkAndUpdateMethod)(instanceInit, cls);
     cls.addMethod(instanceInit);
@@ -162,14 +198,12 @@ function init4InstanceInitMethod(cls) {
 }
 exports.init4InstanceInitMethod = init4InstanceInitMethod;
 function init4StaticInitMethod(cls) {
-    const staticInit = new ArkMethod_1.ArkMethod();
-    staticInit.setDeclaringArkClass(cls);
-    staticInit.setIsGeneratedFlag(true);
-    staticInit.setModifiers(ArkBaseModel_1.ModifierType.STATIC);
     const methodSubSignature = ArkSignatureBuilder_1.ArkSignatureBuilder.buildMethodSubSignatureFromMethodName(Const_1.STATIC_INIT_METHOD_NAME);
     methodSubSignature.setReturnType(Type_1.VoidType.getInstance());
-    const methodSignature = new ArkSignature_1.MethodSignature(staticInit.getDeclaringArkClass().getSignature(), methodSubSignature);
-    staticInit.setImplementationSignature(methodSignature);
+    const methodSignature = new ArkSignature_1.MethodSignature(cls.getClassSigID(), methodSubSignature);
+    const staticInit = new ArkMethod_1.ArkMethod(cls.getClassSigID(), methodSignature);
+    staticInit.setIsGeneratedFlag(true);
+    staticInit.setModifiers(ArkBaseModel_1.ModifierType.STATIC);
     staticInit.setImplOriginFullPosition(new Position_1.FullPosition(0, 0, 0, 0));
     (0, ArkMethodBuilder_1.checkAndUpdateMethod)(staticInit, cls);
     cls.addMethod(staticInit);
@@ -177,16 +211,15 @@ function init4StaticInitMethod(cls) {
 }
 exports.init4StaticInitMethod = init4StaticInitMethod;
 function buildStruct2ArkClass(clsNode, cls, sourceFile, declaringMethod) {
-    var _a;
     const className = genClassName(clsNode.name ? (0, StringUtils_1.cloneText)(clsNode.name.text) : '', cls, declaringMethod);
-    const classSignature = new ArkSignature_1.ClassSignature(className, cls.getDeclaringArkFile().getFileSignature(), ((_a = cls.getDeclaringArkNamespace()) === null || _a === void 0 ? void 0 : _a.getSignature()) || null);
+    const classSignature = new ArkSignature_1.ClassSignature(className, cls.getDeclaringFileID(), cls.getDeclaringArkNamespaceID());
     cls.setSignature(classSignature);
     if (clsNode.typeParameters) {
         (0, builderUtils_1.buildTypeParameters)(clsNode.typeParameters, sourceFile, cls).forEach(typeParameter => {
             cls.addGenericType(typeParameter);
         });
     }
-    initHeritage((0, builderUtils_1.buildHeritageClauses)(clsNode.heritageClauses), cls);
+    initHeritage((0, builderUtils_1.buildHeritageClauses)(clsNode.heritageClauses, sourceFile), cls);
     cls.setModifiers((0, builderUtils_1.buildModifiers)(clsNode));
     cls.setDecorators((0, builderUtils_1.buildDecorators)(clsNode, sourceFile));
     registerCustomComponentIfNeeded(cls);
@@ -196,16 +229,17 @@ function buildStruct2ArkClass(clsNode, cls, sourceFile, declaringMethod) {
     buildArkClassMembers(clsNode, cls, sourceFile);
 }
 function buildClass2ArkClass(clsNode, cls, sourceFile, declaringMethod) {
-    var _a;
-    const className = genClassName(clsNode.name ? (0, StringUtils_1.cloneText)(clsNode.name.text) : '', cls, declaringMethod);
-    const classSignature = new ArkSignature_1.ClassSignature(className, cls.getDeclaringArkFile().getFileSignature(), ((_a = cls.getDeclaringArkNamespace()) === null || _a === void 0 ? void 0 : _a.getSignature()) || null);
-    cls.setSignature(classSignature);
+    if (!cls.getSignature()) {
+        const className = genClassName(clsNode.name ? (0, StringUtils_1.cloneText)(clsNode.name.text) : '', cls, declaringMethod);
+        const classSignature = new ArkSignature_1.ClassSignature(className, cls.getDeclaringFileID(), cls.getDeclaringArkNamespaceID());
+        cls.setSignature(classSignature);
+    }
     if (clsNode.typeParameters) {
         (0, builderUtils_1.buildTypeParameters)(clsNode.typeParameters, sourceFile, cls).forEach(typeParameter => {
             cls.addGenericType(typeParameter);
         });
     }
-    initHeritage((0, builderUtils_1.buildHeritageClauses)(clsNode.heritageClauses), cls);
+    initHeritage((0, builderUtils_1.buildHeritageClauses)(clsNode.heritageClauses, sourceFile), cls);
     cls.setModifiers((0, builderUtils_1.buildModifiers)(clsNode));
     cls.setDecorators((0, builderUtils_1.buildDecorators)(clsNode, sourceFile));
     registerCustomComponentIfNeeded(cls);
@@ -227,30 +261,28 @@ function initHeritage(heritageClauses, cls) {
         cls.addHeritageClassName(key);
     }
 }
-/** Register @Component into Scene.customComponentMap while the class is being built. */
+/** Register @Component into customComponentMap while the class is being built. */
 function registerCustomComponentIfNeeded(cls) {
-    cls.getDeclaringArkFile().getScene().registerCustomComponent(cls);
+    SignatureCanonicalizerRegistry_1.SignatureCanonicalizerRegistry.getInstance().registerCustomComponent(cls);
 }
 function buildInterface2ArkClass(clsNode, cls, sourceFile, declaringMethod) {
-    var _a;
     const className = genClassName(clsNode.name ? (0, StringUtils_1.cloneText)(clsNode.name.text) : '', cls, declaringMethod);
-    const classSignature = new ArkSignature_1.ClassSignature(className, cls.getDeclaringArkFile().getFileSignature(), ((_a = cls.getDeclaringArkNamespace()) === null || _a === void 0 ? void 0 : _a.getSignature()) || null);
+    const classSignature = new ArkSignature_1.ClassSignature(className, cls.getDeclaringFileID(), cls.getDeclaringArkNamespaceID());
     cls.setSignature(classSignature);
     if (clsNode.typeParameters) {
         (0, builderUtils_1.buildTypeParameters)(clsNode.typeParameters, sourceFile, cls).forEach(typeParameter => {
             cls.addGenericType(typeParameter);
         });
     }
-    initHeritage((0, builderUtils_1.buildHeritageClauses)(clsNode.heritageClauses), cls);
+    initHeritage((0, builderUtils_1.buildHeritageClauses)(clsNode.heritageClauses, sourceFile), cls);
     cls.setModifiers((0, builderUtils_1.buildModifiers)(clsNode));
     cls.setDecorators((0, builderUtils_1.buildDecorators)(clsNode, sourceFile));
     cls.setCategory(ArkClass_1.ClassCategory.INTERFACE);
     buildArkClassMembers(clsNode, cls, sourceFile);
 }
 function buildEnum2ArkClass(clsNode, cls, sourceFile, declaringMethod) {
-    var _a;
     const className = genClassName(clsNode.name ? (0, StringUtils_1.cloneText)(clsNode.name.text) : '', cls, declaringMethod);
-    const classSignature = new ArkSignature_1.ClassSignature(className, cls.getDeclaringArkFile().getFileSignature(), ((_a = cls.getDeclaringArkNamespace()) === null || _a === void 0 ? void 0 : _a.getSignature()) || null);
+    const classSignature = new ArkSignature_1.ClassSignature(className, cls.getDeclaringFileID(), cls.getDeclaringArkNamespaceID());
     cls.setSignature(classSignature);
     cls.setModifiers((0, builderUtils_1.buildModifiers)(clsNode));
     cls.setDecorators((0, builderUtils_1.buildDecorators)(clsNode, sourceFile));
@@ -258,40 +290,52 @@ function buildEnum2ArkClass(clsNode, cls, sourceFile, declaringMethod) {
     init4StaticInitMethod(cls);
     buildArkClassMembers(clsNode, cls, sourceFile);
 }
+/**
+ * The type alias a type literal is the direct type of, recorded where the declaration is met.
+ * Signature building parses without parent pointers, so the relation cannot be read back off the
+ * tree there; the body build keeps its pointers and falls back to `parent` below.
+ */
+const typeAliasOfTypeLiteral = new WeakMap();
+function registerTypeAliasTypeLiteral(node) {
+    if (ohos_typescript_1.default.isTypeLiteralNode(node.type)) {
+        typeAliasOfTypeLiteral.set(node.type, node);
+    }
+}
+exports.registerTypeAliasTypeLiteral = registerTypeAliasTypeLiteral;
 function buildTypeLiteralNode2ArkClass(clsNode, cls, sourceFile, declaringMethod) {
     var _a;
     const className = genClassName('', cls, declaringMethod);
-    const classSignature = new ArkSignature_1.ClassSignature(className, cls.getDeclaringArkFile().getFileSignature(), ((_a = cls.getDeclaringArkNamespace()) === null || _a === void 0 ? void 0 : _a.getSignature()) || null);
+    const classSignature = new ArkSignature_1.ClassSignature(className, cls.getDeclaringFileID(), cls.getDeclaringArkNamespaceID());
     cls.setSignature(classSignature);
     cls.setCategory(ArkClass_1.ClassCategory.TYPE_LITERAL);
-    if (ohos_typescript_1.default.isTypeAliasDeclaration(clsNode.parent) && clsNode.parent.typeParameters) {
-        (0, builderUtils_1.buildTypeParameters)(clsNode.parent.typeParameters, sourceFile, cls).forEach(typeParameter => {
+    const enclosingAlias = (_a = typeAliasOfTypeLiteral.get(clsNode)) !== null && _a !== void 0 ? _a : (clsNode.parent !== undefined && ohos_typescript_1.default.isTypeAliasDeclaration(clsNode.parent) ? clsNode.parent : undefined);
+    if (enclosingAlias === null || enclosingAlias === void 0 ? void 0 : enclosingAlias.typeParameters) {
+        (0, builderUtils_1.buildTypeParameters)(enclosingAlias.typeParameters, sourceFile, cls).forEach(typeParameter => {
             cls.addGenericType(typeParameter);
         });
     }
     buildArkClassMembers(clsNode, cls, sourceFile);
 }
 function buildObjectLiteralExpression2ArkClass(clsNode, cls, sourceFile, declaringMethod) {
-    var _a;
     const className = genClassName('', cls, declaringMethod);
-    const classSignature = new ArkSignature_1.ClassSignature(className, cls.getDeclaringArkFile().getFileSignature(), ((_a = cls.getDeclaringArkNamespace()) === null || _a === void 0 ? void 0 : _a.getSignature()) || null);
+    const classSignature = new ArkSignature_1.ClassSignature(className, cls.getDeclaringFileID(), cls.getDeclaringArkNamespaceID());
     cls.setSignature(classSignature);
     cls.setCategory(ArkClass_1.ClassCategory.OBJECT);
     let arkMethods = [];
     init4InstanceInitMethod(cls);
-    const instanceIRTransformer = new ArkIRTransformer_1.ArkIRTransformer(sourceFile, cls.getInstanceInitMethod());
+    const instanceIRTransformer = new ArkIRTransformer_1.ArkIRTransformer(sourceFile, cls.getInstanceInitMethodOrNull());
     const instanceFieldInitializerStmts = [];
     clsNode.properties.forEach(property => {
         if (ohos_typescript_1.default.isPropertyAssignment(property) || ohos_typescript_1.default.isShorthandPropertyAssignment(property) || ohos_typescript_1.default.isSpreadAssignment(property)) {
             (0, ArkFieldBuilder_1.buildProperty2ArkField)(property, sourceFile, cls);
         }
         else {
-            let arkMethod = new ArkMethod_1.ArkMethod();
-            arkMethod.setDeclaringArkClass(cls);
+            const arkMethod = new ArkMethod_1.ArkMethod(cls.getClassSigID());
             (0, ArkMethodBuilder_1.buildArkMethodFromArkClass)(property, cls, arkMethod, sourceFile);
+            arkMethods.push(arkMethod);
         }
     });
-    (0, ArkMethodBuilder_1.buildInitMethod)(cls.getInstanceInitMethod(), instanceFieldInitializerStmts, instanceIRTransformer.getThisLocal(), instanceIRTransformer.getGlobals());
+    (0, ArkMethodBuilder_1.buildInitMethod)(cls.getInstanceInitMethodOrNull(), instanceFieldInitializerStmts, instanceIRTransformer.getThisLocal(), instanceIRTransformer.getGlobals());
     arkMethods.forEach(mtd => {
         (0, ArkMethodBuilder_1.checkAndUpdateMethod)(mtd, cls);
         cls.addMethod(mtd);
@@ -320,11 +364,11 @@ function buildArkClassMembers(clsNode, cls, sourceFile) {
     let instanceIRTransformer;
     let staticIRTransformer;
     if (ohos_typescript_1.default.isClassDeclaration(clsNode) || ohos_typescript_1.default.isClassExpression(clsNode) || ohos_typescript_1.default.isStructDeclaration(clsNode)) {
-        instanceIRTransformer = new ArkIRTransformer_1.ArkIRTransformer(sourceFile, cls.getInstanceInitMethod());
-        staticIRTransformer = new ArkIRTransformer_1.ArkIRTransformer(sourceFile, cls.getStaticInitMethod());
+        instanceIRTransformer = new ArkIRTransformer_1.ArkIRTransformer(sourceFile, cls.getInstanceInitMethodOrNull());
+        staticIRTransformer = new ArkIRTransformer_1.ArkIRTransformer(sourceFile, cls.getStaticInitMethodOrNull());
     }
     if (ohos_typescript_1.default.isEnumDeclaration(clsNode)) {
-        staticIRTransformer = new ArkIRTransformer_1.ArkIRTransformer(sourceFile, cls.getStaticInitMethod());
+        staticIRTransformer = new ArkIRTransformer_1.ArkIRTransformer(sourceFile, cls.getStaticInitMethodOrNull());
     }
     const staticInitStmts = [];
     const instanceInitStmts = [];
@@ -369,15 +413,15 @@ function buildArkClassMembers(clsNode, cls, sourceFile) {
             logger.trace('Skip these members.');
         }
         else {
-            logger.warn(`Please contact developers to support new member in class: ${cls.getSignature().toString()}, member: ${(0, StringUtils_1.cloneText)(member.getText())}!`);
+            logger.warn(`Please contact developers to support new member in class: ${cls.getSignature().toString()}, member: ${(0, StringUtils_1.cloneText)(member.getText(sourceFile))}!`);
         }
     });
     if (ohos_typescript_1.default.isClassDeclaration(clsNode) || ohos_typescript_1.default.isClassExpression(clsNode) || ohos_typescript_1.default.isStructDeclaration(clsNode)) {
-        (0, ArkMethodBuilder_1.buildInitMethod)(cls.getInstanceInitMethod(), instanceInitStmts, instanceIRTransformer.getThisLocal(), instanceIRTransformer.getGlobals());
-        (0, ArkMethodBuilder_1.buildInitMethod)(cls.getStaticInitMethod(), staticInitStmts, staticIRTransformer.getThisLocal(), staticIRTransformer.getGlobals());
+        (0, ArkMethodBuilder_1.buildInitMethod)(cls.getInstanceInitMethodOrNull(), instanceInitStmts, instanceIRTransformer.getThisLocal(), instanceIRTransformer.getGlobals());
+        (0, ArkMethodBuilder_1.buildInitMethod)(cls.getStaticInitMethodOrNull(), staticInitStmts, staticIRTransformer.getThisLocal(), staticIRTransformer.getGlobals());
     }
     if (ohos_typescript_1.default.isEnumDeclaration(clsNode)) {
-        (0, ArkMethodBuilder_1.buildInitMethod)(cls.getStaticInitMethod(), staticInitStmts, staticIRTransformer.getThisLocal(), staticIRTransformer.getGlobals());
+        (0, ArkMethodBuilder_1.buildInitMethod)(cls.getStaticInitMethodOrNull(), staticInitStmts, staticIRTransformer.getThisLocal(), staticIRTransformer.getGlobals());
     }
 }
 function isClassMethod(member) {
@@ -396,7 +440,7 @@ function buildMethodsForClass(clsNode, cls, sourceFile) {
             ohos_typescript_1.default.isConstructSignatureDeclaration(member) ||
             ohos_typescript_1.default.isAccessor(member) ||
             ohos_typescript_1.default.isCallSignatureDeclaration(member)) {
-            let mthd = new ArkMethod_1.ArkMethod();
+            let mthd = new ArkMethod_1.ArkMethod(cls.getClassSigID());
             (0, ArkMethodBuilder_1.buildArkMethodFromArkClass)(member, cls, mthd, sourceFile);
             if (ohos_typescript_1.default.isConstructorDeclaration(member)) {
                 buildParameterProperty2ArkField(member.parameters, cls, sourceFile);
@@ -429,8 +473,7 @@ function buildParameterProperty2ArkField(params, cls, sourceFile) {
         if (parameter.modifiers === undefined || !ohos_typescript_1.default.isIdentifier(parameter.name)) {
             return;
         }
-        let field = new ArkField_1.ArkField();
-        field.setDeclaringArkClass(cls);
+        let field = new ArkField_1.ArkField(cls.getClassSigID());
         field.setCategory(ArkField_1.FieldCategory.PARAMETER_PROPERTY);
         field.setOriginFullPosition(Position_1.FullPosition.buildFromNode(parameter, sourceFile));
         let fieldType;
@@ -440,7 +483,7 @@ function buildParameterProperty2ArkField(params, cls, sourceFile) {
         else {
             fieldType = Type_1.UnknownType.getInstance();
         }
-        const fieldSignature = new ArkSignature_1.FieldSignature(fieldName, cls.getSignature(), fieldType, false);
+        const fieldSignature = new ArkSignature_1.FieldSignature(fieldName, cls.getClassSigID(), fieldType, false);
         field.setSignature(fieldSignature);
         field.setModifiers((0, builderUtils_1.buildModifiers)(parameter));
         if (parameter.questionToken) {
@@ -454,15 +497,12 @@ function buildStaticBlocksForClass(clsNode, cls, sourceFile) {
     const staticBlockMethodSignatures = [];
     clsNode.members.forEach(member => {
         if (ohos_typescript_1.default.isClassStaticBlockDeclaration(member)) {
-            const staticBlockMethod = new ArkMethod_1.ArkMethod();
-            staticBlockMethod.setDeclaringArkClass(cls);
-            staticBlockMethod.setIsGeneratedFlag(true);
-            staticBlockMethod.setImplOriginFullPosition(Position_1.FullPosition.buildFromNode(member, sourceFile));
             const methodName = Const_1.STATIC_BLOCK_METHOD_NAME_PREFIX + staticInitBlockId++;
             const methodSubSignature = new ArkSignature_1.MethodSubSignature(methodName, [], Type_1.VoidType.getInstance(), true);
-            const methodSignature = new ArkSignature_1.MethodSignature(cls.getSignature(), methodSubSignature);
+            const methodSignature = new ArkSignature_1.MethodSignature(cls.getClassSigID(), methodSubSignature);
             staticBlockMethodSignatures.push(methodSignature);
-            staticBlockMethod.setImplementationSignature(methodSignature);
+            const staticBlockMethod = new ArkMethod_1.ArkMethod(cls.getClassSigID(), methodSignature);
+            staticBlockMethod.setIsGeneratedFlag(true);
             staticBlockMethod.setImplOriginFullPosition(Position_1.FullPosition.buildFromNode(member, sourceFile));
             let bodyBuilder = new BodyBuilder_1.BodyBuilder(staticBlockMethod.getSignature(), member, staticBlockMethod, sourceFile);
             staticBlockMethod.setBodyBuilder(bodyBuilder);
@@ -482,6 +522,11 @@ function getInitStmts(transformer, field, initNode, enumFieldInfo) {
     const assignStmt = new Stmt_1.ArkAssignStmt(fieldRef, initValue);
     assignStmt.setOperandOriginalPositions([...fieldRefPositions, ...initPositions]);
     stmts.push(assignStmt);
+    const declaredType = field.getSignature().getType();
+    const unifiedType = (0, builderUtils_1.unifyDeclaredTypeWithInitializer)(declaredType, initValue.getType());
+    if (unifiedType !== declaredType) {
+        field.getSignature().setType(unifiedType);
+    }
     setFieldInitPositionInfo(field, stmts, initValue);
 }
 function processInitValue(transformer, field, initNode, enumFieldInfo, stmts) {
@@ -530,12 +575,13 @@ function createEnumInitValue(field, enumFieldInfo) {
 }
 function setFieldInitPositionInfo(field, stmts, initValue) {
     const fieldOriginPosition = field.getOriginFullPosition();
-    for (const stmt of stmts) {
+    const fieldInitStmts = stmts.filter(stmt => !(stmt instanceof ArkIRTransformer_1.DummyStmt));
+    for (const stmt of fieldInitStmts) {
         if (!stmt.getOriginFullPosition()) {
             stmt.setOriginFullPosition(fieldOriginPosition);
         }
     }
-    field.setInitializer(stmts);
+    field.setInitializer(fieldInitStmts);
     if (field.getType() instanceof Type_1.UnknownType) {
         field.getSignature().setType(initValue.getType());
     }

package/lib/core/model/builder/ArkExportBuilder.d.ts

@@ -5,7 +5,7 @@ import { ArkFile } from '../ArkFile';
 import { ArkNamespace } from '../ArkNamespace';
 export { buildExportInfo, buildExportAssignment, buildExportDeclaration };
 declare function buildExportInfo(arkInstance: ArkExport, arkFile: ArkFile, position: FullPosition): ExportInfo;
-export declare function buildDefaultExportInfo(im: FromInfo, file: ArkFile, arkExport?: ArkExport): ExportInfo;
+export declare function buildDefaultExportInfo(im: FromInfo, file: ArkFile, arkExport?: ArkExport | null): ExportInfo;
 declare function buildExportDeclaration(node: ts.ExportDeclaration, sourceFile: ts.SourceFile, arkFile: ArkFile): ExportInfo[];
 declare function buildExportAssignment(node: ts.ExportAssignment, sourceFile: ts.SourceFile, arkFile: ArkFile): ExportInfo[];
 /**

package/lib/core/model/builder/ArkExportBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ArkExportBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/ArkExportBuilder.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,MAAM,iBAAiB,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,UAAU,EAAc,QAAQ,EAAE,MAAM,cAAc,CAAC;AAG3E,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAMrC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,CAAC;AAQ1E,iBAAS,eAAe,CAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,GAAG,UAAU,CAerG;AAED,wBAAgB,sBAAsB,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,SAAS,GAAG,UAAU,CAOrG;AAED,iBAAS,sBAAsB,CAAC,IAAI,EAAE,EAAE,CAAC,iBAAiB,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,GAAG,UAAU,EAAE,CAgDrH;AAED,iBAAS,qBAAqB,CAAC,IAAI,EAAE,EAAE,CAAC,gBAAgB,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,GAAG,UAAU,EAAE,CAoCnH;AAED;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,EAAE,CAAC,iBAAiB,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,YAAY,GAAG,UAAU,EAAE,CAiB5J;AAED;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,EAAE,CAAC,oBAAoB,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,GAAG,UAAU,EAAE,CAcxI;AAED,wBAAgB,UAAU,CAAC,aAAa,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,YAAY,CAAC,GAAG,SAAS,GAAG,OAAO,CAU5F"}
+{"version":3,"file":"ArkExportBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/ArkExportBuilder.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,MAAM,iBAAiB,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,UAAU,EAAc,QAAQ,EAAE,MAAM,cAAc,CAAC;AAG3E,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAMrC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,CAAC;AAQ1E,iBAAS,eAAe,CAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,GAAG,UAAU,CAerG;AAED,wBAAgB,sBAAsB,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,SAAS,GAAG,IAAI,GAAG,UAAU,CAO5G;AAED,iBAAS,sBAAsB,CAAC,IAAI,EAAE,EAAE,CAAC,iBAAiB,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,GAAG,UAAU,EAAE,CAgDrH;AAED,iBAAS,qBAAqB,CAAC,IAAI,EAAE,EAAE,CAAC,gBAAgB,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,GAAG,UAAU,EAAE,CAoCnH;AAED;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,EAAE,CAAC,iBAAiB,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,YAAY,GAAG,UAAU,EAAE,CAiB5J;AAED;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,EAAE,CAAC,oBAAoB,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,GAAG,UAAU,EAAE,CAcxI;AAED,wBAAgB,UAAU,CAAC,aAAa,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,YAAY,CAAC,GAAG,SAAS,GAAG,OAAO,CAU5F"}

package/lib/core/model/builder/ArkExportBuilder.js

@@ -130,7 +130,7 @@ function buildExportAssignment(node, sourceFile, arkFile) {
         .setLeadingComments(IRUtils_1.IRUtils.getCommentsMetadata(node, sourceFile, arkFile.getScene().getOptions(), true))
         .setTrailingComments(IRUtils_1.IRUtils.getCommentsMetadata(node, sourceFile, arkFile.getScene().getOptions(), false));
     if (ohos_typescript_1.default.isNewExpression(node.expression) && ohos_typescript_1.default.isClassExpression(node.expression.expression)) {
-        let cls = new ArkClass_1.ArkClass();
+        let cls = new ArkClass_1.ArkClass(arkFile.getFileSigID());
         (0, ArkClassBuilder_1.buildNormalArkClassFromArkFile)(node.expression.expression, arkFile, cls, sourceFile);
     }
     if (ohos_typescript_1.default.isIdentifier(node.expression)) {

package/lib/core/model/builder/ArkFieldBuilder.d.ts

@@ -1,9 +1,7 @@
 import ts from 'ohos-typescript';
 import { ArkField } from '../ArkField';
 import { ArkClass } from '../ArkClass';
-import { ArkMethod } from '../ArkMethod';
 export type PropertyLike = ts.PropertyDeclaration | ts.PropertyAssignment;
 export declare function buildProperty2ArkField(member: ts.PropertyDeclaration | ts.PropertyAssignment | ts.ShorthandPropertyAssignment | ts.SpreadAssignment | ts.PropertySignature | ts.EnumMember, sourceFile: ts.SourceFile, cls: ArkClass): ArkField;
 export declare function buildIndexSignature2ArkField(member: ts.IndexSignatureDeclaration, sourceFile: ts.SourceFile, cls: ArkClass): void;
-export declare function buildGetAccessor2ArkField(member: ts.GetAccessorDeclaration, mthd: ArkMethod, sourceFile: ts.SourceFile): void;
 //# sourceMappingURL=ArkFieldBuilder.d.ts.map

package/lib/core/model/builder/ArkFieldBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ArkFieldBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/ArkFieldBuilder.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,MAAM,iBAAiB,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAiB,MAAM,aAAa,CAAC;AAEtD,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAWzC,MAAM,MAAM,YAAY,GAAG,EAAE,CAAC,mBAAmB,GAAG,EAAE,CAAC,kBAAkB,CAAC;AAE1E,wBAAgB,sBAAsB,CAClC,MAAM,EAAE,EAAE,CAAC,mBAAmB,GAAG,EAAE,CAAC,kBAAkB,GAAG,EAAE,CAAC,2BAA2B,GAAG,EAAE,CAAC,gBAAgB,GAAG,EAAE,CAAC,iBAAiB,GAAG,EAAE,CAAC,UAAU,EACpJ,UAAU,EAAE,EAAE,CAAC,UAAU,EACzB,GAAG,EAAE,QAAQ,GACd,QAAQ,CAmDV;AAED,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,EAAE,CAAC,yBAAyB,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,GAAG,EAAE,QAAQ,GAAG,IAAI,CAkBjI;AAED,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,EAAE,CAAC,sBAAsB,EAAE,IAAI,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,GAAG,IAAI,CA8B7H"}
+{"version":3,"file":"ArkFieldBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/ArkFieldBuilder.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,MAAM,iBAAiB,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAiB,MAAM,aAAa,CAAC;AAEtD,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAWvC,MAAM,MAAM,YAAY,GAAG,EAAE,CAAC,mBAAmB,GAAG,EAAE,CAAC,kBAAkB,CAAC;AAE1E,wBAAgB,sBAAsB,CAClC,MAAM,EAAE,EAAE,CAAC,mBAAmB,GAAG,EAAE,CAAC,kBAAkB,GAAG,EAAE,CAAC,2BAA2B,GAAG,EAAE,CAAC,gBAAgB,GAAG,EAAE,CAAC,iBAAiB,GAAG,EAAE,CAAC,UAAU,EACpJ,UAAU,EAAE,EAAE,CAAC,UAAU,EACzB,GAAG,EAAE,QAAQ,GACd,QAAQ,CAkDV;AAED,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,EAAE,CAAC,yBAAyB,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,GAAG,EAAE,QAAQ,GAAG,IAAI,CAmBjI"}

package/lib/core/model/builder/ArkFieldBuilder.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.buildGetAccessor2ArkField = exports.buildIndexSignature2ArkField = exports.buildProperty2ArkField = void 0;
+exports.buildIndexSignature2ArkField = exports.buildProperty2ArkField = void 0;
 const ohos_typescript_1 = __importDefault(require("ohos-typescript"));
 const ArkField_1 = require("../ArkField");
 const logger_1 = __importStar(require("../../../utils/logger"));
@@ -53,9 +53,8 @@ const ArkBaseModel_1 = require("../ArkBaseModel");
 const IRUtils_1 = require("../../common/IRUtils");
 const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER, 'ArkFieldBuilder');
 function buildProperty2ArkField(member, sourceFile, cls) {
-    let field = new ArkField_1.ArkField();
+    let field = new ArkField_1.ArkField(cls.getClassSigID());
     field.setCategory(mapSyntaxKindToFieldOriginType(member.kind));
-    field.setDeclaringArkClass(cls);
     field.setOriginFullPosition(Position_1.FullPosition.buildFromNode(member, sourceFile));
     let fieldName = (0, StringUtils_1.cloneText)(member.getText(sourceFile));
     if (member.name && ohos_typescript_1.default.isComputedPropertyName(member.name)) {
@@ -66,7 +65,7 @@ function buildProperty2ArkField(member, sourceFile, cls) {
             fieldName = (0, builderUtils_1.handlePropertyAccessExpression)(member.name.expression);
         }
         else {
-            logger.warn(`Other property expression type found: ${(0, StringUtils_1.cloneText)(member.name.expression.getText())}!`);
+            logger.warn(`Other property expression type found: ${(0, StringUtils_1.cloneText)(member.name.expression.getText(sourceFile))}!`);
         }
     }
     else if (member.name && (ohos_typescript_1.default.isIdentifier(member.name) || ohos_typescript_1.default.isLiteralExpression(member.name))) {
@@ -78,7 +77,7 @@ function buildProperty2ArkField(member, sourceFile, cls) {
         field.addModifier(ArkBaseModel_1.ModifierType.PRIVATE);
     }
     else {
-        logger.warn(`Other type of property name found: ${(0, StringUtils_1.cloneText)(member.getText())}!`);
+        logger.warn(`Other type of property name found: ${(0, StringUtils_1.cloneText)(member.getText(sourceFile))}!`);
     }
     let fieldType = Type_1.UnknownType.getInstance();
     if (ohos_typescript_1.default.isPropertyDeclaration(member) || ohos_typescript_1.default.isPropertySignature(member)) {
@@ -96,7 +95,7 @@ function buildProperty2ArkField(member, sourceFile, cls) {
         field.addModifier(ArkBaseModel_1.ModifierType.STATIC);
         fieldType = new Type_1.ClassType(cls.getSignature());
     }
-    field.setSignature(new ArkSignature_1.FieldSignature(fieldName, cls.getSignature(), fieldType, field.isStatic()));
+    field.setSignature(new ArkSignature_1.FieldSignature(fieldName, cls.getClassSigID(), fieldType, field.isStatic()));
     if (ohos_typescript_1.default.isPropertyDeclaration(member) && member.exclamationToken) {
         field.setExclamationToken(true);
     }
@@ -106,9 +105,8 @@ function buildProperty2ArkField(member, sourceFile, cls) {
 }
 exports.buildProperty2ArkField = buildProperty2ArkField;
 function buildIndexSignature2ArkField(member, sourceFile, cls) {
-    const field = new ArkField_1.ArkField();
+    const field = new ArkField_1.ArkField(cls.getClassSigID());
     field.setCategory(mapSyntaxKindToFieldOriginType(member.kind));
-    field.setDeclaringArkClass(cls);
     field.setOriginFullPosition(Position_1.FullPosition.buildFromNode(member, sourceFile));
     if (member.modifiers) {
         let modifier = (0, builderUtils_1.buildModifiers)(member);
@@ -116,46 +114,14 @@ function buildIndexSignature2ArkField(member, sourceFile, cls) {
     }
     const fieldName = '[' + (0, StringUtils_1.cloneText)(member.parameters[0].getText(sourceFile)) + ']';
     const fieldType = (0, builderUtils_1.buildGenericType)((0, builderUtils_1.tsNode2Type)(member.type, sourceFile, field), field);
-    const fieldSignature = new ArkSignature_1.FieldSignature(fieldName, cls.getSignature(), fieldType, true);
+    // staticFlag 与 addField 分流基准（field.isStatic()，读 modifier）保持一致——index-signature 是实例成员（obj[key] 访问）。硬编码 true 会导致
+    // 签名 flag 与 isStatic() 分裂（addField 分流进 instance 数组而签名 flag=true），签名值直查（getFieldWithName）下必 miss。
+    const fieldSignature = new ArkSignature_1.FieldSignature(fieldName, cls.getClassSigID(), fieldType, field.isStatic());
     field.setSignature(fieldSignature);
     IRUtils_1.IRUtils.setComments(field, member, sourceFile, cls.getDeclaringArkFile().getScene().getOptions());
     cls.addField(field);
 }
 exports.buildIndexSignature2ArkField = buildIndexSignature2ArkField;
-function buildGetAccessor2ArkField(member, mthd, sourceFile) {
-    let cls = mthd.getDeclaringArkClass();
-    let field = new ArkField_1.ArkField();
-    field.setDeclaringArkClass(cls);
-    field.setCategory(mapSyntaxKindToFieldOriginType(member.kind));
-    field.setOriginFullPosition(Position_1.FullPosition.buildFromNode(member, sourceFile));
-    let fieldName = (0, StringUtils_1.cloneText)(member.getText(sourceFile));
-    if (ohos_typescript_1.default.isIdentifier(member.name) || ohos_typescript_1.default.isLiteralExpression(member.name)) {
-        fieldName = (0, StringUtils_1.cloneText)(member.name.text);
-    }
-    else if (ohos_typescript_1.default.isComputedPropertyName(member.name)) {
-        if (ohos_typescript_1.default.isIdentifier(member.name.expression)) {
-            let propertyName = (0, StringUtils_1.cloneText)(member.name.expression.text);
-            fieldName = propertyName;
-        }
-        else if (ohos_typescript_1.default.isPropertyAccessExpression(member.name.expression)) {
-            fieldName = (0, builderUtils_1.handlePropertyAccessExpression)(member.name.expression);
-        }
-        else if (ohos_typescript_1.default.isLiteralExpression(member.name.expression)) {
-            fieldName = (0, StringUtils_1.cloneText)(member.name.expression.text);
-        }
-        else {
-            logger.warn('Other type of computed property name found!');
-        }
-    }
-    else {
-        logger.warn('Please contact developers to support new type of GetAccessor name!');
-    }
-    const fieldType = mthd.getReturnType();
-    const fieldSignature = new ArkSignature_1.FieldSignature(fieldName, cls.getSignature(), fieldType, false);
-    field.setSignature(fieldSignature);
-    cls.addField(field);
-}
-exports.buildGetAccessor2ArkField = buildGetAccessor2ArkField;
 function mapSyntaxKindToFieldOriginType(syntaxKind) {
     let fieldOriginType = null;
     switch (syntaxKind) {

package/lib/core/model/builder/ArkFileBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ArkFileBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/ArkFileBuilder.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,OAAO,EAAY,MAAM,YAAY,CAAC;AAyB/C,eAAO,MAAM,iBAAiB,UAiB7B,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,gBAAgB,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI,CA0B9H;AAiHD;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAWpE;AAgCD;;;;;;;;;;GAUG;AACH,wBAAgB,8BAA8B,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAcrE"}
+{"version":3,"file":"ArkFileBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/ArkFileBuilder.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,OAAO,EAAY,MAAM,YAAY,CAAC;AA2B/C,eAAO,MAAM,iBAAiB,UAiB7B,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,gBAAgB,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI,CA0B9H;AA2GD;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAcpE;AAgCD;;;;;;;;;;GAUG;AACH,wBAAgB,8BAA8B,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAcrE"}