arkanalyzer 1.0.94 → 2.0.0-beta1

package/lib/core/model/ArkFile.js

@@ -45,8 +45,9 @@ const fs_1 = __importDefault(require("fs"));
 const ArkNamespace_1 = require("./ArkNamespace");
 const ArkSignature_1 = require("./ArkSignature");
 const TSConst_1 = require("../common/TSConst");
-const Const_1 = require("../common/Const");
+const StringUtils_1 = require("../common/StringUtils");
 const SdkUtils_1 = require("../common/SdkUtils");
+const SignatureCanonicalizerRegistry_1 = require("../common/SignatureCanonicalizerRegistry");
 const logger_1 = __importStar(require("../../utils/logger"));
 const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER, 'ArkFile');
 exports.notStmtOrExprKind = [
@@ -81,20 +82,56 @@ var Language;
  * @category core/model
  */
 class ArkFile {
+    /** @internal Get the Registry singleton. */
+    get registry() {
+        return SignatureCanonicalizerRegistry_1.SignatureCanonicalizerRegistry.getInstance();
+    }
     constructor(language) {
         this.absoluteFilePath = '';
         this.projectDir = '';
-        // name to model
-        this.namespaces = new Map(); // don't contain nested namespaces
-        this.classes = new Map(); // don't contain class in namespace
+        /** @internal Formal FileSigID of this file. 0 = DEFAULT (not yet set). */
+        this.fileSigID = 0;
+        /** @internal Formal ClassSigID for the default class. -1 = not yet interned. */
+        this.defaultClassID = -1;
+        /** @internal Whether this file belongs to the current project (true) or is external (SDK/BuiltIn/library, false). */
+        this.projectFile = false;
+        this.topNamespaceCount = 0;
         this.importInfoMap = new Map();
         this.exportInfoMap = new Map();
-        this.fileSignature = ArkSignature_1.FileSignature.DEFAULT;
         this.anonymousClassNumber = 0;
         this.anonymousNamespaceNumber = 0;
         this.ast = null;
         this.language = language;
     }
+    /**
+     * Returns the file signature of this file. A file signature consists of project's name and file's name.
+     * @returns The file signature of this file.
+     */
+    getFileSignature() {
+        return this.registry.fileSigCanonicalizer.get(this.fileSigID);
+    }
+    /** @internal */
+    setFileSignature(fileSignature) {
+        // 三态处理（与 ArkClass.setSignature 对齐）：
+        // 新值首建 → 注册；驱逐态恢复 → 补注册；已有别的 model 持有该签名 → 不覆盖（防"后 setFileSignature 者顶替"写穿）。
+        const existing = this.registry.fileSigCanonicalizer.getExistingId(fileSignature);
+        this.fileSigID = existing >= 0 ? existing : this.registry.fileSigCanonicalizer.getOrCreateId(fileSignature);
+        if (existing < 0 || this.registry.fileSigCanonicalizer.getModel(existing) === undefined) {
+            this.registry.registerFile(this);
+        }
+    }
+    /** @internal Get the formal FileSigID of this file. */
+    getFileSigID() {
+        return this.fileSigID;
+    }
+    /**
+     * Returns the unique ID of this model — the FileSigID 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.
+     */
+    getId() {
+        return this.fileSigID;
+    }
     /**
      * Returns the program language of the file.
      */
@@ -109,7 +146,7 @@ class ArkFile {
      * @returns The file's name (also means its relative path).
      */
     getName() {
-        return this.fileSignature.getFileName();
+        return this.getFileSignature().getFileName();
     }
     setScene(scene) {
         this.scene = scene;
@@ -159,6 +196,7 @@ class ArkFile {
     }
     setCode(code) {
         this.sourceCode = code;
+        this.lineStarts = undefined;
     }
     /**
      * Returns the codes of file as a **string.**
@@ -172,6 +210,7 @@ class ArkFile {
         try {
             const sourceText = fs_1.default.readFileSync(this.absoluteFilePath, 'utf8');
             this.sourceCode = sourceText;
+            this.lineStarts = undefined;
             return this.sourceCode;
         }
         catch (error) {
@@ -179,46 +218,182 @@ class ArkFile {
             return '';
         }
     }
+    /**
+     * Returns cached absolute offsets of each line start in {@link getCode}.
+     * Built once per source text and reused by position-based source extraction.
+     */
+    getLineStarts() {
+        if (this.lineStarts === undefined) {
+            this.lineStarts = (0, StringUtils_1.buildLineStarts)(this.getCode());
+        }
+        return this.lineStarts;
+    }
+    /**
+     * Extracts a source slice by full position using the cached {@link getLineStarts} map.
+     */
+    getSourceTextByFullPosition(position) {
+        return (0, StringUtils_1.extractSourceTextByFullPosition)(this.getCode(), position, this.getLineStarts());
+    }
     /**
      * Clears the cached source text, forcing re-read from file system on next getCode call.
      */
     clearSourceCode() {
         this.sourceCode = undefined;
+        this.lineStarts = undefined;
     }
-    addArkClass(arkClass, originName) {
-        const name = originName !== null && originName !== void 0 ? originName : arkClass.getName();
-        const cls = this.classes.get(name);
-        if (!cls) {
-            this.classes.set(name, arkClass);
+    addArkClass(arkClass) {
+        const existing = this.getTopClassByID(arkClass.getClassSigID());
+        if (existing) {
+            SdkUtils_1.SdkUtils.copyMembers(arkClass, existing);
         }
         else {
-            SdkUtils_1.SdkUtils.copyMembers(arkClass, cls);
-        }
-        if (!originName && !arkClass.isAnonymousClass()) {
-            const index = name.indexOf(Const_1.NAME_DELIMITER);
-            if (index > 0) {
-                const originName = name.substring(0, index);
-                if (!this.classes.has(originName)) {
-                    this.addArkClass(arkClass, originName);
-                }
+            if (!this.topClassSigIDSet) {
+                this.topClassSigIDSet = new Set();
             }
+            this.topClassSigIDSet.add(arkClass.getClassSigID());
         }
     }
     getDefaultClass() {
-        return this.defaultClass;
+        if (this.defaultClassID !== -1) {
+            return this.registry.classSigCanonicalizer.getModel(this.defaultClassID);
+        }
+        return undefined;
     }
     setDefaultClass(defaultClass) {
-        this.defaultClass = defaultClass;
+        this.defaultClassID = defaultClass.getClassSigID();
+    }
+    /** @internal Get the formal ClassSigID of the default class. Returns -1 if not interned. */
+    getDefaultClassID() {
+        return this.defaultClassID;
+    }
+    /** @internal Set the formal ClassSigID of the default class directly. */
+    setDefaultClassID(classID) {
+        this.defaultClassID = classID;
+    }
+    /** @internal Whether this file belongs to the current project. */
+    isProjectFile() {
+        return this.projectFile;
+    }
+    /** @internal Set whether this file belongs to the current project. */
+    setProjectFile(isProject) {
+        this.projectFile = isProject;
     }
     getNamespace(namespaceSignature) {
-        const namespaceName = namespaceSignature.getNamespaceName();
-        return this.getNamespaceWithName(namespaceName);
+        var _a;
+        // O(1) 归属初筛：签名的 declaringFileSigID 直比本 file 的 SigID。
+        if (namespaceSignature.getDeclaringFileSigID() !== this.fileSigID) {
+            return null;
+        }
+        const id = this.registry.namespaceSigCanonicalizer.getExistingId(namespaceSignature);
+        if (id !== -1 && this.hasTopNamespaceWithID(id)) {
+            return (_a = this.registry.namespaceSigCanonicalizer.getModel(id)) !== null && _a !== void 0 ? _a : null;
+        }
+        return null;
     }
     getNamespaceWithName(namespaceName) {
-        return this.namespaces.get(namespaceName) || null;
+        // 精确匹配：拼本文件归属签名直查（复用 canonicalizer 值索引，O(1)，对齐getClassWithName）；
+        // miss 即 null——签名归属是唯一真相，不做线性扫描兜底。
+        if (this.fileSigID >= 0) {
+            return this.getNamespace(new ArkSignature_1.NamespaceSignature(namespaceName, this.fileSigID));
+        }
+        return null;
     }
     getNamespaces() {
-        return Array.from(this.namespaces.values());
+        const arr = this.topNamespaceSigIDs;
+        if (!arr) {
+            return [];
+        }
+        const reg = this.registry;
+        const result = [];
+        for (let i = 0; i < this.topNamespaceCount; i++) {
+            const ns = reg.namespaceSigCanonicalizer.getModel(arr[i]);
+            if (ns) {
+                result.push(ns);
+            }
+        }
+        return result;
+    }
+    /** @internal Returns the SigIDs of direct child namespaces, or null if no namespaces exist. */
+    getTopNamespaceSigIDs() {
+        var _a, _b;
+        return (_b = (_a = this.topNamespaceSigIDs) === null || _a === void 0 ? void 0 : _a.subarray(0, this.topNamespaceCount)) !== null && _b !== void 0 ? _b : null;
+    }
+    /** @internal Returns the number of direct child namespaces. */
+    getTopNamespaceCount() {
+        return this.topNamespaceCount;
+    }
+    /** @internal Checks whether a namespace with the given SigID is a direct child of this file. */
+    hasTopNamespaceWithID(id) {
+        const arr = this.topNamespaceSigIDs;
+        if (!arr) {
+            return false;
+        }
+        for (let i = 0; i < this.topNamespaceCount; i++) {
+            if (arr[i] === id) {
+                return true;
+            }
+        }
+        return false;
+    }
+    /** @internal Returns the direct child namespace with the given SigID, or undefined. */
+    getTopNamespaceByID(id) {
+        if (this.hasTopNamespaceWithID(id)) {
+            return SignatureCanonicalizerRegistry_1.SignatureCanonicalizerRegistry.getInstance().getNamespaceById(id);
+        }
+        return undefined;
+    }
+    /** @internal Ensures the Int32Array has at least minCapacity slots. */
+    ensureTopNamespaceCapacity(minCapacity) {
+        if (!this.topNamespaceSigIDs) {
+            this.topNamespaceSigIDs = new Int32Array(Math.max(minCapacity, 8));
+            return;
+        }
+        if (this.topNamespaceSigIDs.length < minCapacity) {
+            const newCapacity = Math.max(minCapacity, this.topNamespaceSigIDs.length * 2);
+            const newArray = new Int32Array(newCapacity);
+            newArray.set(this.topNamespaceSigIDs.subarray(0, this.topNamespaceCount));
+            this.topNamespaceSigIDs = newArray;
+        }
+    }
+    /** @internal Appends a namespace SigID to the index. */
+    addTopNamespaceSigID(id) {
+        this.ensureTopNamespaceCapacity(this.topNamespaceCount + 1);
+        this.topNamespaceSigIDs[this.topNamespaceCount++] = id;
+    }
+    /** @internal Removes a namespace SigID from the index (swap-remove). */
+    removeTopNamespaceSigID(id) {
+        const arr = this.topNamespaceSigIDs;
+        if (!arr) {
+            return;
+        }
+        for (let i = 0; i < this.topNamespaceCount; i++) {
+            if (arr[i] === id) {
+                arr[i] = arr[--this.topNamespaceCount];
+                return;
+            }
+        }
+    }
+    /** @internal Returns the SigIDs of direct child classes, or null if no classes exist. */
+    getTopClassSigIDs() {
+        var _a;
+        return (_a = this.topClassSigIDSet) !== null && _a !== void 0 ? _a : null;
+    }
+    /** @internal Returns the number of direct child classes (deduplicated by sigID). */
+    getTopClassCount() {
+        var _a, _b;
+        return (_b = (_a = this.topClassSigIDSet) === null || _a === void 0 ? void 0 : _a.size) !== null && _b !== void 0 ? _b : 0;
+    }
+    /** @internal Checks whether a class with the given SigID is a direct child of this file. */
+    hasTopClassWithID(id) {
+        var _a, _b;
+        return (_b = (_a = this.topClassSigIDSet) === null || _a === void 0 ? void 0 : _a.has(id)) !== null && _b !== void 0 ? _b : false;
+    }
+    /** @internal Returns the direct child class with the given SigID, or undefined. */
+    getTopClassByID(id) {
+        if (this.hasTopClassWithID(id)) {
+            return SignatureCanonicalizerRegistry_1.SignatureCanonicalizerRegistry.getInstance().getClassById(id);
+        }
+        return undefined;
     }
     /**
      * Returns the class based on its class signature. If the class could not be found, **null** will be returned.
@@ -226,18 +401,32 @@ class ArkFile {
      * @returns A class. If there is no class, the return will be a **null**.
      */
     getClass(classSignature) {
-        const className = classSignature instanceof ArkSignature_1.AliasClassSignature ? classSignature.getOriginName() : classSignature.getClassName();
-        return this.getClassWithName(className);
+        var _a;
+        // O(1) 归属初筛：签名的 declaringFileSigID 直比本 file 的 SigID。
+        if (classSignature.getDeclaringFileSigID() !== this.fileSigID) {
+            return null;
+        }
+        const id = this.registry.classSigCanonicalizer.getExistingId(classSignature);
+        if (id !== -1 && this.hasTopClassWithID(id)) {
+            return (_a = this.registry.classSigCanonicalizer.getModel(id)) !== null && _a !== void 0 ? _a : null;
+        }
+        return null;
     }
     getClassWithName(className) {
-        // First, search for the top-level class
-        let cls = this.classes.get(className);
-        if (cls) {
-            return cls;
+        if (this.fileSigID >= 0) {
+            const top = this.getClass(ArkSignature_1.ClassSignature.probe(className, this.fileSigID));
+            if (top) {
+                return top;
+            }
+        }
+        const nsIds = this.topNamespaceSigIDs;
+        if (nsIds === undefined || nsIds === null) {
+            return null;
         }
-        // Recursively search for classes within namespaces
-        for (const ns of this.namespaces.values()) {
-            cls = this.findClassInNamespace(ns, className);
+        const reg = this.registry;
+        for (let i = 0; i < this.topNamespaceCount; i++) {
+            const ns = reg.namespaceSigCanonicalizer.getModel(nsIds[i]);
+            const cls = ns ? this.findClassInNamespace(ns, className) : undefined;
             if (cls) {
                 return cls;
             }
@@ -258,10 +447,28 @@ class ArkFile {
         return null;
     }
     getClasses() {
-        return Array.from(new Set(this.classes.values()));
+        const set = this.topClassSigIDSet;
+        if (!set) {
+            return [];
+        }
+        const result = [];
+        for (const sigID of set) {
+            const cls = SignatureCanonicalizerRegistry_1.SignatureCanonicalizerRegistry.getInstance().getClassById(sigID);
+            if (cls) {
+                result.push(cls);
+            }
+        }
+        return result;
     }
     addNamespace(namespace) {
-        this.namespaces.set(namespace.getName(), namespace);
+        const existing = this.getNamespace(namespace.getSignature());
+        if (existing) {
+            // Merge content of namespaces with the same name
+            namespace.getClasses().forEach(cls => existing.addArkClass(cls));
+            namespace.getNamespaces().forEach(ns => existing.addNamespace(ns));
+            return;
+        }
+        this.addTopNamespaceSigID(namespace.getNamespaceSigID());
     }
     /**
      * Returns an **array** of import information.
@@ -293,22 +500,34 @@ class ArkFile {
         return this.importInfoMap.delete(importInfo.getImportClauseName());
     }
     removeNamespace(namespace) {
-        let rtn = this.namespaces.delete(namespace.getName());
-        rtn && (rtn = this.getScene().removeNamespace(namespace));
+        const id = namespace.getNamespaceSigID();
+        const rtn = this.hasTopNamespaceWithID(id);
+        if (rtn) {
+            this.removeTopNamespaceSigID(id);
+            this.registry.removeNamespace(namespace);
+        }
         return rtn;
     }
     removeArkClass(arkClass) {
-        let rtn = this.classes.delete(arkClass.getName());
-        rtn && (rtn = this.getScene().removeClass(arkClass));
+        const id = arkClass.getClassSigID();
+        const rtn = this.hasTopClassWithID(id);
+        if (rtn) {
+            this.topClassSigIDSet.delete(id);
+            this.registry.removeClass(arkClass);
+        }
         return rtn;
     }
     getExportInfos() {
-        const exportInfos = [];
+        const exportInfos = new Array(this.exportInfoMap.size);
+        let writeIdx = 0;
         this.exportInfoMap.forEach((value, key) => {
             if (key !== TSConst_1.ALL || value.getFrom()) {
-                exportInfos.push(value);
+                exportInfos[writeIdx++] = value;
             }
         });
+        if (writeIdx < exportInfos.length) {
+            exportInfos.length = writeIdx;
+        }
         return exportInfos;
     }
     /**
@@ -372,7 +591,7 @@ class ArkFile {
         this.exportInfoMap.delete(exportInfo.getExportClauseName());
     }
     getProjectName() {
-        return this.fileSignature.getProjectName();
+        return this.getFileSignature().getProjectName();
     }
     getModuleName() {
         var _a;
@@ -384,23 +603,13 @@ class ArkFile {
     getOhPackageJson5Path() {
         return this.ohPackageJson5Path;
     }
-    /**
-     * Returns the file signature of this file. A file signature consists of project's name and file's name.
-     * @returns The file signature of this file.
-     */
-    getFileSignature() {
-        return this.fileSignature;
-    }
-    setFileSignature(fileSignature) {
-        this.fileSignature = fileSignature;
-    }
     getAllNamespacesUnderThisFile() {
-        let namespaces = [];
-        namespaces.push(...this.namespaces.values());
-        this.namespaces.forEach(ns => {
-            namespaces.push(...ns.getAllNamespacesUnderThisNamespace());
-        });
-        return namespaces;
+        const result = [];
+        for (const ns of this.getNamespaces()) {
+            result.push(ns);
+            result.push(...ns.getAllNamespacesUnderThisNamespace());
+        }
+        return result;
     }
     getAnonymousClassNumber() {
         return this.anonymousClassNumber++;
@@ -415,10 +624,10 @@ class ArkFile {
         this.ast = value;
     }
     clearAllReferences() {
-        for (const cls of this.classes.values()) {
+        for (const cls of this.getClasses()) {
             cls.clearAllReferences();
         }
-        for (const ns of this.namespaces.values()) {
+        for (const ns of this.getNamespaces()) {
             ns.clearAllReferences();
         }
         for (const exp of this.exportInfoMap.values()) {
@@ -427,11 +636,12 @@ class ArkFile {
         for (const imp of this.importInfoMap.values()) {
             imp.clearAllReferences();
         }
-        this.classes.clear();
-        this.namespaces.clear();
+        this.topClassSigIDSet = undefined;
+        this.topNamespaceSigIDs = undefined;
+        this.topNamespaceCount = 0;
         this.importInfoMap.clear();
         this.exportInfoMap.clear();
-        this.defaultClass = undefined;
+        this.defaultClassID = -1;
         this.scene = undefined;
         this.moduleScene = undefined;
         this.arkModule = undefined;

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

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

package/lib/core/model/ArkImport.js

@@ -20,7 +20,6 @@ const Position_1 = require("../base/Position");
 const ModelUtils_1 = require("../common/ModelUtils");
 const ModelUtils_2 = require("../../frontend/cppFrontend/common/ModelUtils");
 const ArkBaseModel_1 = require("./ArkBaseModel");
-const StringUtils_1 = require("../common/StringUtils");
 /**
  * Shift amount for import type encoding in ImportInfo tags field.
  * Uses CLASS_SPECIFIC_TAG_SHIFT as the base offset for class-specific properties.
@@ -263,7 +262,7 @@ class ImportInfo extends ArkBaseModel_1.ArkBaseModel {
         if (this.sourceCode !== undefined) {
             return this.sourceCode;
         }
-        const code = (0, StringUtils_1.extractSourceTextByFullPosition)(this.getDeclaringArkFile().getCode(), this.originFullPosition);
+        const code = this.getDeclaringArkFile().getSourceTextByFullPosition(this.originFullPosition);
         if (code !== undefined) {
             this.sourceCode = code;
             return code;