arkanalyzer 1.0.94 → 2.0.0-beta1

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

@@ -56,9 +56,11 @@ const ArkClass_1 = require("../ArkClass");
 const ArkMethod_1 = require("../ArkMethod");
 const Position_1 = require("../../base/Position");
 const EtsConst_1 = require("../../common/EtsConst");
+const parseArkSourceFile_1 = require("../../../utils/parseArkSourceFile");
 const ArkSignature_1 = require("../ArkSignature");
 const Const_1 = require("../../common/Const");
 const StringUtils_1 = require("../../common/StringUtils");
+const SignatureCanonicalizerRegistry_1 = require("../../common/SignatureCanonicalizerRegistry");
 const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER, 'ArkFileBuilder');
 exports.notStmtOrExprKind = [
     'ModuleDeclaration',
@@ -95,7 +97,7 @@ function buildArkFileFromFile(absoluteFilePath, projectDir, arkFile, projectName
         sourceText = fs_1.default.readFileSync(arkFile.getFilePath(), 'utf8');
     }
     catch (error) {
-        logger.error('Failed to read file: ${error}');
+        logger.error(`Failed to read file: ${error}`);
         return;
     }
     const options = arkFile.getScene().getOptions();
@@ -103,7 +105,7 @@ function buildArkFileFromFile(absoluteFilePath, projectDir, arkFile, projectName
     if (eagerLoad && arkFile.getScene().getProjectName() === arkFile.getProjectName()) {
         arkFile.setCode(sourceText);
     }
-    const sourceFile = ohos_typescript_1.default.createSourceFile(arkFile.getName(), sourceText, ohos_typescript_1.default.ScriptTarget.Latest, true, undefined, EtsConst_1.ETS_COMPILER_OPTIONS);
+    const sourceFile = (0, parseArkSourceFile_1.parseArkSourceFile)(arkFile.getName(), sourceText, true, EtsConst_1.ETS_COMPILER_OPTIONS);
     // save ast source file, if enabled ast and file is from the project (not from sdk)
     if (arkFile.getScene().getOptions().enableAST && arkFile.getScene().getProjectName() === arkFile.getProjectName()) {
         arkFile.setAST(sourceFile);
@@ -123,10 +125,12 @@ exports.buildArkFileFromFile = buildArkFileFromFile;
  *   which would duplicate `export *` entries (their temp keys are process-level auto-increment).
  */
 function buildArkFile(arkFile, astRoot, skipImportExport = false) {
-    const namespaces = [];
     for (const child of astRoot.statements) {
+        if (ohos_typescript_1.default.isTypeAliasDeclaration(child)) {
+            (0, ArkClassBuilder_1.registerTypeAliasTypeLiteral)(child);
+        }
         if (ohos_typescript_1.default.isModuleDeclaration(child)) {
-            buildAndCollectNamespace(child, arkFile, astRoot, namespaces);
+            buildAndCollectNamespace(child, arkFile, astRoot);
         }
         else if (ohos_typescript_1.default.isClassDeclaration(child) || ohos_typescript_1.default.isInterfaceDeclaration(child) || ohos_typescript_1.default.isEnumDeclaration(child) || ohos_typescript_1.default.isStructDeclaration(child)) {
             buildAndExportClass(child, arkFile, astRoot);
@@ -146,27 +150,30 @@ function buildArkFile(arkFile, astRoot, skipImportExport = false) {
             logger.trace('Child joined default method of arkFile: ', ohos_typescript_1.default.SyntaxKind[child.kind]);
         }
     }
-    mergeAndAddNamespaces(namespaces, arkFile);
 }
-function buildAndCollectNamespace(child, arkFile, astRoot, namespaces) {
-    const ns = new ArkNamespace_1.ArkNamespace();
-    ns.setDeclaringArkFile(arkFile);
-    (0, ArkNamespaceBuilder_1.buildArkNamespace)(child, arkFile, ns, astRoot);
-    namespaces.push(ns);
+function buildAndCollectNamespace(child, arkFile, astRoot) {
+    const namespaceSig = (0, ArkNamespaceBuilder_1.buildNamespaceSignature)(child, arkFile);
+    let ns = SignatureCanonicalizerRegistry_1.SignatureCanonicalizerRegistry.getInstance().getNamespaceBySig(namespaceSig);
+    if (!ns) {
+        ns = new ArkNamespace_1.ArkNamespace(arkFile.getFileSigID(), undefined, namespaceSig);
+        arkFile.addNamespace(ns);
+    }
+    (0, ArkNamespaceBuilder_1.buildArkNamespace)(child, ns, astRoot);
     if (ns.isExported()) {
         arkFile.addExportInfo((0, ArkExportBuilder_1.buildExportInfo)(ns, arkFile, Position_1.FullPosition.buildFromNode(child, astRoot)));
     }
 }
 function buildAndExportClass(child, arkFile, astRoot) {
-    const cls = new ArkClass_1.ArkClass();
+    const cls = new ArkClass_1.ArkClass(arkFile.getFileSigID());
     (0, ArkClassBuilder_1.buildNormalArkClassFromArkFile)(child, arkFile, cls, astRoot);
     if (cls.isExported()) {
         arkFile.addExportInfo((0, ArkExportBuilder_1.buildExportInfo)(cls, arkFile, Position_1.FullPosition.buildFromNode(child, astRoot)));
     }
 }
 function buildAndExportMethod(child, arkFile, astRoot) {
-    const mthd = new ArkMethod_1.ArkMethod();
-    (0, ArkMethodBuilder_1.buildArkMethodFromArkClass)(child, arkFile.getDefaultClass(), mthd, astRoot);
+    const defaultClass = arkFile.getDefaultClass();
+    const mthd = new ArkMethod_1.ArkMethod(defaultClass.getClassSigID());
+    (0, ArkMethodBuilder_1.buildArkMethodFromArkClass)(child, defaultClass, mthd, astRoot);
     if (mthd.isExported()) {
         arkFile.addExportInfo((0, ArkExportBuilder_1.buildExportInfo)(mthd, arkFile, Position_1.FullPosition.buildFromNode(child, astRoot)));
     }
@@ -202,22 +209,10 @@ function tryBuildImportExport(child, arkFile, astRoot) {
     }
     return false;
 }
-function mergeAndAddNamespaces(namespaces, arkFile) {
-    const merged = (0, ArkNamespaceBuilder_1.mergeNameSpaces)(namespaces);
-    merged.forEach(ns => {
-        arkFile.addNamespace(ns);
-        if (ns.isExport()) {
-            const positions = ns.getOriginFullPositions();
-            if (positions.length > 0) {
-                arkFile.addExportInfo((0, ArkExportBuilder_1.buildExportInfo)(ns, arkFile, positions[0]));
-            }
-        }
-    });
-}
 function genDefaultArkClass(arkFile, astRoot) {
-    let defaultClass = new ArkClass_1.ArkClass();
-    (0, ArkClassBuilder_1.buildDefaultArkClassFromArkFile)(arkFile, defaultClass, astRoot);
-    arkFile.setDefaultClass(defaultClass);
+    let defaultClass = new ArkClass_1.ArkClass(arkFile.getFileSigID());
+    (0, ArkClassBuilder_1.buildDefaultArkClassFromArkFile)(defaultClass, astRoot);
+    arkFile.setDefaultClassID(defaultClass.getClassSigID());
     arkFile.addArkClass(defaultClass);
 }
 /**
@@ -227,16 +222,20 @@ function genDefaultArkClass(arkFile, astRoot) {
  * @returns
  */
 function buildImportExportInfoFromFile(arkFile) {
+    var _a;
     let sourceText;
     try {
         sourceText = fs_1.default.readFileSync(arkFile.getFilePath(), 'utf8');
     }
     catch (error) {
-        logger.error('Failed to read file: ${error}');
+        logger.error(`Failed to read file: ${error}`);
         return;
     }
-    arkFile.setCode(sourceText);
-    const sourceFile = ohos_typescript_1.default.createSourceFile(arkFile.getName(), sourceText, ohos_typescript_1.default.ScriptTarget.Latest, true, undefined, EtsConst_1.ETS_COMPILER_OPTIONS);
+    const eagerLoad = (_a = arkFile.getScene().getOptions().saveSourceCodeByDefault) !== null && _a !== void 0 ? _a : false;
+    if (eagerLoad && arkFile.getScene().getProjectName() === arkFile.getProjectName()) {
+        arkFile.setCode(sourceText);
+    }
+    const sourceFile = (0, parseArkSourceFile_1.parseArkSourceFile)(arkFile.getName(), sourceText, true, EtsConst_1.ETS_COMPILER_OPTIONS);
     buildImportExportInfo(arkFile, sourceFile);
 }
 exports.buildImportExportInfoFromFile = buildImportExportInfoFromFile;
@@ -291,10 +290,10 @@ function buildArkFileSignaturesFromFile(arkFile) {
         sourceText = fs_1.default.readFileSync(arkFile.getFilePath(), 'utf8');
     }
     catch (error) {
-        logger.error('Failed to read file: ${error}');
+        logger.error(`Failed to read file: ${error}`);
         return;
     }
-    const sourceFile = ohos_typescript_1.default.createSourceFile(arkFile.getName(), sourceText, ohos_typescript_1.default.ScriptTarget.Latest, true, undefined, EtsConst_1.ETS_COMPILER_OPTIONS);
+    const sourceFile = (0, parseArkSourceFile_1.parseArkSourceFile)(arkFile.getName(), sourceText, true, EtsConst_1.ETS_COMPILER_OPTIONS);
     if (arkFile.getScene().getOptions().enableAST && arkFile.getScene().getProjectName() === arkFile.getProjectName()) {
         arkFile.setAST(sourceFile);
     }

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

@@ -7,7 +7,7 @@ import { Stmt } from '../../base/Stmt';
 import { Local } from '../../base/Local';
 import { Value } from '../../base/Value';
 export type MethodLikeNode = ts.FunctionDeclaration | ts.MethodDeclaration | ts.ConstructorDeclaration | ts.ArrowFunction | ts.AccessorDeclaration | ts.FunctionExpression | ts.MethodSignature | ts.ConstructSignatureDeclaration | ts.CallSignatureDeclaration | ts.FunctionTypeNode;
-export declare function buildDefaultArkMethodFromArkClass(declaringClass: ArkClass, mtd: ArkMethod, sourceFile: ts.SourceFile, node?: ts.ModuleDeclaration): void;
+export declare function buildDefaultArkMethodFromArkClass(mtd: ArkMethod, sourceFile: ts.SourceFile, node?: ts.ModuleDeclaration): void;
 export declare function buildArkMethodFromArkClass(methodNode: MethodLikeNode, declaringClass: ArkClass, mtd: ArkMethod, sourceFile: ts.SourceFile, declaringMethod?: ArkMethod): void;
 export declare function buildNestedMethodName(originName: string, declaringMethodName: string): string;
 export declare class ObjectBindingPatternParameter {
@@ -56,10 +56,17 @@ export declare class MethodParameter implements Value {
     addArrayElement(element: ArrayBindingPatternParameter): void;
     getArrayElements(): ArrayBindingPatternParameter[];
     setArrayElements(arrayElements: ArrayBindingPatternParameter[]): void;
-    getUses(): Value[];
+    getUses(acc?: Value[]): Value[];
 }
 export declare function needDefaultConstructorInClass(arkClass: ArkClass): boolean;
-export declare function buildDefaultConstructor(arkClass: ArkClass, visited?: Set<ArkClass>): boolean;
+/**
+ * On-demand variant of {@link buildDefaultConstructor} with the isLibraryClass guard
+ * lifted: callers decide by construction stage / SDK batch whether library classes
+ * get default constructors (the batch-level parameter replaces the per-class project
+ * name comparison on this hot path). The remaining static guards are unchanged.
+ */
+export declare function ensureDefaultConstructor(arkClass: ArkClass): boolean;
+export declare function buildDefaultConstructor(arkClass: ArkClass, visited?: Set<number>, force?: boolean): boolean;
 export declare function buildInitMethod(initMethod: ArkMethod, fieldInitializerStmts: Stmt[], thisLocal: Local, globals?: Map<string, GlobalRef> | null): void;
 export declare function addInitInConstructor(constructor: ArkMethod): void;
 export declare function isMethodImplementation(node: MethodLikeNode): boolean;

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

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

package/lib/core/model/builder/ArkMethodBuilder.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.replaceSuper2Constructor = exports.updateMethodSignaturesAndLineCols = exports.checkAndUpdateMethod = exports.isMethodImplementation = exports.addInitInConstructor = exports.buildInitMethod = exports.buildDefaultConstructor = exports.needDefaultConstructorInClass = exports.MethodParameter = exports.ArrayBindingPatternParameter = exports.ObjectBindingPatternParameter = exports.buildNestedMethodName = exports.buildArkMethodFromArkClass = exports.buildDefaultArkMethodFromArkClass = void 0;
+exports.replaceSuper2Constructor = exports.updateMethodSignaturesAndLineCols = exports.checkAndUpdateMethod = exports.isMethodImplementation = exports.addInitInConstructor = exports.buildInitMethod = exports.buildDefaultConstructor = exports.ensureDefaultConstructor = exports.needDefaultConstructorInClass = exports.MethodParameter = exports.ArrayBindingPatternParameter = exports.ObjectBindingPatternParameter = exports.buildNestedMethodName = exports.buildArkMethodFromArkClass = exports.buildDefaultArkMethodFromArkClass = void 0;
 const Type_1 = require("../../base/Type");
 const BodyBuilder_1 = require("./BodyBuilder");
 const ViewTreeBuilder_1 = require("../../graph/builder/ViewTreeBuilder");
@@ -65,10 +65,9 @@ const IRUtils_1 = require("../../common/IRUtils");
 const ArkError_1 = require("../../common/ArkError");
 const Position_1 = require("../../base/Position");
 const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER, 'ArkMethodBuilder');
-function buildDefaultArkMethodFromArkClass(declaringClass, mtd, sourceFile, node) {
-    mtd.setDeclaringArkClass(declaringClass);
+function buildDefaultArkMethodFromArkClass(mtd, sourceFile, node) {
     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;
@@ -77,10 +76,7 @@ function buildDefaultArkMethodFromArkClass(declaringClass, mtd, sourceFile, node
 }
 exports.buildDefaultArkMethodFromArkClass = buildDefaultArkMethodFromArkClass;
 function buildArkMethodFromArkClass(methodNode, declaringClass, mtd, sourceFile, declaringMethod) {
-    mtd.setDeclaringArkClass(declaringClass);
     if (declaringMethod !== undefined && !declaringMethod.isGenerated() && !declaringMethod.isDefaultArkMethod()) {
-        // If declaringMethod is %dflt, %instInit, %statInit, then the method should be taken as nested method of them.
-        // Otherwise, it will fail to handle global vars of this method or failed to do the free of bodyBuilder.
         mtd.setOuterMethod(declaringMethod);
     }
     ohos_typescript_1.default.isFunctionDeclaration(methodNode) && mtd.setAsteriskToken(methodNode.asteriskToken !== undefined);
@@ -104,7 +100,7 @@ function buildArkMethodFromArkClass(methodNode, declaringClass, mtd, sourceFile,
         returnType = (0, builderUtils_1.buildGenericType)((0, builderUtils_1.buildReturnType)(methodNode.type, sourceFile, mtd), mtd);
     }
     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.buildFromNode(methodNode, sourceFile));
@@ -130,11 +126,11 @@ exports.buildArkMethodFromArkClass = buildArkMethodFromArkClass;
 function buildMethodName(node, declaringClass, sourceFile, declaringMethod) {
     let name = '';
     if (ohos_typescript_1.default.isFunctionDeclaration(node) || ohos_typescript_1.default.isFunctionExpression(node)) {
-        name = node.name ? (0, StringUtils_1.cloneText)(node.name.text) : buildAnonymousMethodName(node, declaringClass);
+        name = node.name ? (0, StringUtils_1.cloneText)(node.name.text) : buildAnonymousMethodName(declaringClass);
     }
     else if (ohos_typescript_1.default.isFunctionTypeNode(node)) {
         //TODO: check name type
-        name = node.name ? (0, StringUtils_1.cloneText)(node.name.getText(sourceFile)) : buildAnonymousMethodName(node, declaringClass);
+        name = node.name ? (0, StringUtils_1.cloneText)(node.name.getText(sourceFile)) : buildAnonymousMethodName(declaringClass);
     }
     else if (ohos_typescript_1.default.isMethodDeclaration(node) || ohos_typescript_1.default.isMethodSignature(node)) {
         if (ohos_typescript_1.default.isIdentifier(node.name)) {
@@ -172,14 +168,14 @@ function buildMethodName(node, declaringClass, sourceFile, declaringMethod) {
         name = Const_1.SETTER_PREFIX + (0, StringUtils_1.cloneText)(node.name.text);
     }
     else if (ohos_typescript_1.default.isArrowFunction(node)) {
-        name = buildAnonymousMethodName(node, declaringClass);
+        name = buildAnonymousMethodName(declaringClass);
     }
     if (declaringMethod !== undefined && !declaringMethod.isDefaultArkMethod()) {
         name = buildNestedMethodName(name, declaringMethod.getName());
     }
     return name;
 }
-function buildAnonymousMethodName(node, declaringClass) {
+function buildAnonymousMethodName(declaringClass) {
     return `${Const_1.ANONYMOUS_METHOD_PREFIX}${declaringClass.getAnonymousMethodNumber()}`;
 }
 function buildNestedMethodName(originName, declaringMethodName) {
@@ -289,8 +285,8 @@ class MethodParameter {
     setArrayElements(arrayElements) {
         this.arrayElements = arrayElements;
     }
-    getUses() {
-        return [];
+    getUses(acc = []) {
+        return acc;
     }
 }
 exports.MethodParameter = MethodParameter;
@@ -303,14 +299,31 @@ function needDefaultConstructorInClass(arkClass) {
         !arkClass.isDeclare());
 }
 exports.needDefaultConstructorInClass = needDefaultConstructorInClass;
+/**
+ * On-demand variant of {@link buildDefaultConstructor} with the isLibraryClass guard
+ * lifted: callers decide by construction stage / SDK batch whether library classes
+ * get default constructors (the batch-level parameter replaces the per-class project
+ * name comparison on this hot path). The remaining static guards are unchanged.
+ */
+function ensureDefaultConstructor(arkClass) {
+    const category = arkClass.getCategory();
+    if (arkClass.getMethodWithName(TSConst_1.CONSTRUCTOR_NAME) !== null ||
+        (category !== ArkClass_1.ClassCategory.CLASS && category !== ArkClass_1.ClassCategory.OBJECT) ||
+        arkClass.isDefaultArkClass() ||
+        arkClass.isDeclare()) {
+        return false;
+    }
+    return buildDefaultConstructor(arkClass, new Set(), true);
+}
+exports.ensureDefaultConstructor = ensureDefaultConstructor;
 function recursivelyCheckAndBuildSuperConstructor(arkClass, visited = new Set()) {
-    if (visited.has(arkClass)) {
+    if (visited.has(arkClass.getClassSigID())) {
         return;
     }
-    visited.add(arkClass);
+    visited.add(arkClass.getClassSigID());
     let superClass = arkClass.getSuperClass();
     while (superClass !== null) {
-        if (visited.has(superClass)) {
+        if (visited.has(superClass.getClassSigID())) {
             break;
         }
         if (superClass.getMethodWithName(TSConst_1.CONSTRUCTOR_NAME) === null) {
@@ -319,16 +332,12 @@ function recursivelyCheckAndBuildSuperConstructor(arkClass, visited = new Set())
         superClass = superClass.getSuperClass();
     }
 }
-function buildDefaultConstructor(arkClass, visited = new Set()) {
+function buildDefaultConstructor(arkClass, visited = new Set(), force = false) {
     var _a;
     recursivelyCheckAndBuildSuperConstructor(arkClass, visited);
-    if (!needDefaultConstructorInClass(arkClass)) {
+    if (!force && !needDefaultConstructorInClass(arkClass)) {
         return false;
     }
-    const defaultConstructor = new ArkMethod_1.ArkMethod();
-    defaultConstructor.setDeclaringArkClass(arkClass);
-    defaultConstructor.setIsGeneratedFlag(true);
-    defaultConstructor.setImplOriginFullPosition(new Position_1.FullPosition(0, 0, 0, 0));
     const thisLocal = new Local_1.Local(TSConst_1.THIS_NAME, new Type_1.ClassType(arkClass.getSignature()));
     const thisDefStmt = new Stmt_1.ArkAssignStmt(thisLocal, new Ref_1.ArkThisRef(new Type_1.ClassType(arkClass.getSignature())));
     thisLocal.setDeclaringStmt(thisDefStmt);
@@ -353,8 +362,10 @@ function buildDefaultConstructor(arkClass, visited = new Set()) {
         const superInvokeExpr = new Expr_1.ArkInstanceInvokeExpr(thisLocal, superConstructor.getSignature(), 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(true);
+    defaultConstructor.setImplOriginFullPosition(new Position_1.FullPosition(0, 0, 0, 0));
     basicBlock.addStmt(new Stmt_1.ArkReturnStmt(thisLocal));
     const cfg = new Cfg_1.Cfg();
     cfg.addBlock(basicBlock);
@@ -423,7 +434,7 @@ function addInitInConstructor(constructor) {
         }
         break;
     }
-    const initInvokeStmt = new Stmt_1.ArkInvokeStmt(new Expr_1.ArkInstanceInvokeExpr(thisLocal, constructor.getDeclaringArkClass().getInstanceInitMethod().getSignature(), []));
+    const initInvokeStmt = new Stmt_1.ArkInvokeStmt(new Expr_1.ArkInstanceInvokeExpr(thisLocal, constructor.getDeclaringArkClass().getInstanceInitMethodOrNull().getSignature(), []));
     initInvokeStmt.setCfg(cfg);
     firstBlockStmts.splice(index, 0, initInvokeStmt);
 }
@@ -535,6 +546,9 @@ function replaceSuper2Constructor(constructor) {
         logger.error(`Can not find local this in constructor method ${constructor.getSignature().toString()}`);
         return;
     }
+    // 替换埋葬：旧 super invoke expr 被整体替换且无后续持有者——其 (UNKNOWN, super) stub 的 temp 行在此显式 retire（原每显式 super() 构造调用
+    // 留 1 行钉活到 dispose）。
+    superInvokeStmt.getInvokeExpr().retireTemp();
     const newInvokeExpr = new Expr_1.ArkInstanceInvokeExpr(base, superConstructor.getSignature(), superInvokeStmt.getInvokeExpr().getArgs());
     superInvokeStmt.replaceInvokeExpr(newInvokeExpr);
     return;

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

@@ -1,7 +1,8 @@
 import { ArkFile } from '../ArkFile';
 import ts from 'ohos-typescript';
 import { ArkNamespace } from '../ArkNamespace';
-export declare function buildArkNamespace(node: ts.ModuleDeclaration, declaringInstance: ArkFile | ArkNamespace, ns: ArkNamespace, sourceFile: ts.SourceFile): void;
+import { NamespaceSignature } from '../ArkSignature';
+export declare function buildNamespaceSignature(node: ts.ModuleDeclaration, declaringInstance: ArkFile | ArkNamespace): NamespaceSignature;
+export declare function buildArkNamespace(node: ts.ModuleDeclaration, ns: ArkNamespace, sourceFile: ts.SourceFile): void;
 export declare function genDefaultArkClass(ns: ArkNamespace, node: ts.ModuleDeclaration, sourceFile: ts.SourceFile): void;
-export declare function mergeNameSpaces(arkNamespaces: ArkNamespace[]): ArkNamespace[];
 //# sourceMappingURL=ArkNamespaceBuilder.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ArkNamespaceBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/ArkNamespaceBuilder.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAErC,OAAO,EAAE,MAAM,iBAAiB,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAY/C,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,EAAE,CAAC,iBAAiB,EAAE,iBAAiB,EAAE,OAAO,GAAG,YAAY,EAAE,EAAE,EAAE,YAAY,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,GAAG,IAAI,CAkD1J;AAiED,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,CAAC,iBAAiB,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,GAAG,IAAI,CAMhH;AAED,wBAAgB,eAAe,CAAC,aAAa,EAAE,YAAY,EAAE,GAAG,YAAY,EAAE,CAyB7E"}
+{"version":3,"file":"ArkNamespaceBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/ArkNamespaceBuilder.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAErC,OAAO,EAAE,MAAM,iBAAiB,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAO/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAMrD,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,EAAE,CAAC,iBAAiB,EAAE,iBAAiB,EAAE,OAAO,GAAG,YAAY,GAAG,kBAAkB,CAMjI;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,EAAE,CAAC,iBAAiB,EAAE,EAAE,EAAE,YAAY,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,GAAG,IAAI,CAwC/G;AA0DD,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,CAAC,iBAAiB,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,GAAG,IAAI,CAMhH"}

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

@@ -40,10 +40,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergeNameSpaces = exports.genDefaultArkClass = exports.buildArkNamespace = void 0;
+exports.genDefaultArkClass = exports.buildArkNamespace = exports.buildNamespaceSignature = void 0;
 const Position_1 = require("../../base/Position");
 const ArkClassBuilder_1 = require("./ArkClassBuilder");
-const ArkFile_1 = require("../ArkFile");
 const ArkMethodBuilder_1 = require("./ArkMethodBuilder");
 const ohos_typescript_1 = __importDefault(require("ohos-typescript"));
 const ArkNamespace_1 = require("../ArkNamespace");
@@ -55,29 +54,26 @@ const ArkClass_1 = require("../ArkClass");
 const ArkMethod_1 = require("../ArkMethod");
 const ArkSignature_1 = require("../ArkSignature");
 const IRUtils_1 = require("../../common/IRUtils");
+const SignatureCanonicalizerRegistry_1 = require("../../common/SignatureCanonicalizerRegistry");
 const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER, 'ArkNamespaceBuilder');
-function buildArkNamespace(node, declaringInstance, ns, sourceFile) {
-    var _a;
+function buildNamespaceSignature(node, declaringInstance) {
+    const namespaceName = (0, StringUtils_1.cloneText)(node.name.text);
+    if (declaringInstance instanceof ArkNamespace_1.ArkNamespace) {
+        return new ArkSignature_1.NamespaceSignature(namespaceName, declaringInstance.getDeclaringFileID(), declaringInstance.getNamespaceSigID());
+    }
+    return new ArkSignature_1.NamespaceSignature(namespaceName, declaringInstance.getFileSigID());
+}
+exports.buildNamespaceSignature = buildNamespaceSignature;
+function buildArkNamespace(node, ns, sourceFile) {
     // modifiers
     if (node.modifiers) {
         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 = (0, StringUtils_1.cloneText)(node.name.text);
-    const namespaceSignature = new ArkSignature_1.NamespaceSignature(namespaceName, ns.getDeclaringArkFile().getFileSignature(), ((_a = ns.getDeclaringArkNamespace()) === null || _a === void 0 ? void 0 : _a.getSignature()) || null);
-    ns.setSignature(namespaceSignature);
     // set line and column
     const { line, character } = ohos_typescript_1.default.getLineAndCharacterOfPosition(sourceFile, node.getStart(sourceFile));
     const endPos = ohos_typescript_1.default.getLineAndCharacterOfPosition(sourceFile, node.getEnd());
-    ns.setOriginFullPositions([new Position_1.FullPosition(line + 1, character + 1, endPos.line + 1, endPos.character + 1)]);
+    ns.setOriginFullPositions([...ns.getOriginFullPositions(), new Position_1.FullPosition(line + 1, character + 1, endPos.line + 1, endPos.character + 1)]);
     genDefaultArkClass(ns, node, sourceFile);
     // build ns member
     if (node.body) {
@@ -88,9 +84,13 @@ function buildArkNamespace(node, declaringInstance, ns, sourceFile) {
         //TODO: Check
         else if (ohos_typescript_1.default.isModuleDeclaration(node.body)) {
             logger.trace('This ModuleBody is an NamespaceDeclaration.');
-            let childNs = new ArkNamespace_1.ArkNamespace();
-            buildArkNamespace(node.body, ns, childNs, sourceFile);
-            ns.addNamespace(childNs);
+            const namespaceSig = buildNamespaceSignature(node.body, ns);
+            let childNs = SignatureCanonicalizerRegistry_1.SignatureCanonicalizerRegistry.getInstance().getNamespaceBySig(namespaceSig);
+            if (!childNs) {
+                childNs = new ArkNamespace_1.ArkNamespace(ns.getDeclaringFileID(), ns.getNamespaceSigID(), namespaceSig);
+                ns.addNamespace(childNs);
+            }
+            buildArkNamespace(node.body, childNs, sourceFile);
         }
         else if (ohos_typescript_1.default.isIdentifier(node.body)) {
             logger.warn('ModuleBody is Identifier');
@@ -108,34 +108,40 @@ exports.buildArkNamespace = buildArkNamespace;
 // TODO: check and update
 function buildNamespaceMembers(node, namespace, sourceFile) {
     const statements = node.statements;
-    const nestedNamespaces = [];
     statements.forEach(child => {
+        if (ohos_typescript_1.default.isTypeAliasDeclaration(child)) {
+            (0, ArkClassBuilder_1.registerTypeAliasTypeLiteral)(child);
+        }
         if (ohos_typescript_1.default.isModuleDeclaration(child)) {
-            let childNs = new ArkNamespace_1.ArkNamespace();
-            childNs.setDeclaringArkNamespace(namespace);
-            childNs.setDeclaringArkFile(namespace.getDeclaringArkFile());
-            buildArkNamespace(child, namespace, childNs, sourceFile);
-            nestedNamespaces.push(childNs);
+            const childNsSig = buildNamespaceSignature(child, namespace);
+            let childNs = SignatureCanonicalizerRegistry_1.SignatureCanonicalizerRegistry.getInstance().getNamespaceBySig(childNsSig);
+            if (!childNs) {
+                childNs = new ArkNamespace_1.ArkNamespace(namespace.getDeclaringFileID(), namespace.getNamespaceSigID(), childNsSig);
+                namespace.addNamespace(childNs);
+            }
+            buildArkNamespace(child, childNs, sourceFile);
+            if (childNs.isExported()) {
+                namespace.addExportInfo((0, ArkExportBuilder_1.buildExportInfo)(childNs, namespace.getDeclaringArkFile(), Position_1.FullPosition.buildFromNode(child, sourceFile)));
+            }
         }
         else if (ohos_typescript_1.default.isClassDeclaration(child) || ohos_typescript_1.default.isInterfaceDeclaration(child) || ohos_typescript_1.default.isEnumDeclaration(child) || ohos_typescript_1.default.isStructDeclaration(child)) {
-            let cls = new ArkClass_1.ArkClass();
-            (0, ArkClassBuilder_1.buildNormalArkClassFromArkNamespace)(child, namespace, cls, sourceFile);
+            const classSig = (0, ArkClassBuilder_1.buildClassSignature)(child, namespace);
+            let cls = SignatureCanonicalizerRegistry_1.SignatureCanonicalizerRegistry.getInstance().getClassBySig(classSig);
+            if (!cls) {
+                cls = new ArkClass_1.ArkClass(namespace.getDeclaringFileID(), namespace.getNamespaceSigID(), classSig);
+                namespace.addArkClass(cls);
+            }
+            (0, ArkClassBuilder_1.buildNormalArkClassFromArkNamespace)(child, cls, sourceFile);
             if (cls.isExported()) {
                 namespace.addExportInfo((0, ArkExportBuilder_1.buildExportInfo)(cls, namespace.getDeclaringArkFile(), Position_1.FullPosition.buildFromNode(child, sourceFile)));
             }
         }
         // TODO: Check
-        else if (ohos_typescript_1.default.isMethodDeclaration(child)) {
+        else if (ohos_typescript_1.default.isMethodDeclaration(child) || ohos_typescript_1.default.isFunctionDeclaration(child)) {
             logger.trace('This is a MethodDeclaration in ArkNamespace.');
-            let mthd = new ArkMethod_1.ArkMethod();
-            (0, ArkMethodBuilder_1.buildArkMethodFromArkClass)(child, namespace.getDefaultClass(), mthd, sourceFile);
-            if (mthd.isExported()) {
-                namespace.addExportInfo((0, ArkExportBuilder_1.buildExportInfo)(mthd, namespace.getDeclaringArkFile(), Position_1.FullPosition.buildFromNode(child, sourceFile)));
-            }
-        }
-        else if (ohos_typescript_1.default.isFunctionDeclaration(child)) {
-            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);
             if (mthd.isExported()) {
                 namespace.addExportInfo((0, ArkExportBuilder_1.buildExportInfo)(mthd, namespace.getDeclaringArkFile(), Position_1.FullPosition.buildFromNode(child, sourceFile)));
             }
@@ -154,49 +160,11 @@ function buildNamespaceMembers(node, namespace, sourceFile) {
             // join default method
         }
     });
-    const nestedMergedNameSpaces = mergeNameSpaces(nestedNamespaces);
-    nestedMergedNameSpaces.forEach(nestedNameSpace => {
-        namespace.addNamespace(nestedNameSpace);
-        if (nestedNameSpace.isExport()) {
-            const positions = nestedNameSpace.getOriginFullPositions();
-            if (positions.length > 0) {
-                namespace.addExportInfo((0, ArkExportBuilder_1.buildExportInfo)(nestedNameSpace, namespace.getDeclaringArkFile(), positions[0]));
-            }
-        }
-    });
 }
 function genDefaultArkClass(ns, node, sourceFile) {
-    let defaultClass = new ArkClass_1.ArkClass();
-    (0, ArkClassBuilder_1.buildDefaultArkClassFromArkNamespace)(ns, defaultClass, node, sourceFile);
+    let defaultClass = new ArkClass_1.ArkClass(ns.getDeclaringFileID(), ns.getNamespaceSigID());
+    (0, ArkClassBuilder_1.buildDefaultArkClass)(defaultClass, sourceFile, node);
     ns.setDefaultClass(defaultClass);
     ns.addArkClass(defaultClass);
 }
 exports.genDefaultArkClass = genDefaultArkClass;
-function mergeNameSpaces(arkNamespaces) {
-    const namespaceMap = new Map();
-    for (let i = 0; i < arkNamespaces.length; i++) {
-        const currNamespace = arkNamespaces[i];
-        const currName = currNamespace.getName();
-        if (namespaceMap.has(currName)) {
-            const prevNamespace = namespaceMap.get(currName);
-            const nestedPrevNamespaces = prevNamespace.getNamespaces();
-            const nestedCurrNamespaces = currNamespace.getNamespaces();
-            const nestedMergedNameSpaces = mergeNameSpaces([...nestedPrevNamespaces, ...nestedCurrNamespaces]);
-            nestedMergedNameSpaces.forEach(nestedNameSpace => {
-                prevNamespace.addNamespace(nestedNameSpace);
-            });
-            const classes = currNamespace.getClasses();
-            classes.forEach(cls => {
-                prevNamespace.addArkClass(cls);
-            });
-            const prevLineColPairs = prevNamespace.getOriginFullPositions();
-            const currLineColPairs = currNamespace.getOriginFullPositions();
-            prevNamespace.setOriginFullPositions([...prevLineColPairs, ...currLineColPairs]);
-        }
-        else {
-            namespaceMap.set(currName, currNamespace);
-        }
-    }
-    return [...namespaceMap.values()];
-}
-exports.mergeNameSpaces = mergeNameSpaces;

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

@@ -1,9 +1,18 @@
 import { ClassSignature, FieldSignature, MethodSignature, MethodSubSignature } from '../ArkSignature';
 export declare class ArkSignatureBuilder {
+    /**
+     * Stub 缓存白名单（组件名域）：系统组件（isEtsSystemComponent 动态集合，SDK 构建期灌入全量）+ 组件常量（自定义组件折叠名 / If / Repeat）。
+     * 白名单外的名字（new 表达式类名、C++ 类型名等任意来源）不缓存——每次 new，行为不变。
+     */
+    private static readonly CACHEABLE_COMPONENT_STUBS;
+    /** 白名单内同名 stub 共享实例。 */
+    private static readonly componentStubCache;
     static buildMethodSignatureFromClassNameAndMethodName(className: string, methodName: string, staticFlag?: boolean): MethodSignature;
     static buildMethodSignatureFromMethodName(methodName: string, staticFlag?: boolean): MethodSignature;
     static buildMethodSubSignatureFromMethodName(methodName: string, staticFlag?: boolean): MethodSubSignature;
     static buildClassSignatureFromClassName(className: string): ClassSignature;
+    /** @internal Registry dispose 同点清理（Scene.dispose/clear 调用）。 */
+    static clearComponentStubCache(): void;
     static buildFieldSignatureFromFieldName(fieldName: string, staticFlag?: boolean): FieldSignature;
 }
 //# sourceMappingURL=ArkSignatureBuilder.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ArkSignatureBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/ArkSignatureBuilder.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,cAAc,EAAE,cAAc,EAAiB,eAAe,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAGrH,qBAAa,mBAAmB;WACd,8CAA8C,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,GAAE,OAAe,GAAG,eAAe;WAMnI,kCAAkC,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,GAAE,OAAe,GAAG,eAAe;WAKpG,qCAAqC,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,GAAE,OAAe,GAAG,kBAAkB;WAI1G,gCAAgC,CAAC,SAAS,EAAE,MAAM,GAAG,cAAc;WAInE,gCAAgC,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,GAAE,OAAe,GAAG,cAAc;CAGjH"}
+{"version":3,"file":"ArkSignatureBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/ArkSignatureBuilder.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAItG,qBAAa,mBAAmB;IAC5B;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,yBAAyB,CAA2E;IAE5H,wBAAwB;IACxB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAqC;WAEjE,8CAA8C,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,GAAE,OAAe,GAAG,eAAe;WAQnI,kCAAkC,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,GAAE,OAAe,GAAG,eAAe;WAKpG,qCAAqC,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,GAAE,OAAe,GAAG,kBAAkB;WAI1G,gCAAgC,CAAC,SAAS,EAAE,MAAM,GAAG,cAAc;IAajF,+DAA+D;WACjD,uBAAuB,IAAI,IAAI;WAI/B,gCAAgC,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,GAAE,OAAe,GAAG,cAAc;CAGjH"}