arkanalyzer 1.0.67 → 1.0.69

package/lib/callgraph/pointerAnalysis/plugins/SdkPlugin.d.ts

@@ -15,6 +15,7 @@ export declare class SdkPlugin implements IPagPlugin {
     pagBuilder: PagBuilder;
     cg: CallGraph;
     private sdkMethodReturnValueMap;
+    private sdkMethodReturnArrayMap;
     private methodParamValueMap;
     private fakeSdkMethodParamDeclaringStmt;
     constructor(pag: Pag, pagBuilder: PagBuilder, cg: CallGraph);
@@ -28,6 +29,9 @@ export declare class SdkPlugin implements IPagPlugin {
     buildSDKFuncPag(funcID: FuncID, sdkMethod: ArkMethod): void;
     private createDummyParamValue;
     private addSDKMethodReturnPagEdge;
+    private addSDKMethodReturnArrayPagEdge;
+    private addSDKMethodReturnUnionPagEdge;
+    private addSDKMethodReturnGenericPagEdge;
     /**
      * process the anonymous method param, create a new CallSite for it and invoke it.
      */

package/lib/callgraph/pointerAnalysis/plugins/SdkPlugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SdkPlugin.d.ts","sourceRoot":"","sources":["../../../../src/callgraph/pointerAnalysis/plugins/SdkPlugin.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,iCAAiC,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACpF,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,GAAG,EAA6B,MAAM,QAAQ,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C;;;GAGG;AACH,qBAAa,SAAU,YAAW,UAAU;IACxC,GAAG,EAAE,GAAG,CAAC;IACT,UAAU,EAAE,UAAU,CAAC;IACvB,EAAE,EAAE,SAAS,CAAC;IAEd,OAAO,CAAC,uBAAuB,CAA6C;IAC5E,OAAO,CAAC,mBAAmB,CAAuB;IAClD,OAAO,CAAC,+BAA+B,CAAO;gBAElC,GAAG,EAAE,GAAG,EAAE,UAAU,EAAE,UAAU,EAAE,EAAE,EAAE,SAAS;IAS3D,OAAO,IAAI,MAAM;IAIjB,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,aAAa,GAAG,OAAO;IAKxD,eAAe,CAAC,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE;IAM5E,OAAO,CAAC,uBAAuB;IAiB/B;;OAEG;IACI,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,GAAG,IAAI;IAMlE,OAAO,CAAC,qBAAqB;IAiB7B,OAAO,CAAC,yBAAyB;IA4BjC;;OAEG;IACH,OAAO,CAAC,wBAAwB;IAsDzB,cAAc,CAAC,MAAM,EAAE,SAAS,GAAG,KAAK,EAAE,GAAG,SAAS;CAIhE"}
+{"version":3,"file":"SdkPlugin.d.ts","sourceRoot":"","sources":["../../../../src/callgraph/pointerAnalysis/plugins/SdkPlugin.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AAEjD,OAAO,EAAE,MAAM,EAAE,MAAM,iCAAiC,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACpF,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,GAAG,EAA6B,MAAM,QAAQ,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C;;;GAGG;AACH,qBAAa,SAAU,YAAW,UAAU;IACxC,GAAG,EAAE,GAAG,CAAC;IACT,UAAU,EAAE,UAAU,CAAC;IACvB,EAAE,EAAE,SAAS,CAAC;IAEd,OAAO,CAAC,uBAAuB,CAA6C;IAC5E,OAAO,CAAC,uBAAuB,CAAkD;IACjF,OAAO,CAAC,mBAAmB,CAAuB;IAClD,OAAO,CAAC,+BAA+B,CAAO;gBAElC,GAAG,EAAE,GAAG,EAAE,UAAU,EAAE,UAAU,EAAE,EAAE,EAAE,SAAS;IAW3D,OAAO,IAAI,MAAM;IAIjB,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,aAAa,GAAG,OAAO;IAKxD,eAAe,CAAC,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE;IAM5E,OAAO,CAAC,uBAAuB;IAiB/B;;OAEG;IACI,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,GAAG,IAAI;IAMlE,OAAO,CAAC,qBAAqB;IAiB7B,OAAO,CAAC,yBAAyB;IA6CjC,OAAO,CAAC,8BAA8B;IAsCtC,OAAO,CAAC,8BAA8B;IAkCtC,OAAO,CAAC,gCAAgC;IA6BxC;;OAEG;IACH,OAAO,CAAC,wBAAwB;IAsDzB,cAAc,CAAC,MAAM,EAAE,SAAS,GAAG,KAAK,EAAE,GAAG,SAAS;CAIhE"}

package/lib/callgraph/pointerAnalysis/plugins/SdkPlugin.js

@@ -19,6 +19,7 @@ const Expr_1 = require("../../../core/base/Expr");
 const Local_1 = require("../../../core/base/Local");
 const Stmt_1 = require("../../../core/base/Stmt");
 const Type_1 = require("../../../core/base/Type");
+const Const_1 = require("../../../core/common/Const");
 const Pag_1 = require("../Pag");
 const PTAUtils_1 = require("../PTAUtils");
 /**
@@ -31,6 +32,8 @@ class SdkPlugin {
         this.pagBuilder = pagBuilder;
         this.cg = cg;
         this.sdkMethodReturnValueMap = new Map();
+        this.sdkMethodReturnArrayMap = new Map();
+        this.sdkMethodReturnArrayMap = new Map();
         this.methodParamValueMap = new Map();
         this.fakeSdkMethodParamDeclaringStmt = new Stmt_1.ArkAssignStmt(new Local_1.Local(''), new Local_1.Local(''));
     }
@@ -83,6 +86,23 @@ class SdkPlugin {
     }
     addSDKMethodReturnPagEdge(cs, callerCid, calleeCid, calleeMethod, srcNodes) {
         let returnType = calleeMethod.getReturnType();
+        if (returnType instanceof Type_1.ArrayType && cs.callStmt instanceof Stmt_1.ArkAssignStmt) {
+            // Handling the return value of collections.Array.creat, return type is ArrayType
+            this.addSDKMethodReturnArrayPagEdge(cs, callerCid, calleeCid, calleeMethod, srcNodes);
+            return;
+        }
+        if (returnType instanceof Type_1.UnionType && cs.callStmt instanceof Stmt_1.ArkAssignStmt) {
+            // Handling the return value of ArkTSUtils.ASON.parse, return type is UnionType
+            // find real type in UnionType
+            this.addSDKMethodReturnUnionPagEdge(cs, callerCid, calleeCid, calleeMethod, srcNodes);
+            return;
+        }
+        if (returnType instanceof Type_1.GenericType && cs.callStmt instanceof Stmt_1.ArkAssignStmt) {
+            // Handling the return value of UIUtils.makeObserved, return type is GenericType
+            // find real type in callsite realGenericTypes
+            this.addSDKMethodReturnGenericPagEdge(cs, callerCid, calleeCid, calleeMethod, srcNodes);
+            return;
+        }
         if (!(returnType instanceof Type_1.ClassType) || !(cs.callStmt instanceof Stmt_1.ArkAssignStmt)) {
             return;
         }
@@ -105,6 +125,100 @@ class SdkPlugin {
         srcNodes.push(srcPagNode.getID());
         return;
     }
+    addSDKMethodReturnArrayPagEdge(cs, callerCid, calleeCid, calleeMethod, srcNodes) {
+        var _a;
+        let returnType = calleeMethod.getReturnType();
+        let callstmt = cs.callStmt;
+        let arraycidMap = this.sdkMethodReturnArrayMap.get(calleeMethod);
+        if (!arraycidMap) {
+            arraycidMap = new Map();
+        }
+        let newArrayExpr = arraycidMap.get(calleeCid);
+        if (!newArrayExpr) {
+            let staticInvokeExpr = callstmt.getRightOp();
+            if (!(staticInvokeExpr instanceof Expr_1.ArkStaticInvokeExpr)) {
+                return;
+            }
+            if (((_a = staticInvokeExpr.getMethodSignature().getDeclaringClassSignature().getDeclaringNamespaceSignature()) === null || _a === void 0 ? void 0 : _a.getNamespaceName()) === 'collections') {
+                let realtypes = staticInvokeExpr.getRealGenericTypes();
+                if (realtypes !== undefined && realtypes.length > 0) {
+                    // create new array with real type
+                    newArrayExpr = new Expr_1.ArkNewArrayExpr(realtypes[0], staticInvokeExpr.getArg(0));
+                }
+                else {
+                    // create new array with base type
+                    newArrayExpr = new Expr_1.ArkNewArrayExpr(returnType.getBaseType(), staticInvokeExpr.getArg(0));
+                }
+            }
+        }
+        if (newArrayExpr === undefined) {
+            return;
+        }
+        arraycidMap.set(calleeCid, newArrayExpr);
+        this.sdkMethodReturnArrayMap.set(calleeMethod, arraycidMap);
+        let srcPagNode = this.pagBuilder.getOrNewPagNode(calleeCid, newArrayExpr);
+        let dstPagNode = this.pagBuilder.getOrNewPagNode(callerCid, callstmt.getLeftOp(), cs.callStmt);
+        this.pag.addPagEdge(srcPagNode, dstPagNode, Pag_1.PagEdgeKind.Address, cs.callStmt);
+        srcNodes.push(srcPagNode.getID());
+        return;
+    }
+    addSDKMethodReturnUnionPagEdge(cs, callerCid, calleeCid, calleeMethod, srcNodes) {
+        let returnType = calleeMethod.getReturnType();
+        let callstmt = cs.callStmt;
+        let cidMap = this.sdkMethodReturnValueMap.get(calleeMethod);
+        if (!cidMap) {
+            cidMap = new Map();
+        }
+        let newExpr = cidMap.get(calleeCid);
+        if (!newExpr) {
+            let types = returnType.getTypes();
+            for (let uniontype of types) {
+                if (uniontype instanceof Type_1.AliasType && uniontype.getOriginalType() instanceof Type_1.ClassType) {
+                    let classtype = uniontype.getOriginalType();
+                    newExpr = new Expr_1.ArkNewExpr(classtype);
+                }
+                if (uniontype instanceof Type_1.ClassType) {
+                    newExpr = new Expr_1.ArkNewExpr(uniontype);
+                }
+            }
+        }
+        if (newExpr === undefined) {
+            return;
+        }
+        cidMap.set(calleeCid, newExpr);
+        this.sdkMethodReturnValueMap.set(calleeMethod, cidMap);
+        let srcPagNode = this.pagBuilder.getOrNewPagNode(calleeCid, newExpr);
+        let dstPagNode = this.pagBuilder.getOrNewPagNode(callerCid, callstmt.getLeftOp(), cs.callStmt);
+        this.pag.addPagEdge(srcPagNode, dstPagNode, Pag_1.PagEdgeKind.Address, cs.callStmt);
+        srcNodes.push(srcPagNode.getID());
+        return;
+    }
+    addSDKMethodReturnGenericPagEdge(cs, callerCid, calleeCid, calleeMethod, srcNodes) {
+        if (calleeMethod.getName() === Const_1.MAKEOBSERVED) {
+            let callstmt = cs.callStmt;
+            let cidMap = this.sdkMethodReturnValueMap.get(calleeMethod);
+            if (!cidMap) {
+                cidMap = new Map();
+            }
+            let newExpr = cidMap.get(calleeCid);
+            if (!newExpr && cs.args !== undefined && cs.args.length > 0) {
+                let type = cs.args[0].getType();
+                if (type instanceof Type_1.ClassType) {
+                    newExpr = new Expr_1.ArkNewExpr(type);
+                }
+            }
+            if (newExpr === undefined) {
+                return;
+            }
+            cidMap.set(calleeCid, newExpr);
+            this.sdkMethodReturnValueMap.set(calleeMethod, cidMap);
+            let srcPagNode = this.pagBuilder.getOrNewPagNode(calleeCid, newExpr);
+            let dstPagNode = this.pagBuilder.getOrNewPagNode(callerCid, callstmt.getLeftOp(), cs.callStmt);
+            this.pag.addPagEdge(srcPagNode, dstPagNode, Pag_1.PagEdgeKind.Address, cs.callStmt);
+            srcNodes.push(srcPagNode.getID());
+            return;
+        }
+    }
     /**
      * process the anonymous method param, create a new CallSite for it and invoke it.
      */

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

@@ -20,4 +20,5 @@ export declare const UNKNOWN_METHOD_NAME = "";
 export declare const TEMP_LOCAL_PREFIX = "%";
 export declare const LEXICAL_ENV_NAME_PREFIX: string;
 export declare const ARKTS_STATIC_MARK = "use static";
+export declare const MAKEOBSERVED = "makeObserved";
 //# sourceMappingURL=Const.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Const.d.ts","sourceRoot":"","sources":["../../../src/core/common/Const.ts"],"names":[],"mappings":"AAgBA,eAAO,MAAM,cAAc,MAAM,CAAC;AAClC,eAAO,MAAM,WAAW,MAAM,CAAC;AAC/B,eAAO,MAAM,YAAY,QAAQ,CAAC;AAClC,eAAO,MAAM,YAAY,SAAS,CAAC;AAGnC,eAAO,MAAM,sBAAsB,QAA6B,CAAC;AACjE,eAAO,MAAM,sBAAsB,QAAqB,CAAC;AACzD,eAAO,MAAM,yBAAyB,MAAiB,CAAC;AAGxD,eAAO,MAAM,uBAAuB,QAA6B,CAAC;AAClE,eAAO,MAAM,yBAAyB,QAA2B,CAAC;AAClE,eAAO,MAAM,uBAAuB,QAA2B,CAAC;AAChE,eAAO,MAAM,+BAA+B,QAA4B,CAAC;AACzE,eAAO,MAAM,uBAAuB,QAAqB,CAAC;AAC1D,eAAO,MAAM,mBAAmB,WAAW,CAAC;AAG5C,eAAO,MAAM,oBAAoB,QAA6B,CAAC;AAC/D,eAAO,MAAM,iBAAiB,QAA6B,CAAC;AAC5D,eAAO,MAAM,sBAAsB,QAA6B,CAAC;AACjE,eAAO,MAAM,kBAAkB,KAAK,CAAC;AACrC,eAAO,MAAM,kBAAkB,KAAK,CAAC;AACrC,eAAO,MAAM,mBAAmB,KAAK,CAAC;AAGtC,eAAO,MAAM,iBAAiB,MAAc,CAAC;AAC7C,eAAO,MAAM,uBAAuB,QAAiC,CAAC;AAGtE,eAAO,MAAM,iBAAiB,eAAe,CAAC"}
+{"version":3,"file":"Const.d.ts","sourceRoot":"","sources":["../../../src/core/common/Const.ts"],"names":[],"mappings":"AAgBA,eAAO,MAAM,cAAc,MAAM,CAAC;AAClC,eAAO,MAAM,WAAW,MAAM,CAAC;AAC/B,eAAO,MAAM,YAAY,QAAQ,CAAC;AAClC,eAAO,MAAM,YAAY,SAAS,CAAC;AAGnC,eAAO,MAAM,sBAAsB,QAA6B,CAAC;AACjE,eAAO,MAAM,sBAAsB,QAAqB,CAAC;AACzD,eAAO,MAAM,yBAAyB,MAAiB,CAAC;AAGxD,eAAO,MAAM,uBAAuB,QAA6B,CAAC;AAClE,eAAO,MAAM,yBAAyB,QAA2B,CAAC;AAClE,eAAO,MAAM,uBAAuB,QAA2B,CAAC;AAChE,eAAO,MAAM,+BAA+B,QAA4B,CAAC;AACzE,eAAO,MAAM,uBAAuB,QAAqB,CAAC;AAC1D,eAAO,MAAM,mBAAmB,WAAW,CAAC;AAG5C,eAAO,MAAM,oBAAoB,QAA6B,CAAC;AAC/D,eAAO,MAAM,iBAAiB,QAA6B,CAAC;AAC5D,eAAO,MAAM,sBAAsB,QAA6B,CAAC;AACjE,eAAO,MAAM,kBAAkB,KAAK,CAAC;AACrC,eAAO,MAAM,kBAAkB,KAAK,CAAC;AACrC,eAAO,MAAM,mBAAmB,KAAK,CAAC;AAGtC,eAAO,MAAM,iBAAiB,MAAc,CAAC;AAC7C,eAAO,MAAM,uBAAuB,QAAiC,CAAC;AAGtE,eAAO,MAAM,iBAAiB,eAAe,CAAC;AAG9C,eAAO,MAAM,YAAY,iBAAiB,CAAC"}

package/lib/core/common/Const.js

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ARKTS_STATIC_MARK = exports.LEXICAL_ENV_NAME_PREFIX = exports.TEMP_LOCAL_PREFIX = exports.UNKNOWN_METHOD_NAME = exports.UNKNOWN_FIELD_NAME = exports.UNKNOWN_CLASS_NAME = exports.UNKNOWN_NAMESPACE_NAME = exports.UNKNOWN_FILE_NAME = exports.UNKNOWN_PROJECT_NAME = exports.CALL_SIGNATURE_NAME = exports.ANONYMOUS_METHOD_PREFIX = exports.STATIC_BLOCK_METHOD_NAME_PREFIX = exports.STATIC_INIT_METHOD_NAME = exports.INSTANCE_INIT_METHOD_NAME = exports.DEFAULT_ARK_METHOD_NAME = exports.ANONYMOUS_CLASS_DELIMITER = exports.ANONYMOUS_CLASS_PREFIX = exports.DEFAULT_ARK_CLASS_NAME = exports.DEFAULT_NAME = exports.UNKNOWN_NAME = exports.NAME_PREFIX = exports.NAME_DELIMITER = void 0;
+exports.MAKEOBSERVED = exports.ARKTS_STATIC_MARK = exports.LEXICAL_ENV_NAME_PREFIX = exports.TEMP_LOCAL_PREFIX = exports.UNKNOWN_METHOD_NAME = exports.UNKNOWN_FIELD_NAME = exports.UNKNOWN_CLASS_NAME = exports.UNKNOWN_NAMESPACE_NAME = exports.UNKNOWN_FILE_NAME = exports.UNKNOWN_PROJECT_NAME = exports.CALL_SIGNATURE_NAME = exports.ANONYMOUS_METHOD_PREFIX = exports.STATIC_BLOCK_METHOD_NAME_PREFIX = exports.STATIC_INIT_METHOD_NAME = exports.INSTANCE_INIT_METHOD_NAME = exports.DEFAULT_ARK_METHOD_NAME = exports.ANONYMOUS_CLASS_DELIMITER = exports.ANONYMOUS_CLASS_PREFIX = exports.DEFAULT_ARK_CLASS_NAME = exports.DEFAULT_NAME = exports.UNKNOWN_NAME = exports.NAME_PREFIX = exports.NAME_DELIMITER = void 0;
 // names
 exports.NAME_DELIMITER = '$';
 exports.NAME_PREFIX = '%';
@@ -43,3 +43,5 @@ exports.TEMP_LOCAL_PREFIX = exports.NAME_PREFIX;
 exports.LEXICAL_ENV_NAME_PREFIX = exports.TEMP_LOCAL_PREFIX + 'closures';
 // ArkTS version
 exports.ARKTS_STATIC_MARK = 'use static';
+// Concurrent const
+exports.MAKEOBSERVED = 'makeObserved';

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

@@ -52,6 +52,7 @@ export declare const COMPONENT_DECORATOR: Set<string>;
 export declare const ENTRY_DECORATOR: string;
 export declare const BUILDER_DECORATOR: string;
 export declare const BUILDER_PARAM_DECORATOR: string;
+export declare const COMPONENT_BEHAVIOR: string;
 export declare function isEtsAtomicComponent(name: string): boolean;
 export declare function isEtsSystemComponent(name: string): boolean;
 export declare function isEtsContainerComponent(name: string): boolean;

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

@@ -1 +1 @@
-{"version":3,"file":"EtsConst.d.ts","sourceRoot":"","sources":["../../../src/core/common/EtsConst.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAy4BhC,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,MAAkB,CAAC;AACpD,eAAO,MAAM,uBAAuB,EAAE,MAAsB,CAAC;AAE7D,eAAO,MAAM,wBAAwB,EAAE,GAAG,CAAC,MAAM,CAAkG,CAAC;AAEpJ,eAAO,MAAM,wBAAwB,EAAE,GAAG,CAAC,MAAM,CAqD/C,CAAC;AAEH,eAAO,MAAM,mBAAmB,EAAE,GAAG,CAAC,MAAM,CAAqE,CAAC;AAClH,eAAO,MAAM,eAAe,EAAE,MAAgB,CAAC;AAC/C,eAAO,MAAM,iBAAiB,EAAE,MAAkB,CAAC;AACnD,eAAO,MAAM,uBAAuB,EAAE,MAAuB,CAAC;AAE9D,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE1D;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE1D;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE7D;AAED,eAAO,MAAM,yBAAyB,EAAE,MAAiB,CAAC;AAC1D,eAAO,MAAM,sBAAsB,EAAE,MAAc,CAAC;AACpD,eAAO,MAAM,oBAAoB,EAAE,MAAe,CAAC;AACnD,eAAO,MAAM,gBAAgB,EAAE,MAAiB,CAAC;AAEjD,eAAO,MAAM,YAAY,EAAE,MAAa,CAAC;AACzC,eAAO,MAAM,mBAAmB,EAAE,MAAmB,CAAC;AACtD,eAAO,MAAM,yBAAyB,EAAE,MAAiB,CAAC;AAC1D,eAAO,MAAM,wBAAwB,EAAE,MAAgB,CAAC;AAExD,eAAO,MAAM,2BAA2B,EAAE,GAAG,CAAC,MAAM,CAAwF,CAAC;AAE7I,eAAO,MAAM,gBAAgB,EAAE,MAAiB,CAAC;AACjD,eAAO,MAAM,kBAAkB,EAAE,MAAmB,CAAC;AAErD,eAAO,MAAM,mBAAmB,EAAE,MAAoB,CAAC;AACvD,eAAO,MAAM,SAAS,EAAE,MAAmB,CAAC;AAC5C,eAAO,MAAM,MAAM,EAAE,GAAG,CAAC,MAAM,CAA0B,CAAC;AAE1D,eAAO,MAAM,gBAAgB,qBAAqB,CAAC;AACnD,eAAO,MAAM,mBAAmB,wBAAwB,CAAC"}
+{"version":3,"file":"EtsConst.d.ts","sourceRoot":"","sources":["../../../src/core/common/EtsConst.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAy4BhC,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,MAAkB,CAAC;AACpD,eAAO,MAAM,uBAAuB,EAAE,MAAsB,CAAC;AAE7D,eAAO,MAAM,wBAAwB,EAAE,GAAG,CAAC,MAAM,CAAkG,CAAC;AAEpJ,eAAO,MAAM,wBAAwB,EAAE,GAAG,CAAC,MAAM,CAqD/C,CAAC;AAEH,eAAO,MAAM,mBAAmB,EAAE,GAAG,CAAC,MAAM,CAAqE,CAAC;AAClH,eAAO,MAAM,eAAe,EAAE,MAAgB,CAAC;AAC/C,eAAO,MAAM,iBAAiB,EAAE,MAAkB,CAAC;AACnD,eAAO,MAAM,uBAAuB,EAAE,MAAuB,CAAC;AAC9D,eAAO,MAAM,kBAAkB,EAAE,MAAmB,CAAC;AAErD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE1D;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE1D;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE7D;AAED,eAAO,MAAM,yBAAyB,EAAE,MAAiB,CAAC;AAC1D,eAAO,MAAM,sBAAsB,EAAE,MAAc,CAAC;AACpD,eAAO,MAAM,oBAAoB,EAAE,MAAe,CAAC;AACnD,eAAO,MAAM,gBAAgB,EAAE,MAAiB,CAAC;AAEjD,eAAO,MAAM,YAAY,EAAE,MAAa,CAAC;AACzC,eAAO,MAAM,mBAAmB,EAAE,MAAmB,CAAC;AACtD,eAAO,MAAM,yBAAyB,EAAE,MAAiB,CAAC;AAC1D,eAAO,MAAM,wBAAwB,EAAE,MAAgB,CAAC;AAExD,eAAO,MAAM,2BAA2B,EAAE,GAAG,CAAC,MAAM,CAAwF,CAAC;AAE7I,eAAO,MAAM,gBAAgB,EAAE,MAAiB,CAAC;AACjD,eAAO,MAAM,kBAAkB,EAAE,MAAmB,CAAC;AAErD,eAAO,MAAM,mBAAmB,EAAE,MAAoB,CAAC;AACvD,eAAO,MAAM,SAAS,EAAE,MAAmB,CAAC;AAC5C,eAAO,MAAM,MAAM,EAAE,GAAG,CAAC,MAAM,CAA0B,CAAC;AAE1D,eAAO,MAAM,gBAAgB,qBAAqB,CAAC;AACnD,eAAO,MAAM,mBAAmB,wBAAwB,CAAC"}

package/lib/core/common/EtsConst.js

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BUILD_PROFILE_JSON5 = exports.OH_PACKAGE_JSON5 = exports.ON_OFF = exports.CALL_BACK = exports.COMPONENT_ATTRIBUTE = exports.COMPONENT_INSTANCE = exports.COMPONENT_COMMON = exports.SPECIAL_CONTAINER_COMPONENT = exports.COMPONENT_BUILD_FUNCTION = exports.COMPONENT_BRANCH_FUNCTION = exports.COMPONENT_IF_BRANCH = exports.COMPONENT_IF = exports.COMPONENT_REPEAT = exports.COMPONENT_CUSTOMVIEW = exports.COMPONENT_POP_FUNCTION = exports.COMPONENT_CREATE_FUNCTION = exports.isEtsContainerComponent = exports.isEtsSystemComponent = exports.isEtsAtomicComponent = exports.BUILDER_PARAM_DECORATOR = exports.BUILDER_DECORATOR = exports.ENTRY_DECORATOR = exports.COMPONENT_DECORATOR = exports.BUILDIN_ATOMIC_COMPONENT = exports.BUILDIN_SYSTEM_COMPONENT = exports.COMPONENT_LAZY_FOR_EACH = exports.COMPONENT_FOR_EACH = exports.ETS_COMPILER_OPTIONS = void 0;
+exports.BUILD_PROFILE_JSON5 = exports.OH_PACKAGE_JSON5 = exports.ON_OFF = exports.CALL_BACK = exports.COMPONENT_ATTRIBUTE = exports.COMPONENT_INSTANCE = exports.COMPONENT_COMMON = exports.SPECIAL_CONTAINER_COMPONENT = exports.COMPONENT_BUILD_FUNCTION = exports.COMPONENT_BRANCH_FUNCTION = exports.COMPONENT_IF_BRANCH = exports.COMPONENT_IF = exports.COMPONENT_REPEAT = exports.COMPONENT_CUSTOMVIEW = exports.COMPONENT_POP_FUNCTION = exports.COMPONENT_CREATE_FUNCTION = exports.isEtsContainerComponent = exports.isEtsSystemComponent = exports.isEtsAtomicComponent = exports.COMPONENT_BEHAVIOR = exports.BUILDER_PARAM_DECORATOR = exports.BUILDER_DECORATOR = exports.ENTRY_DECORATOR = exports.COMPONENT_DECORATOR = exports.BUILDIN_ATOMIC_COMPONENT = exports.BUILDIN_SYSTEM_COMPONENT = exports.COMPONENT_LAZY_FOR_EACH = exports.COMPONENT_FOR_EACH = exports.ETS_COMPILER_OPTIONS = void 0;
 exports.ETS_COMPILER_OPTIONS = {
     ets: {
         emitDecorators: [
@@ -982,6 +982,7 @@ exports.COMPONENT_DECORATOR = new Set(['Reusable', 'Component', 'ComponentV2', '
 exports.ENTRY_DECORATOR = 'Entry';
 exports.BUILDER_DECORATOR = 'Builder';
 exports.BUILDER_PARAM_DECORATOR = 'BuilderParam';
+exports.COMPONENT_BEHAVIOR = 'Behavior';
 function isEtsAtomicComponent(name) {
     return exports.BUILDIN_ATOMIC_COMPONENT.has(name);
 }

package/lib/core/graph/builder/ViewTreeBuilder.d.ts

@@ -1,5 +1,7 @@
 import { Constant } from '../../base/Constant';
 import { Decorator } from '../../base/Decorator';
+import { ArkInstanceInvokeExpr } from '../../base/Expr';
+import { Local } from '../../base/Local';
 import { ArkInstanceFieldRef } from '../../base/Ref';
 import { Stmt } from '../../base/Stmt';
 import { Type } from '../../base/Type';
@@ -47,10 +49,11 @@ declare class ViewTreeNodeImpl implements ViewTreeNode {
     static createCustomComponent(): ViewTreeNodeImpl;
     static createBuilderNode(): ViewTreeNodeImpl;
     static createBuilderParamNode(): ViewTreeNodeImpl;
+    static createBehaviorNode(): ViewTreeNodeImpl;
     changeBuilderParam2BuilderNode(builder: ArkMethod): void;
     hasBuilderParam(): boolean;
     clone(parent: ViewTreeNodeImpl, map?: Map<ViewTreeNodeImpl, ViewTreeNodeImpl>): ViewTreeNodeImpl;
-    addStmt(tree: ViewTreeImpl, stmt: Stmt): void;
+    addStmt(local2Node: Map<Local, ViewTreeNodeImpl>, tree: ViewTreeImpl, stmt: Stmt): void;
     private parseAttributes;
     private getBindValues;
     parseStateValues(tree: ViewTreeImpl, stmt: Stmt): void;
@@ -173,6 +176,7 @@ export declare class ViewTreeImpl extends TreeNodeStack implements ViewTree {
     private repeatCreationParser;
     private ifBranchCreationParser;
     private COMPONENT_CREATE_PARSERS;
+    COMPONENT_BEHAVIOR_PARSERS: Map<string, (local2Node: Map<Local, ViewTreeNodeImpl>, stmt: Stmt, expr: ArkInstanceInvokeExpr) => ViewTreeNodeImpl | undefined>;
     private componentCreateParse;
     private parseStaticInvokeExpr;
     /**
@@ -200,6 +204,52 @@ export declare class ViewTreeImpl extends TreeNodeStack implements ViewTree {
     private parseAssignStmt;
     private parseInvokeStmt;
     private buildViewTreeFromCfg;
+    /**
+     * Parses the 'tabBar' behavior binding.
+     * Only supports extracting the argument when it is of type CustomBuilder.
+     * Other argument types (e.g. string, Resource, TabBarOptions, SubTabBarStyle, BottomTabBarStyle, ComponentContent) are not handled.
+     *
+     * Supported signatures:
+     *   - tabBar(options: string | Resource | CustomBuilder | TabBarOptions)
+     *   - tabBar(value: SubTabBarStyle | BottomTabBarStyle) // API 9+
+     *   - tabBar(content: ComponentContent | SubTabBarStyle | BottomTabBarStyle | string | Resource | CustomBuilder | TabBarOptions) // API 18+
+     */
+    private tabBarComponentParser;
+    /**
+     * Parses the 'navDestination' behavior binding.
+     * Supports extracting the 'builder' argument when it is of FunctionType.
+     *
+     * navDestination(builder: (name: string, param: unknown) => void)
+     */
+    private navDestinationComponentParser;
+    /**
+     * Parses the 'bindContextMenu' behavior binding for API 8 and API 12.
+     * Only supports extracting the 'content' argument when it is of type CustomBuilder.
+     * Other argument types (e.g. ResponseType, ContextMenuOptions) are not handled.
+     *
+     * Supported signatures:
+     *   - bindContextMenu(content: CustomBuilder, responseType: ResponseType, options?: ContextMenuOptions): T   // API 8
+     *   - bindContextMenu(isShown: boolean, content: CustomBuilder, options?: ContextMenuOptions): T             // API 12
+     */
+    private bindContextMenuComponentParser;
+    /**
+     * Parses the 'bindContentCover' behavior binding.
+     * Only supports extracting the CustomBuilder argument from the second parameter.
+     * Other ContentCoverOptions properties are not handled.
+     *
+     * bindContentCover(isShow: boolean, builder: CustomBuilder, options?: ContentCoverOptions): T
+     */
+    private bindContentCoverComponentParser;
+    /**
+     * Parses the 'bindPopup' behavior binding.
+     * Only supports extracting the 'builder' field from CustomPopupOptions (custom popup content).
+     * Other PopupOptions properties are not supported yet.
+     *
+     * bindPopup(show: boolean, popup: PopupOptions | CustomPopupOptions): T
+     */
+    private bindPopupComponentParser;
+    private parseBehaviorComponent;
+    private parseBuilderFieldNode;
 }
 export declare function buildViewTree(render: ArkMethod): ViewTree;
 export {};

package/lib/core/graph/builder/ViewTreeBuilder.d.ts.map

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

package/lib/core/graph/builder/ViewTreeBuilder.js

@@ -266,6 +266,11 @@ class ViewTreeNodeImpl {
         instance.type = ViewTreeNodeType.BuilderParam;
         return instance;
     }
+    static createBehaviorNode() {
+        let instance = new ViewTreeNodeImpl(EtsConst_1.COMPONENT_BEHAVIOR);
+        instance.type = ViewTreeNodeType.SystemComponent; // to check
+        return instance;
+    }
     changeBuilderParam2BuilderNode(builder) {
         var _a;
         this.name = EtsConst_1.BUILDER_DECORATOR;
@@ -309,13 +314,13 @@ class ViewTreeNodeImpl {
         }
         return newNode;
     }
-    addStmt(tree, stmt) {
-        this.parseAttributes(stmt);
+    addStmt(local2Node, tree, stmt) {
+        this.parseAttributes(local2Node, tree, stmt);
         if (this.name !== EtsConst_1.COMPONENT_FOR_EACH && this.name !== EtsConst_1.COMPONENT_LAZY_FOR_EACH) {
             this.parseStateValues(tree, stmt);
         }
     }
-    parseAttributes(stmt) {
+    parseAttributes(local2Node, tree, stmt) {
         let expr;
         if (stmt instanceof Stmt_1.ArkAssignStmt) {
             let op = stmt.getRightOp();
@@ -346,6 +351,23 @@ class ViewTreeNodeImpl {
                     relationValues.push(arg);
                 }
             }
+            let builderNode;
+            if (tree.COMPONENT_BEHAVIOR_PARSERS.has(key) && expr instanceof Expr_1.ArkInstanceInvokeExpr) {
+                let parseFn = tree.COMPONENT_BEHAVIOR_PARSERS.get(key);
+                if (parseFn) {
+                    builderNode = parseFn(local2Node, stmt, expr);
+                }
+            }
+            if (builderNode) {
+                // create a virtual node name 'Behavior' to hold the behaviorNode
+                let behaviorNode = ViewTreeNodeImpl.createBehaviorNode();
+                behaviorNode.attributes.set(key, [stmt, relationValues]);
+                behaviorNode.parseStateValues(tree, stmt);
+                behaviorNode.children.push(builderNode);
+                builderNode.parent = behaviorNode;
+                this.children.push(behaviorNode);
+                behaviorNode.parent = this;
+            }
             this.attributes.set(key, [stmt, relationValues]);
         }
     }
@@ -473,6 +495,15 @@ class ViewTreeImpl extends TreeNodeStack {
             ['If.branch', this.ifBranchCreationParser.bind(this)],
             ['WaterFlow.create', this.waterFlowCreationParser.bind(this)],
         ]);
+        this.COMPONENT_BEHAVIOR_PARSERS = new Map([
+            ['tabBar', this.tabBarComponentParser.bind(this)],
+            ['navDestination', this.navDestinationComponentParser.bind(this)],
+            ['bindContextMenu', this.bindContextMenuComponentParser.bind(this)],
+            ['bindMenu', this.bindContextMenuComponentParser.bind(this)],
+            ['bindContentCover', this.bindContentCoverComponentParser.bind(this)],
+            ['bindSheet', this.bindContentCoverComponentParser.bind(this)],
+            ['bindPopup', this.bindPopupComponentParser.bind(this)],
+        ]);
         this.render = render;
         this.stateValues = new Map();
         this.fieldTypes = new Map();
@@ -643,7 +674,7 @@ class ViewTreeImpl extends TreeNodeStack {
     /**
      * @internal
      */
-    addBuilderNode(method) {
+    addBuilderNode(method, shouldPush = true) {
         let builderViewTree = method.getViewTree();
         if (!builderViewTree || !builderViewTree.getRoot()) {
             logger.error(`ViewTree->addBuilderNode ${method.getSignature().toString()} build viewtree fail.`);
@@ -651,12 +682,16 @@ class ViewTreeImpl extends TreeNodeStack {
             let node = ViewTreeNodeImpl.createBuilderNode();
             node.signature = method.getSignature();
             node.classSignature = node.signature;
-            this.push(node);
-            this.pop();
+            if (shouldPush) {
+                this.push(node);
+                this.pop();
+            }
             return node;
         }
         let root = builderViewTree.getRoot();
-        this.push(root);
+        if (shouldPush) {
+            this.push(root);
+        }
         if (method.getDeclaringArkClass() === this.render.getDeclaringArkClass()) {
             for (const [field, nodes] of builderViewTree.getStateValues()) {
                 for (const node of nodes) {
@@ -664,7 +699,9 @@ class ViewTreeImpl extends TreeNodeStack {
                 }
             }
         }
-        this.pop();
+        if (shouldPush) {
+            this.pop();
+        }
         return root;
     }
     /**
@@ -917,34 +954,34 @@ class ViewTreeImpl extends TreeNodeStack {
         this.popComponentExpect(EtsConst_1.COMPONENT_IF);
         return this.addSystemComponentNode(EtsConst_1.COMPONENT_IF_BRANCH);
     }
-    componentCreateParse(componentName, methodName, stmt, expr) {
+    componentCreateParse(local2Node, componentName, methodName, stmt, expr) {
         let parserFn = this.COMPONENT_CREATE_PARSERS.get(`${componentName}.${methodName}`);
         if (parserFn) {
             let node = parserFn(componentName, stmt, expr);
-            node === null || node === void 0 ? void 0 : node.addStmt(this, stmt);
+            node === null || node === void 0 ? void 0 : node.addStmt(local2Node, this, stmt);
             return node;
         }
         this.popAutomicComponent(componentName);
         let node = this.addSystemComponentNode(componentName);
-        node.addStmt(this, stmt);
+        node.addStmt(local2Node, this, stmt);
         return node;
     }
-    parseStaticInvokeExpr(local2Node, stmt, expr) {
+    parseStaticInvokeExpr(local2Node, stmt, expr, shouldPush = true) {
         let methodSignature = expr.getMethodSignature();
         let method = this.findMethod(methodSignature);
         if (method === null || method === void 0 ? void 0 : method.hasBuilderDecorator()) {
-            let node = this.addBuilderNode(method);
+            let node = this.addBuilderNode(method, shouldPush);
             node.parseStateValues(this, stmt);
             return node;
         }
         let name = methodSignature.getDeclaringClassSignature().getClassName();
         let methodName = methodSignature.getMethodSubSignature().getMethodName();
         if (this.isCreateFunc(methodName)) {
-            return this.componentCreateParse(name, methodName, stmt, expr);
+            return this.componentCreateParse(local2Node, name, methodName, stmt, expr);
         }
         let currentNode = this.top();
         if (name === (currentNode === null || currentNode === void 0 ? void 0 : currentNode.name)) {
-            currentNode.addStmt(this, stmt);
+            currentNode.addStmt(local2Node, this, stmt);
             if (methodName === EtsConst_1.COMPONENT_POP_FUNCTION) {
                 this.pop();
             }
@@ -962,7 +999,7 @@ class ViewTreeImpl extends TreeNodeStack {
      * @param local2Node
      * @param expr
      */
-    parseInstanceInvokeExpr(local2Node, stmt, expr) {
+    parseInstanceInvokeExpr(local2Node, stmt, expr, shouldPush = true) {
         let temp = expr.getBase();
         if (local2Node.has(temp)) {
             let component = local2Node.get(temp);
@@ -976,7 +1013,7 @@ class ViewTreeImpl extends TreeNodeStack {
                 this.pop();
             }
             else {
-                component === null || component === void 0 ? void 0 : component.addStmt(this, stmt);
+                component === null || component === void 0 ? void 0 : component.addStmt(local2Node, this, stmt);
             }
             return component;
         }
@@ -994,11 +1031,11 @@ class ViewTreeImpl extends TreeNodeStack {
         }
         let method = this.findMethod(expr.getMethodSignature());
         if (name === 'this' && (method === null || method === void 0 ? void 0 : method.hasBuilderDecorator())) {
-            return this.addBuilderNode(method);
+            return this.addBuilderNode(method, shouldPush);
         }
         return undefined;
     }
-    parsePtrInvokeExpr(local2Node, stmt, expr) {
+    parsePtrInvokeExpr(local2Node, stmt, expr, shouldPush = true) {
         let temp = expr.getFuncPtrLocal();
         if (temp instanceof Local_1.Local && local2Node.has(temp)) {
             let component = local2Node.get(temp);
@@ -1012,7 +1049,7 @@ class ViewTreeImpl extends TreeNodeStack {
                 this.pop();
             }
             else {
-                component === null || component === void 0 ? void 0 : component.addStmt(this, stmt);
+                component === null || component === void 0 ? void 0 : component.addStmt(local2Node, this, stmt);
             }
             return component;
         }
@@ -1031,7 +1068,7 @@ class ViewTreeImpl extends TreeNodeStack {
             }
             let method = this.findMethod(expr.getMethodSignature());
             if (name === 'this' && (method === null || method === void 0 ? void 0 : method.hasBuilderDecorator())) {
-                return this.addBuilderNode(method);
+                return this.addBuilderNode(method, shouldPush);
             }
         }
         return undefined;
@@ -1050,7 +1087,7 @@ class ViewTreeImpl extends TreeNodeStack {
      * @param stmt
      * @returns
      */
-    parseAssignStmt(local2Node, stmt) {
+    parseAssignStmt(local2Node, stmt, shouldPush = true) {
         let left = stmt.getLeftOp();
         let right = stmt.getRightOp();
         if (!(left instanceof Local_1.Local)) {
@@ -1058,13 +1095,13 @@ class ViewTreeImpl extends TreeNodeStack {
         }
         let component;
         if (right instanceof Expr_1.ArkStaticInvokeExpr) {
-            component = this.parseStaticInvokeExpr(local2Node, stmt, right);
+            component = this.parseStaticInvokeExpr(local2Node, stmt, right, shouldPush);
         }
         else if (right instanceof Expr_1.ArkInstanceInvokeExpr) {
-            component = this.parseInstanceInvokeExpr(local2Node, stmt, right);
+            component = this.parseInstanceInvokeExpr(local2Node, stmt, right, shouldPush);
         }
         else if (right instanceof Expr_1.ArkPtrInvokeExpr) {
-            component = this.parsePtrInvokeExpr(local2Node, stmt, right);
+            component = this.parsePtrInvokeExpr(local2Node, stmt, right, shouldPush);
         }
         if (component) {
             local2Node.set(left, component);
@@ -1093,7 +1130,7 @@ class ViewTreeImpl extends TreeNodeStack {
                     continue;
                 }
                 if (stmt instanceof Stmt_1.ArkAssignStmt) {
-                    this.parseAssignStmt(local2Node, stmt);
+                    this.parseAssignStmt(local2Node, stmt, false);
                 }
                 else if (stmt instanceof Stmt_1.ArkInvokeStmt) {
                     this.parseInvokeStmt(local2Node, stmt);
@@ -1101,6 +1138,125 @@ class ViewTreeImpl extends TreeNodeStack {
             }
         }
     }
+    /**
+     * Parses the 'tabBar' behavior binding.
+     * Only supports extracting the argument when it is of type CustomBuilder.
+     * Other argument types (e.g. string, Resource, TabBarOptions, SubTabBarStyle, BottomTabBarStyle, ComponentContent) are not handled.
+     *
+     * Supported signatures:
+     *   - tabBar(options: string | Resource | CustomBuilder | TabBarOptions)
+     *   - tabBar(value: SubTabBarStyle | BottomTabBarStyle) // API 9+
+     *   - tabBar(content: ComponentContent | SubTabBarStyle | BottomTabBarStyle | string | Resource | CustomBuilder | TabBarOptions) // API 18+
+     */
+    tabBarComponentParser(local2Node, stmt, expr) {
+        // Only the first argument (index 0) is analyzed for CustomBuilder type
+        return this.parseBehaviorComponent(local2Node, expr, 0);
+    }
+    /**
+     * Parses the 'navDestination' behavior binding.
+     * Supports extracting the 'builder' argument when it is of FunctionType.
+     *
+     * navDestination(builder: (name: string, param: unknown) => void)
+     */
+    navDestinationComponentParser(local2Node, stmt, expr) {
+        const args = expr.getArgs();
+        const arg = args[0];
+        const type = arg.getType();
+        if (!(type instanceof Type_1.FunctionType)) {
+            return undefined;
+        }
+        return this.parseBehaviorComponent(local2Node, expr, 0);
+    }
+    /**
+     * Parses the 'bindContextMenu' behavior binding for API 8 and API 12.
+     * Only supports extracting the 'content' argument when it is of type CustomBuilder.
+     * Other argument types (e.g. ResponseType, ContextMenuOptions) are not handled.
+     *
+     * Supported signatures:
+     *   - bindContextMenu(content: CustomBuilder, responseType: ResponseType, options?: ContextMenuOptions): T   // API 8
+     *   - bindContextMenu(isShown: boolean, content: CustomBuilder, options?: ContextMenuOptions): T             // API 12
+     */
+    bindContextMenuComponentParser(local2Node, stmt, expr) {
+        const args = expr.getArgs();
+        const firstType = args[0].getType();
+        const argIndex = firstType instanceof Type_1.BooleanType ? 1 : 0;
+        return this.parseBehaviorComponent(local2Node, expr, argIndex);
+    }
+    /**
+     * Parses the 'bindContentCover' behavior binding.
+     * Only supports extracting the CustomBuilder argument from the second parameter.
+     * Other ContentCoverOptions properties are not handled.
+     *
+     * bindContentCover(isShow: boolean, builder: CustomBuilder, options?: ContentCoverOptions): T
+     */
+    bindContentCoverComponentParser(local2Node, stmt, expr) {
+        return this.parseBehaviorComponent(local2Node, expr, 1);
+    }
+    /**
+     * Parses the 'bindPopup' behavior binding.
+     * Only supports extracting the 'builder' field from CustomPopupOptions (custom popup content).
+     * Other PopupOptions properties are not supported yet.
+     *
+     * bindPopup(show: boolean, popup: PopupOptions | CustomPopupOptions): T
+     */
+    bindPopupComponentParser(local2Node, stmt, expr) {
+        return this.parseBehaviorComponent(local2Node, expr, 1, 'builder');
+    }
+    parseBehaviorComponent(local2Node, expr, argIndex, builderFieldName) {
+        const args = expr.getArgs();
+        const arg = args[argIndex];
+        const local = arg;
+        const type = arg.getType();
+        // Prefer to return existing node
+        if (local2Node.has(local)) {
+            const node = local2Node.get(local);
+            return node;
+        }
+        // Normal ‘Builder’ parsing
+        if (!builderFieldName) {
+            if (type instanceof Type_1.FunctionType) {
+                const method = this.findMethod(type.getMethodSignature());
+                if (method && method.hasBuilderDecorator()) {
+                    const builderNode = this.addBuilderNode(method, false);
+                    local2Node.set(local, builderNode);
+                    return builderNode;
+                }
+            }
+        }
+        else {
+            // Complex builder field parsing (e.g. 'builder' field in ‘bindPopup’)
+            if (type instanceof Type_1.ClassType && builderFieldName) {
+                return this.parseBuilderFieldNode(local, type, builderFieldName, local2Node);
+            }
+        }
+        return undefined;
+    }
+    parseBuilderFieldNode(local, type, builderFieldName, local2Node) {
+        const cls = this.findClass(type.getClassSignature());
+        if (!cls) {
+            return undefined;
+        }
+        const field = cls.getFieldWithName(builderFieldName);
+        if (!field) {
+            return undefined;
+        }
+        const map = parseObjectLiteral(cls, this.getDeclaringArkClass().getDeclaringArkFile().getScene());
+        const builderValue = map.get(field);
+        if (!(builderValue instanceof Ref_1.ArkInstanceFieldRef)) {
+            return undefined;
+        }
+        const builder_type = builderValue.getType();
+        if (!(builder_type instanceof Type_1.FunctionType)) {
+            return undefined;
+        }
+        const method = this.findMethod(builder_type.getMethodSignature());
+        if (method && method.hasBuilderDecorator()) {
+            const builderNode = this.addBuilderNode(method, false);
+            local2Node.set(local, builderNode);
+            return builderNode;
+        }
+        return undefined;
+    }
 }
 exports.ViewTreeImpl = ViewTreeImpl;
 function buildViewTree(render) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "arkanalyzer",
-  "version": "1.0.67",
-  "commit_id": "9f1d0514",
+  "version": "1.0.69",
+  "commit_id": "34dca3b7",
   "files": [
     "docs",
     "lib",