arkanalyzer 1.0.94 → 2.0.0-beta1

package/lib/frontend/cppFrontend/model/builder/ArkClassBuilder.js

@@ -73,15 +73,12 @@ function buildNormalArkClassFromArkMethod(clsNode, cls, sourceFile, declaring) {
 }
 exports.buildNormalArkClassFromArkMethod = buildNormalArkClassFromArkMethod;
 function buildNormalArkClassFromArkFile(clsNode, arkFile, cls, sourceFile, declaring) {
-    cls.setDeclaringArkFile(arkFile);
     cls.setOriginFullPosition(Position_1.FullPosition.cxxBuildFromNode(clsNode, sourceFile));
     buildNormalArkClass(clsNode, cls, sourceFile, declaring);
     arkFile.addArkClass(cls);
 }
 exports.buildNormalArkClassFromArkFile = buildNormalArkClassFromArkFile;
 function buildNormalArkClassFromArkNamespace(clsNode, arkNamespace, cls, sourceFile, declaring) {
-    cls.setDeclaringArkNamespace(arkNamespace);
-    cls.setDeclaringArkFile(arkNamespace.getDeclaringArkFile());
     cls.setOriginFullPosition(Position_1.FullPosition.cxxBuildFromNode(clsNode, sourceFile));
     buildNormalArkClass(clsNode, cls, sourceFile, declaring);
     arkNamespace.addArkClass(cls);
@@ -115,9 +112,8 @@ function buildNormalArkClass(clsNode, cls, sourceFile, declaring) {
 }
 exports.buildNormalArkClass = buildNormalArkClass;
 function buildUnion2ArkClass(clsNode, cls, sourceFile, declaring) {
-    var _a;
     const className = genClassName(clsNode.name ? clsNode.name : '', cls, declaring);
-    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.UNION);
     (0, ArkClassBuilder_1.init4InstanceInitMethod)(cls);
@@ -125,9 +121,8 @@ function buildUnion2ArkClass(clsNode, cls, sourceFile, declaring) {
     buildArkClassMembers(clsNode, cls, sourceFile);
 }
 function buildStruct2ArkClass(clsNode, cls, sourceFile, declaring) {
-    var _a;
     const className = genClassName(clsNode.name ? clsNode.name : '', cls, declaring);
-    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.inner) {
         processCXXHeritage(clsNode, cls);
@@ -140,9 +135,8 @@ function buildStruct2ArkClass(clsNode, cls, sourceFile, declaring) {
     buildArkClassMembers(clsNode, cls, sourceFile);
 }
 function buildClass2ArkClass(clsNode, cls, sourceFile, declaring) {
-    var _a;
     const className = genClassName(clsNode.name ? clsNode.name : '', cls, declaring);
-    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.inner) {
         processCXXHeritage(clsNode, cls);
@@ -159,9 +153,8 @@ function buildClass2ArkClass(clsNode, cls, sourceFile, declaring) {
     cls.setModifiers((0, builderUtils_1.buildModifiersForCxxClass)(cls));
 }
 function buildTemplateClass(clsNode, cls, sourceFile, declaring) {
-    var _a;
     const className = genClassName(clsNode.name ? clsNode.name : '', cls, declaring);
-    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.inner) {
         processCXXHeritage(clsNode, cls);
@@ -205,9 +198,8 @@ function processCXXHeritage(clsNode, cls) {
     }
 }
 function buildEnum2ArkClass(clsNode, cls, sourceFile, declaring) {
-    var _a;
     const className = genClassName(clsNode.name ? clsNode.name : '', cls, declaring);
-    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.ENUM);
     (0, ArkClassBuilder_1.init4StaticInitMethod)(cls);
@@ -216,15 +208,15 @@ function buildEnum2ArkClass(clsNode, cls, sourceFile, declaring) {
 function buildInitMethodsForClassTag(tag, cls, sourceFile, instanceInitStmts, staticInitStmts) {
     if (tag === ArkCxxAstNode_1.CxxTagUsed.Class) {
         const tu = sourceFile;
-        const instanceIRTransformer = new ArkIRTransformer_1.ArkCxxIRTransformer(tu, cls.getInstanceInitMethod());
-        const staticIRTransformer = new ArkIRTransformer_1.ArkCxxIRTransformer(tu, cls.getStaticInitMethod());
-        (0, ArkMethodBuilder_1.buildInitMethod)(cls.getInstanceInitMethod(), instanceInitStmts, instanceIRTransformer.getThisLocal());
-        (0, ArkMethodBuilder_1.buildInitMethod)(cls.getStaticInitMethod(), staticInitStmts, staticIRTransformer.getThisLocal());
+        const instanceIRTransformer = new ArkIRTransformer_1.ArkCxxIRTransformer(tu, cls.getInstanceInitMethodOrNull());
+        const staticIRTransformer = new ArkIRTransformer_1.ArkCxxIRTransformer(tu, cls.getStaticInitMethodOrNull());
+        (0, ArkMethodBuilder_1.buildInitMethod)(cls.getInstanceInitMethodOrNull(), instanceInitStmts, instanceIRTransformer.getThisLocal());
+        (0, ArkMethodBuilder_1.buildInitMethod)(cls.getStaticInitMethodOrNull(), staticInitStmts, staticIRTransformer.getThisLocal());
     }
     else if (tag === ArkCxxAstNode_1.CxxTagUsed.Enum) {
         const tu = sourceFile;
-        const staticIRTransformer = new ArkIRTransformer_1.ArkCxxIRTransformer(tu, cls.getStaticInitMethod());
-        (0, ArkMethodBuilder_1.buildInitMethod)(cls.getStaticInitMethod(), staticInitStmts, staticIRTransformer.getThisLocal());
+        const staticIRTransformer = new ArkIRTransformer_1.ArkCxxIRTransformer(tu, cls.getStaticInitMethodOrNull());
+        (0, ArkMethodBuilder_1.buildInitMethod)(cls.getStaticInitMethodOrNull(), staticInitStmts, staticIRTransformer.getThisLocal());
     }
 }
 function buildArkClassMembers(clsNode, cls, sourceFile) {
@@ -242,7 +234,7 @@ function buildArkClassMembers(clsNode, cls, sourceFile) {
                 const arkField = (0, ArkFieldBuilder_1.buildProperty2ArkField)(member, sourceFile, cls);
                 // If the parameter inner is not empty, it means it contains initialization information
                 if (member.inner.length > 0 && (0, cppUtils_1.hasNodeFlag)(member, ArkCxxAstNode_1.CxxNodeFlag.HasInClassInitializer)) {
-                    staticIRTransformer = new ArkIRTransformer_1.ArkCxxIRTransformer(sourceFile, cls.getStaticInitMethod());
+                    staticIRTransformer = new ArkIRTransformer_1.ArkCxxIRTransformer(sourceFile, cls.getStaticInitMethodOrNull());
                     getInitStmts(staticIRTransformer, arkField, member.inner[member.inner.length - 1]);
                 }
                 arkField.getInitializer().forEach(stmt => instanceInitStmts.push(stmt));
@@ -250,7 +242,7 @@ function buildArkClassMembers(clsNode, cls, sourceFile) {
             }
             case ArkCxxAstNode_1.AstKind.EnumConstantDecl: {
                 const arkField = (0, ArkFieldBuilder_1.buildProperty2ArkField)(member, sourceFile, cls);
-                staticIRTransformer = new ArkIRTransformer_1.ArkCxxIRTransformer(sourceFile, cls.getStaticInitMethod());
+                staticIRTransformer = new ArkIRTransformer_1.ArkCxxIRTransformer(sourceFile, cls.getStaticInitMethodOrNull());
                 getInitStmts(staticIRTransformer, arkField, member.inner[0], enumFieldInfo);
                 arkField.getInitializer().forEach(stmt => staticInitStmts.push(stmt));
                 break;
@@ -280,8 +272,8 @@ function buildArkClassMembers(clsNode, cls, sourceFile) {
     buildInitMethodsForClassTag(tag, cls, sourceFile, instanceInitStmts, staticInitStmts);
 }
 function processClassDeclInClass(classDeclNode, cls, sourceFile) {
-    const newCls = new ArkClass_1.ArkClass();
     const namespace = cls.getDeclaringArkNamespace();
+    const newCls = new ArkClass_1.ArkClass(cls.getDeclaringFileID(), namespace === null || namespace === void 0 ? void 0 : namespace.getNamespaceSigID());
     if (namespace) {
         buildNormalArkClassFromArkNamespace(classDeclNode, namespace, newCls, sourceFile, cls);
     }
@@ -312,7 +304,7 @@ function processUsingDeclInClass(usingDecl, cls) {
 function processTypeAliasDeclInClass(typeAliasDecl, cls, sourceFile, instanceInitStmts) {
     const arkField = (0, ArkFieldBuilder_1.buildProperty2ArkField)(typeAliasDecl, sourceFile, cls);
     //  it's a  type alias declaration
-    const staticIRTransformer = new ArkIRTransformer_1.ArkCxxIRTransformer(sourceFile, cls.getStaticInitMethod());
+    const staticIRTransformer = new ArkIRTransformer_1.ArkCxxIRTransformer(sourceFile, cls.getStaticInitMethodOrNull());
     const stmts = staticIRTransformer.cxxNodeToStmts(typeAliasDecl);
     if (stmts.length === 0) {
         return;
@@ -329,25 +321,23 @@ function buildMethodsForClass(clsNode, cls, sourceFile) {
             member.kind === ArkCxxAstNode_1.AstKind.CXXConstructorDecl ||
             member.kind === ArkCxxAstNode_1.AstKind.CXXDestructorDecl ||
             member.kind === ArkCxxAstNode_1.AstKind.FriendDecl) {
-            let method = new ArkMethod_1.ArkMethod();
+            let method = new ArkMethod_1.ArkMethod(cls.getClassSigID());
             (0, ArkMethodBuilder_1.buildArkMethodFromArkClass)(member, cls, method, sourceFile);
         }
     });
 }
 function buildDefaultArkClassFromArkFile(arkFile, defaultClass, astRoot) {
-    defaultClass.setDeclaringArkFile(arkFile);
     defaultClass.setCategory(ArkClass_1.ClassCategory.CLASS);
     buildDefaultArkClass(defaultClass, astRoot);
 }
 exports.buildDefaultArkClassFromArkFile = buildDefaultArkClassFromArkFile;
 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);
 }
 function genDefaultArkMethod(cls, sourceFile, node) {
-    let defaultMethod = new ArkMethod_1.ArkMethod();
+    let defaultMethod = new ArkMethod_1.ArkMethod(cls.getClassSigID());
     (0, ArkMethodBuilder_1.buildDefaultArkMethodFromArkClass)(cls, defaultMethod, sourceFile, node);
     cls.setDefaultArkMethod(defaultMethod);
 }

package/lib/frontend/cppFrontend/model/builder/ArkFieldBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ArkFieldBuilder.d.ts","sourceRoot":"","sources":["../../../../../src/frontend/cppFrontend/model/builder/ArkFieldBuilder.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,QAAQ,EAAiB,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAQ3D,OAAO,EAAE,UAAU,EAAW,MAAM,2BAA2B,CAAC;AAEhE,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ,GAAG,QAAQ,CAsB1G"}
+{"version":3,"file":"ArkFieldBuilder.d.ts","sourceRoot":"","sources":["../../../../../src/frontend/cppFrontend/model/builder/ArkFieldBuilder.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,QAAQ,EAAiB,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAQ3D,OAAO,EAAE,UAAU,EAAW,MAAM,2BAA2B,CAAC;AAEhE,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ,GAAG,QAAQ,CAqB1G"}

package/lib/frontend/cppFrontend/model/builder/ArkFieldBuilder.js

@@ -25,9 +25,8 @@ const IRUtils_1 = require("../../common/IRUtils");
 const builderUtils_2 = require("../../../../core/model/builder/builderUtils");
 const ArkCxxAstNode_1 = require("../../utils/ArkCxxAstNode");
 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.cxxBuildFromNode(member, sourceFile));
     let fieldName = member.name;
     field.addModifier((0, builderUtils_1.buildModifiers)(member));
@@ -39,7 +38,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()));
     IRUtils_1.IRUtils.setComments(field, member, sourceFile, cls.getDeclaringArkFile().getScene().getOptions());
     cls.addField(field);
     return field;

package/lib/frontend/cppFrontend/model/builder/ArkFileBuilder.d.ts

@@ -1,5 +1,4 @@
 import { ArkFile } from '../../../../core/model/ArkFile';
-import { ArkClass } from '../../../../core/model/ArkClass';
 import type { CxxAstNode } from '../../utils/ArkCxxAstNode';
 import { Scene } from '../../../../Scene';
 import { FrontendParseFailure } from '../../../FrontendBuilder';
@@ -20,6 +19,7 @@ export declare function prepareArkFile(scene: Scene, absoluteFilePath: string, t
  * @param arkFile - Pre-allocated ArkFile to populate (must have scene and file path set).
  */
 export declare function buildImportExportInfoFromFile(arkFile: ArkFile): void;
-export declare const classMap: Map<string, ArkClass>;
+export declare const classMap: Map<string, number>;
+export declare function disposeClassMap(): void;
 export declare function buildArkClassFromCxxClass(classNode: CxxAstNode, arkFile: ArkFile, astRoot: CxxAstNode): void;
 //# sourceMappingURL=ArkFileBuilder.d.ts.map

package/lib/frontend/cppFrontend/model/builder/ArkFileBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ArkFileBuilder.d.ts","sourceRoot":"","sources":["../../../../../src/frontend/cppFrontend/model/builder/ArkFileBuilder.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,OAAO,EAAY,MAAM,gCAAgC,CAAC;AAMnE,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAS3D,OAAO,KAAK,EAAE,UAAU,EAAkB,MAAM,2BAA2B,CAAC;AAK5E,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAG1C,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAwFhE,MAAM,WAAW,oBAAoB;IACjC,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,WAAW,EAAE,oBAAoB,EAAE,CAAC;CACvC;AAED;;GAEG;AACH,wBAAgB,eAAe,CAC3B,KAAK,EAAE,KAAK,EACZ,mBAAmB,EAAE,MAAM,EAAE,EAC7B,oBAAoB,GAAE,MAAU,EAChC,oBAAoB,GAAE,MAAU,EAChC,UAAU,GAAE,OAAe,GAC5B,oBAAoB,CAkCtB;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,KAAK,EAAE,gBAAgB,EAAE,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,UAAU,GAAE,OAAe,GAAG,IAAI,CA0BhI;AAED;;;;;;GAMG;AACH,wBAAgB,6BAA6B,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CA4BpE;AAED,eAAO,MAAM,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAA+B,CAAC;AAE3E,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,GAAG,IAAI,CAU5G"}
+{"version":3,"file":"ArkFileBuilder.d.ts","sourceRoot":"","sources":["../../../../../src/frontend/cppFrontend/model/builder/ArkFileBuilder.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,OAAO,EAAY,MAAM,gCAAgC,CAAC;AAenE,OAAO,KAAK,EAAE,UAAU,EAAkB,MAAM,2BAA2B,CAAC;AAK5E,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAG1C,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAwFhE,MAAM,WAAW,oBAAoB;IACjC,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,WAAW,EAAE,oBAAoB,EAAE,CAAC;CACvC;AAED;;GAEG;AACH,wBAAgB,eAAe,CAC3B,KAAK,EAAE,KAAK,EACZ,mBAAmB,EAAE,MAAM,EAAE,EAC7B,oBAAoB,GAAE,MAAU,EAChC,oBAAoB,GAAE,MAAU,EAChC,UAAU,GAAE,OAAe,GAC5B,oBAAoB,CAmCtB;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,KAAK,EAAE,gBAAgB,EAAE,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,UAAU,GAAE,OAAe,GAAG,IAAI,CA0BhI;AAED;;;;;;GAMG;AACH,wBAAgB,6BAA6B,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CA4BpE;AAED,eAAO,MAAM,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAA6B,CAAC;AAEvE,wBAAgB,eAAe,IAAI,IAAI,CAEtC;AAED,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,GAAG,IAAI,CAU5G"}

package/lib/frontend/cppFrontend/model/builder/ArkFileBuilder.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.buildArkClassFromCxxClass = exports.classMap = exports.buildImportExportInfoFromFile = exports.prepareArkFile = exports.prepareArkFiles = void 0;
+exports.buildArkClassFromCxxClass = exports.disposeClassMap = exports.classMap = exports.buildImportExportInfoFromFile = exports.prepareArkFile = exports.prepareArkFiles = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const ArkFile_1 = require("../../../../core/model/ArkFile");
@@ -170,6 +170,7 @@ function prepareArkFiles(scene, absoluteSourceFiles, maxParallelProcesses = 1, m
         onSourceAst: (sourceFile, astRoot) => {
             const target = new ArkFile_1.ArkFile(ArkFile_1.Language.CXX);
             target.setScene(scene);
+            scene.setFile(target);
             try {
                 applyArkFile(target, sourceFile, astRoot);
                 arkFiles.push(target);
@@ -254,15 +255,19 @@ function buildImportExportInfoFromFile(arkFile) {
 }
 exports.buildImportExportInfoFromFile = buildImportExportInfoFromFile;
 exports.classMap = new Map();
+function disposeClassMap() {
+    exports.classMap.clear();
+}
+exports.disposeClassMap = disposeClassMap;
 function buildArkClassFromCxxClass(classNode, arkFile, astRoot) {
-    let cls = new ArkClass_1.ArkClass();
+    let cls = new ArkClass_1.ArkClass(arkFile.getFileSigID());
     if (classNode.kind === ArkCxxAstNode_1.AstKind.ClassTemplateDecl) {
         classNode.tagUsed = classNode.tagUsed ? classNode.tagUsed : ArkCxxAstNode_1.CxxTagUsed.Class;
     }
     (0, ArkClassBuilder_1.buildNormalArkClassFromArkFile)(classNode, arkFile, cls, astRoot);
     addExportInfoOnCondition(classNode, cls, arkFile, astRoot);
     if (classNode.id) {
-        exports.classMap.set(classNode.id, cls);
+        exports.classMap.set(classNode.id, cls.getClassSigID());
     }
 }
 exports.buildArkClassFromCxxClass = buildArkClassFromCxxClass;
@@ -310,20 +315,14 @@ function addExportInfoOnCondition(currNode, arkInstance, arkFile, astRoot) {
     }
 }
 function buildArkMethodFromCxxMethod(mtdNode, arkFile, astRoot, arkClass) {
-    let mtd = new ArkMethod_1.ArkMethod();
-    (0, ArkMethodBuilder_1.buildArkMethodFromArkClass)(mtdNode, arkClass !== null && arkClass !== void 0 ? arkClass : arkFile.getDefaultClass(), mtd, astRoot);
+    const declaringClass = arkClass !== null && arkClass !== void 0 ? arkClass : arkFile.getDefaultClass();
+    let mtd = new ArkMethod_1.ArkMethod(declaringClass.getClassSigID());
+    (0, ArkMethodBuilder_1.buildArkMethodFromArkClass)(mtdNode, declaringClass, mtd, astRoot);
     addExportInfoOnCondition(mtdNode, mtd, arkFile, astRoot);
 }
-/**
- * Building ArkFile instance
- *
- * @param arkFile
- * @param astRoot
- * @returns
- */
-function buildArkFile(arkFile, astRoot) {
-    var _a, _b;
-    // handle header units
+/** 头部单元的 include 指令 → ImportInfo。 */
+function buildImportInfosFromHeaderUnits(arkFile, astRoot) {
+    var _a;
     (_a = astRoot.headerUnits) === null || _a === void 0 ? void 0 : _a.forEach((child) => {
         var _a;
         if (!child.includes) {
@@ -337,8 +336,19 @@ function buildArkFile(arkFile, astRoot) {
             buildImportInfoFromInclude(includeInfo, child, astRoot, arkFile);
         }
     });
+}
+/**
+ * Building ArkFile instance
+ *
+ * @param arkFile
+ * @param astRoot
+ * @returns
+ */
+function buildArkFile(arkFile, astRoot) {
+    var _a;
+    buildImportInfosFromHeaderUnits(arkFile, astRoot);
     // handle non-header unit
-    const statements = (_b = astRoot.inner) !== null && _b !== void 0 ? _b : [];
+    const statements = (_a = astRoot.inner) !== null && _a !== void 0 ? _a : [];
     statements.forEach((child) => {
         let childKind = child.kind;
         switch (childKind) {
@@ -355,10 +365,8 @@ function buildArkFile(arkFile, astRoot) {
                 buildArkMethodFromCxxMethod(child, arkFile, astRoot);
                 break;
             case ArkCxxAstNode_1.AstKind.NamespaceDecl:
-                let ns = new ArkNamespace_1.ArkNamespace();
-                ns.setDeclaringArkFile(arkFile);
+                let ns = new ArkNamespace_1.ArkNamespace(arkFile.getFileSigID());
                 (0, ArkNamespaceBuilder_1.buildArkNamespace)(child, arkFile, ns, astRoot);
-                arkFile.addNamespace(ns);
                 addExportInfoOnCondition(child, ns, arkFile, astRoot);
                 break;
             case ArkCxxAstNode_1.AstKind.CXXMethodDecl:
@@ -395,10 +403,9 @@ function getDeclaringArkClassOfMethod(mtd, arkFile) {
     const className = (_a = mtd.mangledName) !== null && _a !== void 0 ? _a : '';
     let arkClass = arkFile.getClasses().find(arkClass => arkClass.getName() === className);
     if (!arkClass) {
-        arkClass = new ArkClass_1.ArkClass();
-        const classSignature = new ArkSignature_1.ClassSignature(className, arkFile.getFileSignature());
+        arkClass = new ArkClass_1.ArkClass(arkFile.getFileSigID());
+        const classSignature = new ArkSignature_1.ClassSignature(className, arkFile.getFileSigID());
         arkClass.setSignature(classSignature);
-        arkClass.setDeclaringArkFile(arkFile);
         arkFile.addArkClass(arkClass);
         (0, ArkClassBuilder_3.init4InstanceInitMethod)(arkClass);
         (0, ArkClassBuilder_3.init4StaticInitMethod)(arkClass);
@@ -406,8 +413,8 @@ function getDeclaringArkClassOfMethod(mtd, arkFile) {
     return arkClass;
 }
 function genDefaultArkClass(arkFile, astRoot) {
-    let defaultClass = new ArkClass_1.ArkClass();
+    let defaultClass = new ArkClass_1.ArkClass(arkFile.getFileSigID());
     (0, ArkClassBuilder_2.buildDefaultArkClassFromArkFile)(arkFile, defaultClass, astRoot);
-    arkFile.setDefaultClass(defaultClass);
+    arkFile.setDefaultClassID(defaultClass.getClassSigID());
     arkFile.addArkClass(defaultClass);
 }

package/lib/frontend/cppFrontend/model/builder/ArkMethodBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ArkMethodBuilder.d.ts","sourceRoot":"","sources":["../../../../../src/frontend/cppFrontend/model/builder/ArkMethodBuilder.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAa7D,OAAO,EAAkE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAElH,OAAO,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAepD,OAAO,EAAE,UAAU,EAAW,MAAM,2BAA2B,CAAC;AAkChE,wBAAgB,iCAAiC,CAAC,cAAc,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,IAAI,CAAC,EAAE,UAAU,GAAG,IAAI,CAY3I;AAED,wBAAgB,0BAA0B,CAAC,UAAU,EAAE,UAAU,EAAE,GAAG,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,GAAG,IAAI,CA0B/G;AAED,wBAAgB,0BAA0B,CAAC,UAAU,EAAE,UAAU,EAAE,cAAc,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,EAChE,UAAU,EAAE,UAAU,EAAE,eAAe,CAAC,EAAE,SAAS,GAAG,IAAI,CA8CpG;AAwHD,wBAAgB,wCAAwC,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAWjF;AAED,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAsDnE;AAED,wBAAgB,eAAe,CAAC,UAAU,EAAE,SAAS,EAAE,qBAAqB,EAAE,IAAI,EAAE,EAAE,SAAS,EAAE,KAAK,GAAG,IAAI,CAuB5G;AAED,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,SAAS,GAAG,IAAI,CAmCjE;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAkBhE"}
+{"version":3,"file":"ArkMethodBuilder.d.ts","sourceRoot":"","sources":["../../../../../src/frontend/cppFrontend/model/builder/ArkMethodBuilder.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAO7D,OAAO,EAAkE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAElH,OAAO,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAepD,OAAO,EAAE,UAAU,EAAW,MAAM,2BAA2B,CAAC;AA+BhE,wBAAgB,iCAAiC,CAAC,cAAc,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,IAAI,CAAC,EAAE,UAAU,GAAG,IAAI,CAU3I;AAED,wBAAgB,0BAA0B,CAAC,UAAU,EAAE,UAAU,EAAE,GAAG,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,GAAG,IAAI,CAyB/G;AAED,wBAAgB,0BAA0B,CACtC,UAAU,EAAE,UAAU,EACtB,cAAc,EAAE,QAAQ,EACxB,GAAG,EAAE,SAAS,EACd,UAAU,EAAE,UAAU,EACtB,eAAe,CAAC,EAAE,SAAS,GAC5B,IAAI,CA6CN;AAwHD,wBAAgB,wCAAwC,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAWjF;AAED,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAoDnE;AAED,wBAAgB,eAAe,CAAC,UAAU,EAAE,SAAS,EAAE,qBAAqB,EAAE,IAAI,EAAE,EAAE,SAAS,EAAE,KAAK,GAAG,IAAI,CAuB5G;AAED,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,SAAS,GAAG,IAAI,CAqCjE;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAgBhE"}

package/lib/frontend/cppFrontend/model/builder/ArkMethodBuilder.js

@@ -74,9 +74,7 @@ function getSpecificNodes(methodNode, targetNode) {
         return [];
     }
     // Handle Cpp lambda functions
-    if (methodNode.type && !((0, builderUtils_1.isCxxFunctionPointer)(methodNode.type.qualType)) &&
-        !LAMBDA_WRAPPER_METHOD_KINDS.includes(methodNode.kind) &&
-        methodNode.inner) {
+    if (methodNode.type && !(0, builderUtils_1.isCxxFunctionPointer)(methodNode.type.qualType) && !LAMBDA_WRAPPER_METHOD_KINDS.includes(methodNode.kind) && methodNode.inner) {
         return getSpecificNodes(methodNode.inner[0], targetNode);
     }
     let result = [];
@@ -88,9 +86,8 @@ function getSpecificNodes(methodNode, targetNode) {
     return result.length > 0 ? result : [];
 }
 function buildDefaultArkMethodFromArkClass(declaringClass, mtd, sourceFile, node) {
-    mtd.setDeclaringArkClass(declaringClass);
     const methodSubSignature = ArkSignatureBuilder_1.ArkSignatureBuilder.buildMethodSubSignatureFromMethodName(Const_1.DEFAULT_ARK_METHOD_NAME, true);
-    const methodSignature = new ArkSignature_1.MethodSignature(mtd.getDeclaringArkClass().getSignature(), methodSubSignature);
+    const methodSignature = new ArkSignature_1.MethodSignature(mtd.getDeclaringArkClass().getClassSigID(), methodSubSignature);
     mtd.setImplementationSignature(methodSignature);
     mtd.setImplOriginFullPosition(new Position_1.FullPosition(0, 0, 0, 0));
     const defaultMethodNode = node ? node : sourceFile;
@@ -126,7 +123,6 @@ function handleFunctionTemplateDecl(methodNode, mtd, sourceFile) {
 }
 exports.handleFunctionTemplateDecl = handleFunctionTemplateDecl;
 function buildArkMethodFromArkClass(methodNode, declaringClass, mtd, sourceFile, declaringMethod) {
-    mtd.setDeclaringArkClass(declaringClass);
     if (declaringMethod !== undefined) {
         mtd.setOuterMethod(declaringMethod);
     }
@@ -157,7 +153,7 @@ function buildArkMethodFromArkClass(methodNode, declaringClass, mtd, sourceFile,
     }
     reCheckModifiers(methodName, declaringClass, mtd, methodParameters);
     const methodSubSignature = new ArkSignature_1.MethodSubSignature(methodName, methodParameters, returnType, mtd.isStatic());
-    const methodSignature = new ArkSignature_1.MethodSignature(mtd.getDeclaringArkClass().getSignature(), methodSubSignature);
+    const methodSignature = new ArkSignature_1.MethodSignature(mtd.getDeclaringArkClass().getClassSigID(), methodSubSignature);
     if (isMethodImplementation(methodNode)) {
         mtd.setImplementationSignature(methodSignature);
         mtd.setImplOriginFullPosition(Position_1.FullPosition.cxxBuildFromNode(methodNode, sourceFile));
@@ -303,9 +299,6 @@ function buildDefaultConstructor(arkClass) {
         return false;
     }
     recursivelyCheckAndBuildSuperConstructor(arkClass);
-    const defaultConstructor = new ArkMethod_1.ArkMethod();
-    defaultConstructor.setDeclaringArkClass(arkClass);
-    defaultConstructor.setIsGeneratedFlag(false);
     const thisLocal = new Local_1.Local(TSConst_1.THIS_NAME, new Type_1.ClassType(arkClass.getSignature()));
     const locals = new Set([thisLocal]);
     const basicBlock = new BasicBlock_1.BasicBlock();
@@ -326,12 +319,13 @@ function buildDefaultConstructor(arkClass) {
     basicBlock.addStmt(new Stmt_1.ArkAssignStmt(thisLocal, new Ref_1.ArkThisRef(new Type_1.ClassType(arkClass.getSignature()))));
     if (superConstructor) {
         const superMethodSubSignature = new ArkSignature_1.MethodSubSignature(TSConst_1.SUPER_NAME, parameters, superConstructor.getReturnType());
-        const superMethodSignature = new ArkSignature_1.MethodSignature(arkClass.getSignature(), superMethodSubSignature);
+        const superMethodSignature = new ArkSignature_1.MethodSignature(arkClass.getClassSigID(), superMethodSubSignature);
         const superInvokeExpr = new Expr_1.ArkStaticInvokeExpr(superMethodSignature, parameterArgs);
         basicBlock.addStmt(new Stmt_1.ArkInvokeStmt(superInvokeExpr));
     }
-    const methodSubSignature = new ArkSignature_1.MethodSubSignature(TSConst_1.CONSTRUCTOR_NAME, parameters, thisLocal.getType(), defaultConstructor.isStatic());
-    defaultConstructor.setImplementationSignature(new ArkSignature_1.MethodSignature(arkClass.getSignature(), methodSubSignature));
+    const methodSubSignature = new ArkSignature_1.MethodSubSignature(TSConst_1.CONSTRUCTOR_NAME, parameters, thisLocal.getType());
+    const defaultConstructor = new ArkMethod_1.ArkMethod(arkClass.getClassSigID(), new ArkSignature_1.MethodSignature(arkClass.getClassSigID(), methodSubSignature));
+    defaultConstructor.setIsGeneratedFlag(false);
     basicBlock.addStmt(new Stmt_1.ArkReturnStmt(thisLocal));
     const cfg = new Cfg_1.Cfg();
     cfg.addBlock(basicBlock);
@@ -394,7 +388,7 @@ function addInitInConstructor(constructor) {
     }
     let initInvokeStmt;
     try {
-        initInvokeStmt = new Stmt_1.ArkInvokeStmt(new Expr_1.ArkInstanceInvokeExpr(thisLocal, constructor.getDeclaringArkClass().getInstanceInitMethod().getSignature(), []));
+        initInvokeStmt = new Stmt_1.ArkInvokeStmt(new Expr_1.ArkInstanceInvokeExpr(thisLocal, constructor.getDeclaringArkClass().getInstanceInitMethodOrNull().getSignature(), []));
     }
     catch (e) {
         logger.warn('addInitInConstructor: failed to build initInvokeStmt due to exception: ', e);
@@ -410,7 +404,7 @@ function isMethodImplementation(node) {
     var _a;
     switch (node.kind) {
         case ArkCxxAstNode_1.AstKind.LambdaExpr:
-            return (node.inner && node.inner.length > 0);
+            return node.inner && node.inner.length > 0;
         case ArkCxxAstNode_1.AstKind.CXXMethodDecl:
         case ArkCxxAstNode_1.AstKind.CXXConstructorDecl:
         case ArkCxxAstNode_1.AstKind.CXXDestructorDecl:
@@ -419,7 +413,7 @@ function isMethodImplementation(node) {
         case ArkCxxAstNode_1.AstKind.FriendDecl:
             // CXXConstructorDecl-CXXCtorInitializer: using Base::Base
             // ==> The constructor of the subclass has the same implementation as that of the parent class.
-            return !!((_a = node.inner) === null || _a === void 0 ? void 0 : _a.find((inn) => (inn.kind === ArkCxxAstNode_1.AstKind.CompoundStmt || inn.kind === ArkCxxAstNode_1.AstKind.CXXCtorInitializer)));
+            return !!((_a = node.inner) === null || _a === void 0 ? void 0 : _a.find((inn) => inn.kind === ArkCxxAstNode_1.AstKind.CompoundStmt || inn.kind === ArkCxxAstNode_1.AstKind.CXXCtorInitializer));
         default:
             return false;
     }

package/lib/frontend/cppFrontend/model/builder/ArkNamespaceBuilder.d.ts

@@ -1,8 +1,6 @@
 import { ArkFile } from '../../../../core/model/ArkFile';
 import { ArkNamespace } from '../../../../core/model/ArkNamespace';
-import { ArkClass } from '../../../../core/model/ArkClass';
 import { CxxAstNode } from '../../utils/ArkCxxAstNode';
-export declare function buildDefaultArkClassFromArkNamespace(arkNamespace: ArkNamespace, defaultClass: ArkClass, nsNode: CxxAstNode, sourceFile: CxxAstNode): void;
 export declare function genDefaultArkClass(ns: ArkNamespace, node: CxxAstNode, sourceFile: CxxAstNode): void;
 export declare function buildArkNamespace(node: CxxAstNode, declaringInstance: ArkFile | ArkNamespace, ns: ArkNamespace, sourceFile: CxxAstNode): void;
 //# sourceMappingURL=ArkNamespaceBuilder.d.ts.map

package/lib/frontend/cppFrontend/model/builder/ArkNamespaceBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ArkNamespaceBuilder.d.ts","sourceRoot":"","sources":["../../../../../src/frontend/cppFrontend/model/builder/ArkNamespaceBuilder.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAC;AAEzD,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAGnE,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAG3D,OAAO,EAAE,UAAU,EAAW,MAAM,2BAA2B,CAAC;AAwBhE,wBAAgB,oCAAoC,CAChD,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,QAAQ,EACtB,MAAM,EAAE,UAAU,EAClB,UAAU,EAAE,UAAU,GACvB,IAAI,CAIN;AAGD,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,GAAG,IAAI,CAMnG;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,UAAU,EAAE,iBAAiB,EAAE,OAAO,GAAG,YAAY,EAAE,EAAE,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,GAAG,IAAI,CA+B7I"}
+{"version":3,"file":"ArkNamespaceBuilder.d.ts","sourceRoot":"","sources":["../../../../../src/frontend/cppFrontend/model/builder/ArkNamespaceBuilder.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAC;AAEzD,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAMnE,OAAO,EAAE,UAAU,EAAW,MAAM,2BAA2B,CAAC;AAoBhE,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,GAAG,IAAI,CAKnG;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,UAAU,EAAE,iBAAiB,EAAE,OAAO,GAAG,YAAY,EAAE,EAAE,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,GAAG,IAAI,CAqB7I"}

package/lib/frontend/cppFrontend/model/builder/ArkNamespaceBuilder.js

@@ -37,9 +37,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildArkNamespace = exports.genDefaultArkClass = exports.buildDefaultArkClassFromArkNamespace = void 0;
+exports.buildArkNamespace = exports.genDefaultArkClass = void 0;
 const ArkClassBuilder_1 = require("./ArkClassBuilder");
-const ArkFile_1 = require("../../../../core/model/ArkFile");
 const ArkMethodBuilder_1 = require("./ArkMethodBuilder");
 const ArkNamespace_1 = require("../../../../core/model/ArkNamespace");
 const builderUtils_1 = require("./builderUtils");
@@ -53,25 +52,18 @@ const Const_1 = require("../../../../core/common/Const");
 const ArkMethodBuilder_2 = require("./ArkMethodBuilder");
 const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER, 'ArkNamespaceBuilder');
 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);
 }
 function genDefaultArkMethod(cls, sourceFile, node) {
-    let defaultMethod = new ArkMethod_1.ArkMethod();
+    let defaultMethod = new ArkMethod_1.ArkMethod(cls.getClassSigID());
     (0, ArkMethodBuilder_2.buildDefaultArkMethodFromArkClass)(cls, defaultMethod, sourceFile, node);
     cls.setDefaultArkMethod(defaultMethod);
 }
-function buildDefaultArkClassFromArkNamespace(arkNamespace, defaultClass, nsNode, sourceFile) {
-    defaultClass.setDeclaringArkNamespace(arkNamespace);
-    defaultClass.setDeclaringArkFile(arkNamespace.getDeclaringArkFile());
-    buildDefaultArkClass(defaultClass, sourceFile, nsNode);
-}
-exports.buildDefaultArkClassFromArkNamespace = buildDefaultArkClassFromArkNamespace;
 function genDefaultArkClass(ns, node, sourceFile) {
-    let defaultClass = new ArkClass_1.ArkClass();
-    buildDefaultArkClassFromArkNamespace(ns, defaultClass, node, sourceFile);
+    let defaultClass = new ArkClass_1.ArkClass(ns.getDeclaringFileID(), ns.getNamespaceSigID());
+    buildDefaultArkClass(defaultClass, sourceFile, node);
     ns.setDefaultClass(defaultClass);
     ns.addArkClass(defaultClass);
 }
@@ -81,16 +73,8 @@ function buildArkNamespace(node, declaringInstance, ns, sourceFile) {
     // modifierFlags from wire + AstParser access merge
     ns.setModifiers((0, builderUtils_1.buildModifiers)(node));
     ns.setDecorators((0, builderUtils_1.buildDecorators)(node, sourceFile));
-    if (declaringInstance instanceof ArkFile_1.ArkFile) {
-        ns.setDeclaringArkFile(declaringInstance);
-    }
-    else {
-        ns.setDeclaringArkNamespace(declaringInstance);
-        ns.setDeclaringArkFile(declaringInstance.getDeclaringArkFile());
-    }
-    ns.setDeclaringInstance(declaringInstance);
     const namespaceName = genNamespaceName(node.name ? node.name : '', declaringInstance);
-    const namespaceSignature = new ArkSignature_1.NamespaceSignature(namespaceName, ns.getDeclaringArkFile().getFileSignature(), ((_a = ns.getDeclaringArkNamespace()) === null || _a === void 0 ? void 0 : _a.getSignature()) || null);
+    const namespaceSignature = new ArkSignature_1.NamespaceSignature(namespaceName, ns.getDeclaringFileID(), (_a = ns.getDeclaringArkNamespace()) === null || _a === void 0 ? void 0 : _a.getNamespaceSigID());
     ns.setSignature(namespaceSignature);
     // set line and column
     ns.setOriginFullPositions([Position_1.FullPosition.cxxBuildFromNode(node, sourceFile)]);
@@ -102,6 +86,7 @@ function buildArkNamespace(node, declaringInstance, ns, sourceFile) {
     else {
         logger.warn('JSDocNamespaceDeclaration found.');
     }
+    declaringInstance.addNamespace(ns);
 }
 exports.buildArkNamespace = buildArkNamespace;
 function genNamespaceName(name, declaringInstance) {
@@ -132,16 +117,13 @@ function buildNamespaceMembers(node, namespace, sourceFile) {
     statements.forEach((child) => {
         switch (child.kind) {
             case ArkCxxAstNode_1.AstKind.NamespaceDecl: {
-                let childNs = new ArkNamespace_1.ArkNamespace();
-                childNs.setDeclaringArkNamespace(namespace);
-                childNs.setDeclaringArkFile(namespace.getDeclaringArkFile());
+                let childNs = new ArkNamespace_1.ArkNamespace(namespace.getDeclaringFileID(), namespace.getNamespaceSigID());
                 buildArkNamespace(child, namespace, childNs, sourceFile);
-                namespace.addNamespace(childNs);
                 return;
             }
             case ArkCxxAstNode_1.AstKind.CXXRecordDecl:
             case ArkCxxAstNode_1.AstKind.ClassTemplateDecl: {
-                let cls = new ArkClass_1.ArkClass();
+                let cls = new ArkClass_1.ArkClass(namespace.getDeclaringFileID(), namespace.getNamespaceSigID());
                 (0, ArkClassBuilder_1.buildNormalArkClassFromArkNamespace)(child, namespace, cls, sourceFile);
                 return;
             }
@@ -154,8 +136,9 @@ function buildNamespaceMembers(node, namespace, sourceFile) {
             case ArkCxxAstNode_1.AstKind.FunctionTemplateDecl:
             case ArkCxxAstNode_1.AstKind.FunctionDecl:
             case ArkCxxAstNode_1.AstKind.FriendDecl: {
-                let mthd = new ArkMethod_1.ArkMethod();
-                (0, ArkMethodBuilder_1.buildArkMethodFromArkClass)(child, namespace.getDefaultClass(), mthd, sourceFile);
+                const defaultClass = namespace.getDefaultClass();
+                let mthd = new ArkMethod_1.ArkMethod(defaultClass.getClassSigID());
+                (0, ArkMethodBuilder_1.buildArkMethodFromArkClass)(child, defaultClass, mthd, sourceFile);
                 return;
             }
             case ArkCxxAstNode_1.AstKind.UsingDecl:
@@ -169,21 +152,20 @@ function buildNamespaceMembers(node, namespace, sourceFile) {
     });
 }
 function buildArkMethodForClassMethodInNamespace(methodNode, namespace, sourceFile) {
-    var _a;
     let className = methodNode.mangledName;
     if (!className) {
         logger.trace('Declaration class not found', methodNode);
         return;
     }
-    let arkClass = namespace.getClassWithName(className);
+    // 签名 get-or-create：拼归属签名直查（对齐 ArkFileBuilder file 级精确匹配先例），
+    // 消除原按名搜索查 'Foo' 误命中 'Foo$Bar' 的前缀错配
+    const classSignature = new ArkSignature_1.ClassSignature(className, namespace.getDeclaringFileID(), namespace.getNamespaceSigID());
+    let arkClass = namespace.getClass(classSignature);
     if (!arkClass) {
-        arkClass = new ArkClass_1.ArkClass();
-        arkClass.setDeclaringArkNamespace(namespace);
-        arkClass.setDeclaringArkFile(namespace.getDeclaringArkFile());
-        const classSignature = new ArkSignature_1.ClassSignature(className, arkClass.getDeclaringArkFile().getFileSignature(), ((_a = arkClass.getDeclaringArkNamespace()) === null || _a === void 0 ? void 0 : _a.getSignature()) || null);
+        arkClass = new ArkClass_1.ArkClass(namespace.getDeclaringFileID(), namespace.getNamespaceSigID());
         arkClass.setSignature(classSignature);
-        namespace.addArkClass(arkClass, className);
+        namespace.addArkClass(arkClass);
     }
-    let mtd = new ArkMethod_1.ArkMethod();
+    let mtd = new ArkMethod_1.ArkMethod(arkClass.getClassSigID());
     (0, ArkMethodBuilder_1.buildArkMethodFromArkClass)(methodNode, arkClass, mtd, sourceFile);
 }

package/lib/frontend/cppFrontend/model/builder/BodyBuilder.d.ts

@@ -46,6 +46,7 @@ export declare class CxxBodyBuilder {
     private inferTypesDefineInOuter;
     private updateNestedMethodUsedInOuter;
     private updateNestedMethodWithClosures;
+    private syncChildrenOuterMethodSigID;
     private updateOuterMethodWithClosures;
     private getOriginalNestedMethodName;
     private updateGlobalInfoWithClosures;

package/lib/frontend/cppFrontend/model/builder/BodyBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BodyBuilder.d.ts","sourceRoot":"","sources":["../../../../../src/frontend/cppFrontend/model/builder/BodyBuilder.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAC7D,OAAO,EAAkB,eAAe,EAA8C,MAAM,qCAAqC,CAAC;AAClI,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAI5D,OAAO,EAAsC,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAI1F,OAAO,EAAE,UAAU,EAAW,MAAM,2BAA2B,CAAC;AAYhE,qBAAa,cAAc;IACvB,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,OAAO,CAAC,CAAyB;gBAE7B,eAAe,EAAE,eAAe,EAAE,aAAa,EAAE,UAAU,EAAE,eAAe,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU;IAIpH,KAAK,IAAI,OAAO,GAAG,IAAI;IAcvB,aAAa,IAAI,UAAU;IAI3B,UAAU,IAAI,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,SAAS;IAIhD,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAI;IAIxD;;;;;;;;OAQG;IACH,OAAO,CAAC,wBAAwB;IAiChC;;;;;OAKG;IACH,OAAO,CAAC,eAAe;IA2BvB;;;;;OAKG;IACI,sBAAsB,IAAI,IAAI;IAwDrC,OAAO,CAAC,eAAe;IAWvB,OAAO,CAAC,6BAA6B;IASrC,OAAO,CAAC,sCAAsC;IA4B9C,OAAO,CAAC,0BAA0B;IAiBlC,OAAO,CAAC,uBAAuB;IAgB/B,OAAO,CAAC,8BAA8B;IAmBtC,OAAO,CAAC,wBAAwB;IAuBhC,OAAO,CAAC,uBAAuB;IAe/B,OAAO,CAAC,6BAA6B;IAyCrC,OAAO,CAAC,8BAA8B;IAkBtC,OAAO,CAAC,6BAA6B;IA2BrC,OAAO,CAAC,2BAA2B;IAUnC,OAAO,CAAC,4BAA4B;IAqBpC,OAAO,CAAC,2BAA2B;IAyBnC,OAAO,CAAC,oCAAoC;IA+B5C,OAAO,CAAC,8BAA8B;IAWtC,OAAO,CAAC,qCAAqC;IA8B7C,OAAO,CAAC,2BAA2B;IAuDnC,OAAO,CAAC,kCAAkC;CAkB7C"}
+{"version":3,"file":"BodyBuilder.d.ts","sourceRoot":"","sources":["../../../../../src/frontend/cppFrontend/model/builder/BodyBuilder.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAC7D,OAAO,EAAkB,eAAe,EAA8C,MAAM,qCAAqC,CAAC;AAClI,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAI5D,OAAO,EAAsC,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAI1F,OAAO,EAAE,UAAU,EAAW,MAAM,2BAA2B,CAAC;AAahE,qBAAa,cAAc;IACvB,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,OAAO,CAAC,CAAyB;gBAE7B,eAAe,EAAE,eAAe,EAAE,aAAa,EAAE,UAAU,EAAE,eAAe,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU;IAIpH,KAAK,IAAI,OAAO,GAAG,IAAI;IAcvB,aAAa,IAAI,UAAU;IAI3B,UAAU,IAAI,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,SAAS;IAIhD,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAI;IAIxD;;;;;;;;OAQG;IACH,OAAO,CAAC,wBAAwB;IAiChC;;;;;OAKG;IACH,OAAO,CAAC,eAAe;IA2BvB;;;;;OAKG;IACI,sBAAsB,IAAI,IAAI;IAwDrC,OAAO,CAAC,eAAe;IAWvB,OAAO,CAAC,6BAA6B;IASrC,OAAO,CAAC,sCAAsC;IA4B9C,OAAO,CAAC,0BAA0B;IAiBlC,OAAO,CAAC,uBAAuB;IAgB/B,OAAO,CAAC,8BAA8B;IAmBtC,OAAO,CAAC,wBAAwB;IAuBhC,OAAO,CAAC,uBAAuB;IAe/B,OAAO,CAAC,6BAA6B;IAyCrC,OAAO,CAAC,8BAA8B;IAkCtC,OAAO,CAAC,4BAA4B;IAWpC,OAAO,CAAC,6BAA6B;IA2BrC,OAAO,CAAC,2BAA2B;IAUnC,OAAO,CAAC,4BAA4B;IAqBpC,OAAO,CAAC,2BAA2B;IAyBnC,OAAO,CAAC,oCAAoC;IA+B5C,OAAO,CAAC,8BAA8B;IAWtC,OAAO,CAAC,qCAAqC;IA8B7C,OAAO,CAAC,2BAA2B;IAuDnC,OAAO,CAAC,kCAAkC;CAkB7C"}