arkanalyzer 1.0.93 → 2.0.0-beta1

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

@@ -21,22 +21,52 @@ export declare const arkMethodNodeKind: string[];
  * @category core/model
  */
 export declare class ArkMethod extends ArkBaseModel implements ArkExport {
-    private declaringArkClass;
-    private outerMethod?;
-    private genericTypes?;
-    private declareSignatures?;
+    /** @internal Formal ClassSigID for the declaring class. -1 = not yet interned. */
+    private declaringClassID;
+    /** @internal Formal MethodSigID for the outer method. undefined = none. */
+    private outerMethodSigID?;
+    /** @internal Formal MethodSigID of this method's implementation signature. undefined = declare-only (no implementation). */
+    private implementSigID?;
+    /** @internal Formal MethodSigIDs of the declaration signatures. undefined = no separate declarations. */
+    private declareSigIDs?;
+    /**
+     * @internal SigIDs of classes declared inside this method body (bare source name → ClassSigID).
+     * Only methods whose body contains a class declaration have this map. Enables deterministic
+     * scope-chain resolution of local-class references (bare name → exact SigID), replacing
+     * the file-level fuzzy prefix matching on composed names (`Local$Outer-m`).
+     */
+    private localClassSigIDs?;
+    /** The full position of the method implementation. Undefined when the method has no implementation (e.g., interface method). */
+    private implOriginFullPosition?;
     /** The full positions of the method declarations (for interface/abstract methods with separate declarations). */
     private declareOriginFullPositions?;
-    private implSignature?;
-    /** The full position of the method implementation.
-     *  Undefined when the method has no implementation (e.g., interface method). */
-    private implOriginFullPosition?;
+    private genericTypes?;
     private sourceCode?;
     private body?;
     private viewTree?;
     private bodyBuilder?;
     private CxxBodyBuilder?;
+    /**
+     * @deprecated Construct with the declaring class ID and (optionally) the signature
+     * objects instead.
+     */
     constructor();
+    /**
+     * Build directly from the declaring class ID and (optionally) signature objects and
+     * the outer method SigID.
+     * `setImplementationSignature` / `setDeclareSignatures` are the registration points:
+     * the implementation path interns the signature, refreshes canonical parameter names,
+     * and registers this method as the model with arbitration; the declaration path only
+     * interns (registration is completed by ArkClass.addMethod).
+     * @param declaringClassID - Formal ClassSigID of the declaring class (required).
+     * @param implementationSignature - The implementation signature object; not yet
+     *        registered — registration happens inside via setImplementationSignature.
+     * @param declareSignatures - The declaration signature object(s); not yet interned —
+     *        interning happens inside via setDeclareSignatures.
+     * @param outerMethodSigID - Formal MethodSigID of the outer (enclosing) method for
+     *        nested methods. Non-positive values are treated as none.
+     */
+    constructor(declaringClassID: number, implementationSignature?: MethodSignature, declareSignatures?: MethodSignature | MethodSignature[], outerMethodSigID?: number);
     /**
      * Returns the program language of the file where this method defined.
      */
@@ -139,8 +169,16 @@ export declare class ArkMethod extends ArkBaseModel implements ArkExport {
      * @returns The declaring class of the method.
      */
     getDeclaringArkClass(): ArkClass;
+    /** @deprecated Use the ID-injecting constructor {@link constructor(declaringClassID, implementationSignature, declareSignatures, outerMethodSigID)}. */
     setDeclaringArkClass(declaringArkClass: ArkClass): void;
+    /** @internal Get the formal ClassSigID of the declaring class. Returns -1 if not interned. */
+    getDeclaringClassID(): number;
+    /** @internal Get the formal MethodSigID of the outer method. Returns undefined if none. */
+    getOuterMethodSigID(): number | undefined;
+    /** @internal Set the formal MethodSigID of the outer method directly. Non-positive IDs are treated as none. */
+    setOuterMethodSigID(sigID: number): void;
     getDeclaringArkFile(): ArkFile;
+    getDeclaringArkFileID(): number;
     isDefaultArkMethod(): boolean;
     isAnonymousMethod(): boolean;
     getParameters(): MethodParameter[];
@@ -148,9 +186,12 @@ export declare class ArkMethod extends ArkBaseModel implements ArkExport {
     /**
      * Get all declare signatures.
      * The results could be null if there is no seperated declaration of the method.
+     * Note: the returned array is a rebuilt copy; mutating it does not affect the internal storage.
      * @returns null or the method declare signatures.
      */
     getDeclareSignatures(): MethodSignature[] | null;
+    /** @internal Get the formal MethodSigIDs of the declaration signatures. Returns undefined if none. */
+    getDeclareSigIDs(): number[] | undefined;
     /**
      * Get the index of the matched method declare signature among all declare signatures.
      * The index will be -1 if there is no matched signature found.
@@ -171,13 +212,6 @@ export declare class ArkMethod extends ArkBaseModel implements ArkExport {
      * - Class Signature: indicates which class this method belong to.
      * - Method SubSignature: indicates the detail info of this method such as method name, parameters, returnType, etc.
      * @returns The method signature.
-     * @example
-     * 1. Get the signature of method mtd.
-
-     ```typescript
-     let signature = mtd.getSignature();
-     // ... ...
-     ```
      */
     getSignature(): MethodSignature;
     /**
@@ -199,6 +233,41 @@ export declare class ArkMethod extends ArkBaseModel implements ArkExport {
      * @param signature - signature of implementation.
      */
     setImplementationSignature(signature: MethodSignature): void;
+    /**
+     * @internal Refresh the implementation-side parameter names onto the canonical signature.
+     *
+     * Parameter names are not part of signature identity (hash/equals/toString use parameter
+     * types only), so a declaration and an implementation with differing parameter names share
+     * one canonical instance — whichever interned first. The implementation is the authority
+     * for body-local generation (`prebuildStmts` reads `getParameters()` through the canonical
+     * instance), so when an implementation signature carries different parameter names than the
+     * canonical instance, the canonical parameter list is replaced with the implementation's.
+     */
+    private refreshCanonicalParameterNames;
+    /**
+     * @internal Register this method as the model of the given implementation SigID, with arbitration:
+     * - Sibling methods of the same declaring class never overwrite each other's registration:
+     *   builders merge same-signature overloads/declarations by reading the previously added
+     *   method through the canonicalizer, and the final winner is registered by ArkClass.addMethod.
+     * - The reverse-lookup slot should be held by the method that actually has a body (C++ decl/impl split).
+     * - Setting an implementation signature twice on different methods is anomalous and logged.
+     */
+    private registerImplModelWithArbitration;
+    /** @internal Whether this method belongs to a C++ file. Defensive against unresolved declaring class. */
+    private isCxxMethod;
+    /** @internal Get the formal MethodSigID of this method's implementation signature. Returns undefined for declare-only methods. */
+    getMethodSigID(): number | undefined;
+    /**
+     * Returns the unique ID of this model — the MethodSigID in the canonicalizer.
+     * The signature table and the model table share one dense ID space, so this ID
+     * resolves both the signature and the model.
+     *
+     * A method may be registered under multiple SigIDs (n:1: the implementation slot
+     * plus declaration slots all hold this model). This returns the ID of the
+     * signature {@link getSignature} would return — the implementation ID when set,
+     * otherwise the first declaration ID; 0 (the DEFAULT slot) when neither is set.
+     */
+    getId(): number;
     getSubSignature(): MethodSubSignature;
     getGenericTypes(): GenericType[] | undefined;
     isGenericsMethod(): boolean;
@@ -297,7 +366,24 @@ export declare class ArkMethod extends ArkBaseModel implements ArkExport {
     validate(): ArkError;
     matchMethodSignature(args: Value[]): MethodSignature;
     getOuterMethod(): ArkMethod | undefined;
+    /**
+     * @internal Sets the outer (enclosing) method of a nested function.
+     * Internally only the formal MethodSigID is stored; the outer method itself is resolved back via the method signature canonicalizer.
+     * @param method - The outer method of this nested method.
+     */
     setOuterMethod(method: ArkMethod): void;
+    /**
+     * @internal Register a class declared inside this method body, keyed by its bare source name.
+     * The class model itself is stored under the composed name (`Local$Outer-m`) at file/namespace
+     * top level; this map preserves the bare-name → ClassSigID scope binding. First registration
+     * wins (TS block-scoped shadowing is not modeled at this granularity).
+     */
+    registerLocalClass(bareName: string, classSigID: number): void;
+    /**
+     * @internal Get the ClassSigID of a class declared inside this method body by its bare name.
+     * Returns undefined when no such class is registered.
+     */
+    getLocalClassSigID(bareName: string): number | undefined;
     getFunctionLocal(name: string): Local | null;
     setQuestionToken(questionToken: boolean): void;
     getQuestionToken(): boolean;

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

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

package/lib/core/model/ArkMethod.js

@@ -13,21 +13,48 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ArkMethod = exports.arkMethodNodeKind = void 0;
 const Ref_1 = require("../base/Ref");
 const Stmt_1 = require("../base/Stmt");
 const Type_1 = require("../base/Type");
 const ArkClass_1 = require("./ArkClass");
+const ArkSignature_1 = require("./ArkSignature");
 const ArkExport_1 = require("./ArkExport");
 const Const_1 = require("../common/Const");
 const Position_1 = require("../base/Position");
 const ArkBaseModel_1 = require("./ArkBaseModel");
 const ArkError_1 = require("../common/ArkError");
+const SignatureCanonicalizerRegistry_1 = require("../common/SignatureCanonicalizerRegistry");
+const ArkFile_1 = require("./ArkFile");
 const TSConst_1 = require("../common/TSConst");
-const StringUtils_1 = require("../common/StringUtils");
 const Type_2 = require("../../frontend/cppFrontend/base/Type");
 const ModelUtils_1 = require("../common/ModelUtils");
+const logger_1 = __importStar(require("../../utils/logger"));
+const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER, 'ArkMethod');
 exports.arkMethodNodeKind = [
     'MethodDeclaration',
     'Constructor',
@@ -44,8 +71,22 @@ exports.arkMethodNodeKind = [
  * @category core/model
  */
 class ArkMethod extends ArkBaseModel_1.ArkBaseModel {
-    constructor() {
+    constructor(declaringClassID, implementationSignature, declareSignatures, outerMethodSigID) {
         super();
+        /** @internal Formal ClassSigID for the declaring class. -1 = not yet interned. */
+        this.declaringClassID = -1;
+        if (declaringClassID !== undefined) {
+            this.declaringClassID = declaringClassID;
+        }
+        if (implementationSignature) {
+            this.setImplementationSignature(implementationSignature);
+        }
+        if (declareSignatures) {
+            this.setDeclareSignatures(declareSignatures);
+        }
+        if (outerMethodSigID !== undefined) {
+            this.outerMethodSigID = outerMethodSigID > 0 ? outerMethodSigID : undefined;
+        }
     }
     /**
      * Returns the program language of the file where this method defined.
@@ -71,14 +112,14 @@ class ArkMethod extends ArkBaseModel_1.ArkBaseModel {
             return this.sourceCode;
         }
         if (this.implOriginFullPosition !== undefined) {
-            const code = (0, StringUtils_1.extractSourceTextByFullPosition)(this.getDeclaringArkFile().getCode(), this.implOriginFullPosition);
+            const code = this.getDeclaringArkFile().getSourceTextByFullPosition(this.implOriginFullPosition);
             if (code !== undefined) {
                 this.sourceCode = code;
             }
             return code;
         }
         if (this.declareOriginFullPositions && this.declareOriginFullPositions.length > 0) {
-            const code = (0, StringUtils_1.extractSourceTextByFullPosition)(this.getDeclaringArkFile().getCode(), this.declareOriginFullPositions[0]);
+            const code = this.getDeclaringArkFile().getSourceTextByFullPosition(this.declareOriginFullPositions[0]);
             if (code !== undefined) {
                 this.sourceCode = code;
             }
@@ -90,8 +131,7 @@ class ArkMethod extends ArkBaseModel_1.ArkBaseModel {
      * @deprecated Source text is now stored on ArkFile only. This method has no effect.
      * @param _code - The source code (ignored).
      */
-    setCode(_code) {
-    }
+    setCode(_code) { }
     /**
      * @deprecated Since version 1.0.91. Use getDeclareOriginFullPositions().map(p => p.getFirstLine()) instead.
      * @returns null or the lines of the method's declarations with number type.
@@ -256,13 +296,32 @@ class ArkMethod extends ArkBaseModel_1.ArkBaseModel {
      * @returns The declaring class of the method.
      */
     getDeclaringArkClass() {
-        return this.declaringArkClass;
+        if (this.declaringClassID !== -1) {
+            return SignatureCanonicalizerRegistry_1.SignatureCanonicalizerRegistry.getInstance().classSigCanonicalizer.getModel(this.declaringClassID);
+        }
+        return undefined;
     }
+    /** @deprecated Use the ID-injecting constructor {@link constructor(declaringClassID, implementationSignature, declareSignatures, outerMethodSigID)}. */
     setDeclaringArkClass(declaringArkClass) {
-        this.declaringArkClass = declaringArkClass;
+        this.declaringClassID = declaringArkClass.getClassSigID();
+    }
+    /** @internal Get the formal ClassSigID of the declaring class. Returns -1 if not interned. */
+    getDeclaringClassID() {
+        return this.declaringClassID;
+    }
+    /** @internal Get the formal MethodSigID of the outer method. Returns undefined if none. */
+    getOuterMethodSigID() {
+        return this.outerMethodSigID;
+    }
+    /** @internal Set the formal MethodSigID of the outer method directly. Non-positive IDs are treated as none. */
+    setOuterMethodSigID(sigID) {
+        this.outerMethodSigID = sigID > 0 ? sigID : undefined;
     }
     getDeclaringArkFile() {
-        return this.declaringArkClass.getDeclaringArkFile();
+        return this.getDeclaringArkClass().getDeclaringArkFile();
+    }
+    getDeclaringArkFileID() {
+        return this.getDeclaringArkClass().getDeclaringFileID();
     }
     isDefaultArkMethod() {
         return this.getName() === Const_1.DEFAULT_ARK_METHOD_NAME;
@@ -279,11 +338,27 @@ class ArkMethod extends ArkBaseModel_1.ArkBaseModel {
     /**
      * Get all declare signatures.
      * The results could be null if there is no seperated declaration of the method.
+     * Note: the returned array is a rebuilt copy; mutating it does not affect the internal storage.
      * @returns null or the method declare signatures.
      */
     getDeclareSignatures() {
-        var _a;
-        return (_a = this.declareSignatures) !== null && _a !== void 0 ? _a : null;
+        const ids = this.declareSigIDs;
+        if (ids === undefined) {
+            return null;
+        }
+        const canonicalizer = SignatureCanonicalizerRegistry_1.SignatureCanonicalizerRegistry.getInstance().methodSigCanonicalizer;
+        const result = [];
+        for (const id of ids) {
+            const sig = canonicalizer.get(id);
+            if (sig !== undefined) {
+                result.push(sig);
+            }
+        }
+        return result.length > 0 ? result : null;
+    }
+    /** @internal Get the formal MethodSigIDs of the declaration signatures. Returns undefined if none. */
+    getDeclareSigIDs() {
+        return this.declareSigIDs;
     }
     /**
      * Get the index of the matched method declare signature among all declare signatures.
@@ -292,8 +367,8 @@ class ArkMethod extends ArkBaseModel_1.ArkBaseModel {
      * @returns -1 or the index of the matched signature.
      */
     getDeclareSignatureIndex(targetSignature) {
-        let declareSignatures = this.declareSignatures;
-        if (declareSignatures === undefined) {
+        const declareSignatures = this.getDeclareSignatures();
+        if (declareSignatures === null) {
             return -1;
         }
         for (let i = 0; i < declareSignatures.length; i++) {
@@ -310,7 +385,10 @@ class ArkMethod extends ArkBaseModel_1.ArkBaseModel {
      */
     getImplementationSignature() {
         var _a;
-        return (_a = this.implSignature) !== null && _a !== void 0 ? _a : null;
+        if (this.implementSigID === undefined) {
+            return null;
+        }
+        return (_a = SignatureCanonicalizerRegistry_1.SignatureCanonicalizerRegistry.getInstance().methodSigCanonicalizer.get(this.implementSigID)) !== null && _a !== void 0 ? _a : null;
     }
     /**
      * Get the method signature of the implementation or the first declaration if there is no implementation.
@@ -319,17 +397,18 @@ class ArkMethod extends ArkBaseModel_1.ArkBaseModel {
      * - Class Signature: indicates which class this method belong to.
      * - Method SubSignature: indicates the detail info of this method such as method name, parameters, returnType, etc.
      * @returns The method signature.
-     * @example
-     * 1. Get the signature of method mtd.
-
-     ```typescript
-     let signature = mtd.getSignature();
-     // ... ...
-     ```
      */
     getSignature() {
-        var _a;
-        return (_a = this.implSignature) !== null && _a !== void 0 ? _a : this.declareSignatures[0];
+        const impl = this.getImplementationSignature();
+        if (impl !== null) {
+            return impl;
+        }
+        const declares = this.getDeclareSignatures();
+        if (declares !== null && declares.length > 0) {
+            return declares[0];
+        }
+        logger.error(`A method (SigID=${this.getMethodSigID()}) has neither an implementation nor a declaration signature; returning DEFAULT.`);
+        return ArkSignature_1.MethodSignature.DEFAULT;
     }
     /**
      * Set signatures of all declarations.
@@ -337,12 +416,15 @@ class ArkMethod extends ArkBaseModel_1.ArkBaseModel {
      * @param signatures - one signature or a list of signatures.
      */
     setDeclareSignatures(signatures) {
-        if (Array.isArray(signatures)) {
-            this.declareSignatures = signatures;
-        }
-        else {
-            this.declareSignatures = [signatures];
+        const sigList = Array.isArray(signatures) ? signatures : [signatures];
+        const canonicalizer = SignatureCanonicalizerRegistry_1.SignatureCanonicalizerRegistry.getInstance().methodSigCanonicalizer;
+        // Only intern here; the model is registered when the method is added to a class(ArkClass.addMethod).
+        // Eager registration would overwrite the model of the previously added same-signature method while builders still need to read it for merging.
+        const ids = [];
+        for (const sig of sigList) {
+            ids.push(canonicalizer.getOrCreateId(sig));
         }
+        this.declareSigIDs = ids;
     }
     /**
      * Reset signature of one declaration with the specified index.
@@ -351,10 +433,13 @@ class ArkMethod extends ArkBaseModel_1.ArkBaseModel {
      * @param index - index of signature want to set.
      */
     setDeclareSignatureWithIndex(signature, index) {
-        if (this.declareSignatures === undefined || this.declareSignatures.length <= index) {
+        if (this.declareSigIDs === undefined || this.declareSigIDs.length <= index) {
             return;
         }
-        this.declareSignatures[index] = signature;
+        // Only intern here; the model registration stays with ArkClass.addMethod (see setDeclareSignatures).
+        const canonicalizer = SignatureCanonicalizerRegistry_1.SignatureCanonicalizerRegistry.getInstance().methodSigCanonicalizer;
+        const id = canonicalizer.getOrCreateId(signature);
+        this.declareSigIDs[index] = id;
     }
     /**
      * Set signature of implementation.
@@ -362,7 +447,100 @@ class ArkMethod extends ArkBaseModel_1.ArkBaseModel {
      * @param signature - signature of implementation.
      */
     setImplementationSignature(signature) {
-        this.implSignature = signature;
+        const reg = SignatureCanonicalizerRegistry_1.SignatureCanonicalizerRegistry.getInstance();
+        const canonicalizer = reg.methodSigCanonicalizer;
+        const id = canonicalizer.getOrCreateId(signature);
+        this.implementSigID = id;
+        this.refreshCanonicalParameterNames(canonicalizer, id, signature);
+        this.registerImplModelWithArbitration(canonicalizer, id);
+    }
+    /**
+     * @internal Refresh the implementation-side parameter names onto the canonical signature.
+     *
+     * Parameter names are not part of signature identity (hash/equals/toString use parameter
+     * types only), so a declaration and an implementation with differing parameter names share
+     * one canonical instance — whichever interned first. The implementation is the authority
+     * for body-local generation (`prebuildStmts` reads `getParameters()` through the canonical
+     * instance), so when an implementation signature carries different parameter names than the
+     * canonical instance, the canonical parameter list is replaced with the implementation's.
+     */
+    refreshCanonicalParameterNames(canonicalizer, id, implSignature) {
+        const canonical = canonicalizer.get(id);
+        if (canonical === undefined || canonical === implSignature) {
+            return;
+        }
+        const canonicalParams = canonical.getMethodSubSignature().getParameters();
+        const implParams = implSignature.getMethodSubSignature().getParameters();
+        const namesDiffer = canonicalParams.length !== implParams.length || canonicalParams.some((p, i) => p.getName() !== implParams[i].getName());
+        if (namesDiffer) {
+            canonical.getMethodSubSignature().setParameters(implParams);
+        }
+    }
+    /**
+     * @internal Register this method as the model of the given implementation SigID, with arbitration:
+     * - Sibling methods of the same declaring class never overwrite each other's registration:
+     *   builders merge same-signature overloads/declarations by reading the previously added
+     *   method through the canonicalizer, and the final winner is registered by ArkClass.addMethod.
+     * - The reverse-lookup slot should be held by the method that actually has a body (C++ decl/impl split).
+     * - Setting an implementation signature twice on different methods is anomalous and logged.
+     */
+    registerImplModelWithArbitration(canonicalizer, id) {
+        const existing = canonicalizer.getModel(id);
+        if (existing !== undefined && existing !== this) {
+            if (this.declaringClassID > 0 && this.declaringClassID === existing.getDeclaringClassID()) {
+                return;
+            }
+            const existingHasBody = existing.getBody() !== undefined;
+            const thisHasBody = this.getBody() !== undefined;
+            if (this.isCxxMethod()) {
+                if (existingHasBody && !thisHasBody) {
+                    // C++ decl/impl split: the declaration borrows the impl signature. Keep the
+                    // body-holding implementation in the reverse-lookup slot.
+                    return;
+                }
+                if (existingHasBody && thisHasBody) {
+                    logger.error(`Duplicate method (SigID=${this.getMethodSigID()}), the latter wins.`);
+                }
+            }
+            else {
+                logger.error(`Implementation signature (SigID=${this.getMethodSigID()}) is set twice, the latter wins.`);
+            }
+        }
+        canonicalizer.setModel(id, this);
+    }
+    /** @internal Whether this method belongs to a C++ file. Defensive against unresolved declaring class. */
+    isCxxMethod() {
+        if (this.declaringClassID <= 0) {
+            return false;
+        }
+        const cls = SignatureCanonicalizerRegistry_1.SignatureCanonicalizerRegistry.getInstance().classSigCanonicalizer.getModel(this.declaringClassID);
+        if (cls === undefined) {
+            return false;
+        }
+        return cls.getLanguage() === ArkFile_1.Language.CXX;
+    }
+    /** @internal Get the formal MethodSigID of this method's implementation signature. Returns undefined for declare-only methods. */
+    getMethodSigID() {
+        return this.implementSigID;
+    }
+    /**
+     * Returns the unique ID of this model — the MethodSigID in the canonicalizer.
+     * The signature table and the model table share one dense ID space, so this ID
+     * resolves both the signature and the model.
+     *
+     * A method may be registered under multiple SigIDs (n:1: the implementation slot
+     * plus declaration slots all hold this model). This returns the ID of the
+     * signature {@link getSignature} would return — the implementation ID when set,
+     * otherwise the first declaration ID; 0 (the DEFAULT slot) when neither is set.
+     */
+    getId() {
+        if (this.implementSigID !== undefined) {
+            return this.implementSigID;
+        }
+        if (this.declareSigIDs !== undefined && this.declareSigIDs.length > 0) {
+            return this.declareSigIDs[0];
+        }
+        return 0;
     }
     getSubSignature() {
         return this.getSignature().getMethodSubSignature();
@@ -635,11 +813,11 @@ class ArkMethod extends ArkBaseModel_1.ArkBaseModel {
                 errMsg: 'methodSignature and originFullPosition are not matched.',
             };
         }
-        return this.validateFields(['declaringArkClass']);
+        return this.validateFields(['declaringClassID']);
     }
     matchMethodSignature(args) {
         var _a, _b, _c;
-        const signatures = (_a = this.declareSignatures) === null || _a === void 0 ? void 0 : _a.filter((f) => {
+        const signatures = (_a = this.getDeclareSignatures()) === null || _a === void 0 ? void 0 : _a.filter((f) => {
             const parameters = f.getMethodSubSignature().getParameters();
             const max = parameters.length;
             let min = 0;
@@ -651,10 +829,44 @@ class ArkMethod extends ArkBaseModel_1.ArkBaseModel {
         return ((_c = (_b = signatures === null || signatures === void 0 ? void 0 : signatures.find((p) => ModelUtils_1.ModelUtils.isMatched(p.getMethodSubSignature().getParameters(), args, this.getDeclaringArkFile().getScene()))) !== null && _b !== void 0 ? _b : signatures === null || signatures === void 0 ? void 0 : signatures[0]) !== null && _c !== void 0 ? _c : this.getSignature());
     }
     getOuterMethod() {
-        return this.outerMethod;
+        if (this.outerMethodSigID !== undefined) {
+            return SignatureCanonicalizerRegistry_1.SignatureCanonicalizerRegistry.getInstance().methodSigCanonicalizer.getModel(this.outerMethodSigID);
+        }
+        return undefined;
     }
+    /**
+     * @internal Sets the outer (enclosing) method of a nested function.
+     * Internally only the formal MethodSigID is stored; the outer method itself is resolved back via the method signature canonicalizer.
+     * @param method - The outer method of this nested method.
+     */
     setOuterMethod(method) {
-        this.outerMethod = method;
+        const id = method.getMethodSigID();
+        this.outerMethodSigID = id !== undefined && id > 0 ? id : undefined;
+    }
+    /**
+     * @internal Register a class declared inside this method body, keyed by its bare source name.
+     * The class model itself is stored under the composed name (`Local$Outer-m`) at file/namespace
+     * top level; this map preserves the bare-name → ClassSigID scope binding. First registration
+     * wins (TS block-scoped shadowing is not modeled at this granularity).
+     */
+    registerLocalClass(bareName, classSigID) {
+        if (!bareName || classSigID <= 0) {
+            return;
+        }
+        if (!this.localClassSigIDs) {
+            this.localClassSigIDs = new Map();
+        }
+        if (!this.localClassSigIDs.has(bareName)) {
+            this.localClassSigIDs.set(bareName, classSigID);
+        }
+    }
+    /**
+     * @internal Get the ClassSigID of a class declared inside this method body by its bare name.
+     * Returns undefined when no such class is registered.
+     */
+    getLocalClassSigID(bareName) {
+        var _a;
+        return (_a = this.localClassSigIDs) === null || _a === void 0 ? void 0 : _a.get(bareName);
     }
     getFunctionLocal(name) {
         var _a;
@@ -701,10 +913,11 @@ class ArkMethod extends ArkBaseModel_1.ArkBaseModel {
         this.clearBodyAndSupplementary();
         this.freeBodyBuilder();
         this.freeCxxBodyBuilder();
-        this.declaringArkClass = undefined;
-        this.outerMethod = undefined;
-        this.declareSignatures = undefined;
-        this.implSignature = undefined;
+        this.declaringClassID = -1;
+        this.outerMethodSigID = undefined;
+        this.declareSigIDs = undefined;
+        this.implementSigID = undefined;
+        this.localClassSigIDs = undefined;
     }
 }
 exports.ArkMethod = ArkMethod;

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

@@ -80,7 +80,7 @@ export declare class ArkModule {
     setModulePath(modulePath: string): void;
     getModuleName(): string;
     setModuleName(moduleName: string): void;
-    getFilesMap(): Map<string, ArkFile>;
+    getFilesMap(): Map<number, ArkFile>;
     getLoadState(): ModuleLoadState;
     setLoadState(state: ModuleLoadState): void;
     getModuleType(): ModuleType;

package/lib/core/model/ArkModule.js

@@ -219,7 +219,7 @@ class ArkModule {
     }
     // --- File management ---
     addFile(arkFile) {
-        this.filesMap.set(arkFile.getFileSignature().toMapKey(), arkFile);
+        this.filesMap.set(arkFile.getFileSigID(), arkFile);
     }
     clearFilesMap() {
         this.filesMap.clear();