arkanalyzer 1.0.94 → 2.0.0-beta1

package/lib/core/base/TypeExpr.js

@@ -70,21 +70,39 @@ class TypeQueryExpr extends AbstractTypeExpr {
     getGenerateTypes() {
         return this.genericTypes;
     }
+    isUnclearWithVisited(visited) {
+        if (visited.has(this)) {
+            return false;
+        }
+        visited.add(this);
+        if (this.getType().isUnclearWithVisited(visited)) {
+            return true;
+        }
+        const generateTypes = this.getGenerateTypes();
+        if (generateTypes === undefined || generateTypes === null) {
+            return false;
+        }
+        for (let i = 0; i < generateTypes.length; i++) {
+            if (generateTypes[i].isUnclearWithVisited(visited)) {
+                return true;
+            }
+        }
+        return false;
+    }
     addGenericType(gType) {
         if (!this.genericTypes) {
             this.genericTypes = [];
         }
         this.genericTypes.push(gType);
     }
-    getUses() {
+    getUses(acc = []) {
         const opValue = this.getOpValue();
         if (opValue instanceof ArkBaseModel_1.ArkBaseModel) {
-            return [];
+            return acc;
         }
-        let uses = [];
-        uses.push(opValue);
-        uses.push(...opValue.getUses());
-        return uses;
+        acc.push(opValue);
+        opValue.getUses(acc);
+        return acc;
     }
     getType() {
         var _a;
@@ -138,12 +156,18 @@ class KeyofTypeExpr extends AbstractTypeExpr {
     setOpType(opType) {
         this.opType = opType;
     }
-    getUses() {
-        let uses = [];
+    isUnclearWithVisited(visited) {
+        if (visited.has(this)) {
+            return false;
+        }
+        visited.add(this);
+        return this.getOpType().isUnclearWithVisited(visited);
+    }
+    getUses(acc = []) {
         if (this.getOpType() instanceof TypeQueryExpr) {
-            uses.push(...this.getOpType().getUses());
+            this.getOpType().getUses(acc);
         }
-        return uses;
+        return acc;
     }
     getType() {
         return this;

package/lib/core/base/Value.d.ts

@@ -1,4 +1,16 @@
+import type { Stmt } from './Stmt';
 import { Type } from './Type';
+/**
+ * The one shared read-only empty array documented at {@link Value.getUses}. Every implementation
+ * hands back this same instance when it has nothing to report, so callers must never append to it.
+ */
+export declare const EMPTY_USES: Value[];
+/**
+ * The one shared read-only empty array handed back when no using-statement has been recorded, e.g.
+ * by `Local.getUsedStmts` and `GlobalRef.getUsedStmts`. Every value shares this instance, so
+ * callers must never append to it.
+ */
+export declare const EMPTY_USED_STMTS: Stmt[];
 /**
  * @category core/base
  */
@@ -6,9 +18,15 @@ export interface Value {
     /**
      * Return a list of values which are contained in this {@link Value}.
      * Value is a core interface in ArkAnalyzer, which may represent any value or expression.
-     * @returns An **array** of values used by this value.
+     * @param acc - Optional accumulator to append into instead of allocating a fresh array. Threading
+     *              one accumulator through a traversal avoids the transient array per node that a
+     *              recursive concat allocates.
+     * @returns An **array** of values used by this value. When called without `acc` on a value that
+     *          has no uses, implementations hand back one shared process-wide instance so the hot
+     *          accessor stays allocation-free. Treat that array as read-only - appending to it would
+     *          add the element to every other value's uses - and pass your own `acc` to append.
      */
-    getUses(): Value[];
+    getUses(acc?: Value[]): Value[];
     /**
      * Return the type of this value. The interface is encapsulated in {@link Value}.
      * The `Type` is defined in type.ts, such as **Any**, **Unknown**, **TypeParameter**,

package/lib/core/base/Value.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Value.d.ts","sourceRoot":"","sources":["../../../src/core/base/Value.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAE9B;;GAEG;AACH,MAAM,WAAW,KAAK;IAClB;;;;OAIG;IACH,OAAO,IAAI,KAAK,EAAE,CAAC;IAEnB;;;;;;;;;;;;;;;;;;OAkBG;IACH,OAAO,IAAI,IAAI,CAAC;CACnB"}
+{"version":3,"file":"Value.d.ts","sourceRoot":"","sources":["../../../src/core/base/Value.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAE9B;;;GAGG;AACH,eAAO,MAAM,UAAU,EAAE,KAAK,EAAO,CAAC;AAEtC;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,EAAE,IAAI,EAAO,CAAC;AAE3C;;GAEG;AACH,MAAM,WAAW,KAAK;IAClB;;;;;;;;;;OAUG;IACH,OAAO,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE,CAAC;IAEhC;;;;;;;;;;;;;;;;;;OAkBG;IACH,OAAO,IAAI,IAAI,CAAC;CACnB"}

package/lib/core/base/Value.js

@@ -14,3 +14,15 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.EMPTY_USED_STMTS = exports.EMPTY_USES = void 0;
+/**
+ * The one shared read-only empty array documented at {@link Value.getUses}. Every implementation
+ * hands back this same instance when it has nothing to report, so callers must never append to it.
+ */
+exports.EMPTY_USES = [];
+/**
+ * The one shared read-only empty array handed back when no using-statement has been recorded, e.g.
+ * by `Local.getUsedStmts` and `GlobalRef.getUsedStmts`. Every value shares this instance, so
+ * callers must never append to it.
+ */
+exports.EMPTY_USED_STMTS = [];

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

@@ -8,6 +8,9 @@ import { AliasType } from '../base/Type';
 import { ArkMethod } from '../model/ArkMethod';
 import { FullPosition } from '../base/Position';
 import { ArkValueTransformer } from './ArkValueTransformer';
+import { ArkClass } from '../model/ArkClass';
+import { ArkFile } from '../model/ArkFile';
+import { ArkNamespace } from '../model/ArkNamespace';
 export type ValueAndStmts = {
     value: Value;
     valueOriginalPositions: FullPosition[];
@@ -28,10 +31,16 @@ export declare class ArkIRTransformer {
     static readonly DUMMY_IF_OPERATOR_END = "IfEnd";
     protected sourceFile: ts.SourceFile;
     protected declaringMethod: ArkMethod;
+    protected _declaringClass: ArkClass;
+    protected _declaringNamespace?: ArkNamespace;
+    protected _declaringFile: ArkFile;
     protected inBuilderMethod: boolean;
     protected builderMethodContextFlag: boolean;
     protected arkValueTransformer: ArkValueTransformer;
     constructor(sourceFile: ts.SourceFile, declaringMethod: ArkMethod);
+    get declaringClass(): ArkClass;
+    get declaringNamespace(): ArkNamespace | undefined;
+    get declaringFile(): ArkFile;
     getLocals(): Set<Local>;
     getGlobals(): Map<string, GlobalRef> | null;
     getThisLocal(): Local;
@@ -78,6 +87,15 @@ export declare class ArkIRTransformer {
     static tokenToUnaryOperator(token: ts.SyntaxKind): UnaryOperator | null;
     static tokenToBinaryOperator(token: ts.SyntaxKind): BinaryOperator | null;
     generateAssignStmtForValue(value: Value, valueOriginalPositions: FullPosition[]): ValueAndStmts;
+    /**
+     * Appends the temp-variable assignment (when one is needed) directly into `stmts` and
+     * returns the temp local with its position, skipping the ValueAndStmts wrapper and its
+     * single-element stmts array that generateAssignStmtForValue allocates per call.
+     */
+    generateAssignStmtForValueInto(value: Value, valueOriginalPositions: FullPosition[], stmts: Stmt[]): {
+        value: Value;
+        positions: FullPosition[];
+    };
     generateIfStmtForValues(leftValue: Value, leftOpOriginalPositions: FullPosition[], rightValue: Value, rightOpOriginalPositions: FullPosition[]): Stmt[];
     setBuilderMethodContextFlag(builderMethodContextFlag: boolean): void;
 }

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

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

package/lib/core/common/ArkIRTransformer.js

@@ -38,6 +38,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ArkIRTransformer = exports.DummyStmt = void 0;
+const SdkUtils_1 = require("./SdkUtils");
 const Expr_1 = require("../base/Expr");
 const Ref_1 = require("../base/Ref");
 const ts = __importStar(require("ohos-typescript"));
@@ -49,10 +50,10 @@ const ArkSignature_1 = require("../model/ArkSignature");
 const IRUtils_1 = require("./IRUtils");
 const ArkMethod_1 = require("../model/ArkMethod");
 const ArkMethodBuilder_1 = require("../model/builder/ArkMethodBuilder");
-const ArkSignatureBuilder_1 = require("../model/builder/ArkSignatureBuilder");
 const EtsConst_1 = require("./EtsConst");
 const Position_1 = require("../base/Position");
 const ModelUtils_1 = require("./ModelUtils");
+const SignatureCanonicalizerRegistry_1 = require("./SignatureCanonicalizerRegistry");
 const Builtin_1 = require("./Builtin");
 const TSConst_1 = require("./TSConst");
 const builderUtils_1 = require("../model/builder/builderUtils");
@@ -79,9 +80,21 @@ class ArkIRTransformer {
         this.builderMethodContextFlag = false;
         this.sourceFile = sourceFile;
         this.declaringMethod = declaringMethod;
+        this._declaringClass = this.declaringMethod.getDeclaringArkClass();
+        this._declaringNamespace = this._declaringClass.getDeclaringArkNamespace();
+        this._declaringFile = this._declaringClass.getDeclaringArkFile();
         this.inBuilderMethod = ModelUtils_1.ModelUtils.isArkUIBuilderMethod(declaringMethod);
         this.arkValueTransformer = new ArkValueTransformer_1.ArkValueTransformer(this, sourceFile, this.declaringMethod);
     }
+    get declaringClass() {
+        return this._declaringClass;
+    }
+    get declaringNamespace() {
+        return this._declaringNamespace;
+    }
+    get declaringFile() {
+        return this._declaringFile;
+    }
     getLocals() {
         return this.arkValueTransformer.getLocals();
     }
@@ -168,7 +181,7 @@ class ArkIRTransformer {
         }
         this.mapStmtsToTsStmt(stmts, node);
         if (stmts.length > 0) {
-            IRUtils_1.IRUtils.setComments(stmts[0], node, this.sourceFile, this.declaringMethod.getDeclaringArkFile().getScene().getOptions());
+            IRUtils_1.IRUtils.setComments(stmts[0], node, this.sourceFile, this.declaringFile.getScene().getOptions());
         }
         return stmts;
     }
@@ -176,27 +189,30 @@ class ArkIRTransformer {
         return this.arkValueTransformer.tsNodeToValueAndStmts(node);
     }
     functionDeclarationToStmts(functionDeclarationNode) {
-        const declaringClass = this.declaringMethod.getDeclaringArkClass();
-        const arkMethod = new ArkMethod_1.ArkMethod();
+        const arkMethod = new ArkMethod_1.ArkMethod(this.declaringClass.getClassSigID());
         if (this.builderMethodContextFlag) {
             ModelUtils_1.ModelUtils.implicitArkUIBuilderMethods.add(arkMethod);
         }
-        (0, ArkMethodBuilder_1.buildArkMethodFromArkClass)(functionDeclarationNode, declaringClass, arkMethod, this.sourceFile, this.declaringMethod);
+        (0, ArkMethodBuilder_1.buildArkMethodFromArkClass)(functionDeclarationNode, this.declaringClass, arkMethod, this.sourceFile, this.declaringMethod);
         return [];
     }
     classDeclarationToStmts(node) {
-        const cls = new ArkClass_1.ArkClass();
-        const declaringArkNamespace = this.declaringMethod.getDeclaringArkClass().getDeclaringArkNamespace();
-        if (declaringArkNamespace) {
-            cls.setDeclaringArkNamespace(declaringArkNamespace);
-        }
-        cls.setDeclaringArkFile(this.declaringMethod.getDeclaringArkFile());
+        var _a;
+        const cls = new ArkClass_1.ArkClass(this.declaringFile.getFileSigID(), (_a = this.declaringNamespace) === null || _a === void 0 ? void 0 : _a.getNamespaceSigID());
         (0, ArkClassBuilder_1.buildNormalArkClassFromArkMethod)(node, cls, this.sourceFile, this.declaringMethod);
+        // Register the bare source name → ClassSigID binding on the declaring method so that
+        // references (new / type annotation) resolve deterministically along the method scope
+        // chain during inference, instead of relying on file-level fuzzy prefix matching over
+        // the composed name (`Local$Outer-m`). The map key is the bare source name; the class
+        // model itself keeps the composed name.
+        if (node.name) {
+            this.declaringMethod.registerLocalClass((0, StringUtils_1.cloneText)(node.name.text), cls.getClassSigID());
+        }
         return [];
     }
     // This is only used to add class property assign stmts into constructor when it is with parameter property.
     parameterPropertyToStmts(paramNode) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         let stmts = [];
         let fieldName;
         if (ts.isIdentifier(paramNode.name)) {
@@ -216,8 +232,7 @@ class ArkIRTransformer {
         if (paramNode.modifiers === undefined || !ts.isIdentifier(paramNode.name)) {
             return [];
         }
-        const arkClass = this.declaringMethod.getDeclaringArkClass();
-        const fieldSignature = (_a = arkClass.getFieldWithName(fieldName)) === null || _a === void 0 ? void 0 : _a.getSignature();
+        const fieldSignature = (_a = this.declaringClass.getFieldWithName(fieldName)) === null || _a === void 0 ? void 0 : _a.getSignature();
         const paramLocal = Array.from(this.getLocals()).find(local => local.getName() === fieldName);
         if (fieldSignature === undefined || paramLocal === undefined) {
             return [];
@@ -226,8 +241,8 @@ class ArkIRTransformer {
         const fieldAssignStmt = new Stmt_1.ArkAssignStmt(leftOp, paramLocal);
         fieldAssignStmt.setOperandOriginalPositions([Position_1.FullPosition.DEFAULT, Position_1.FullPosition.DEFAULT, Position_1.FullPosition.DEFAULT]);
         // If the parameter has initializer, the related stmts should be added into class instance init method.
-        const instInitMethodCfg = (_b = arkClass.getInstanceInitMethod().getBody()) === null || _b === void 0 ? void 0 : _b.getCfg();
-        const instInitStmts = (_c = instInitMethodCfg === null || instInitMethodCfg === void 0 ? void 0 : instInitMethodCfg.getStartingBlock()) === null || _c === void 0 ? void 0 : _c.getStmts();
+        const instInitMethodCfg = (_c = (_b = this.declaringClass.getInstanceInitMethodOrNull()) === null || _b === void 0 ? void 0 : _b.getBody()) === null || _c === void 0 ? void 0 : _c.getCfg();
+        const instInitStmts = (_d = instInitMethodCfg === null || instInitMethodCfg === void 0 ? void 0 : instInitMethodCfg.getStartingBlock()) === null || _d === void 0 ? void 0 : _d.getStmts();
         if (paramNode.initializer && instInitStmts && instInitMethodCfg) {
             const { value: instanceInitValue, valueOriginalPositions: instanceInitPositions, stmts: instanceInitStmts, } = this.tsNodeToValueAndStmts(paramNode.initializer);
             const instanceAssignStmt = new Stmt_1.ArkAssignStmt(leftOp, instanceInitValue);
@@ -283,14 +298,13 @@ class ArkIRTransformer {
     }
     handleExpressionValueWithTempVarIfNeeded(value, positions, stmts) {
         if (IRUtils_1.IRUtils.moreThanOneAddress(value)) {
-            const { value: tempValue, valueOriginalPositions: tempPositions, stmts: tempStmts } = this.generateAssignStmtForValue(value, positions);
-            tempStmts.forEach(stmt => stmts.push(stmt));
-            return { value: tempValue, positions: tempPositions };
+            return this.generateAssignStmtForValueInto(value, positions, stmts);
         }
         return { value, positions };
     }
     returnStatementToStmts(returnStatement) {
         const stmts = [];
+        let returnType;
         if (returnStatement.expression) {
             let { value: exprValue, valueOriginalPositions: exprPositions, stmts: exprStmts } = this.tsNodeToValueAndStmts(returnStatement.expression);
             exprStmts.forEach(stmt => stmts.push(stmt));
@@ -298,24 +312,24 @@ class ArkIRTransformer {
             const returnStmt = new Stmt_1.ArkReturnStmt(processedValue);
             returnStmt.setOperandOriginalPositions(processedPositions);
             stmts.push(returnStmt);
-            if (this.declaringMethod.getSubSignature().getReturnType() instanceof Type_1.UnknownType) {
-                this.declaringMethod.getSubSignature().setReturnType(processedValue.getType());
-            }
-            return stmts;
+            returnType = processedValue.getType();
         }
-        stmts.push(new Stmt_1.ArkReturnVoidStmt());
-        if (this.declaringMethod.getSubSignature().getReturnType() instanceof Type_1.UnknownType) {
+        else {
+            stmts.push(new Stmt_1.ArkReturnVoidStmt());
+            returnType = Type_1.VoidType.getInstance();
+        }
+        if (!(returnType instanceof Type_1.UnknownType) && this.declaringMethod.getSubSignature().getReturnType() instanceof Type_1.UnknownType) {
             if (this.declaringMethod.containsModifier(ArkBaseModel_1.ModifierType.ASYNC)) {
-                const promise = this.declaringMethod.getDeclaringArkFile().getScene().getSdkGlobal(TSConst_1.PROMISE);
+                const promise = SdkUtils_1.SdkUtils.getSdkGlobal(TSConst_1.PROMISE);
                 if (promise instanceof ArkClass_1.ArkClass) {
-                    this.declaringMethod.getSubSignature().setReturnType(new Type_1.ClassType(promise.getSignature()));
+                    this.declaringMethod.getSubSignature().setReturnType(new Type_1.ClassType(promise.getSignature(), [returnType]));
                 }
                 else {
-                    this.declaringMethod.getSubSignature().setReturnType(new Type_1.UnclearReferenceType(TSConst_1.PROMISE, [Type_1.VoidType.getInstance()]));
+                    this.declaringMethod.getSubSignature().setReturnType(new Type_1.UnclearReferenceType(TSConst_1.PROMISE, [returnType]));
                 }
             }
             else {
-                this.declaringMethod.getSubSignature().setReturnType(Type_1.VoidType.getInstance());
+                this.declaringMethod.getSubSignature().setReturnType(returnType);
             }
         }
         return stmts;
@@ -334,8 +348,7 @@ class ArkIRTransformer {
             this.addInvokeStmts(exprValue, exprPositions, stmts);
         }
         else if (this.shouldGenerateExtraAssignStmt(exprNode)) {
-            const { stmts: exprStmts } = this.generateAssignStmtForValue(exprValue, exprPositions);
-            exprStmts.forEach(stmt => stmts.push(stmt));
+            this.generateAssignStmtForValueInto(exprValue, exprPositions, stmts);
         }
         return stmts;
     }
@@ -348,7 +361,7 @@ class ArkIRTransformer {
             if (stmt instanceof Stmt_1.ArkAssignStmt && stmt.getRightOp() instanceof Expr_1.ArkStaticInvokeExpr) {
                 const rightOp = stmt.getRightOp();
                 if (rightOp.getMethodSignature().getMethodSubSignature().getMethodName() === EtsConst_1.COMPONENT_REPEAT) {
-                    const createMethodSignature = ArkSignatureBuilder_1.ArkSignatureBuilder.buildMethodSignatureFromClassNameAndMethodName(EtsConst_1.COMPONENT_REPEAT, EtsConst_1.COMPONENT_CREATE_FUNCTION);
+                    const createMethodSignature = ModelUtils_1.ModelUtils.getOrCreateComponentMethodSig(EtsConst_1.COMPONENT_REPEAT, EtsConst_1.COMPONENT_CREATE_FUNCTION);
                     const createInvokeExpr = new Expr_1.ArkStaticInvokeExpr(createMethodSignature, rightOp.getArgs());
                     stmt.setRightOp(createInvokeExpr);
                     hasRepeat = true;
@@ -449,7 +462,8 @@ class ArkIRTransformer {
             // 对于type A = {x:1, y:2}语句，当前阶段即可精确获取ClassType类型，需找到对应的ArkClass作为originalObject
             // 对于其他情况此处为UnclearReferenceTye并由类型推导进行查找和处理
             if (rightType instanceof Type_1.ClassType) {
-                const classObject = ModelUtils_1.ModelUtils.getClassWithName(rightType.getClassSignature().getClassName(), this.declaringMethod.getDeclaringArkClass());
+                // TypeLiteral 的 ClassType 唯一生成路径是"构建即 addArkClass 注册、签名即归属"，签名直查必命中，无需按名兜底
+                const classObject = SignatureCanonicalizerRegistry_1.SignatureCanonicalizerRegistry.getInstance().getClassBySig(rightType.getClassSignature());
                 if (classObject) {
                     expr.setOriginalObject(classObject);
                 }
@@ -471,17 +485,19 @@ class ArkIRTransformer {
         }
         let importInfo = new ArkImport_1.ImportInfo();
         importInfo.build(importClauseName, ArkImport_1.ImportType.TYPE_ALIAS_IMPORT, importFrom, Position_1.FullPosition.buildFromNode(importTypeNode, this.sourceFile), 0);
-        importInfo.setDeclaringArkFile(this.declaringMethod.getDeclaringArkFile());
+        importInfo.setDeclaringArkFile(this.declaringFile);
         return new Expr_1.AliasTypeExpr(importInfo, importTypeNode.isTypeOf);
     }
     switchStatementToValueAndStmts(switchStatement) {
         const valueAndStmtsOfSwitchAndCases = [];
-        const exprStmts = [];
-        let { value: exprValue, valueOriginalPositions: exprPositions, stmts: exprTempStmts } = this.tsNodeToValueAndStmts(switchStatement.expression);
-        exprTempStmts.forEach(stmt => exprStmts.push(stmt));
+        const switchExprResult = this.tsNodeToValueAndStmts(switchStatement.expression);
+        const exprStmts = switchExprResult.stmts;
+        let exprValue = switchExprResult.value;
+        let exprPositions = switchExprResult.valueOriginalPositions;
         if (IRUtils_1.IRUtils.moreThanOneAddress(exprValue)) {
-            ({ value: exprValue, valueOriginalPositions: exprPositions, stmts: exprTempStmts } = this.generateAssignStmtForValue(exprValue, exprPositions));
-            exprTempStmts.forEach(stmt => exprStmts.push(stmt));
+            const temp = this.generateAssignStmtForValueInto(exprValue, exprPositions, exprStmts);
+            exprValue = temp.value;
+            exprPositions = temp.positions;
         }
         valueAndStmtsOfSwitchAndCases.push({
             value: exprValue,
@@ -543,20 +559,27 @@ class ArkIRTransformer {
             } = this.generateAssignStmtForValue(iterableValue, iterablePositions));
             iterableStmts.forEach(stmt => stmts.push(stmt));
         }
+        // 教训存档（实证定案，勿再常量化）：iterator/next stub 必须每循环 new 独立实例。共享实例（常量化）的断点在 ValueInference.preInfer 守卫——先推导的
+        // 循环 retireWithReplacement 共享 temp 行后，跟随循环的 expr 在 preInfer 时 getMethodSignature() 物化返回真实签名（lib.es2015）→
+        // needInfer(真实文件)=false 且 isUnclearType(IterableIterator<T>)=false（泛型实参不参与）→ 整个推导被跳过 → realGenericTypes 无人设置 → item
+        // 停留形式泛参 T → unknown。
+        // "待解析"是 per-expr 语义，共享 temp 行的"已解析"状态会传染给所有共享者——与 toString / 实例缓存同根因（归宿垄断）。
         const iteratorMethodSubSignature = new ArkSignature_1.MethodSubSignature(Builtin_1.Builtin.ITERATOR_FUNCTION, [], Builtin_1.Builtin.ITERATOR_CLASS_TYPE);
-        const iteratorMethodSignature = new ArkSignature_1.MethodSignature(ArkSignature_1.ClassSignature.DEFAULT, iteratorMethodSubSignature);
+        const iteratorMethodSignature = new ArkSignature_1.MethodSignature(0, iteratorMethodSubSignature);
         const iteratorInvokeExpr = new Expr_1.ArkInstanceInvokeExpr(iterableValue, iteratorMethodSignature, []);
         const iteratorInvokeExprPositions = [iterablePositions[0], ...iterablePositions];
         const { value: iterator, valueOriginalPositions: iteratorPositions, stmts: iteratorStmts, } = this.generateAssignStmtForValue(iteratorInvokeExpr, iteratorInvokeExprPositions);
         iteratorStmts.forEach(stmt => stmts.push(stmt));
         iterator.setType(Builtin_1.Builtin.ITERATOR_CLASS_TYPE);
-        const nextMethodSubSignature = new ArkSignature_1.MethodSubSignature(Builtin_1.Builtin.ITERATOR_NEXT, [], Builtin_1.Builtin.ITERATOR_RESULT_CLASS_TYPE);
-        const nextMethodSignature = new ArkSignature_1.MethodSignature(ArkSignature_1.ClassSignature.DEFAULT, nextMethodSubSignature);
+        const iteratorNextMethodSubSignature = new ArkSignature_1.MethodSubSignature(Builtin_1.Builtin.ITERATOR_NEXT, [], Builtin_1.Builtin.ITERATOR_RESULT_CLASS_TYPE);
+        const nextMethodSignature = new ArkSignature_1.MethodSignature(0, iteratorNextMethodSubSignature);
         const iteratorNextInvokeExpr = new Expr_1.ArkInstanceInvokeExpr(iterator, nextMethodSignature, []);
         const iteratorNextInvokeExprPositions = [iteratorPositions[0], ...iteratorPositions];
         const { value: iteratorResult, valueOriginalPositions: iteratorResultPositions, stmts: iteratorResultStmts, } = this.generateAssignStmtForValue(iteratorNextInvokeExpr, iteratorNextInvokeExprPositions);
         iteratorResultStmts.forEach(stmt => stmts.push(stmt));
         iteratorResult.setType(Builtin_1.Builtin.ITERATOR_RESULT_CLASS_TYPE);
+        // Object path: the IteratorResult stub is unclear and is routed to the temp
+        // canonicalizer inside the constructor — no formal interning without a model.
         const doneFieldSignature = new ArkSignature_1.FieldSignature(Builtin_1.Builtin.ITERATOR_RESULT_DONE, Builtin_1.Builtin.ITERATOR_RESULT_CLASS_SIGNATURE, Type_1.BooleanType.getInstance(), false);
         const doneFieldRef = new Ref_1.ArkInstanceFieldRef(iteratorResult, doneFieldSignature);
         const doneFieldRefPositions = [iteratorResultPositions[0], ...iteratorResultPositions];
@@ -618,16 +641,10 @@ class ArkIRTransformer {
         if (this.inBuilderMethod) {
             this.tsNodeToStmts(ifStatement.thenStatement).forEach(stmt => stmts.push(stmt));
             if (ifStatement.elseStatement) {
-                const branchElseMethodSignature = ArkSignatureBuilder_1.ArkSignatureBuilder.buildMethodSignatureFromClassNameAndMethodName(EtsConst_1.COMPONENT_IF, EtsConst_1.COMPONENT_BRANCH_FUNCTION);
-                const branchElseInvokeExpr = new Expr_1.ArkStaticInvokeExpr(branchElseMethodSignature, [ValueUtil_1.ValueUtil.getOrCreateNumberConst(1)]);
-                const branchElseInvokeExprPositions = [Position_1.FullPosition.buildFromNode(ifStatement.elseStatement, this.sourceFile), Position_1.FullPosition.DEFAULT];
-                const branchElseInvokeStmt = new Stmt_1.ArkInvokeStmt(branchElseInvokeExpr);
-                branchElseInvokeStmt.setOperandOriginalPositions(branchElseInvokeExprPositions);
-                stmts.push(branchElseInvokeStmt);
+                stmts.push(this.arkValueTransformer.generateBuilderIfBranch(1, Position_1.FullPosition.buildFromNode(ifStatement.elseStatement, this.sourceFile)));
                 this.tsNodeToStmts(ifStatement.elseStatement).forEach(stmt => stmts.push(stmt));
             }
-            const popInvokeStmt = this.arkValueTransformer.generateComponentPopStmts(EtsConst_1.COMPONENT_IF);
-            stmts.push(popInvokeStmt);
+            stmts.push(this.arkValueTransformer.generateComponentPopStmts(EtsConst_1.COMPONENT_IF));
         }
         return stmts;
     }
@@ -661,26 +678,16 @@ class ArkIRTransformer {
     }
     conditionToStmts(expression) {
         const stmts = [];
+        const { value: conditionExpr, valueOriginalPositions: conditionExprPositions, stmts: conditionStmts, } = this.arkValueTransformer.conditionToValueAndStmts(expression);
+        conditionStmts.forEach(stmt => stmts.push(stmt));
         if (this.inBuilderMethod) {
-            const { value: conditionExpr, valueOriginalPositions: conditionExprPositions, stmts: conditionStmts, } = this.arkValueTransformer.conditionToValueAndStmts(expression);
-            conditionStmts.forEach(stmt => stmts.push(stmt));
-            const createMethodSignature = ArkSignatureBuilder_1.ArkSignatureBuilder.buildMethodSignatureFromClassNameAndMethodName(EtsConst_1.COMPONENT_IF, EtsConst_1.COMPONENT_CREATE_FUNCTION);
             const { value: conditionLocal, valueOriginalPositions: conditionLocalPositions, stmts: assignConditionStmts, } = this.generateAssignStmtForValue(conditionExpr, conditionExprPositions);
             assignConditionStmts.forEach(stmt => stmts.push(stmt));
-            const createInvokeExpr = new Expr_1.ArkStaticInvokeExpr(createMethodSignature, [conditionLocal]);
-            const createInvokeExprPositions = [conditionLocalPositions[0], ...conditionLocalPositions];
-            const { stmts: createStmts } = this.generateAssignStmtForValue(createInvokeExpr, createInvokeExprPositions);
+            const { stmts: createStmts } = this.arkValueTransformer.generateComponentCreationStmts(EtsConst_1.COMPONENT_IF, [conditionLocal], conditionLocalPositions[0], conditionLocalPositions);
             createStmts.forEach(stmt => stmts.push(stmt));
-            const branchMethodSignature = ArkSignatureBuilder_1.ArkSignatureBuilder.buildMethodSignatureFromClassNameAndMethodName(EtsConst_1.COMPONENT_IF, EtsConst_1.COMPONENT_BRANCH_FUNCTION);
-            const branchInvokeExpr = new Expr_1.ArkStaticInvokeExpr(branchMethodSignature, [ValueUtil_1.ValueUtil.getOrCreateNumberConst(0)]);
-            const branchInvokeExprPositions = [conditionLocalPositions[0], Position_1.FullPosition.DEFAULT];
-            const branchInvokeStmt = new Stmt_1.ArkInvokeStmt(branchInvokeExpr);
-            branchInvokeStmt.setOperandOriginalPositions(branchInvokeExprPositions);
-            stmts.push(branchInvokeStmt);
+            stmts.push(this.arkValueTransformer.generateBuilderIfBranch(0, conditionLocalPositions[0]));
         }
         else {
-            const { value: conditionExpr, valueOriginalPositions: conditionExprPositions, stmts: conditionStmts, } = this.arkValueTransformer.conditionToValueAndStmts(expression);
-            conditionStmts.forEach(stmt => stmts.push(stmt));
             const ifStmt = new Stmt_1.ArkIfStmt(conditionExpr);
             ifStmt.setOperandOriginalPositions(conditionExprPositions);
             stmts.push(ifStmt);
@@ -801,22 +808,34 @@ class ArkIRTransformer {
         return null;
     }
     generateAssignStmtForValue(value, valueOriginalPositions) {
+        const stmts = [];
+        const temp = this.generateAssignStmtForValueInto(value, valueOriginalPositions, stmts);
+        return {
+            value: temp.value,
+            valueOriginalPositions: temp.positions,
+            stmts,
+        };
+    }
+    /**
+     * Appends the temp-variable assignment (when one is needed) directly into `stmts` and
+     * returns the temp local with its position, skipping the ValueAndStmts wrapper and its
+     * single-element stmts array that generateAssignStmtForValue allocates per call.
+     */
+    generateAssignStmtForValueInto(value, valueOriginalPositions, stmts) {
         const leftOp = this.arkValueTransformer.generateTempLocal(value.getType());
         if (valueOriginalPositions.length === 0) {
-            return {
-                value: leftOp,
-                valueOriginalPositions: [],
-                stmts: []
-            };
+            return { value: leftOp, positions: [] };
         }
         const leftOpPosition = valueOriginalPositions[0];
         const assignStmt = new Stmt_1.ArkAssignStmt(leftOp, value);
-        assignStmt.setOperandOriginalPositions([leftOpPosition, ...valueOriginalPositions]);
-        return {
-            value: leftOp,
-            valueOriginalPositions: [leftOpPosition],
-            stmts: [assignStmt],
-        };
+        const operandPositions = new Array(1 + valueOriginalPositions.length);
+        operandPositions[0] = leftOpPosition;
+        for (let i = 0; i < valueOriginalPositions.length; i++) {
+            operandPositions[i + 1] = valueOriginalPositions[i];
+        }
+        assignStmt.setOperandOriginalPositions(operandPositions);
+        stmts.push(assignStmt);
+        return { value: leftOp, positions: [leftOpPosition] };
     }
     generateIfStmtForValues(leftValue, leftOpOriginalPositions, rightValue, rightOpOriginalPositions) {
         var _a;

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

@@ -3,11 +3,14 @@ import { Local } from '../base/Local';
 import { FullPosition } from '../base/Position';
 import { ArkAliasTypeDefineStmt, Stmt } from '../base/Stmt';
 import { BinaryOperator } from '../base/Expr';
+import { ArkClass } from '../model/ArkClass';
 import { AliasType, Type } from '../base/Type';
 import { Value } from '../base/Value';
 import { GlobalRef } from '../base/Ref';
 import { ArkMethod } from '../model/ArkMethod';
 import { ArkIRTransformer, ValueAndStmts } from './ArkIRTransformer';
+import { ArkNamespace } from '../model/ArkNamespace';
+import { ArkFile } from '../model/ArkFile';
 export declare class ArkValueTransformer {
     conditionalOperatorNo: number;
     protected tempLocalNo: number;
@@ -16,6 +19,9 @@ export declare class ArkValueTransformer {
     protected globals?: Map<string, GlobalRef>;
     protected thisLocal: Local;
     protected declaringMethod: ArkMethod;
+    protected declaringClass: ArkClass;
+    protected declaringNamespace?: ArkNamespace;
+    protected declaringFile: ArkFile;
     protected arkIRTransformer: ArkIRTransformer;
     protected aliasTypeMap: Map<string, [AliasType, ArkAliasTypeDefineStmt]>;
     protected builderMethodContextFlag: boolean;
@@ -31,6 +37,12 @@ export declare class ArkValueTransformer {
     private thisExpressionToValueAndStmts;
     private superExpressionToValueAndStmts;
     private conditionalExpressionToValueAndStmts;
+    /**
+     * In ArkUI builder methods, lower `a ? b : c` like statement if:
+     * If.create / If.branch(0) / true / If.branch(1) / false / If.pop, still yielding a result local.
+     * Stays linear (no CFG diamond); ViewTree reads the If.create protocol.
+     */
+    private builderConditionalExpressionToValueAndStmts;
     private objectLiteralExpresionToValueAndStmts;
     private appendObjectLiteralPropertyInitStmts;
     private processObjectLiteralPropertyInitStmts;
@@ -39,7 +51,11 @@ export declare class ArkValueTransformer {
     private getObjectLiteralFieldInitInfo;
     private generateSystemComponentStmt;
     private generateCustomViewStmt;
-    private generateComponentCreationStmts;
+    /** @internal Emit a component create invocation assigned to a temporary local. */
+    generateComponentCreationStmts(componentName: string, createArgs: Value[], componentExpressionPosition: FullPosition, createArgsPositionsAllFlat: FullPosition[]): ValueAndStmts;
+    /** @internal Emit an If.branch invocation for the given branch index. */
+    generateBuilderIfBranch(index: number, position?: FullPosition): Stmt;
+    /** @internal Emit a component pop invocation that closes the matching create. */
     generateComponentPopStmts(componentName: string, componentExpressionPosition?: FullPosition): Stmt;
     private etsComponentExpressionToValueAndStmts;
     private classExpressionToValueAndStmts;
@@ -53,11 +69,13 @@ export declare class ArkValueTransformer {
     private elementAccessExpressionToValueAndStmts;
     private callExpressionToValueAndStmts;
     private generateInvokeValueAndStmts;
-    private handleFieldRefInvoke;
+    private buildInvokeFullPosition;
+    private getCallNameNode;
+    private propertyAccessCalleeToInvoke;
+    private elementAccessCalleeToInvoke;
     private handleLocalInvoke;
     private isCustomViewCall;
     private isSystemComponentCall;
-    private handleArrayRefInvoke;
     private handleDefaultInvoke;
     private parseArgumentsOfCallExpression;
     private parseArguments;

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

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