arkanalyzer 1.0.94 → 2.0.0-beta1

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

@@ -17,24 +17,47 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ArkSignatureBuilder = void 0;
 const ArkSignature_1 = require("../ArkSignature");
 const Type_1 = require("../../base/Type");
+const EtsConst_1 = require("../../common/EtsConst");
 class ArkSignatureBuilder {
     static buildMethodSignatureFromClassNameAndMethodName(className, methodName, staticFlag = false) {
         const classSignature = this.buildClassSignatureFromClassName(className);
         const methodSubSignature = this.buildMethodSubSignatureFromMethodName(methodName, staticFlag);
+        // Object path: the stub class signature (unclear) is routed to the temp canonicalizer
+        // inside the constructor — no formal interning without a model.
         return new ArkSignature_1.MethodSignature(classSignature, methodSubSignature);
     }
     static buildMethodSignatureFromMethodName(methodName, staticFlag = false) {
         const methodSubSignature = this.buildMethodSubSignatureFromMethodName(methodName, staticFlag);
-        return new ArkSignature_1.MethodSignature(ArkSignature_1.ClassSignature.DEFAULT, methodSubSignature);
+        return new ArkSignature_1.MethodSignature(0, methodSubSignature);
     }
     static buildMethodSubSignatureFromMethodName(methodName, staticFlag = false) {
         return new ArkSignature_1.MethodSubSignature(methodName, [], Type_1.UnknownType.getInstance(), staticFlag);
     }
     static buildClassSignatureFromClassName(className) {
-        return new ArkSignature_1.ClassSignature(className, ArkSignature_1.FileSignature.DEFAULT);
+        // 白名单内的组件名走共享缓存；名单外（任意类名）保持每次 new 的现状。
+        if ((0, EtsConst_1.isEtsSystemComponent)(className) || this.CACHEABLE_COMPONENT_STUBS.has(className)) {
+            let cached = this.componentStubCache.get(className);
+            if (cached === undefined) {
+                cached = new ArkSignature_1.ClassSignature(className, 0);
+                this.componentStubCache.set(className, cached);
+            }
+            return cached;
+        }
+        return new ArkSignature_1.ClassSignature(className, 0);
+    }
+    /** @internal Registry dispose 同点清理（Scene.dispose/clear 调用）。 */
+    static clearComponentStubCache() {
+        this.componentStubCache.clear();
     }
     static buildFieldSignatureFromFieldName(fieldName, staticFlag = false) {
-        return new ArkSignature_1.FieldSignature(fieldName, ArkSignature_1.ClassSignature.DEFAULT, Type_1.UnknownType.getInstance(), staticFlag);
+        return new ArkSignature_1.FieldSignature(fieldName, 0, Type_1.UnknownType.getInstance(), staticFlag);
     }
 }
 exports.ArkSignatureBuilder = ArkSignatureBuilder;
+/**
+ * Stub 缓存白名单（组件名域）：系统组件（isEtsSystemComponent 动态集合，SDK 构建期灌入全量）+ 组件常量（自定义组件折叠名 / If / Repeat）。
+ * 白名单外的名字（new 表达式类名、C++ 类型名等任意来源）不缓存——每次 new，行为不变。
+ */
+ArkSignatureBuilder.CACHEABLE_COMPONENT_STUBS = new Set([EtsConst_1.COMPONENT_CUSTOMVIEW, EtsConst_1.COMPONENT_IF, EtsConst_1.COMPONENT_REPEAT]);
+/** 白名单内同名 stub 共享实例。 */
+ArkSignatureBuilder.componentStubCache = new Map();

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"BodyBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/BodyBuilder.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAkB,eAAe,EAA8C,MAAM,iBAAiB,CAAC;AAC9G,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAItC,OAAO,EAAuD,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAIhG,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,MAAM,MAAM,iBAAiB,GAAG;IAC5B,MAAM,EAAE,SAAS,CAAC;IAClB,QAAQ,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC;CACxC,CAAC;AAEF,qBAAa,WAAW;IACpB,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,OAAO,CAAC,CAAyB;IACzC,OAAO,CAAC,cAAc,CAA4B;gBAEtC,eAAe,EAAE,eAAe,EAAE,aAAa,EAAE,EAAE,CAAC,IAAI,EAAE,eAAe,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU;IAKpH,KAAK,IAAI,OAAO,GAAG,IAAI;IAkBvB,aAAa,IAAI,UAAU;IAI3B,UAAU,IAAI,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,SAAS;IAIhD,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAI;IAIjD,kBAAkB,IAAI,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC;IAI/C,kBAAkB,CAAC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,IAAI;IAI1E;;;;;;OAMG;IACH,OAAO,CAAC,wBAAwB;IAiChC;;;;;OAKG;IACH,OAAO,CAAC,eAAe;IA2BvB;;;;;OAKG;IACI,sBAAsB,IAAI,IAAI;IAwDrC,OAAO,CAAC,eAAe;IAWvB,OAAO,CAAC,6BAA6B;IASrC,OAAO,CAAC,sCAAsC;IA4B9C,OAAO,CAAC,0BAA0B;IAiBlC,OAAO,CAAC,uBAAuB;IAgB/B,OAAO,CAAC,8BAA8B;IAmBtC,OAAO,CAAC,wBAAwB;IAuBhC,OAAO,CAAC,uBAAuB;IAe/B,OAAO,CAAC,6BAA6B;IAyCrC,OAAO,CAAC,8BAA8B;IAkBtC,OAAO,CAAC,6BAA6B;IA2BrC,OAAO,CAAC,2BAA2B;IAUnC,OAAO,CAAC,4BAA4B;IAqBpC,OAAO,CAAC,2BAA2B;IAwBnC,OAAO,CAAC,oCAAoC;IA+B5C,OAAO,CAAC,8BAA8B;IAWtC,OAAO,CAAC,qCAAqC;IA8B7C,OAAO,CAAC,2BAA2B;CA8CtC"}
+{"version":3,"file":"BodyBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/BodyBuilder.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAkB,eAAe,EAA8C,MAAM,iBAAiB,CAAC;AAC9G,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAKtC,OAAO,EAAuD,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAIhG,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,MAAM,MAAM,iBAAiB,GAAG;IAC5B,MAAM,EAAE,SAAS,CAAC;IAClB,QAAQ,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC;CACxC,CAAC;AAEF,qBAAa,WAAW;IACpB,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,OAAO,CAAC,CAAyB;IACzC,OAAO,CAAC,cAAc,CAA4B;gBAEtC,eAAe,EAAE,eAAe,EAAE,aAAa,EAAE,EAAE,CAAC,IAAI,EAAE,eAAe,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU;IAKpH,KAAK,IAAI,OAAO,GAAG,IAAI;IAkBvB,aAAa,IAAI,UAAU;IAI3B,UAAU,IAAI,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,SAAS;IAIhD,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAI;IAIjD,kBAAkB,IAAI,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC;IAI/C,kBAAkB,CAAC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,IAAI;IAI1E;;;;;;OAMG;IACH,OAAO,CAAC,wBAAwB;IAiChC;;;;;OAKG;IACH,OAAO,CAAC,eAAe;IA2BvB;;;;;OAKG;IACI,sBAAsB,IAAI,IAAI;IAwDrC,OAAO,CAAC,eAAe;IAWvB,OAAO,CAAC,6BAA6B;IASrC,OAAO,CAAC,sCAAsC;IA4B9C,OAAO,CAAC,0BAA0B;IAalC,OAAO,CAAC,uBAAuB;IAgB/B,OAAO,CAAC,8BAA8B;IAmBtC,OAAO,CAAC,wBAAwB;IAuBhC,OAAO,CAAC,uBAAuB;IAe/B,OAAO,CAAC,6BAA6B;IAyCrC,OAAO,CAAC,8BAA8B;IAkCtC,OAAO,CAAC,4BAA4B;IAYpC,OAAO,CAAC,6BAA6B;IA2BrC,OAAO,CAAC,2BAA2B;IAUnC,OAAO,CAAC,4BAA4B;IAqBpC,OAAO,CAAC,2BAA2B;IAwBnC,OAAO,CAAC,oCAAoC;IAiC5C,OAAO,CAAC,8BAA8B;IAWtC,OAAO,CAAC,qCAAqC;IA8B7C,OAAO,CAAC,2BAA2B;CA8CtC"}

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

