arkanalyzer 1.0.93 → 2.0.0-beta1

package/lib/core/inference/ValueInference.js

@@ -46,6 +46,7 @@ var InstanceInvokeExprInference_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LocalInference = exports.ArkCastExprInference = exports.ArkInstanceOfExprInference = exports.ArkConditionExprInference = exports.ArkNormalBinOpExprInference = exports.ArkNewArrayExprInference = exports.ArkNewExprInference = exports.ArkPtrInvokeExprInference = exports.StaticInvokeExprInference = exports.InstanceInvokeExprInference = exports.StaticFieldRefInference = exports.FieldRefInference = exports.ClosureFieldRefInference = exports.ParameterRefInference = exports.ValueInference = exports.Bind = exports.valueCtors = exports.InferLanguage = void 0;
 const Stmt_1 = require("../base/Stmt");
+const SdkUtils_1 = require("../common/SdkUtils");
 const Type_1 = require("../base/Type");
 const TypeInference_1 = require("../common/TypeInference");
 const IRInference_1 = require("../common/IRInference");
@@ -189,7 +190,9 @@ let ClosureFieldRefInference = class ClosureFieldRefInference extends ValueInfer
         var _a;
         const type = value.getBase().getType();
         if (type instanceof Type_1.LexicalEnvType) {
-            let newType = (_a = type.getClosures().find(c => c.getName() === value.getFieldName())) === null || _a === void 0 ? void 0 : _a.getType();
+            let newType = (_a = type
+                .getClosures()
+                .find(c => c.getName() === value.getFieldName())) === null || _a === void 0 ? void 0 : _a.getType();
             if (newType && !TypeInference_1.TypeInference.isUnclearType(newType)) {
                 value.setType(newType);
             }
@@ -213,8 +216,9 @@ let FieldRefInference = class FieldRefInference extends ValueInference {
      * @returns {boolean} True if pre-inference should be performed, false otherwise
      */
     preInfer(value, stmt) {
-        return IRInference_1.IRInference.needInfer(value.getFieldSignature().getDeclaringSignature().getDeclaringFileSignature()) ||
-            TypeInference_1.TypeInference.isUnclearType(value.getType()) || value.getFieldSignature().isStatic();
+        return (IRInference_1.IRInference.needInfer(value.getFieldSignature().getDeclaringSignature().getDeclaringFileSignature()) ||
+            TypeInference_1.TypeInference.isUnclearType(value.getType()) ||
+            value.getFieldSignature().isStatic());
     }
     /**
      * Performs inference on a field reference within the context of a statement
@@ -248,8 +252,7 @@ let StaticFieldRefInference = class StaticFieldRefInference extends ValueInferen
      * @returns {boolean} True if pre-inference should be performed, false otherwise
      */
     preInfer(value, stmt) {
-        return IRInference_1.IRInference.needInfer(value.getFieldSignature().getDeclaringSignature().getDeclaringFileSignature()) ||
-            TypeInference_1.TypeInference.isUnclearType(value.getType());
+        return (IRInference_1.IRInference.needInfer(value.getFieldSignature().getDeclaringSignature().getDeclaringFileSignature()) || TypeInference_1.TypeInference.isUnclearType(value.getType()));
     }
     /**
      * Performs inference on a static field reference within the context of a statement
@@ -262,12 +265,14 @@ let StaticFieldRefInference = class StaticFieldRefInference extends ValueInferen
         const baseSignature = value.getFieldSignature().getDeclaringSignature();
         const baseName = baseSignature instanceof ArkSignature_1.ClassSignature ? baseSignature.getClassName() : baseSignature.getNamespaceName();
         const arkMethod = stmt.getCfg().getDeclaringMethod();
-        const baseType = TypeInference_1.TypeInference.inferBaseType(baseName, arkMethod.getDeclaringArkClass());
-        if (!baseType) {
-            return undefined;
+        // Multi-candidate probing: same-name global entities are probed in order until the member resolves.
+        for (const baseType of TypeInference_1.TypeInference.inferBaseTypes(baseName, arkMethod.getDeclaringArkClass())) {
+            const result = IRInference_1.IRInference.inferInstanceMember(baseType, value, arkMethod, IRInference_1.IRInference.updateRefSignature);
+            if (result) {
+                return result === value ? undefined : result;
+            }
         }
-        const result = IRInference_1.IRInference.inferInstanceMember(baseType, value, arkMethod, IRInference_1.IRInference.updateRefSignature);
-        return !result || result === value ? undefined : result;
+        return undefined;
     }
 };
 StaticFieldRefInference = __decorate([
@@ -286,8 +291,8 @@ let InstanceInvokeExprInference = InstanceInvokeExprInference_1 = class Instance
      * @returns {boolean} True if pre-inference should be performed, false otherwise
      */
     preInfer(value, stmt) {
-        return IRInference_1.IRInference.needInfer(value.getMethodSignature().getDeclaringClassSignature().getDeclaringFileSignature()) ||
-            TypeInference_1.TypeInference.isUnclearType(value.getType());
+        return (IRInference_1.IRInference.needInfer(value.getMethodSignature().getDeclaringClassSignature().getDeclaringFileSignature()) ||
+            TypeInference_1.TypeInference.isUnclearType(value.getType()));
     }
     /**
      * Performs inference on an instance invocation expression within the context of a statement
@@ -300,24 +305,24 @@ let InstanceInvokeExprInference = InstanceInvokeExprInference_1 = class Instance
         const arkMethod = stmt.getCfg().getDeclaringMethod();
         const baseType = TypeInference_1.TypeInference.inferRefinedValueType(value.getBase(), arkMethod.getDeclaringArkFile().getScene());
         const result = IRInference_1.IRInference.inferInstanceMember(baseType, value, arkMethod, InstanceInvokeExprInference_1.inferInvokeExpr);
+        if (result === value) {
+            // isStatic 形态升级防御：签名已解析为 static 但 expr 停留 instance 形态的残余在此收敛——正常升级依赖 inferInvokeExpr 族返回替换 expr
+            // （invokeMatchedMethod 的 isStatic 分支），物化跟随/推导短路等场景可能就地 set 了 static 签名却未换形态（OperandOriginalPositions 实证）。
+            // base 为 super 时保持 instance（super.staticM() 的 postInfer base 替换语义优先，staticinvoke 丢弃 receiver 虽语义等价但保守排除）。
+            const sig = value.getMethodSignature();
+            if (sig.getMethodSubSignature().isStatic() && value.getBase().getName() !== TSConst_1.SUPER_NAME) {
+                return new Expr_1.ArkStaticInvokeExpr(sig, value.getArgs(), value.getRealGenericTypes(), value.getSpreadFlags());
+            }
+        }
         return !result || result === value ? undefined : result;
     }
     /**
      * Performs post-inference processing on invocation expressions
-     * Handles special case for super() calls by replacing the base with 'this' local
      * @param {ArkInstanceInvokeExpr} value - The original invocation expression
      * @param {Value} newValue - The new value after inference
-     * @param {Stmt} stmt - The statement containing the invocation
+     * @param {Stmt} stmt - The statement containing the expression
      */
     postInfer(value, newValue, stmt) {
-        var _a;
-        if (value instanceof Expr_1.ArkInstanceInvokeExpr && value.getBase().getName() === TSConst_1.SUPER_NAME) {
-            const thisLocal = (_a = stmt.getCfg().getDeclaringMethod().getBody()) === null || _a === void 0 ? void 0 : _a.getLocals().get(TSConst_1.THIS_NAME);
-            if (thisLocal) {
-                value.setBase(thisLocal);
-                thisLocal.addUsedStmt(stmt);
-            }
-        }
         super.postInfer(value, newValue, stmt);
     }
     getMethodName(expr, arkMethod) {
@@ -327,7 +332,7 @@ let InstanceInvokeExprInference = InstanceInvokeExprInference_1 = class Instance
         const methodName = expr.getMethodSignature().getMethodSubSignature().getMethodName();
         const scene = arkMethod.getDeclaringArkFile().getScene();
         if (baseType instanceof Type_1.ArrayType || baseType instanceof Type_1.TupleType) {
-            const arrayInterface = scene.getSdkGlobal(Builtin_1.Builtin.ARRAY);
+            const arrayInterface = SdkUtils_1.SdkUtils.getSdkGlobal(Builtin_1.Builtin.ARRAY);
             const realTypes = baseType instanceof Type_1.ArrayType ? [baseType.getBaseType()] : undefined;
             if (arrayInterface instanceof ArkClass_1.ArkClass) {
                 baseType = new Type_1.ClassType(arrayInterface.getSignature(), realTypes);
@@ -345,7 +350,8 @@ let InstanceInvokeExprInference = InstanceInvokeExprInference_1 = class Instance
         else if (baseType instanceof Type_1.AnnotationNamespaceType) {
             const namespace = scene.getNamespace(baseType.getNamespaceSignature());
             if (namespace) {
-                const foundMethod = ModelUtils_1.ModelUtils.findPropertyInNamespace(methodName, namespace);
+                // 多实体探测：跨文件同名 ns（Intl 系）的后续文件实体持有该文件声明的成员
+                const foundMethod = ModelUtils_1.ModelUtils.findPropertyInNamespaces(methodName, namespace);
                 if (foundMethod instanceof ArkMethod_1.ArkMethod) {
                     let signature = foundMethod.matchMethodSignature(expr.getArgs());
                     TypeInference_1.TypeInference.inferSignatureReturnType(signature, foundMethod);
@@ -391,12 +397,21 @@ let StaticInvokeExprInference = class StaticInvokeExprInference extends Instance
             }
             return undefined;
         }
-        const baseType = this.getBaseType(expr, arkMethod);
-        const result = baseType ? IRInference_1.IRInference.inferInstanceMember(baseType, expr, arkMethod, InstanceInvokeExprInference.inferInvokeExpr) :
-            (arkMethod.getDeclaringArkFile().getLanguage() === ArkFile_1.Language.CXX ?
-                IRInference_2.IRInference.inferStaticInvokeExprByMethodName(methodName, arkMethod, expr) :
-                IRInference_1.IRInference.inferStaticInvokeExprByMethodName(methodName, arkMethod, expr));
-        return !result || result === expr ? undefined : result;
+        // Multi-candidate probing: same-name global entities are probed in order until the invoke resolves;
+        // the by-name fallback chain runs only when no candidate exists at all.
+        const baseTypes = this.getBaseTypes(expr, arkMethod);
+        if (baseTypes.length > 0) {
+            for (const baseType of baseTypes) {
+                const result = IRInference_1.IRInference.inferInstanceMember(baseType, expr, arkMethod, InstanceInvokeExprInference.inferInvokeExpr);
+                if (result) {
+                    return result === expr ? undefined : result;
+                }
+            }
+            return undefined;
+        }
+        return arkMethod.getDeclaringArkFile().getLanguage() === ArkFile_1.Language.CXX
+            ? IRInference_2.IRInference.inferStaticInvokeExprByMethodName(methodName, arkMethod, expr)
+            : IRInference_1.IRInference.inferStaticInvokeExprByMethodName(methodName, arkMethod, expr);
     }
     getBaseType(expr, arkMethod) {
         const className = expr.getMethodSignature().getDeclaringClassSignature().getClassName();
@@ -405,6 +420,14 @@ let StaticInvokeExprInference = class StaticInvokeExprInference extends Instance
         }
         return null;
     }
+    /** Multi-candidate variant of {@link getBaseType} (same-name global entities expanded). */
+    getBaseTypes(expr, arkMethod) {
+        const className = expr.getMethodSignature().getDeclaringClassSignature().getClassName();
+        if (className && className !== Const_1.UNKNOWN_CLASS_NAME) {
+            return TypeInference_1.TypeInference.inferBaseTypes(className, arkMethod.getDeclaringArkClass());
+        }
+        return [];
+    }
 };
 StaticInvokeExprInference = __decorate([
     Bind()
@@ -457,12 +480,20 @@ let ArkNewExprInference = class ArkNewExprInference extends ValueInference {
         return IRInference_1.IRInference.needInfer(value.getClassType().getClassSignature().getDeclaringFileSignature());
     }
     infer(value, stmt) {
-        var _a;
+        var _a, _b, _c;
         const className = value.getClassType().getClassSignature().getClassName();
         const arkMethod = stmt.getCfg().getDeclaringMethod();
-        let type = (_a = ModelUtils_1.ModelUtils.findDeclaredLocal(new Local_1.Local(className), arkMethod, 1)) === null || _a === void 0 ? void 0 : _a.getType();
+        let type = ModelUtils_1.ModelUtils.findDeclaredLocalType(className, arkMethod, 1);
+        if (TypeInference_1.TypeInference.isUnclearType(type)) {
+            // Deterministic local-class resolution along the method scope chain before
+            // the file-level fuzzy name search.
+            const localClass = ModelUtils_1.ModelUtils.findLocalClassInMethodChain(className, arkMethod);
+            if (localClass) {
+                type = new Type_1.ClassType(localClass.getSignature());
+            }
+        }
         if (TypeInference_1.TypeInference.isUnclearType(type)) {
-            type = TypeInference_1.TypeInference.inferUnclearRefName(className, arkMethod.getDeclaringArkClass());
+            type = TypeInference_1.TypeInference.inferUnclearRefName(className, arkMethod.getDeclaringArkClass(), arkMethod);
         }
         if (type instanceof Type_1.AliasType) {
             const originType = TypeInference_1.TypeInference.replaceAliasType(type);
@@ -473,10 +504,27 @@ let ArkNewExprInference = class ArkNewExprInference extends ValueInference {
                 type = originType;
             }
         }
-        if (type && type instanceof Type_1.ClassType) {
-            value.getClassType().setClassSignature(type.getClassSignature());
-            TypeInference_1.TypeInference.inferRealGenericTypes(value.getClassType().getRealGenericTypes(), arkMethod.getDeclaringArkClass());
+        if (!(type instanceof Type_1.ClassType)) {
+            return undefined;
+        }
+        // 构造器对象升级：type 解析为构造器持有类（ns 内 declare const 的 %AC 字面量类——如 Intl.NumberFormat，或顶层 Constructor interface）时，
+        // `new` 的实例类型 = construct-signature（或 call）返回类型——对齐 Expr.ArkNewExpr.inferType 的 constructorSignature 升级链。
+        // 顶层场景原靠后续赋值传播兜底（%0 初始 unclear 可覆盖）；
+        // ns 内 %AC 场景类型构建期已明确，narrowing 哲学下传播不覆盖，必须在此显式升级。
+        const scene = arkMethod.getDeclaringArkFile().getScene();
+        let instanceType = type;
+        const typeClass = scene.getClass(type.getClassSignature());
+        if (typeClass) {
+            const ctorReturn = (_b = (_a = typeClass.getMethodWithName(Const_1.CONSTRUCT_SIGNATURE_NAME)) === null || _a === void 0 ? void 0 : _a.getReturnType()) !== null && _b !== void 0 ? _b : (_c = typeClass.getMethodWithName(Const_1.CALL_SIGNATURE_NAME)) === null || _c === void 0 ? void 0 : _c.getReturnType();
+            if (ctorReturn) {
+                const replaced = TypeInference_1.TypeInference.replaceAliasType(ctorReturn);
+                if (replaced instanceof Type_1.ClassType) {
+                    instanceType = replaced;
+                }
+            }
         }
+        value.getClassType().setClassSignature(instanceType.getClassSignature());
+        TypeInference_1.TypeInference.inferRealGenericTypes(value.getClassType().getRealGenericTypes(), arkMethod.getDeclaringArkClass());
         return undefined;
     }
 };
@@ -645,12 +693,14 @@ let LocalInference = class LocalInference extends ValueInference {
         return 'Local';
     }
     preInfer(value) {
-        return TypeInference_1.TypeInference.isUnclearType(value.getType());
+        const type = value.getType();
+        return TypeInference_1.TypeInference.isUnclearType(type) || type instanceof Type_1.UndefinedType || type instanceof Type_1.NullType;
     }
     infer(value, stmt) {
-        var _a, _b;
+        var _a;
         const name = value.getName();
-        const arkClass = stmt.getCfg().getDeclaringMethod().getDeclaringArkClass();
+        const arkMethod = stmt.getCfg().getDeclaringMethod();
+        const arkClass = arkMethod.getDeclaringArkClass();
         // Special handling for 'this' reference - set to current class type
         if (name === TSConst_1.THIS_NAME) {
             value.setType(new Type_1.ClassType(arkClass.getSignature(), arkClass.getRealTypes()));
@@ -659,7 +709,7 @@ let LocalInference = class LocalInference extends ValueInference {
         let newType;
         // Skip temporary variables (those with name prefix) and look for declared locals
         if (!name.startsWith(Const_1.NAME_PREFIX)) {
-            newType = (_b = (_a = ModelUtils_1.ModelUtils.findDeclaredLocal(value, stmt.getCfg().getDeclaringMethod(), 1)) === null || _a === void 0 ? void 0 : _a.getType()) !== null && _b !== void 0 ? _b : TypeInference_1.TypeInference.inferBaseType(name, arkClass);
+            newType = (_a = ModelUtils_1.ModelUtils.findDeclaredLocalType(name, arkMethod, 1)) !== null && _a !== void 0 ? _a : TypeInference_1.TypeInference.inferBaseType(name, arkClass);
         }
         if (newType) {
             value.setType(newType);

package/lib/core/inference/abc/AbcInference.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AbcInference.d.ts","sourceRoot":"","sources":["../../../../src/core/inference/abc/AbcInference.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAGxF,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAQlD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,OAAO,EAAQ,iBAAiB,EAAiB,2BAA2B,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxH,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAEvC,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAGzC,OAAO,EAEH,qBAAqB,EACrB,mBAAmB,EAGtB,MAAM,gBAAgB,CAAC;AAIxB,OAAO,EAAsB,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AA+B5E,qBAAa,kBAAmB,SAAQ,eAAe;IAE5C,QAAQ,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI;IAQ3C,OAAO,CAAC,kCAAkC;CA8B7C;AA6ED,qBAAa,mBAAoB,SAAQ,gBAAgB;IAE9C,wBAAwB,IAAI,mBAAmB;IAI/C,oBAAoB,IAAI,eAAe;IAIvC,kBAAkB,IAAI,aAAa;CAK7C;AAED,qBACa,oBAAqB,SAAQ,iBAAiB;IAChD,YAAY,IAAI,MAAM;IAItB,QAAQ,CAAC,KAAK,EAAE,mBAAmB,EAAE,IAAI,EAAE,IAAI,GAAG,OAAO;IAgBzD,KAAK,CAAC,KAAK,EAAE,mBAAmB,EAAE,IAAI,EAAE,IAAI,GAAG,KAAK,GAAG,SAAS;CAmB1E;AAED,qBACa,8BAA+B,SAAQ,2BAA2B;IAC3E,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAa;IAE5C;;;;;;OAMG;IACI,KAAK,CAAC,KAAK,EAAE,qBAAqB,EAAE,IAAI,EAAE,IAAI,GAAG,KAAK,GAAG,SAAS;IASzE;;;;OAIG;IACH,OAAO,CAAC,iBAAiB;CAc5B;AAED,qBACa,wBAAyB,SAAQ,cAAc,CAAC,qBAAqB,CAAC;IAC/E,OAAO,CAAC,MAAM,CAAC,UAAU,CAA0B;IAE5C,YAAY,IAAI,MAAM;IAItB,QAAQ,CAAC,KAAK,EAAE,qBAAqB,EAAE,IAAI,EAAE,IAAI,GAAG,OAAO;IAI3D,KAAK,CAAC,KAAK,EAAE,qBAAqB,EAAE,IAAI,EAAE,IAAI,GAAG,KAAK,GAAG,SAAS;CAa5E"}
+{"version":3,"file":"AbcInference.d.ts","sourceRoot":"","sources":["../../../../src/core/inference/abc/AbcInference.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAGxF,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAElD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,OAAO,EAAQ,iBAAiB,EAAiB,2BAA2B,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxH,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAEvC,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAGzC,OAAO,EAAoB,qBAAqB,EAAE,mBAAmB,EAA8B,MAAM,gBAAgB,CAAC;AAI1H,OAAO,EAAsB,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AA6B5E,qBAAa,kBAAmB,SAAQ,eAAe;IAC5C,QAAQ,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI;IAO3C,OAAO,CAAC,kCAAkC;CA8B7C;AA4ED,qBAAa,mBAAoB,SAAQ,gBAAgB;IAC9C,wBAAwB,IAAI,mBAAmB;IAI/C,oBAAoB,IAAI,eAAe;IAIvC,kBAAkB,IAAI,aAAa;CAK7C;AAED,qBACa,oBAAqB,SAAQ,iBAAiB;IAChD,YAAY,IAAI,MAAM;IAItB,QAAQ,CAAC,KAAK,EAAE,mBAAmB,EAAE,IAAI,EAAE,IAAI,GAAG,OAAO;IAgBzD,KAAK,CAAC,KAAK,EAAE,mBAAmB,EAAE,IAAI,EAAE,IAAI,GAAG,KAAK,GAAG,SAAS;CAmB1E;AAED,qBACa,8BAA+B,SAAQ,2BAA2B;IAC3E,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAa;IAE5C;;;;;;OAMG;IACI,KAAK,CAAC,KAAK,EAAE,qBAAqB,EAAE,IAAI,EAAE,IAAI,GAAG,KAAK,GAAG,SAAS;IASzE;;;;OAIG;IACH,OAAO,CAAC,iBAAiB;CAkB5B;AAED,qBACa,wBAAyB,SAAQ,cAAc,CAAC,qBAAqB,CAAC;IAC/E,OAAO,CAAC,MAAM,CAAC,UAAU,CAA0B;IAE5C,YAAY,IAAI,MAAM;IAItB,QAAQ,CAAC,KAAK,EAAE,qBAAqB,EAAE,IAAI,EAAE,IAAI,GAAG,OAAO;IAI3D,KAAK,CAAC,KAAK,EAAE,qBAAqB,EAAE,IAAI,EAAE,IAAI,GAAG,KAAK,GAAG,SAAS;CA4B5E"}

package/lib/core/inference/abc/AbcInference.js

@@ -168,8 +168,8 @@ class AbcStmtInference extends ModelInference_1.StmtInference {
                 target.setType(srcType);
                 return target.getUsedStmts();
             }
-            else if (target instanceof Ref_1.AbstractFieldRef && projectName === target.getFieldSignature().getDeclaringSignature()
-                .getDeclaringFileSignature().getProjectName()) {
+            else if (target instanceof Ref_1.AbstractFieldRef &&
+                projectName === target.getFieldSignature().getDeclaringSignature().getDeclaringFileSignature().getProjectName()) {
                 target.getFieldSignature().setType(srcType);
             }
             else if (target instanceof Ref_1.ArkParameterRef) {
@@ -220,12 +220,12 @@ let AbcFieldRefInference = class AbcFieldRefInference extends ValueInference_1.F
             if (signature instanceof ArkSignature_1.ClassSignature && signature.getDeclaringFileSignature().getProjectName() === scene.getProjectName()) {
                 const cls = scene.getClass(signature);
                 if (cls) {
-                    const field = new ArkField_1.ArkField();
-                    field.setDeclaringArkClass(cls);
-                    const fieldSignature = new ArkSignature_1.FieldSignature(value.getFieldSignature().getFieldName(), cls.getSignature(), Type_1.UnknownType.getInstance());
+                    const field = new ArkField_1.ArkField(cls.getClassSigID());
+                    const fieldSignature = new ArkSignature_1.FieldSignature(value.getFieldSignature().getFieldName(), cls.getClassSigID(), Type_1.UnknownType.getInstance());
                     field.setSignature(fieldSignature);
                     cls.addField(field);
-                    value.setFieldSignature(fieldSignature);
+                    // 终点确定，graduateToFormal 直达。
+                    value.graduateToFormal(field.getFieldSigID());
                 }
             }
         }
@@ -260,7 +260,7 @@ let AbcInstanceInvokeExprInference = AbcInstanceInvokeExprInference_1 = class Ab
         var _a, _b;
         if (value.getBase().getName() === AbcInstanceInvokeExprInference_1.CONTEXT) {
             const scene = arkMethod.getDeclaringArkFile().getScene();
-            const signature = (_a = scene.getSdkGlobal(AbcInstanceInvokeExprInference_1.CONTEXT)) === null || _a === void 0 ? void 0 : _a.getSignature();
+            const signature = (_a = SdkUtils_1.SdkUtils.getSdkGlobal(AbcInstanceInvokeExprInference_1.CONTEXT)) === null || _a === void 0 ? void 0 : _a.getSignature();
             if (signature instanceof ArkSignature_1.AliasTypeSignature) {
                 const cls = (_b = scene.getMethod(signature.getDeclaringMethodSignature())) === null || _b === void 0 ? void 0 : _b.getDeclaringArkClass();
                 if (cls) {
@@ -284,16 +284,29 @@ let AbcExceptionRefInference = AbcExceptionRefInference_1 = class AbcExceptionRe
         return TypeInference_1.TypeInference.isUnclearType(value.getType());
     }
     infer(value, stmt) {
-        var _a;
-        if (!AbcExceptionRefInference_1.ERROR_TYPE) {
-            const scene = stmt.getCfg().getDeclaringMethod().getDeclaringArkFile().getScene();
-            const err = (_a = scene.getSdkArkFiles().find(e => e.getName().endsWith(EtsConst_1.OHOS_BASE_FILE))) === null || _a === void 0 ? void 0 : _a.getClassWithName(EtsConst_1.BUSINESS_ERROR);
-            if (err instanceof ArkClass_1.ArkClass) {
-                AbcExceptionRefInference_1.ERROR_TYPE = new Type_1.ClassType(err.getSignature(), err.getGenericsTypes());
-                value.setType(AbcExceptionRefInference_1.ERROR_TYPE);
+        if (AbcExceptionRefInference_1.ERROR_TYPE) {
+            value.setType(AbcExceptionRefInference_1.ERROR_TYPE);
+            return undefined;
+        }
+        const scene = stmt.getCfg().getDeclaringMethod().getDeclaringArkFile().getScene();
+        const errFile = scene.getSdkArkFiles().find(e => e.getName().endsWith(EtsConst_1.OHOS_BASE_FILE));
+        if (!errFile) {
+            return undefined;
+        }
+        // 签名直查：file 顶层 → 各 namespace（与 getClassWithName 的递归顺序一致），
+        // 免线性扫描与前缀模糊匹配
+        let err = null;
+        err = errFile.getClass(new ArkSignature_1.ClassSignature(EtsConst_1.BUSINESS_ERROR, errFile.getFileSigID()));
+        if (!err) {
+            for (const ns of errFile.getAllNamespacesUnderThisFile()) {
+                err = ns.getClass(new ArkSignature_1.ClassSignature(EtsConst_1.BUSINESS_ERROR, ns.getDeclaringFileID(), ns.getNamespaceSigID()));
+                if (err) {
+                    break;
+                }
             }
         }
-        else {
+        if (err instanceof ArkClass_1.ArkClass) {
+            AbcExceptionRefInference_1.ERROR_TYPE = new Type_1.ClassType(err.getSignature(), err.getGenericsTypes());
             value.setType(AbcExceptionRefInference_1.ERROR_TYPE);
         }
         return undefined;

package/lib/core/inference/arkts/ArkTsInference.d.ts

@@ -10,7 +10,7 @@ import { Local } from '../../base/Local';
 import { AliasTypeExpr, ArkInstanceInvokeExpr } from '../../base/Expr';
 export declare class ArkTsStmtInference extends StmtInference {
     constructor(valueInferences: ValueInference<Value>[]);
-    typeSpread(stmt: Stmt, method: ArkMethod): Set<Stmt>;
+    typeSpread(stmt: Stmt, method: ArkMethod): Stmt[] | undefined;
     transferRight2Left(leftOp: Value, rightType: Type, method: ArkMethod): Stmt[] | undefined;
     static updateUnionType(target: Value, srcType: Type, method: ArkMethod): Stmt[] | undefined;
     static updateGlobalRef(ref: Value | null, srcType: Type): Stmt[] | undefined;
@@ -32,10 +32,16 @@ export declare class ArkTSFieldRefInference extends FieldRefInference {
     preInfer(value: ArkInstanceFieldRef, stmt: Stmt): boolean;
     /**
      * Checks if a value represents an anonymous class 'this' field reference
-     * Identifies field references that access fields directly on 'this' in anonymous class constructors
+     * Identifies field references that access fields directly on 'this' in the AC's
+     * %instInit — the carrier of field-initializer expressions, where `this` lexically
+     * means the ENCLOSING this (rebound to the host class by inferThisLocal), so def-side
+     * member resolution against the AC would only degrade. The AC's own constructors keep
+     * the build-time this (ClassType(AC), see the this-semantic guards in
+     * ArkTSLocalInference.infer / IRInference.inferBase) and their def-side resolution
+     * must NOT be skipped — skipping it left build-time probe stubs permanently uncorrected.
      * @param {Value} stmtDef - The value to check (typically a field reference)
      * @param {ArkMethod} arkMethod - The method containing the value
-     * @returns {boolean} True if the value is an anonymous class 'this' field reference
+     * @returns {boolean} True if the value is an anonymous class %instInit 'this' field reference
      */
     private isAnonClassThisRef;
 }

package/lib/core/inference/arkts/ArkTsInference.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ArkTsInference.d.ts","sourceRoot":"","sources":["../../../../src/core/inference/arkts/ArkTsInference.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAKxG,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAElD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAEH,iBAAiB,EAEjB,2BAA2B,EAC3B,cAAc,EACd,cAAc,EACjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAA0B,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAiD,IAAI,EAAE,MAAM,iBAAiB,CAAC;AACtF,OAAO,EAAoB,mBAAmB,EAA8B,MAAM,gBAAgB,CAAC;AACnG,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAIzC,OAAO,EAAsB,aAAa,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AA+C3F,qBAAa,kBAAmB,SAAQ,aAAa;gBAErC,eAAe,EAAE,cAAc,CAAC,KAAK,CAAC,EAAE;IAI7C,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,GAAG,GAAG,CAAC,IAAI,CAAC;IAUpD,kBAAkB,CAAC,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,GAAG,IAAI,EAAE,GAAG,SAAS;WAclF,eAAe,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,GAAG,IAAI,EAAE,GAAG,SAAS;WAiBpF,eAAe,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,EAAE,OAAO,EAAE,IAAI,GAAG,IAAI,EAAE,GAAG,SAAS;CActF;AAGD,qBAAa,qBAAsB,SAAQ,gBAAgB;IAEhD,wBAAwB,IAAI,mBAAmB;IAI/C,mBAAmB,IAAI,cAAc;IAIrC,oBAAoB,IAAI,eAAe;IAIvC,kBAAkB,IAAI,aAAa;CAK7C;AAED,qBAAa,sBAAuB,SAAQ,qBAAqB;CAEhE;AAED,qBAAa,kBAAmB,SAAQ,gBAAgB;IAE7C,wBAAwB,IAAI,mBAAmB;IAI/C,oBAAoB,IAAI,eAAe;IAIvC,kBAAkB,IAAI,aAAa;CAI7C;AAGD,qBACa,sBAAuB,SAAQ,iBAAiB;IAClD,QAAQ,CAAC,KAAK,EAAE,mBAAmB,EAAE,IAAI,EAAE,IAAI,GAAG,OAAO;IAOhE;;;;;;OAMG;IACH,OAAO,CAAC,kBAAkB;CAO7B;AAGD,qBACa,gCAAiC,SAAQ,2BAA2B;IAC7E;;;;;;OAMG;IACI,KAAK,CAAC,KAAK,EAAE,qBAAqB,EAAE,IAAI,EAAE,IAAI,GAAG,KAAK,GAAG,SAAS;IAUzE;;;;;OAKG;IACH,OAAO,CAAC,iBAAiB;CAS5B;AAGD,qBACa,sBAAuB,SAAQ,cAAc,CAAC,aAAa,CAAC;IAC9D,YAAY,IAAI,MAAM;IAItB,QAAQ,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO;IAIvC,KAAK,CAAC,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,IAAI,GAAG,KAAK,GAAG,SAAS;CAwCpE;AAGD,qBACa,mBAAoB,SAAQ,cAAc;IAC5C,YAAY,IAAI,MAAM;IAItB,QAAQ,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO;IAW/B,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,GAAG,KAAK,GAAG,SAAS;IA0BzD,OAAO,CAAC,YAAY;CASvB"}
+{"version":3,"file":"ArkTsInference.d.ts","sourceRoot":"","sources":["../../../../src/core/inference/arkts/ArkTsInference.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAKxG,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAElD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAQ,iBAAiB,EAAiB,2BAA2B,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxI,OAAO,EAA0B,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAA2D,IAAI,EAAiB,MAAM,iBAAiB,CAAC;AAC/G,OAAO,EAAoB,mBAAmB,EAA8B,MAAM,gBAAgB,CAAC;AACnG,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAKzC,OAAO,EAAsB,aAAa,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAmD3F,qBAAa,kBAAmB,SAAQ,aAAa;gBACrC,eAAe,EAAE,cAAc,CAAC,KAAK,CAAC,EAAE;IAI7C,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,GAAG,IAAI,EAAE,GAAG,SAAS;IAU7D,kBAAkB,CAAC,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,GAAG,IAAI,EAAE,GAAG,SAAS;WAwBlF,eAAe,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,GAAG,IAAI,EAAE,GAAG,SAAS;WAiBpF,eAAe,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,EAAE,OAAO,EAAE,IAAI,GAAG,IAAI,EAAE,GAAG,SAAS;CAatF;AAED,qBAAa,qBAAsB,SAAQ,gBAAgB;IAChD,wBAAwB,IAAI,mBAAmB;IAI/C,mBAAmB,IAAI,cAAc;IAIrC,oBAAoB,IAAI,eAAe;IAIvC,kBAAkB,IAAI,aAAa;CAK7C;AAED,qBAAa,sBAAuB,SAAQ,qBAAqB;CAAG;AAEpE,qBAAa,kBAAmB,SAAQ,gBAAgB;IAC7C,wBAAwB,IAAI,mBAAmB;IAI/C,oBAAoB,IAAI,eAAe;IAIvC,kBAAkB,IAAI,aAAa;CAI7C;AAED,qBACa,sBAAuB,SAAQ,iBAAiB;IAClD,QAAQ,CAAC,KAAK,EAAE,mBAAmB,EAAE,IAAI,EAAE,IAAI,GAAG,OAAO;IAOhE;;;;;;;;;;;;OAYG;IACH,OAAO,CAAC,kBAAkB;CAS7B;AAED,qBACa,gCAAiC,SAAQ,2BAA2B;IAC7E;;;;;;OAMG;IACI,KAAK,CAAC,KAAK,EAAE,qBAAqB,EAAE,IAAI,EAAE,IAAI,GAAG,KAAK,GAAG,SAAS;IAUzE;;;;;OAKG;IACH,OAAO,CAAC,iBAAiB;CAS5B;AAED,qBACa,sBAAuB,SAAQ,cAAc,CAAC,aAAa,CAAC;IAC9D,YAAY,IAAI,MAAM;IAItB,QAAQ,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO;IAIvC,KAAK,CAAC,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,IAAI,GAAG,KAAK,GAAG,SAAS;CAwCpE;AAED,qBACa,mBAAoB,SAAQ,cAAc;IAC5C,YAAY,IAAI,MAAM;IAItB,QAAQ,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO;IAU/B,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,GAAG,KAAK,GAAG,SAAS;IA4CzD,OAAO,CAAC,YAAY;CASvB"}

package/lib/core/inference/arkts/ArkTsInference.js

@@ -52,7 +52,8 @@ class ArkTsClassInference extends ModelInference_1.ClassInference {
     preInfer(arkClass) {
         super.preInfer(arkClass);
         TypeInference_1.TypeInference.inferGenericType(arkClass.getGenericsTypes(), arkClass);
-        arkClass.getFields()
+        arkClass
+            .getFields()
             .filter(p => TypeInference_1.TypeInference.isUnclearType(p.getType()))
             .forEach(f => {
             const newType = TypeInference_1.TypeInference.inferUnclearedType(f.getType(), arkClass);
@@ -73,10 +74,13 @@ class ArkTsMethodInference extends ModelInference_1.MethodInference {
         }
     }
     inferMethodSignature(ms, arkMethod) {
-        ms.getMethodSubSignature().getParameters().forEach(p => TypeInference_1.TypeInference.inferParameterType(p, arkMethod));
+        ms.getMethodSubSignature()
+            .getParameters()
+            .forEach(p => TypeInference_1.TypeInference.inferParameterType(p, arkMethod));
         TypeInference_1.TypeInference.inferSignatureReturnType(ms, arkMethod);
     }
 }
+const IS_GENERIC_OR_ANY = (t) => t instanceof Type_1.GenericType || t instanceof Type_1.AnyType;
 class ArkTsStmtInference extends ModelInference_1.StmtInference {
     constructor(valueInferences) {
         super(valueInferences);
@@ -91,10 +95,20 @@ class ArkTsStmtInference extends ModelInference_1.StmtInference {
         return super.typeSpread(stmt, method);
     }
     transferRight2Left(leftOp, rightType, method) {
-        const projectName = method.getDeclaringArkFile().getProjectName();
-        if (!TypeInference_1.TypeInference.isUnclearType(rightType) || rightType instanceof Type_1.GenericType || TypeInference_1.TypeInference.isDummyClassType(rightType)) {
+        // An unclear ClassType with fully-resolved real type args still carries information
+        // (e.g. IterableIterator<number> stubs) and should propagate to the left operand.
+        const realArgs = rightType instanceof Type_1.ClassType ? rightType.getRealGenericTypes() : undefined;
+        let isUnclearWithRealArgs = false;
+        for (let i = 0; realArgs !== undefined && i < realArgs.length; i++) {
+            if (!(realArgs[i] instanceof Type_1.GenericType)) {
+                isUnclearWithRealArgs = true;
+                break;
+            }
+        }
+        const isPlaceholderRight = rightType instanceof Type_1.NullType || rightType instanceof Type_1.UndefinedType;
+        if ((!TypeInference_1.TypeInference.isUnclearType(rightType) && !isPlaceholderRight) || rightType instanceof Type_1.GenericType || isUnclearWithRealArgs) {
             let leftType = leftOp.getType();
-            if (TypeInference_1.TypeInference.isTypeCanBeOverride(leftType) || TypeInference_1.TypeInference.isAnonType(leftType, projectName)) {
+            if (TypeInference_1.TypeInference.isTypeCanBeOverride(leftType) || TypeInference_1.TypeInference.isAnonType(leftType, method.getDeclaringArkFile().getProjectName())) {
                 leftType = rightType;
             }
             if (leftOp.getType() !== leftType) {
@@ -179,17 +193,23 @@ let ArkTSFieldRefInference = class ArkTSFieldRefInference extends ValueInference
     }
     /**
      * Checks if a value represents an anonymous class 'this' field reference
-     * Identifies field references that access fields directly on 'this' in anonymous class constructors
+     * Identifies field references that access fields directly on 'this' in the AC's
+     * %instInit — the carrier of field-initializer expressions, where `this` lexically
+     * means the ENCLOSING this (rebound to the host class by inferThisLocal), so def-side
+     * member resolution against the AC would only degrade. The AC's own constructors keep
+     * the build-time this (ClassType(AC), see the this-semantic guards in
+     * ArkTSLocalInference.infer / IRInference.inferBase) and their def-side resolution
+     * must NOT be skipped — skipping it left build-time probe stubs permanently uncorrected.
      * @param {Value} stmtDef - The value to check (typically a field reference)
      * @param {ArkMethod} arkMethod - The method containing the value
-     * @returns {boolean} True if the value is an anonymous class 'this' field reference
+     * @returns {boolean} True if the value is an anonymous class %instInit 'this' field reference
      */
     isAnonClassThisRef(stmtDef, arkMethod) {
-        return (arkMethod.getName() === Const_1.INSTANCE_INIT_METHOD_NAME || arkMethod.getName() === TSConst_1.CONSTRUCTOR_NAME) &&
+        return (arkMethod.getName() === Const_1.INSTANCE_INIT_METHOD_NAME &&
             stmtDef instanceof Ref_1.ArkInstanceFieldRef &&
             stmtDef.getBase().getName() === TSConst_1.THIS_NAME &&
             arkMethod.getDeclaringArkClass().isAnonymousClass() &&
-            stmtDef.getFieldName().indexOf('.') === -1;
+            stmtDef.getFieldName().indexOf('.') === -1);
     }
 };
 ArkTSFieldRefInference = __decorate([
@@ -272,7 +292,7 @@ let AliasTypeExprInference = class AliasTypeExprInference extends ValueInference
         }
         if (type) {
             const realGenericTypes = value.getRealGenericTypes();
-            if (TypeInference_1.TypeInference.checkType(type, t => t instanceof Type_1.GenericType || t instanceof Type_1.AnyType) && realGenericTypes && realGenericTypes.length > 0) {
+            if (TypeInference_1.TypeInference.checkType(type, IS_GENERIC_OR_ANY) && realGenericTypes && realGenericTypes.length > 0) {
                 TypeInference_1.TypeInference.inferRealGenericTypes(realGenericTypes, arkMethod.getDeclaringArkClass());
                 type = TypeInference_1.TypeInference.replaceTypeWithReal(type, realGenericTypes);
             }
@@ -294,8 +314,7 @@ let ArkTSLocalInference = class ArkTSLocalInference extends ValueInference_1.Loc
     }
     preInfer(value) {
         const type = value.getType();
-        if (value.getName() === TSConst_1.THIS_NAME && type instanceof Type_1.ClassType &&
-            type.getClassSignature().getClassName().startsWith(Const_1.ANONYMOUS_CLASS_PREFIX)) {
+        if (value.getName() === TSConst_1.THIS_NAME && type instanceof Type_1.ClassType && type.getClassSignature().getClassName().startsWith(Const_1.ANONYMOUS_CLASS_PREFIX)) {
             return true;
         }
         else if (type instanceof Type_1.FunctionType) {
@@ -310,15 +329,34 @@ let ArkTSLocalInference = class ArkTSLocalInference extends ValueInference_1.Loc
         const arkMethod = stmt.getCfg().getDeclaringMethod();
         let newType;
         if (name === TSConst_1.THIS_NAME) {
-            newType = (_a = IRInference_1.IRInference.inferThisLocal(arkMethod)) === null || _a === void 0 ? void 0 : _a.getType();
-            if (newType) {
-                value.setType(newType);
+            // this-semantic guard: only the AC's %instInit (the carrier of field-initializer
+            // expressions, where `this` lexically means the ENCLOSING this at the object
+            // literal / class expression site — the host class) gets rebound via
+            // inferThisLocal. The AC's own methods (constructor, named method properties)
+            // keep the build-time this (ClassType(AC)) — the instance itself. Rebinding
+            // them to the host class breaks every `this.<memberOfAC>` resolution downstream.
+            const hostMethod = stmt.getCfg().getDeclaringMethod();
+            if (hostMethod.getName() === Const_1.INSTANCE_INIT_METHOD_NAME && hostMethod.getDeclaringArkClass().isAnonymousClass()) {
+                newType = (_a = IRInference_1.IRInference.inferThisLocal(hostMethod)) === null || _a === void 0 ? void 0 : _a.getType();
+                if (newType) {
+                    value.setType(newType);
+                }
+            }
+            return undefined;
+        }
+        else if (name === TSConst_1.SUPER_NAME) {
+            const superType = TypeInference_1.TypeInference.inferBaseType(TSConst_1.SUPER_NAME, arkMethod.getDeclaringArkClass());
+            if (superType) {
+                value.setType(superType);
             }
             return undefined;
         }
         else if (type instanceof Type_1.FunctionType) {
             const methodSignature = type.getMethodSignature();
-            methodSignature.getMethodSubSignature().getParameters().forEach(p => TypeInference_1.TypeInference.inferParameterType(p, arkMethod));
+            const parameters = methodSignature.getMethodSubSignature().getParameters();
+            for (let i = 0; i < parameters.length; i++) {
+                TypeInference_1.TypeInference.inferParameterType(parameters[i], arkMethod);
+            }
             TypeInference_1.TypeInference.inferSignatureReturnType(methodSignature, arkMethod);
             return undefined;
         }