arkanalyzer 1.0.93 → 2.0.0-beta1

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

@@ -17,15 +17,45 @@ export declare class SdkUtils {
     private static dfsFiles;
     static dispose(): void;
     static buildSdkImportMap(file: ArkFile): void;
+    /**
+     * Entry count of the SDK import map, read as part of the resolution table state that decides
+     * whether a cached "no file" answer is still valid.
+     */
+    static getSdkImportMapSize(): number;
     static getImportSdkFile(from: string): ArkFile | undefined;
     private static isGlobalPath;
-    static loadGlobalAPI(file: ArkFile, globalMap: Map<string, ArkExport>): void;
-    static mergeGlobalAPI(file: ArkFile, globalMap: Map<string, ArkExport>): void;
-    private static copyNamespace;
-    static loadAPI(api: ArkExport, globalMap: Map<string, ArkExport>, override?: boolean): void;
-    static postInferredSdk(file: ArkFile, globalMap: Map<string, ArkExport>): void;
+    /** @internal 取名字下的首实体（单值视图语义）。 */
+    private static getFirstGlobal;
+    /** @internal first-win 登记：append 到列表尾部（首实体不变）。 */
+    private static appendGlobal;
+    /** @internal override 登记：移到列表头部（等价旧单值覆盖语义）。 */
+    private static promoteGlobal;
+    static loadGlobalAPI(file: ArkFile, globalMap: Map<string, ArkExport[]>): void;
+    static mergeGlobalAPI(file: ArkFile, globalMap: Map<string, ArkExport[]>): void;
+    static loadAPI(api: ArkExport, globalMap: Map<string, ArkExport[]>, override?: boolean): void;
+    static postInferredSdk(file: ArkFile, globalMap: Map<string, ArkExport[]>): void;
     private static loadClass;
     private static loadGlobalLocal;
+    /** @internal, Get all member-provider classes of a global symbol for member probing. */
+    static getSdkGlobalMemberClasses(globalName: string): ArkClass[];
+    /**
+     * Get the same-name classes mounted in sibling entities of a class's declaring
+     * namespace — for cross-file same-name namespaces (e.g. `Intl` declared across
+     * lib.es5 + lib.es20XX.intl), the class's counterpart in each sibling namespace
+     * carries members declared in that file. Sibling order follows registration
+     * order (= DFS file order); returns [] for non-global namespaces.
+     */
+    static getNamespacedSiblingClasses(arkClass: ArkClass): ArkClass[];
+    /**
+     * Single-value view of the SDK global map: the first entity registered under the name (first-win 语义). Returns null when unregistered.
+     */
+    static getSdkGlobal(globalName: string): ArkExport | null;
+    /**
+     * All SDK global entities registered under the given name (multi-declaration
+     * scenario: e.g. `interface Object` + `declare var Object: ObjectConstructor` are
+     * two entities). Order is the registration order; entry [0] equals {@link getSdkGlobal}.
+     */
+    static getSdkGlobals(globalName: string): ArkExport[];
     static copyMembers(from: ArkClass, to: ArkClass): void;
     static computeGlobalThis(leftOp: AbstractFieldRef, arkMethod: ArkMethod): void;
     static extendArkUI(scene: Scene): void;

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

@@ -1 +1 @@
-{"version":3,"file":"SdkUtils.d.ts","sourceRoot":"","sources":["../../../src/core/common/SdkUtils.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAc,MAAM,oBAAoB,CAAC;AAU3D,OAAO,EAAE,QAAQ,EAAiB,MAAM,mBAAmB,CAAC;AAG5D,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAG/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAG/C,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAGnC,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAIpC,qBAAa,QAAQ;IACjB,OAAO,CAAC,MAAM,CAAC,SAAS,CAAoB;IAC5C,OAAO,CAAC,MAAM,CAAC,YAAY,CAGxB;IAEH,OAAO,CAAC,MAAM,CAAC,YAAY,CAAoD;IAC/E,OAAc,aAAa,SAAc;IACzC,OAAO,CAAC,MAAM,CAAC,cAAc,CAG3B;WAEY,YAAY,CAAC,YAAY,EAAE,GAAG,GAAG,IAAI;WAQrC,aAAa,IAAI,GAAG;WAoBpB,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE;IAW9D,OAAO,CAAC,MAAM,CAAC,QAAQ;WAaT,OAAO,IAAI,IAAI;WAIf,iBAAiB,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI;WAStC,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS;IAIjE,OAAO,CAAC,MAAM,CAAC,YAAY;WAUb,aAAa,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAI;WAqBrE,cAAc,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAI;IAiBpF,OAAO,CAAC,MAAM,CAAC,aAAa;WAWd,OAAO,CAAC,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,QAAQ,GAAE,OAAe,GAAG,IAAI;WAY3F,eAAe,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAI;IAgBrF,OAAO,CAAC,MAAM,CAAC,SAAS;IAiBxB,OAAO,CAAC,MAAM,CAAC,eAAe;WA0BhB,WAAW,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,QAAQ,GAAG,IAAI;WAqB/C,iBAAiB,CAAC,MAAM,EAAE,gBAAgB,EAAE,SAAS,EAAE,SAAS,GAAG,IAAI;WAWvE,WAAW,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;WAgB/B,2BAA2B,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;CAwBnE"}
+{"version":3,"file":"SdkUtils.d.ts","sourceRoot":"","sources":["../../../src/core/common/SdkUtils.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAc,MAAM,oBAAoB,CAAC;AAY3D,OAAO,EAAE,QAAQ,EAAiB,MAAM,mBAAmB,CAAC;AAG5D,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAG/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAG/C,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAEnC,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAQpC,qBAAa,QAAQ;IACjB,OAAO,CAAC,MAAM,CAAC,SAAS,CAA8B;IACtD,OAAO,CAAC,MAAM,CAAC,YAAY,CAGxB;IAEH,OAAO,CAAC,MAAM,CAAC,YAAY,CAAkD;IAC7E,OAAc,aAAa,SAAc;IACzC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAgF;WAE/F,YAAY,CAAC,YAAY,EAAE,GAAG,GAAG,IAAI;WAsBrC,aAAa,IAAI,GAAG;WAoBpB,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE;IAW9D,OAAO,CAAC,MAAM,CAAC,QAAQ;WAaT,OAAO,IAAI,IAAI;WAIf,iBAAiB,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI;IAUpD;;;OAGG;WACW,mBAAmB,IAAI,MAAM;WAI7B,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS;IAQjE,OAAO,CAAC,MAAM,CAAC,YAAY;IAkB3B,kCAAkC;IAClC,OAAO,CAAC,MAAM,CAAC,cAAc;IAI7B,kDAAkD;IAClD,OAAO,CAAC,MAAM,CAAC,YAAY;IAW3B,+CAA+C;IAC/C,OAAO,CAAC,MAAM,CAAC,aAAa;WAad,aAAa,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,GAAG,IAAI;WAsBvE,cAAc,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,GAAG,IAAI;WAexE,OAAO,CAAC,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,EAAE,QAAQ,GAAE,OAAe,GAAG,IAAI;WAe7F,eAAe,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,GAAG,IAAI;IAgBvF,OAAO,CAAC,MAAM,CAAC,SAAS;IAqBxB,OAAO,CAAC,MAAM,CAAC,eAAe;IAiC9B,wFAAwF;WAC1E,yBAAyB,CAAC,UAAU,EAAE,MAAM,GAAG,QAAQ,EAAE;IAuCvE;;;;;;OAMG;WACW,2BAA2B,CAAC,QAAQ,EAAE,QAAQ,GAAG,QAAQ,EAAE;IAkBzE;;OAEG;WACW,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAIhE;;;;OAIG;WACW,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,EAAE;WAI9C,WAAW,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,QAAQ,GAAG,IAAI;WA8B/C,iBAAiB,CAAC,MAAM,EAAE,gBAAgB,EAAE,SAAS,EAAE,SAAS,GAAG,IAAI;WAWvE,WAAW,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;WAc/B,2BAA2B,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;CAuBnE"}

package/lib/core/common/SdkUtils.js

@@ -53,14 +53,31 @@ const path_1 = __importDefault(require("path"));
 const Type_1 = require("../base/Type");
 const ArkNamespace_1 = require("../model/ArkNamespace");
 const logger_1 = __importStar(require("../../utils/logger"));
-const ohos_typescript_1 = __importDefault(require("ohos-typescript"));
 const fs_1 = __importDefault(require("fs"));
+const parseArkSourceFile_1 = require("../../utils/parseArkSourceFile");
+const SignatureCanonicalizerRegistry_1 = require("./SignatureCanonicalizerRegistry");
 const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER, 'SdkUtils');
+const DEFAULT_ES_VERSION = 'ES2021';
 class SdkUtils {
     static setEsVersion(buildProfile) {
-        const accessChain = 'buildOption.arkOptions.tscConfig.targetESVersion';
-        const version = accessChain.split('.').reduce((acc, key) => acc === null || acc === void 0 ? void 0 : acc[key], buildProfile);
-        if (version && this.esVersionMap.has(version)) {
+        var _a;
+        const products = (_a = buildProfile === null || buildProfile === void 0 ? void 0 : buildProfile.app) === null || _a === void 0 ? void 0 : _a.products;
+        let version;
+        if (Array.isArray(products)) {
+            const defaultProduct = products.find(p => (p === null || p === void 0 ? void 0 : p.name) === 'default');
+            const accessChain = 'buildOption.arkOptions.tscConfig.targetESVersion';
+            if (defaultProduct) {
+                version = accessChain.split('.').reduce((acc, key) => acc === null || acc === void 0 ? void 0 : acc[key], defaultProduct);
+            }
+            // Fall back to the first product with a targetESVersion
+            if (!version) {
+                version = products.find(product => accessChain.split('.').reduce((acc, key) => acc === null || acc === void 0 ? void 0 : acc[key], product));
+            }
+        }
+        if (!version) {
+            version = DEFAULT_ES_VERSION;
+        }
+        if (this.esVersionMap.has(version)) {
             this.esVersion = version;
         }
     }
@@ -82,7 +99,7 @@ class SdkUtils {
         return {
             moduleName: '',
             name: this.BUILT_IN_NAME,
-            path: builtInPath
+            path: builtInPath,
         };
     }
     static fetchBuiltInFiles(builtInPath) {
@@ -97,7 +114,7 @@ class SdkUtils {
         return Array.from(result);
     }
     static dfsFiles(filePath, files) {
-        const sourceFile = ohos_typescript_1.default.createSourceFile(filePath, fs_1.default.readFileSync(filePath, 'utf8'), ohos_typescript_1.default.ScriptTarget.Latest);
+        const sourceFile = (0, parseArkSourceFile_1.parseArkSourceFile)(filePath, fs_1.default.readFileSync(filePath, 'utf8'), false);
         const references = sourceFile.libReferenceDirectives;
         references.forEach(ref => {
             this.dfsFiles(path_1.default.join(path_1.default.dirname(filePath), `lib.${ref.fileName}.d.ts`), files);
@@ -113,19 +130,34 @@ class SdkUtils {
     }
     static buildSdkImportMap(file) {
         const fileName = path_1.default.basename(file.getName());
+        const fileSigID = file.getFileSigID();
         if (fileName.startsWith(EtsConst_1.SCOPE_PREFIX)) {
-            this.sdkImportMap.set(fileName.replace(/\.d\.e?ts$/, ''), file);
+            this.sdkImportMap.set(fileName.replace(/\.d\.e?ts$/, ''), fileSigID);
         }
         else if (file.getName().startsWith('api')) {
-            this.sdkImportMap.set(file.getName().replace(/^api[/\\]|\.d\.e?ts$/g, ''), file);
+            this.sdkImportMap.set(file.getName().replace(/^api[/\\]|\.d\.e?ts$/g, ''), fileSigID);
         }
     }
+    /**
+     * Entry count of the SDK import map, read as part of the resolution table state that decides
+     * whether a cached "no file" answer is still valid.
+     */
+    static getSdkImportMapSize() {
+        return this.sdkImportMap.size;
+    }
     static getImportSdkFile(from) {
-        return this.sdkImportMap.get(from);
+        const fileSigID = this.sdkImportMap.get(from);
+        if (fileSigID === undefined) {
+            return undefined;
+        }
+        return SignatureCanonicalizerRegistry_1.SignatureCanonicalizerRegistry.getInstance().getFileById(fileSigID);
     }
     static isGlobalPath(file) {
         var _a;
-        return !!((_a = file.getScene().getOptions().sdkGlobalFolders) === null || _a === void 0 ? void 0 : _a.find(x => {
+        return !!((_a = file
+            .getScene()
+            .getOptions()
+            .sdkGlobalFolders) === null || _a === void 0 ? void 0 : _a.find(x => {
             if (path_1.default.isAbsolute(x)) {
                 return file.getFilePath().startsWith(x);
             }
@@ -134,6 +166,39 @@ class SdkUtils {
             }
         }));
     }
+    // --- 多值登记 helpers（单值视图兼容语义） ---
+    // globalMap 为多值主存（名字 → 实体列表，登记序）。单值视图 = 列表 [0]：
+    // appendGlobal 保持首实体不变（旧 first-win 语义）；promoteGlobal 移至头部
+    //（旧 override 覆盖语义）。
+    /** @internal 取名字下的首实体（单值视图语义）。 */
+    static getFirstGlobal(globalMap, name) {
+        var _a;
+        return (_a = globalMap.get(name)) === null || _a === void 0 ? void 0 : _a[0];
+    }
+    /** @internal first-win 登记：append 到列表尾部（首实体不变）。 */
+    static appendGlobal(globalMap, name, entity) {
+        const list = globalMap.get(name);
+        if (!list) {
+            globalMap.set(name, [entity]);
+            return;
+        }
+        if (!list.includes(entity)) {
+            list.push(entity);
+        }
+    }
+    /** @internal override 登记：移到列表头部（等价旧单值覆盖语义）。 */
+    static promoteGlobal(globalMap, name, entity) {
+        const list = globalMap.get(name);
+        if (!list) {
+            globalMap.set(name, [entity]);
+            return;
+        }
+        const idx = list.indexOf(entity);
+        if (idx >= 0) {
+            list.splice(idx, 1);
+        }
+        list.unshift(entity);
+    }
     static loadGlobalAPI(file, globalMap) {
         var _a, _b, _c;
         if (!this.isGlobalPath(file)) {
@@ -149,7 +214,8 @@ class SdkUtils {
                     .forEach(mtd => this.loadAPI(mtd, globalMap));
             }
         });
-        (_c = (_b = (_a = file.getDefaultClass().getDefaultArkMethod()) === null || _a === void 0 ? void 0 : _a.getBody()) === null || _b === void 0 ? void 0 : _b.getAliasTypeMap()) === null || _c === void 0 ? void 0 : _c.forEach(a => this.loadAPI(a[0], globalMap, true));
+        (_c = (_b = (_a = file.getDefaultClass()
+            .getDefaultArkMethod()) === null || _a === void 0 ? void 0 : _a.getBody()) === null || _b === void 0 ? void 0 : _b.getAliasTypeMap()) === null || _c === void 0 ? void 0 : _c.forEach(a => this.loadAPI(a[0], globalMap, true));
         file.getNamespaces().forEach(ns => this.loadAPI(ns, globalMap));
     }
     static mergeGlobalAPI(file, globalMap) {
@@ -161,35 +227,25 @@ class SdkUtils {
                 this.loadClass(globalMap, cls);
             }
         });
-        file.getNamespaces().forEach(ns => {
-            const oldNs = globalMap.get(ns.getName());
-            if (oldNs instanceof ArkNamespace_1.ArkNamespace && oldNs !== ns) {
-                SdkUtils.copyNamespace(ns, oldNs);
-            }
-        });
-    }
-    static copyNamespace(ns, oldNs) {
-        ns.getClasses().forEach(cls => {
-            const oldCls = oldNs.getClassWithName(cls.getName());
-            if (oldCls) {
-                this.copyMembers(cls, oldCls);
-            }
-            else {
-                oldNs.addArkClass(cls);
-            }
-        });
+        // 跨文件同名 namespace 不再合并（copyNamespace 退役）：ns 实体已在阶段 1
+        // 多值登记（各文件的实体共存），成员可见性由探测层承担——
+        // ModelUtils.findPropertyInNamespaces 逐实体探测（%dflt locals / ns 内类 /
+        // 嵌套 ns / export），成员签名归属真实声明文件。
     }
     static loadAPI(api, globalMap, override = false) {
-        const old = globalMap.get(api.getName());
+        const old = this.getFirstGlobal(globalMap, api.getName());
         if (!old) {
-            globalMap.set(api.getName(), api);
+            this.appendGlobal(globalMap, api.getName(), api);
         }
         else if (override) {
             logger.trace(`${old.getSignature()} is override`);
-            globalMap.set(api.getName(), api);
+            this.promoteGlobal(globalMap, api.getName(), api);
         }
         else {
+            // first-win（单值视图保持首实体），但后续同名实体仍多值登记（append 尾部）
+            //——同名多声明（跨文件 interface 增补等）的成员探测依赖完整实体列表。
             logger.trace(`duplicated api: ${api.getSignature()}`);
+            this.appendGlobal(globalMap, api.getName(), api);
         }
     }
     static postInferredSdk(file, globalMap) {
@@ -206,18 +262,22 @@ class SdkUtils {
         });
     }
     static loadClass(globalMap, cls) {
-        const old = globalMap.get(cls.getName());
+        const old = this.getFirstGlobal(globalMap, cls.getName());
         if (cls === old) {
             return;
         }
         else if (old instanceof ArkClass_1.ArkClass && old.getDeclaringArkFile().getProjectName() === cls.getDeclaringArkFile().getProjectName()) {
             if (old.getCategory() === ArkClass_1.ClassCategory.CLASS || old.getCategory() === ArkClass_1.ClassCategory.INTERFACE) {
-                this.copyMembers(cls, old);
+                // 同名 interface 跨文件增补（TS 语义为同一实体）：不再 copyMembers 灌
+                // 入首实体——各文件的实体共存在多值列表（阶段1已登记），成员留在
+                // 声明类，探测层逐实体查找（成员签名归属真实声明文件）。
+                return;
             }
             else {
-                this.copyMembers(old, cls);
-                globalMap.delete(cls.getName());
-                this.loadAPI(cls, globalMap, true);
+                // 类别冲突（旧 enum 等 vs 新 interface/class）：不再 copyMembers(old, cls)
+                //——两实体共存多值（cls 提升为单值视图，与旧 delete+override 语义
+                // 一致），成员探测并集可见。
+                this.promoteGlobal(globalMap, cls.getName(), cls);
             }
         }
         else {
@@ -229,19 +289,20 @@ class SdkUtils {
         local.setSignature(new ArkSignature_1.LocalSignature(name, defaultArkMethod.getSignature()));
         const scene = defaultArkMethod.getDeclaringArkFile().getScene();
         if (scene.getOptions().isScanAbc) {
-            const instance = globalMap.get(name + 'Interface');
-            const attr = globalMap.get(name + EtsConst_1.COMPONENT_ATTRIBUTE);
+            const instance = this.getFirstGlobal(globalMap, name + 'Interface');
+            const attr = this.getFirstGlobal(globalMap, name + EtsConst_1.COMPONENT_ATTRIBUTE);
             if (attr instanceof ArkClass_1.ArkClass && instance instanceof ArkClass_1.ArkClass) {
-                this.copyMembers(instance, attr);
-                globalMap.set(name, attr);
+                // abc 场景不再 copyMembers 合并（挂载分裂来源）：attr 提升为单值视图
+                //（与旧 set 语义一致），成员留在各自声明类，由探测层逐实体查找。
+                this.promoteGlobal(globalMap, name, attr);
                 return;
             }
         }
-        const old = globalMap.get(name);
+        const old = this.getFirstGlobal(globalMap, name);
         if (old instanceof ArkClass_1.ArkClass && local.getType() instanceof Type_1.ClassType) {
-            const localConstructor = globalMap.get(local.getType().getClassSignature().getClassName());
+            const localConstructor = this.getFirstGlobal(globalMap, local.getType().getClassSignature().getClassName());
             if (localConstructor instanceof ArkClass_1.ArkClass) {
-                this.copyMembers(localConstructor, old);
+                this.appendGlobal(globalMap, name, local);
             }
             else {
                 this.loadAPI(local, globalMap, true);
@@ -251,17 +312,106 @@ class SdkUtils {
             this.loadAPI(local, globalMap, true);
         }
     }
+    // --- SDK global symbol member probing (migrated from Registry — work item L) ---
+    // This layer MAY use instanceof on model classes freely (SdkUtils sits above the
+    // dependency-graph floor); the Registry must not (value imports of model classes
+    // would create real module-loading edges that flip the ESM cycle, see Registry's
+    // dependency-graph constraint note).
+    /** @internal, Get all member-provider classes of a global symbol for member probing. */
+    static getSdkGlobalMemberClasses(globalName) {
+        const result = [];
+        const seen = new Set();
+        const push = (c) => {
+            if (!seen.has(c)) {
+                seen.add(c);
+                result.push(c);
+            }
+        };
+        const reg = SignatureCanonicalizerRegistry_1.SignatureCanonicalizerRegistry.getInstance();
+        for (const e of SdkUtils.getSdkGlobals(globalName)) {
+            if (e instanceof ArkClass_1.ArkClass) {
+                push(e);
+                continue;
+            }
+            if (!(e instanceof Local_1.Local)) {
+                continue;
+            }
+            const localType = e.getType();
+            if (!(localType instanceof Type_1.ClassType)) {
+                continue;
+            }
+            // Local → ctor class via canonicalizer direct lookup: SDK classes are registered (setModel) at build time
+            // before their var locals enter the global map; evicted models miss this lookup.
+            const ctorSig = localType.getClassSignature();
+            const id = reg.classSigCanonicalizer.getExistingId(ctorSig);
+            const ctorClass = id !== -1 ? reg.classSigCanonicalizer.getModel(id) : undefined;
+            if (ctorClass !== undefined) {
+                push(ctorClass);
+            }
+            for (const c of SdkUtils.getSdkGlobals(ctorSig.getClassName())) {
+                if (c instanceof ArkClass_1.ArkClass) {
+                    push(c);
+                }
+            }
+        }
+        return result;
+    }
+    /**
+     * Get the same-name classes mounted in sibling entities of a class's declaring
+     * namespace — for cross-file same-name namespaces (e.g. `Intl` declared across
+     * lib.es5 + lib.es20XX.intl), the class's counterpart in each sibling namespace
+     * carries members declared in that file. Sibling order follows registration
+     * order (= DFS file order); returns [] for non-global namespaces.
+     */
+    static getNamespacedSiblingClasses(arkClass) {
+        const ns = arkClass.getDeclaringArkNamespace();
+        if (!ns) {
+            return [];
+        }
+        const result = [];
+        const className = arkClass.getName();
+        for (const e of SdkUtils.getSdkGlobals(ns.getName())) {
+            if (e instanceof ArkNamespace_1.ArkNamespace && e !== ns) {
+                const c = e.getClassWithName(className);
+                if (c) {
+                    result.push(c);
+                }
+            }
+        }
+        return result;
+    }
+    /**
+     * Single-value view of the SDK global map: the first entity registered under the name (first-win 语义). Returns null when unregistered.
+     */
+    static getSdkGlobal(globalName) {
+        var _a, _b;
+        return (_b = (_a = SignatureCanonicalizerRegistry_1.SignatureCanonicalizerRegistry.getInstance().sdkGlobalMap.get(globalName)) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : null;
+    }
+    /**
+     * All SDK global entities registered under the given name (multi-declaration
+     * scenario: e.g. `interface Object` + `declare var Object: ObjectConstructor` are
+     * two entities). Order is the registration order; entry [0] equals {@link getSdkGlobal}.
+     */
+    static getSdkGlobals(globalName) {
+        var _a;
+        return (_a = SignatureCanonicalizerRegistry_1.SignatureCanonicalizerRegistry.getInstance().sdkGlobalMap.get(globalName)) !== null && _a !== void 0 ? _a : [];
+    }
     static copyMembers(from, to) {
         from.getMethods().forEach(method => {
             var _a, _b, _c, _d;
             const dist = method.isStatic() ? to.getStaticMethodWithName(method.getName()) : to.getMethodWithName(method.getName());
             const distSignatures = dist === null || dist === void 0 ? void 0 : dist.getDeclareSignatures();
             if (distSignatures) {
-                (_a = method.getDeclareSignatures()) === null || _a === void 0 ? void 0 : _a.forEach(x => distSignatures.push(x));
+                // getDeclareSignatures() returns a rebuilt copy — write the merged list back explicitly.
+                const merged = [...distSignatures];
+                (_a = method.getDeclareSignatures()) === null || _a === void 0 ? void 0 : _a.forEach(x => merged.push(x));
+                dist.setDeclareSignatures(merged);
             }
             else if (method.getName() === Const_1.DEFAULT_ARK_METHOD_NAME && dist) {
-                (_b = method.getBody()) === null || _b === void 0 ? void 0 : _b.getLocals().forEach(local => { var _a; return (_a = dist.getBody()) === null || _a === void 0 ? void 0 : _a.getLocals().set(local.getName(), local); });
-                (_d = (_c = method.getBody()) === null || _c === void 0 ? void 0 : _c.getAliasTypeMap()) === null || _d === void 0 ? void 0 : _d.forEach(type => { var _a, _b; return (_b = (_a = dist.getBody()) === null || _a === void 0 ? void 0 : _a.getAliasTypeMap()) === null || _b === void 0 ? void 0 : _b.set(type[0].getName(), type); });
+                (_b = method
+                    .getBody()) === null || _b === void 0 ? void 0 : _b.getLocals().forEach(local => { var _a; return (_a = dist.getBody()) === null || _a === void 0 ? void 0 : _a.getLocals().set(local.getName(), local); });
+                (_d = (_c = method
+                    .getBody()) === null || _c === void 0 ? void 0 : _c.getAliasTypeMap()) === null || _d === void 0 ? void 0 : _d.forEach(type => { var _a, _b; return (_b = (_a = dist.getBody()) === null || _a === void 0 ? void 0 : _a.getAliasTypeMap()) === null || _b === void 0 ? void 0 : _b.set(type[0].getName(), type); });
             }
             else {
                 to.addMethod(method);
@@ -275,7 +425,7 @@ class SdkUtils {
         });
     }
     static computeGlobalThis(leftOp, arkMethod) {
-        const globalThis = arkMethod.getDeclaringArkFile().getScene().getSdkGlobal(TSConst_1.GLOBAL_THIS_NAME);
+        const globalThis = SdkUtils.getSdkGlobal(TSConst_1.GLOBAL_THIS_NAME);
         if (globalThis instanceof ArkNamespace_1.ArkNamespace) {
             const exportInfo = new ArkExport_1.ExportInfo.Builder()
                 .exportClauseName(leftOp.getFieldName())
@@ -285,12 +435,10 @@ class SdkUtils {
         }
     }
     static extendArkUI(scene) {
-        const cls = scene.getSdkGlobal(EtsConst_1.COMMON_METHOD);
+        const cls = SdkUtils.getSdkGlobal(EtsConst_1.COMMON_METHOD);
         if (cls instanceof ArkClass_1.ArkClass) {
-            const mtd = new ArkMethod_1.ArkMethod();
-            mtd.setDeclaringArkClass(cls);
             const methodSubSignature = new ArkSignature_1.MethodSubSignature(EtsConst_1.COMPONENT_POP_FUNCTION, [], Type_1.VoidType.getInstance(), false);
-            mtd.setDeclareSignatures(new ArkSignature_1.MethodSignature(cls.getSignature(), methodSubSignature));
+            const mtd = new ArkMethod_1.ArkMethod(cls.getClassSigID(), undefined, new ArkSignature_1.MethodSignature(cls.getClassSigID(), methodSubSignature));
             mtd.setIsGeneratedFlag(true);
             cls.addMethod(mtd);
         }
@@ -304,8 +452,7 @@ class SdkUtils {
         if (!fs_1.default.existsSync(componentsDir)) {
             return;
         }
-        const componentFiles = fs_1.default.readdirSync(componentsDir)
-            .filter(file => file.endsWith('.json'));
+        const componentFiles = fs_1.default.readdirSync(componentsDir).filter(file => file.endsWith('.json'));
         const componentNames = [];
         componentFiles.forEach(file => {
             const filePath = path_1.default.join(componentsDir, file);
@@ -326,14 +473,11 @@ class SdkUtils {
     }
 }
 exports.SdkUtils = SdkUtils;
-SdkUtils.esVersion = 'ES2021';
+SdkUtils.esVersion = DEFAULT_ES_VERSION;
 SdkUtils.esVersionMap = new Map([
     ['ES2017', 'lib.es2020.d.ts'],
-    ['ES2021', 'lib.es2021.d.ts']
+    ['ES2021', 'lib.es2021.d.ts'],
 ]);
 SdkUtils.sdkImportMap = new Map();
 SdkUtils.BUILT_IN_NAME = 'built-in';
-SdkUtils.BUILT_IN_PATHS = [
-    'lib/node_modules/ohos-typescript/lib',
-    'node_modules/ohos-typescript/lib',
-];
+SdkUtils.BUILT_IN_PATHS = ['lib/node_modules/ohos-typescript/lib', 'node_modules/ohos-typescript/lib'];

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

@@ -0,0 +1,95 @@
+/**
+ * Interface that signatures must implement to participate in hash-based canonicalization.
+ *
+ * The three-layer architecture:
+ * - Layer 1: `getHashCode()` — 32-bit hash computed at construction time, cached in a readonly field
+ * - Layer 2: `Canonicalizer<number>` with `numberWithEquality` strategy — open-addressing + chaining
+ * - Layer 3: `equals()` — per-field semantic comparison, used when hash collisions occur
+ */
+export interface Canonicalizable {
+    /** Stable 32-bit hash code. Two equal signatures must have the same hash code. */
+    getHashCode(): number;
+    /** Semantic equality. Used for collision resolution in Layer 2. */
+    equals(other: this): boolean;
+}
+/**
+ * Value-semantic identity comparison between two signatures:
+ * cached-hash fast reject + `equals()` final verdict.
+ *
+ * Execution rules: the hash comparison short-circuits only comparisons whose
+ * result is "unequal"; comparisons whose result is "equal" necessarily run
+ * `equals()` (the Canonicalizable contract "equals ⇒ same hash" guarantees the
+ * hashes match), where canonical instances short-circuit on the first line
+ * (`this === other`). This is the same hash-then-equals protocol the
+ * canonicalizer probe uses internally — running it once directly between the
+ * two objects, instead of twice (once per probe) plus an ID comparison, and
+ * without depending on registration state.
+ *
+ * Why not compare canonicalizer IDs ("same ID ⇒ equal")? IDs are a function
+ * of value × registration history, not of value alone: two unregistered
+ * signatures (e.g. temp stubs) both yield getExistingId() === -1 and would be
+ * wrongly judged equal; one registered + one unregistered would be wrongly
+ * judged unequal; and the getId() variant would blind-write unregistered
+ * values into the formal space (permanent holes, see the temp-space design).
+ *
+ * No string building, no string hashing.
+ */
+export declare function signatureEquals(a: Canonicalizable, b: Canonicalizable): boolean;
+/**
+ * A canonicalizer that deduplicates signatures by value semantics using hash + equals.
+ *
+ * Uses a three-layer hash-collision-handling architecture:
+ *
+ * 1. `sig.getHashCode()` returns a cached 32-bit hash (computed once at construction)
+ * 2. `Canonicalizer<S>` with `numberWithEquality` strategy uses TypedArray hash tables
+ *    with open addressing + chaining for collision handling
+ * 3. `sig.equals()` does per-field comparison when hash collisions occur
+ *
+ * This eliminates the `list: string[]` storage of `toMapKey()` strings (~500 KB-1 MB
+ * for 10k-level signatures) and avoids repeated string concatenation in `toMapKey()`.
+ *
+ * IDs are dense integers starting from 0.
+ *
+ * @template S - The signature type, must implement {@link Canonicalizable}
+ */
+export declare class SignatureCanonicalizer<S extends Canonicalizable> {
+    private canonicalizer;
+    /**
+     * Get the unique integer ID for a signature.
+     * If a signature with the same hash and `equals()` result has been seen before, returns the existing ID.
+     * Otherwise, assigns a new ID and records the signature as the canonical instance.
+     *
+     * @param sig - The signature to canonicalize
+     * @returns The integer ID (>= 0)
+     */
+    getOrCreateId(sig: S): number;
+    /**
+     * Get the integer ID of a signature if it already exists.
+     * Returns -1 if the signature has not been canonicalized.
+     * Does not create a new ID or modify internal state.
+     *
+     * @param sig - The signature to query
+     * @returns The integer ID (>= 0) if found, -1 otherwise
+     */
+    getExistingId(sig: S): number;
+    /**
+     * Get the canonical signature instance associated with an integer ID.
+     *
+     * @param id - The integer ID
+     * @returns The canonical signature instance, or `undefined` if the ID is out of bounds
+     */
+    get(id: number): S | undefined;
+    /**
+     * Get the total number of unique signatures registered so far.
+     */
+    size(): number;
+    /**
+     * Get hash table statistics (for debugging/profiling).
+     */
+    getStats(): import("../../utils/Canonicalizer").CanonicalizerStats;
+    /**
+     * Clear all registered signatures and reset the canonicalizer.
+     */
+    clear(): void;
+}
+//# sourceMappingURL=SignatureCanonicalizer.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"SignatureCanonicalizer.d.ts","sourceRoot":"","sources":["../../../src/core/common/SignatureCanonicalizer.ts"],"names":[],"mappings":"AAiBA;;;;;;;GAOG;AACH,MAAM,WAAW,eAAe;IAC5B,kFAAkF;IAClF,WAAW,IAAI,MAAM,CAAC;IACtB,mEAAmE;IACnE,MAAM,CAAC,KAAK,EAAE,IAAI,GAAG,OAAO,CAAC;CAChC;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,eAAe,CAAC,CAAC,EAAE,eAAe,EAAE,CAAC,EAAE,eAAe,GAAG,OAAO,CAE/E;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,qBAAa,sBAAsB,CAAC,CAAC,SAAS,eAAe;IACzD,OAAO,CAAC,aAAa,CAGnB;IAEF;;;;;;;OAOG;IACI,aAAa,CAAC,GAAG,EAAE,CAAC,GAAG,MAAM;IAIpC;;;;;;;OAOG;IACI,aAAa,CAAC,GAAG,EAAE,CAAC,GAAG,MAAM;IAIpC;;;;;OAKG;IACI,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS;IAIrC;;OAEG;IACI,IAAI,IAAI,MAAM;IAIrB;;OAEG;IACI,QAAQ;IAIf;;OAEG;IACI,KAAK,IAAI,IAAI;CAGvB"}