@@ -21,6 +21,7 @@ const CfgBuilder_1 = require("../../graph/builder/CfgBuilder");
 const Local_1 = require("../../base/Local");
 const ArkMethodBuilder_1 = require("./ArkMethodBuilder");
 const Const_1 = require("../../common/Const");
+const SignatureCanonicalizerRegistry_1 = require("../../common/SignatureCanonicalizerRegistry");
 const Ref_1 = require("../../base/Ref");
 const Stmt_1 = require("../../base/Stmt");
 const Type_1 = require("../../base/Type");
@@ -238,13 +239,9 @@ class BodyBuilder {
     }
     generateNestedMethodChains(outerMethod) {
         let candidateMethods = [];
-        outerMethod
-            .getDeclaringArkClass()
-            .getMethods()
-            .forEach(method => {
-            if (method.getName().startsWith(Const_1.NAME_PREFIX) && method.getName().endsWith(`${Const_1.NAME_DELIMITER}${outerMethod.getName()}`)) {
-                candidateMethods.push(method);
-            }
+        outerMethod.getDeclaringArkClass().forEachNestedMethodOf(outerMethod.getName(), method => {
+            candidateMethods.push(method);
+            return true;
         });
         const childrenChains = this.getNestedChildrenChains(outerMethod, candidateMethods);
         if (childrenChains.length > 0) {
@@ -345,7 +342,7 @@ class BodyBuilder {
         const outerGlobals = (_c = outerMethod.getBody()) === null || _c === void 0 ? void 0 : _c.getUsedGlobals();
         const callGlobal = (_d = outerGlobals === null || outerGlobals === void 0 ? void 0 : outerGlobals.get(nestedMethodName)) !== null && _d !== void 0 ? _d : outerGlobals === null || outerGlobals === void 0 ? void 0 : outerGlobals.get(originalMethodName);
         if (callGlobal !== undefined && callGlobal instanceof Ref_1.GlobalRef && callGlobal.getRef() === null) {
-            const fieldSignature = new ArkSignature_1.FieldSignature(nestedMethodName, nestedMethod.getDeclaringArkClass().getSignature(), new Type_1.FunctionType(nestedMethod.getSignature()));
+            const fieldSignature = new ArkSignature_1.FieldSignature(nestedMethodName, nestedMethod.getDeclaringArkClass().getClassSigID(), new Type_1.FunctionType(nestedMethod.getSignature()));
             callGlobal.setRef(new Ref_1.ArkStaticFieldRef(fieldSignature));
         }
         const childrenChains = nestedChain.children;
@@ -360,16 +357,43 @@ class BodyBuilder {
         if (!(closuresLocal.getType() instanceof Type_1.LexicalEnvType)) {
             return;
         }
+        // A declare entry can be value-equal to the implementation signature (they then share
+        // one canonical instance). Injecting it here AND in the impl path below would unshift
+        // the closure param twice onto the same shared params array — skip it and let the impl
+        // path handle the shared instance exactly once.
+        const implSigID = nestedMethod.getMethodSigID();
+        const canonicalizer = SignatureCanonicalizerRegistry_1.SignatureCanonicalizerRegistry.getInstance().methodSigCanonicalizer;
         const declareSignatures = nestedMethod.getDeclareSignatures();
         declareSignatures === null || declareSignatures === void 0 ? void 0 : declareSignatures.forEach((signature, index) => {
+            if (implSigID !== undefined && canonicalizer.getExistingId(signature) === implSigID) {
+                return;
+            }
             nestedMethod.setDeclareSignatureWithIndex(this.createNewSignatureWithClosures(closuresLocal, signature), index);
         });
+        const oldSigID = nestedMethod.getMethodSigID();
         const implementSignature = nestedMethod.getImplementationSignature();
         if (implementSignature !== null) {
             nestedMethod.setImplementationSignature(this.createNewSignatureWithClosures(closuresLocal, implementSignature));
+            // Rebuilding the signature interns a new MethodSigID. Direct children reference the
+            // outer method by its (now stale) SigID, so re-point them to the new one.
+            const newSigID = nestedMethod.getMethodSigID();
+            if (newSigID !== oldSigID) {
+                this.syncChildrenOuterMethodSigID(nestedMethod, oldSigID, newSigID);
+            }
         }
         this.addClosureParamsAssignStmts(closuresLocal, nestedMethod);
     }
+    syncChildrenOuterMethodSigID(parent, oldSigID, newSigID) {
+        if (oldSigID === undefined || oldSigID <= 0 || newSigID === undefined) {
+            return;
+        }
+        parent.getDeclaringArkClass().forEachMethod(method => {
+            if (method !== parent && method.getOuterMethodSigID() === oldSigID) {
+                method.setOuterMethodSigID(newSigID);
+            }
+            return true;
+        });
+    }
     updateOuterMethodWithClosures(outerMethod, nestedMethod, closuresLocal) {
         var _a, _b, _c, _d, _e, _f;
         const nestedMethodName = nestedMethod.getName();
@@ -419,7 +443,7 @@ class BodyBuilder {
         if (!(lexicalEnv instanceof Type_1.LexicalEnvType)) {
             return;
         }
-        const fieldSignature = new ArkSignature_1.FieldSignature(methodSignature.getMethodSubSignature().getMethodName(), methodSignature.getDeclaringClassSignature(), new Type_1.ClosureType(lexicalEnv, methodSignature));
+        const fieldSignature = new ArkSignature_1.FieldSignature(methodSignature.getMethodSubSignature().getMethodName(), methodSignature.getDeclaringClassSigID(), new Type_1.ClosureType(lexicalEnv, methodSignature));
         globalRef.setRef(new Ref_1.ArkStaticFieldRef(fieldSignature));
         this.updateAbstractInvokeExprWithClosures(globalRef, outerMethod.getSignature(), nestedMethod.getSignature(), closuresLocal);
     }
@@ -445,7 +469,9 @@ class BodyBuilder {
     // 更新所有stmt中调用内层函数处的AbstractInvokeExpr中的函数签名和实参args，加入闭包参数
     // 更新所有stmt中定义的函数指针的usedStmt中的函数签名和实参args，加入闭包参数
     updateAbstractInvokeExprWithClosures(value, outerMethodSignature, nestedMethodSignature, closuresLocal) {
-        for (const usedStmt of value.getUsedStmts()) {
+        const usedStmts = value.getUsedStmts();
+        for (let i = 0; i < usedStmts.length; i++) {
+            const usedStmt = usedStmts[i];
             if (usedStmt instanceof Stmt_1.ArkInvokeStmt) {
                 this.updateSignatureAndArgsInArkInvokeExpr(usedStmt, nestedMethodSignature, closuresLocal);
             }
@@ -479,7 +505,7 @@ class BodyBuilder {
         closuresParam.setType(closuresLocal.getType());
         params.unshift(closuresParam);
         let newSubSignature = new ArkSignature_1.MethodSubSignature(oldSubSignature.getMethodName(), params, oldSubSignature.getReturnType(), oldSubSignature.isStatic());
-        return new ArkSignature_1.MethodSignature(oldSignature.getDeclaringClassSignature(), newSubSignature);
+        return new ArkSignature_1.MethodSignature(oldSignature.getDeclaringClassSigID(), newSubSignature);
     }
     updateSignatureAndArgsInArkInvokeExpr(stmt, methodSignature, closuresLocal) {
         let expr;

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

@@ -11,11 +11,21 @@ export declare function handlePropertyAccessExpression(node: ts.PropertyAccessEx
 export declare function buildDecorators(node: ts.Node, sourceFile: ts.SourceFile): Set<Decorator>;
 export declare function parseDecorator(node: ts.Decorator): Decorator | undefined;
 export declare function buildModifiers(node: ts.Node): number;
-export declare function buildHeritageClauses(heritageClauses?: ts.NodeArray<HeritageClause>): Map<string, string>;
+export declare function buildHeritageClauses(heritageClauses: ts.NodeArray<HeritageClause> | undefined, sourceFile: ts.SourceFile): Map<string, string>;
 export declare function buildTypeParameters(typeParameters: ts.NodeArray<TypeParameterDeclaration>, sourceFile: ts.SourceFile, arkInstance: ArkMethod | ArkClass): GenericType[];
 export declare function buildParameters(params: ts.NodeArray<ParameterDeclaration>, arkInstance: ArkMethod | ArkField, sourceFile: ts.SourceFile, paramsPosition: Map<string, FullPosition>): MethodParameter[];
 export declare function buildGenericType(type: Type, arkInstance: ArkMethod | ArkField | AliasType): Type;
 export declare function buildReturnType(node: TypeNode, sourceFile: ts.SourceFile, method: ArkMethod): Type;
 export declare function tsNode2Type(typeNode: ts.TypeNode | ts.TypeParameterDeclaration, sourceFile: ts.SourceFile, arkInstance: ArkMethod | ArkClass | ArkField): Type;
 export declare function buildTypeFromPreStr(preStr: string): Type;
+/**
+ * 构建期同名载体统一：声明类型为 UnclearReferenceType（未解析标注，类别未知）且初始化器类型为
+ * 同名 ClassType（如 `new SharedArr()` 的 stub——new 语义保证类别是类）时，声明侧统一到初始化器
+ * 的 ClassType 实例。仅限纯名字标注（无泛型实参）——带实参的标注（如 `Set<string>`）有完整的
+ * 推断期名字解析路径（实参树全链解析），构建期统一反而引入实参形态中间态。统一后与 new 表达式/
+ * 构造器 invoke 共享同一 stub 的 temp class 行，目标类后续注册时可一次毕业全链收敛。ArrayType
+ * 按 dimension 一致做元素级递归；其余组合一律声明优先（零行为变化）。统一产物仍是 unclear
+ * （stub declaring 为 %unk），不影响后续推断路径。
+ */
+export declare function unifyDeclaredTypeWithInitializer(declared: Type, initializer: Type): Type;
 //# sourceMappingURL=builderUtils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"builderUtils.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/builderUtils.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,EAAE,EAAE,cAAc,EAAE,oBAAoB,EAAE,QAAQ,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAC/G,OAAO,EACH,SAAS,EAIT,WAAW,EAGX,IAAI,EAIP,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAA4D,eAAe,EAAiC,MAAM,oBAAoB,CAAC;AAsB9I,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAMnD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,EAAE,CAAC,aAAa,GAAG,MAAM,CAUlE;AAED,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,EAAE,CAAC,wBAAwB,GAAG,MAAM,CAYxF;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,GAAG,GAAG,CAAC,SAAS,CAAC,CAUxF;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,EAAE,CAAC,SAAS,GAAG,SAAS,GAAG,SAAS,CAuBxE;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,GAAG,MAAM,CAUpD;AAED,wBAAgB,oBAAoB,CAAC,eAAe,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,cAAc,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAkBxG;AAED,wBAAgB,mBAAmB,CAC/B,cAAc,EAAE,EAAE,CAAC,SAAS,CAAC,wBAAwB,CAAC,EACtD,UAAU,EAAE,EAAE,CAAC,UAAU,EACzB,WAAW,EAAE,SAAS,GAAG,QAAQ,GAClC,WAAW,EAAE,CAyBf;AA4ED,wBAAgB,eAAe,CAC3B,MAAM,EAAE,EAAE,CAAC,SAAS,CAAC,oBAAoB,CAAC,EAC1C,WAAW,EAAE,SAAS,GAAG,QAAQ,EACjC,UAAU,EAAE,EAAE,CAAC,UAAU,EACzB,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,GAC1C,eAAe,EAAE,CAkDnB;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,GAAG,IAAI,CAsDhG;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,GAAG,IAAI,CAQlG;AAED,wBAAgB,WAAW,CACvB,QAAQ,EAAE,EAAE,CAAC,QAAQ,GAAG,EAAE,CAAC,wBAAwB,EACnD,UAAU,EAAE,EAAE,CAAC,UAAU,EACzB,WAAW,EAAE,SAAS,GAAG,QAAQ,GAAG,QAAQ,GAC7C,IAAI,CA8FN;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAiDxD"}
+{"version":3,"file":"builderUtils.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/builderUtils.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,EAAE,EAAE,cAAc,EAAE,oBAAoB,EAAE,QAAQ,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAC/G,OAAO,EACH,SAAS,EAIT,WAAW,EAGX,IAAI,EAIP,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAA4D,eAAe,EAAiC,MAAM,oBAAoB,CAAC;AAsB9I,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAOnD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,EAAE,CAAC,aAAa,GAAG,MAAM,CAUlE;AAED,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,EAAE,CAAC,wBAAwB,GAAG,MAAM,CAYxF;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,GAAG,GAAG,CAAC,SAAS,CAAC,CAUxF;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,EAAE,CAAC,SAAS,GAAG,SAAS,GAAG,SAAS,CAuBxE;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,GAAG,MAAM,CAapD;AAED,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,EAAE,CAAC,SAAS,CAAC,cAAc,CAAC,GAAG,SAAS,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAkB9I;AAED,wBAAgB,mBAAmB,CAC/B,cAAc,EAAE,EAAE,CAAC,SAAS,CAAC,wBAAwB,CAAC,EACtD,UAAU,EAAE,EAAE,CAAC,UAAU,EACzB,WAAW,EAAE,SAAS,GAAG,QAAQ,GAClC,WAAW,EAAE,CAyBf;AA4ED,wBAAgB,eAAe,CAC3B,MAAM,EAAE,EAAE,CAAC,SAAS,CAAC,oBAAoB,CAAC,EAC1C,WAAW,EAAE,SAAS,GAAG,QAAQ,EACjC,UAAU,EAAE,EAAE,CAAC,UAAU,EACzB,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,GAC1C,eAAe,EAAE,CAkDnB;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,GAAG,IAAI,CAsDhG;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,GAAG,IAAI,CAWlG;AAED,wBAAgB,WAAW,CACvB,QAAQ,EAAE,EAAE,CAAC,QAAQ,GAAG,EAAE,CAAC,wBAAwB,EACnD,UAAU,EAAE,EAAE,CAAC,UAAU,EACzB,WAAW,EAAE,SAAS,GAAG,QAAQ,GAAG,QAAQ,GAC7C,IAAI,CAiCN;AAiFD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAiDxD;AA8DD;;;;;;;;GAQG;AACH,wBAAgB,gCAAgC,CAAC,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,GAAG,IAAI,CAUxF"}

package/lib/core/model/builder/builderUtils.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.buildTypeFromPreStr = exports.tsNode2Type = exports.buildReturnType = exports.buildGenericType = exports.buildParameters = exports.buildTypeParameters = exports.buildHeritageClauses = exports.buildModifiers = exports.parseDecorator = exports.buildDecorators = exports.handlePropertyAccessExpression = exports.handleQualifiedName = void 0;
+exports.unifyDeclaredTypeWithInitializer = exports.buildTypeFromPreStr = exports.tsNode2Type = exports.buildReturnType = exports.buildGenericType = exports.buildParameters = exports.buildTypeParameters = exports.buildHeritageClauses = exports.buildModifiers = exports.parseDecorator = exports.buildDecorators = exports.handlePropertyAccessExpression = exports.handleQualifiedName = void 0;
 const ohos_typescript_1 = __importDefault(require("ohos-typescript"));
 const Type_1 = require("../../base/Type");
 const TypeInference_1 = require("../../common/TypeInference");
@@ -93,13 +93,13 @@ function handlePropertyAccessExpression(node) {
 exports.handlePropertyAccessExpression = handlePropertyAccessExpression;
 function buildDecorators(node, sourceFile) {
     let decorators = new Set();
-    ohos_typescript_1.default.getAllDecorators(node).forEach(decoratorNode => {
+    for (const decoratorNode of ohos_typescript_1.default.getAllDecorators(node)) {
         let decorator = parseDecorator(decoratorNode);
         if (decorator) {
             decorator.setContent((0, StringUtils_1.cloneText)(decoratorNode.expression.getText(sourceFile)));
             decorators.add(decorator);
         }
-    });
+    }
     return decorators;
 }
 exports.buildDecorators = buildDecorators;
@@ -125,23 +125,25 @@ function parseDecorator(node) {
 }
 exports.parseDecorator = parseDecorator;
 function buildModifiers(node) {
-    var _a;
     let modifiers = 0;
     if (ohos_typescript_1.default.canHaveModifiers(node)) {
-        (_a = ohos_typescript_1.default.getModifiers(node)) === null || _a === void 0 ? void 0 : _a.forEach(modifier => {
-            modifiers |= (0, ArkBaseModel_1.modifierKind2Enum)(modifier.kind);
-        });
+        const nodeModifiers = ohos_typescript_1.default.getModifiers(node);
+        if (nodeModifiers) {
+            for (const modifier of nodeModifiers) {
+                modifiers |= (0, ArkBaseModel_1.modifierKind2Enum)(modifier.kind);
+            }
+        }
     }
     return modifiers;
 }
 exports.buildModifiers = buildModifiers;
-function buildHeritageClauses(heritageClauses) {
+function buildHeritageClauses(heritageClauses, sourceFile) {
     let heritageClausesMap = new Map();
     heritageClauses === null || heritageClauses === void 0 ? void 0 : heritageClauses.forEach(heritageClause => {
         heritageClause.types.forEach(type => {
             let heritageClauseName = '';
             if (type.typeArguments) {
-                heritageClauseName = (0, StringUtils_1.cloneText)(type.getText());
+                heritageClauseName = (0, StringUtils_1.cloneText)(type.getText(sourceFile));
             }
             else if (ohos_typescript_1.default.isIdentifier(type.expression)) {
                 heritageClauseName = (0, StringUtils_1.cloneText)(type.expression.text);
@@ -150,7 +152,7 @@ function buildHeritageClauses(heritageClauses) {
                 heritageClauseName = handlePropertyAccessExpression(type.expression);
             }
             else {
-                heritageClauseName = (0, StringUtils_1.cloneText)(type.getText());
+                heritageClauseName = (0, StringUtils_1.cloneText)(type.getText(sourceFile));
             }
             heritageClausesMap.set(heritageClauseName, ohos_typescript_1.default.SyntaxKind[heritageClause.token]);
         });
@@ -377,88 +379,22 @@ function buildReturnType(node, sourceFile, method) {
 exports.buildReturnType = buildReturnType;
 function tsNode2Type(typeNode, sourceFile, arkInstance) {
     if (ohos_typescript_1.default.isTypeReferenceNode(typeNode)) {
-        const genericTypes = [];
-        if (typeNode.typeArguments) {
-            for (const typeArgument of typeNode.typeArguments) {
-                genericTypes.push(tsNode2Type(typeArgument, sourceFile, arkInstance));
-            }
-        }
-        let referenceNodeName = typeNode.typeName;
-        if (ohos_typescript_1.default.isQualifiedName(referenceNodeName)) {
-            let parameterTypeStr = handleQualifiedName(referenceNodeName);
-            return new Type_1.UnclearReferenceType(parameterTypeStr, genericTypes);
-        }
-        else {
-            let parameterTypeStr = (0, StringUtils_1.cloneText)(referenceNodeName.text);
-            if (parameterTypeStr === Builtin_1.Builtin.OBJECT) {
-                return Builtin_1.Builtin.OBJECT_CLASS_TYPE;
-            }
-            return new Type_1.UnclearReferenceType(parameterTypeStr, genericTypes);
-        }
+        return buildTypeFromTypeReference(typeNode, sourceFile, arkInstance);
     }
     else if (ohos_typescript_1.default.isUnionTypeNode(typeNode) || ohos_typescript_1.default.isIntersectionTypeNode(typeNode)) {
-        let multipleTypePara = [];
-        typeNode.types.forEach(tmpType => {
-            multipleTypePara.push(tsNode2Type(tmpType, sourceFile, arkInstance));
-        });
-        if (ohos_typescript_1.default.isUnionTypeNode(typeNode)) {
-            return new Type_1.UnionType(multipleTypePara);
-        }
-        else {
-            return new Type_1.IntersectionType(multipleTypePara);
-        }
+        return buildTypeFromUnionOrIntersection(typeNode, sourceFile, arkInstance);
     }
     else if (ohos_typescript_1.default.isLiteralTypeNode(typeNode)) {
         return ArkValueTransformer_1.ArkValueTransformer.resolveLiteralTypeNode(typeNode, sourceFile);
     }
     else if (ohos_typescript_1.default.isTypeLiteralNode(typeNode)) {
-        let cls = new ArkClass_1.ArkClass();
-        let declaringClass;
-        if (arkInstance instanceof ArkMethod_1.ArkMethod) {
-            declaringClass = arkInstance.getDeclaringArkClass();
-        }
-        else if (arkInstance instanceof ArkField_1.ArkField) {
-            declaringClass = arkInstance.getDeclaringArkClass();
-        }
-        else {
-            declaringClass = arkInstance;
-        }
-        if (declaringClass.getDeclaringArkNamespace()) {
-            cls.setDeclaringArkNamespace(declaringClass.getDeclaringArkNamespace());
-            cls.setDeclaringArkFile(declaringClass.getDeclaringArkFile());
-        }
-        else {
-            cls.setDeclaringArkFile(declaringClass.getDeclaringArkFile());
-        }
-        (0, ArkClassBuilder_1.buildNormalArkClassFromArkMethod)(typeNode, cls, sourceFile);
-        return new Type_1.ClassType(cls.getSignature());
+        return buildTypeFromTypeLiteral(typeNode, sourceFile, arkInstance);
     }
     else if (ohos_typescript_1.default.isFunctionTypeNode(typeNode)) {
-        let mtd = new ArkMethod_1.ArkMethod();
-        let cls;
-        if (arkInstance instanceof ArkMethod_1.ArkMethod) {
-            cls = arkInstance.getDeclaringArkClass();
-        }
-        else if (arkInstance instanceof ArkClass_1.ArkClass) {
-            cls = arkInstance;
-        }
-        else {
-            cls = arkInstance.getDeclaringArkClass();
-        }
-        (0, ArkMethodBuilder_1.buildArkMethodFromArkClass)(typeNode, cls, mtd, sourceFile);
-        return new Type_1.FunctionType(mtd.getSignature());
+        return buildTypeFromFunctionType(typeNode, sourceFile, arkInstance);
     }
     else if (ohos_typescript_1.default.isTypeParameterDeclaration(typeNode)) {
-        const name = (0, StringUtils_1.cloneText)(typeNode.name.text);
-        let defaultType;
-        if (typeNode.default) {
-            defaultType = tsNode2Type(typeNode.default, sourceFile, arkInstance);
-        }
-        let constraint;
-        if (typeNode.constraint) {
-            constraint = tsNode2Type(typeNode.constraint, sourceFile, arkInstance);
-        }
-        return new Type_1.GenericType(name, defaultType, constraint);
+        return buildTypeFromTypeParameter(typeNode, sourceFile, arkInstance);
     }
     else if (ohos_typescript_1.default.isTupleTypeNode(typeNode)) {
         const types = [];
@@ -488,6 +424,81 @@ function tsNode2Type(typeNode, sourceFile, arkInstance) {
     }
 }
 exports.tsNode2Type = tsNode2Type;
+function buildTypeFromTypeReference(typeNode, sourceFile, arkInstance) {
+    const genericTypes = [];
+    if (typeNode.typeArguments) {
+        for (const typeArgument of typeNode.typeArguments) {
+            genericTypes.push(tsNode2Type(typeArgument, sourceFile, arkInstance));
+        }
+    }
+    let referenceNodeName = typeNode.typeName;
+    if (ohos_typescript_1.default.isQualifiedName(referenceNodeName)) {
+        let parameterTypeStr = handleQualifiedName(referenceNodeName);
+        return new Type_1.UnclearReferenceType(parameterTypeStr, genericTypes);
+    }
+    else {
+        let parameterTypeStr = (0, StringUtils_1.cloneText)(referenceNodeName.text);
+        if (parameterTypeStr === Builtin_1.Builtin.OBJECT) {
+            return Builtin_1.Builtin.OBJECT_CLASS_TYPE;
+        }
+        return new Type_1.UnclearReferenceType(parameterTypeStr, genericTypes);
+    }
+}
+function buildTypeFromUnionOrIntersection(typeNode, sourceFile, arkInstance) {
+    let multipleTypePara = [];
+    typeNode.types.forEach(tmpType => {
+        multipleTypePara.push(tsNode2Type(tmpType, sourceFile, arkInstance));
+    });
+    if (ohos_typescript_1.default.isUnionTypeNode(typeNode)) {
+        return new Type_1.UnionType(multipleTypePara);
+    }
+    else {
+        return new Type_1.IntersectionType(multipleTypePara);
+    }
+}
+function buildTypeFromTypeLiteral(typeNode, sourceFile, arkInstance) {
+    var _a;
+    let declaringClass;
+    if (arkInstance instanceof ArkMethod_1.ArkMethod) {
+        declaringClass = arkInstance.getDeclaringArkClass();
+    }
+    else if (arkInstance instanceof ArkField_1.ArkField) {
+        declaringClass = arkInstance.getDeclaringArkClass();
+    }
+    else {
+        declaringClass = arkInstance;
+    }
+    let cls = new ArkClass_1.ArkClass(declaringClass.getDeclaringFileID(), (_a = declaringClass.getDeclaringArkNamespace()) === null || _a === void 0 ? void 0 : _a.getNamespaceSigID());
+    (0, ArkClassBuilder_1.buildNormalArkClassFromArkMethod)(typeNode, cls, sourceFile);
+    return new Type_1.ClassType(cls.getSignature());
+}
+function buildTypeFromFunctionType(typeNode, sourceFile, arkInstance) {
+    let cls;
+    if (arkInstance instanceof ArkMethod_1.ArkMethod) {
+        cls = arkInstance.getDeclaringArkClass();
+    }
+    else if (arkInstance instanceof ArkClass_1.ArkClass) {
+        cls = arkInstance;
+    }
+    else {
+        cls = arkInstance.getDeclaringArkClass();
+    }
+    let mtd = new ArkMethod_1.ArkMethod(cls.getClassSigID());
+    (0, ArkMethodBuilder_1.buildArkMethodFromArkClass)(typeNode, cls, mtd, sourceFile);
+    return new Type_1.FunctionType(mtd.getSignature());
+}
+function buildTypeFromTypeParameter(typeNode, sourceFile, arkInstance) {
+    const name = (0, StringUtils_1.cloneText)(typeNode.name.text);
+    let defaultType;
+    if (typeNode.default) {
+        defaultType = tsNode2Type(typeNode.default, sourceFile, arkInstance);
+    }
+    let constraint;
+    if (typeNode.constraint) {
+        constraint = tsNode2Type(typeNode.constraint, sourceFile, arkInstance);
+    }
+    return new Type_1.GenericType(name, defaultType, constraint);
+}
 function buildTypeFromPreStr(preStr) {
     let postStr = '';
     switch (preStr) {
@@ -564,21 +575,23 @@ function buildTypeFromTypeQuery(typeQueryNode, sourceFile, arkInstance) {
     if (ohos_typescript_1.default.isQualifiedName(exprNameNode)) {
         if ((0, StringUtils_1.cloneText)(exprNameNode.left.getText(sourceFile)) === TSConst_1.THIS_NAME) {
             const fieldName = (0, StringUtils_1.cloneText)(exprNameNode.right.getText(sourceFile));
+            let baseLocal;
+            let fieldSignature;
             if (arkInstance instanceof ArkMethod_1.ArkMethod) {
-                const fieldSignature = (_b = (_a = arkInstance.getDeclaringArkClass().getFieldWithName(fieldName)) === null || _a === void 0 ? void 0 : _a.getSignature()) !== null && _b !== void 0 ? _b : ArkSignatureBuilder_1.ArkSignatureBuilder.buildFieldSignatureFromFieldName(fieldName);
-                const baseLocal = (_d = (_c = arkInstance.getBody()) === null || _c === void 0 ? void 0 : _c.getLocals().get(TSConst_1.THIS_NAME)) !== null && _d !== void 0 ? _d : new Local_1.Local(TSConst_1.THIS_NAME, new Type_1.ClassType(arkInstance.getDeclaringArkClass().getSignature(), arkInstance.getDeclaringArkClass().getGenericsTypes()));
-                opValue = new Ref_1.ArkInstanceFieldRef(baseLocal, fieldSignature);
+                const declaringClass = arkInstance.getDeclaringArkClass();
+                fieldSignature = (_b = (_a = declaringClass.getFieldWithName(fieldName)) === null || _a === void 0 ? void 0 : _a.getSignature()) !== null && _b !== void 0 ? _b : ArkSignatureBuilder_1.ArkSignatureBuilder.buildFieldSignatureFromFieldName(fieldName);
+                baseLocal = (_d = (_c = arkInstance.getBody()) === null || _c === void 0 ? void 0 : _c.getLocals().get(TSConst_1.THIS_NAME)) !== null && _d !== void 0 ? _d : new Local_1.Local(TSConst_1.THIS_NAME, new Type_1.ClassType(declaringClass.getSignature(), declaringClass.getGenericsTypes()));
             }
             else if (arkInstance instanceof ArkClass_1.ArkClass) {
-                const fieldSignature = (_f = (_e = arkInstance.getFieldWithName(fieldName)) === null || _e === void 0 ? void 0 : _e.getSignature()) !== null && _f !== void 0 ? _f : ArkSignatureBuilder_1.ArkSignatureBuilder.buildFieldSignatureFromFieldName(fieldName);
-                const baseLocal = new Local_1.Local(TSConst_1.THIS_NAME, new Type_1.ClassType(arkInstance.getSignature(), arkInstance.getGenericsTypes()));
-                opValue = new Ref_1.ArkInstanceFieldRef(baseLocal, fieldSignature);
+                fieldSignature = (_f = (_e = arkInstance.getFieldWithName(fieldName)) === null || _e === void 0 ? void 0 : _e.getSignature()) !== null && _f !== void 0 ? _f : ArkSignatureBuilder_1.ArkSignatureBuilder.buildFieldSignatureFromFieldName(fieldName);
+                baseLocal = new Local_1.Local(TSConst_1.THIS_NAME, new Type_1.ClassType(arkInstance.getSignature(), arkInstance.getGenericsTypes()));
             }
             else {
-                const fieldSignature = arkInstance.getSignature();
-                const baseLocal = new Local_1.Local(TSConst_1.THIS_NAME, new Type_1.ClassType(arkInstance.getDeclaringArkClass().getSignature(), arkInstance.getDeclaringArkClass().getGenericsTypes()));
-                opValue = new Ref_1.ArkInstanceFieldRef(baseLocal, fieldSignature);
+                fieldSignature = arkInstance.getSignature();
+                const declaringClass = arkInstance.getDeclaringArkClass();
+                baseLocal = new Local_1.Local(TSConst_1.THIS_NAME, new Type_1.ClassType(declaringClass.getSignature(), declaringClass.getGenericsTypes()));
             }
+            opValue = new Ref_1.ArkInstanceFieldRef(baseLocal, fieldSignature);
         }
         else {
             const exprName = (0, StringUtils_1.cloneText)(exprNameNode.getText(sourceFile));
@@ -597,3 +610,24 @@ function buildTypeFromTypeQuery(typeQueryNode, sourceFile, arkInstance) {
     }
     return expr;
 }
+/**
+ * 构建期同名载体统一：声明类型为 UnclearReferenceType（未解析标注，类别未知）且初始化器类型为
+ * 同名 ClassType（如 `new SharedArr()` 的 stub——new 语义保证类别是类）时，声明侧统一到初始化器
+ * 的 ClassType 实例。仅限纯名字标注（无泛型实参）——带实参的标注（如 `Set<string>`）有完整的
+ * 推断期名字解析路径（实参树全链解析），构建期统一反而引入实参形态中间态。统一后与 new 表达式/
+ * 构造器 invoke 共享同一 stub 的 temp class 行，目标类后续注册时可一次毕业全链收敛。ArrayType
+ * 按 dimension 一致做元素级递归；其余组合一律声明优先（零行为变化）。统一产物仍是 unclear
+ * （stub declaring 为 %unk），不影响后续推断路径。
+ */
+function unifyDeclaredTypeWithInitializer(declared, initializer) {
+    if (declared instanceof Type_1.ArrayType && initializer instanceof Type_1.ArrayType && declared.getDimension() === initializer.getDimension()) {
+        const unified = unifyDeclaredTypeWithInitializer(declared.getBaseType(), initializer.getBaseType());
+        return unified !== declared.getBaseType() ? new Type_1.ArrayType(unified, declared.getDimension()) : declared;
+    }
+    if (initializer instanceof Type_1.ClassType && declared instanceof Type_1.UnclearReferenceType &&
+        declared.getGenericTypes().length === 0 && initializer.getClassSignature().getClassName() === declared.getName()) {
+        return initializer;
+    }
+    return declared;
+}
+exports.unifyDeclaredTypeWithInitializer = unifyDeclaredTypeWithInitializer;

package/lib/frontend/FrontendBuilder.d.ts

@@ -1,5 +1,5 @@
 import { Language } from '../core/model/ArkFile';
-import { ModuleScene, Scene } from '../Scene';
+import { Scene } from '../Scene';
 import { ArkFile } from '../core/model/ArkFile';
 import { ArkModule } from '../core/model/ArkModule';
 import { ModuleDepthLevel } from './common/ModuleDepth';
@@ -17,10 +17,6 @@ export interface FrontendParseResult {
  * vs the C++ builder.
  */
 export declare class FrontendBuilder {
-    private static partitionFilePaths;
-    private static collectFailedFilePaths;
-    static buildFilesIntoArkFiles(scene: Scene, filePaths: string[]): void;
-    static buildModuleFilesIntoArkFiles(moduleScene: ModuleScene, filePaths: string[]): void;
     /**
      * Builds a single project file into a pre-allocated {@link ArkFile} (the former `if (CXX) … else …` in `Scene`).
      */
@@ -94,12 +90,20 @@ export declare class FrontendBuilder {
      * context.
      */
     private static freeMethodBodyBuilder;
+    /**
+     * Build the body of every class's default method (%dflt) in the file and free its builder.
+     * %dflt methods hold the file-level (or namespace-level) top-level statements and their
+     * builder is mounted on a node that a re-parse cannot address by position (the file or
+     * namespace node itself), so they are built while the signature round's AST is still mounted.
+     * All other method builders are untouched.
+     */
+    static buildDefaultMethodBodies(arkFile: ArkFile): void;
     /**
      * Release the BodyBuilders mounted during signature building so the ArkFile retains only
      * signatures (no ArkBody/CFG) and does not retain AST/build context in memory. Mirrors the
      * release pattern in {@link Scene.parseAndRegisterSdkFile}.
      */
-    private static freeBodyBuildersInFile;
+    static freeBodyBuildersInFile(arkFile: ArkFile): void;
     /**
      * Build method bodies (ArkBody/CFG/Stmt/Expr) for all ArkFiles in the given module, then
      * run default-constructor post-processing. This is the module-scoped equivalent of

package/lib/frontend/FrontendBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FrontendBuilder.d.ts","sourceRoot":"","sources":["../../src/frontend/FrontendBuilder.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,KAAK,EAAmB,MAAM,UAAU,CAAC;AAG/D,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAOpD,OAAO,EAAE,gBAAgB,EAAyB,MAAM,sBAAsB,CAAC;AAQ/E,MAAM,WAAW,oBAAoB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,mBAAmB;IAChC,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,WAAW,EAAE,oBAAoB,EAAE,CAAC;CACvC;AAED;;;;GAIG;AACH,qBAAa,eAAe;IACxB,OAAO,CAAC,MAAM,CAAC,kBAAkB;IAajC,OAAO,CAAC,MAAM,CAAC,sBAAsB;WAOvB,sBAAsB,CAAC,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,IAAI;WAW/D,4BAA4B,CAAC,WAAW,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,IAAI;IAe/F;;OAEG;WACW,2BAA2B,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI;IAQjG;;;;;;;;;;;OAWG;WACW,uBAAuB,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,gBAAgB,GAAG,IAAI;IAYrG;;;;;;;;;;;;OAYG;WACW,sBAAsB,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,EAAE;IA+BhF;;;;;;;;OAQG;IACH,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAWlC;;OAEG;WACW,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAQtE;;;;;;;;;;;;;;;;;;;;;OAqBG;WACW,qBAAqB,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,gBAAgB,GAAG,IAAI;IAW5H;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,qBAAqB;IASpC;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,sBAAsB;IAMrC;;;;;;;;;;;;;;;;;;;;;;;;;;;OA2BG;WACW,qBAAqB,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI;IA8B5D;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,0BAA0B;CAc5C"}
+{"version":3,"file":"FrontendBuilder.d.ts","sourceRoot":"","sources":["../../src/frontend/FrontendBuilder.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAIjC,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAOpD,OAAO,EAAE,gBAAgB,EAAyB,MAAM,sBAAsB,CAAC;AAQ/E,MAAM,WAAW,oBAAoB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,mBAAmB;IAChC,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,WAAW,EAAE,oBAAoB,EAAE,CAAC;CACvC;AAED;;;;GAIG;AACH,qBAAa,eAAe;IACxB;;OAEG;WACW,2BAA2B,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,IAAI;IAQjG;;;;;;;;;;;OAWG;WACW,uBAAuB,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,gBAAgB,GAAG,IAAI;IAYrG;;;;;;;;;;;;OAYG;WACW,sBAAsB,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,EAAE;IA+BhF;;;;;;;;OAQG;IACH,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAWlC;;OAEG;WACW,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAQtE;;;;;;;;;;;;;;;;;;;;;OAqBG;WACW,qBAAqB,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,gBAAgB,GAAG,IAAI;IAW5H;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,qBAAqB;IASpC;;;;;;OAMG;WACW,wBAAwB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAW9D;;;;OAIG;WACW,sBAAsB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAM5D;;;;;;;;;;;;;;;;;;;;;;;;;;;OA2BG;WACW,qBAAqB,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI;IA8B5D;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,0BAA0B;CAc5C"}