arkanalyzer 1.0.41 → 1.0.43

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

@@ -0,0 +1,160 @@
+"use strict";
+/*
+ * Copyright (c) 2025 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SdkPlugin = void 0;
+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 Pag_1 = require("../Pag");
+const PTAUtils_1 = require("../PTAUtils");
+/**
+ * SdkPlugin processes OpenHarmony and built-in SDK APIs.
+ * creates fake PAG nodes for SDK method return values and parameters.
+ */
+class SdkPlugin {
+    constructor(pag, pagBuilder, cg) {
+        this.pag = pag;
+        this.pagBuilder = pagBuilder;
+        this.cg = cg;
+        this.sdkMethodReturnValueMap = new Map();
+        this.methodParamValueMap = new Map();
+        this.fakeSdkMethodParamDeclaringStmt = new Stmt_1.ArkAssignStmt(new Local_1.Local(''), new Local_1.Local(''));
+    }
+    getName() {
+        return 'SdkPlugin';
+    }
+    canHandle(cs, cgNode) {
+        let methodType = (0, PTAUtils_1.getBuiltInApiType)(cgNode.getMethod());
+        return cgNode.isSdkMethod() && (methodType === PTAUtils_1.BuiltApiType.NotBuiltIn);
+    }
+    processCallSite(cs, cid, basePTNode) {
+        let srcNodes = [];
+        this.addSDKMethodPagCallEdge(cs, cid, 0, srcNodes);
+        return srcNodes;
+    }
+    addSDKMethodPagCallEdge(cs, callerCid, calleeCid, srcNodes) {
+        let calleeFuncID = cs.getCalleeFuncID();
+        let calleeNode = this.cg.getNode(calleeFuncID);
+        let calleeMethod = this.cg.getArkMethodByFuncID(calleeFuncID);
+        if (!calleeMethod) {
+            return;
+        }
+        if (!this.methodParamValueMap.has(calleeNode.getID())) {
+            this.buildSDKFuncPag(calleeNode.getID(), calleeMethod);
+        }
+        this.addSDKMethodReturnPagEdge(cs, callerCid, calleeCid, calleeMethod, srcNodes);
+        this.addSDKMethodParamPagEdge(cs, callerCid, calleeCid, calleeNode.getID(), srcNodes);
+        return;
+    }
+    /**
+     * will not create real funcPag, only create param values
+     */
+    buildSDKFuncPag(funcID, sdkMethod) {
+        let paramArr = this.createDummyParamValue(sdkMethod);
+        this.methodParamValueMap.set(funcID, paramArr);
+    }
+    createDummyParamValue(sdkMethod) {
+        let args = sdkMethod.getParameters();
+        let paramArr = [];
+        if (!args) {
+            return paramArr;
+        }
+        // Local
+        args.forEach((arg) => {
+            let argInstance = new Local_1.Local(arg.getName(), arg.getType());
+            argInstance.setDeclaringStmt(this.fakeSdkMethodParamDeclaringStmt);
+            paramArr.push(argInstance);
+        });
+        return paramArr;
+    }
+    addSDKMethodReturnPagEdge(cs, callerCid, calleeCid, calleeMethod, srcNodes) {
+        let returnType = calleeMethod.getReturnType();
+        if (!(returnType instanceof Type_1.ClassType) || !(cs.callStmt instanceof Stmt_1.ArkAssignStmt)) {
+            return;
+        }
+        // check fake heap object exists or not
+        let cidMap = this.sdkMethodReturnValueMap.get(calleeMethod);
+        if (!cidMap) {
+            cidMap = new Map();
+        }
+        let newExpr = cidMap.get(calleeCid);
+        if (!newExpr) {
+            if (returnType instanceof Type_1.ClassType) {
+                newExpr = new Expr_1.ArkNewExpr(returnType);
+            }
+        }
+        cidMap.set(calleeCid, newExpr);
+        this.sdkMethodReturnValueMap.set(calleeMethod, cidMap);
+        let srcPagNode = this.pagBuilder.getOrNewPagNode(calleeCid, newExpr);
+        let dstPagNode = this.pagBuilder.getOrNewPagNode(callerCid, cs.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.
+     */
+    addSDKMethodParamPagEdge(cs, callerCid, calleeCid, funcID, srcNodes) {
+        var _a, _b;
+        let argNum = (_a = cs.args) === null || _a === void 0 ? void 0 : _a.length;
+        if (!argNum) {
+            return;
+        }
+        // add args to parameters edges
+        for (let i = 0; i < argNum; i++) {
+            let arg = (_b = cs.args) === null || _b === void 0 ? void 0 : _b[i];
+            let paramValue;
+            if (arg instanceof Local_1.Local && arg.getType() instanceof Type_1.FunctionType) {
+                paramValue = this.methodParamValueMap.get(funcID)[i];
+            }
+            else {
+                continue;
+            }
+            if (!(arg && paramValue)) {
+                continue;
+            }
+            // Get or create new PAG node for argument and parameter
+            let srcPagNode = this.pagBuilder.getOrNewPagNode(callerCid, arg, cs.callStmt);
+            let dstPagNode = this.pagBuilder.getOrNewPagNode(calleeCid, paramValue, cs.callStmt);
+            if (dstPagNode instanceof Pag_1.PagLocalNode) {
+                // set the fake param Value in PagLocalNode
+                /**
+                 * TODO: !!!
+                 * some API param is in the form of anonymous method:
+                 *  component/common.d.ts
+                 *  declare function animateTo(value: AnimateParam, event: () => void): void;
+                 *
+                 * this param fake Value will create PagFuncNode rather than PagLocalNode
+                 * when this API is called, the anonymous method pointer will not be able to pass into the fake Value PagNode
+                 */
+                dstPagNode.setSdkParam();
+                let sdkParamInvokeStmt = new Stmt_1.ArkInvokeStmt(new Expr_1.ArkPtrInvokeExpr(arg.getType().getMethodSignature(), paramValue, []));
+                // create new DynCallSite
+                let sdkParamCallSite = this.cg.getCallSiteManager().newDynCallSite(sdkParamInvokeStmt, undefined, undefined, funcID);
+                dstPagNode.addRelatedDynCallSite(sdkParamCallSite);
+            }
+            this.pag.addPagEdge(srcPagNode, dstPagNode, Pag_1.PagEdgeKind.Copy, cs.callStmt);
+            srcNodes.push(srcPagNode.getID());
+        }
+        return;
+    }
+    getParamValues(method) {
+        const funcID = this.cg.getCallGraphNodeByMethod(method.getSignature()).getID();
+        return this.methodParamValueMap.get(funcID);
+    }
+}
+exports.SdkPlugin = SdkPlugin;

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

@@ -0,0 +1,68 @@
+import { Stmt } from '../../../core/base/Stmt';
+import { Value } from '../../../core/base/Value';
+import { NodeID } from '../../../core/graph/GraphTraits';
+import { CallGraph, CallGraphNode } from '../../model/CallGraph';
+import { ICallSite } from '../../model/CallSite';
+import { ContextID } from '../context/Context';
+import { Pag, PagNode } from '../Pag';
+import { PagBuilder } from '../PagBuilder';
+import { IPagPlugin } from './IPagPlugin';
+export declare enum StorageType {
+    APP_STORAGE = 0,
+    LOCAL_STORAGE = 1,
+    SUBSCRIBED_ABSTRACT_PROPERTY = 2,
+    Undefined = 3
+}
+export declare enum StorageLinkEdgeType {
+    Property2Local = 0,
+    Local2Property = 1,
+    TwoWay = 2
+}
+/**
+ * StoragePlugin processes AppStorage, LocalStorage, and SubscribedAbstractProperty APIs.
+ */
+export declare class StoragePlugin implements IPagPlugin {
+    pag: Pag;
+    pagBuilder: PagBuilder;
+    cg: CallGraph;
+    private storagePropertyMap;
+    constructor(pag: Pag, pagBuilder: PagBuilder, cg: CallGraph);
+    getName(): string;
+    canHandle(cs: ICallSite, cgNode: CallGraphNode): boolean;
+    processCallSite(cs: ICallSite, cid: ContextID, emptyNode: NodeID): NodeID[];
+    /**
+     * get storageType enum with method's Declaring ClassName
+     *
+     * @param storageName ClassName that method belongs to, currently support AppStorage and SubscribedAbstractProperty
+     * SubscribedAbstractProperty: in following listing, `link1` is infered as ClassType `SubscribedAbstractProperty`,
+     * it needs to get PAG node to check the StorageType
+     * let link1: SubscribedAbstractProperty<A> = AppStorage.link('PropA');
+     * link1.set(a);
+     * @param cs: for search PAG node in SubscribedAbstractProperty
+     * @param cid: for search PAG node in SubscribedAbstractProperty
+     * @returns StorageType enum
+     */
+    private getStorageType;
+    private processStorageAPI;
+    private processStorageSetOrCreate;
+    /**
+     * search the storage map to get propertyNode with given storage and propertyFieldName
+     * @param storage storage type: AppStorage, LocalStorage etc.
+     * @param propertyName string property key
+     * @returns propertyNode: PagLocalNode
+     */
+    getOrNewPropertyNode(storage: StorageType, propertyName: string): PagNode;
+    /**
+     * add PagEdge
+     * @param edgeKind: edge kind differs from API
+     * @param propertyNode: PAG node created by protpertyName
+     * @param obj: heapObj stored with Storage API
+     */
+    addPropertyLinkEdge(propertyNode: PagNode, storageObj: Value, cid: ContextID, stmt: Stmt, edgeKind: number, srcNodes: NodeID[]): void;
+    private processStorageLink;
+    private processStorageProp;
+    private processStorageSet;
+    private processStorageGet;
+    private getPropertyName;
+}
+//# sourceMappingURL=StoragePlugin.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"StoragePlugin.d.ts","sourceRoot":"","sources":["../../../../src/callgraph/pointerAnalysis/plugins/StoragePlugin.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,IAAI,EAAiB,MAAM,yBAAyB,CAAC;AAE9D,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,iCAAiC,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,GAAG,EAA6B,OAAO,EAAE,MAAM,QAAQ,CAAC;AACjE,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,oBAAY,WAAW;IACnB,WAAW,IAAA;IACX,aAAa,IAAA;IACb,4BAA4B,IAAA;IAC5B,SAAS,IAAA;CACZ;AAED,oBAAY,mBAAmB;IAC3B,cAAc,IAAA;IACd,cAAc,IAAA;IACd,MAAM,IAAA;CACT;AAED;;GAEG;AACH,qBAAa,aAAc,YAAW,UAAU;IAC5C,GAAG,EAAE,GAAG,CAAC;IACT,UAAU,EAAE,UAAU,CAAC;IACvB,EAAE,EAAE,SAAS,CAAC;IACd,OAAO,CAAC,kBAAkB,CAAmD;gBAEjE,GAAG,EAAE,GAAG,EAAE,UAAU,EAAE,UAAU,EAAE,EAAE,EAAE,SAAS;IAU3D,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,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE;IAc3E;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,cAAc;IAatB,OAAO,CAAC,iBAAiB;IAyBzB,OAAO,CAAC,yBAAyB;IAoBjC;;;;;OAKG;IACI,oBAAoB,CAAC,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO;IAsBhF;;;;;OAKG;IACI,mBAAmB,CAAC,YAAY,EAAE,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI;IAuB5I,OAAO,CAAC,kBAAkB;IAyB1B,OAAO,CAAC,kBAAkB;IAwB1B,OAAO,CAAC,iBAAiB;IAqBzB,OAAO,CAAC,iBAAiB;IA+BzB,OAAO,CAAC,eAAe;CAY1B"}

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

@@ -0,0 +1,288 @@
+"use strict";
+/*
+ * Copyright (c) 2025 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StoragePlugin = exports.StorageLinkEdgeType = exports.StorageType = void 0;
+const Constant_1 = require("../../../core/base/Constant");
+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 Pag_1 = require("../Pag");
+var StorageType;
+(function (StorageType) {
+    StorageType[StorageType["APP_STORAGE"] = 0] = "APP_STORAGE";
+    StorageType[StorageType["LOCAL_STORAGE"] = 1] = "LOCAL_STORAGE";
+    StorageType[StorageType["SUBSCRIBED_ABSTRACT_PROPERTY"] = 2] = "SUBSCRIBED_ABSTRACT_PROPERTY";
+    StorageType[StorageType["Undefined"] = 3] = "Undefined";
+})(StorageType = exports.StorageType || (exports.StorageType = {}));
+;
+var StorageLinkEdgeType;
+(function (StorageLinkEdgeType) {
+    StorageLinkEdgeType[StorageLinkEdgeType["Property2Local"] = 0] = "Property2Local";
+    StorageLinkEdgeType[StorageLinkEdgeType["Local2Property"] = 1] = "Local2Property";
+    StorageLinkEdgeType[StorageLinkEdgeType["TwoWay"] = 2] = "TwoWay";
+})(StorageLinkEdgeType = exports.StorageLinkEdgeType || (exports.StorageLinkEdgeType = {}));
+;
+/**
+ * StoragePlugin processes AppStorage, LocalStorage, and SubscribedAbstractProperty APIs.
+ */
+class StoragePlugin {
+    constructor(pag, pagBuilder, cg) {
+        this.storagePropertyMap = new Map();
+        this.pag = pag;
+        this.pagBuilder = pagBuilder;
+        this.cg = cg;
+        // Initialize storagePropertyMap for each StorageType
+        this.storagePropertyMap.set(StorageType.APP_STORAGE, new Map());
+        this.storagePropertyMap.set(StorageType.LOCAL_STORAGE, new Map());
+    }
+    getName() {
+        return 'StoragePlugin';
+    }
+    canHandle(cs, cgNode) {
+        const storageName = cgNode.getMethod().getDeclaringClassSignature().getClassName();
+        return this.getStorageType(storageName) !== StorageType.Undefined;
+    }
+    processCallSite(cs, cid, emptyNode) {
+        let calleeFuncID = cs.getCalleeFuncID();
+        if (!calleeFuncID) {
+            return [];
+        }
+        const cgNode = this.cg.getNode(calleeFuncID);
+        const storageName = cgNode.getMethod().getDeclaringClassSignature().getClassName();
+        const storageType = this.getStorageType(storageName);
+        const calleeName = cgNode.getMethod().getMethodSubSignature().getMethodName();
+        return this.processStorageAPI(cs, cid, storageType, calleeName, this.pagBuilder);
+    }
+    /**
+     * get storageType enum with method's Declaring ClassName
+     *
+     * @param storageName ClassName that method belongs to, currently support AppStorage and SubscribedAbstractProperty
+     * SubscribedAbstractProperty: in following listing, `link1` is infered as ClassType `SubscribedAbstractProperty`,
+     * it needs to get PAG node to check the StorageType
+     * let link1: SubscribedAbstractProperty<A> = AppStorage.link('PropA');
+     * link1.set(a);
+     * @param cs: for search PAG node in SubscribedAbstractProperty
+     * @param cid: for search PAG node in SubscribedAbstractProperty
+     * @returns StorageType enum
+     */
+    getStorageType(storageName) {
+        switch (storageName) {
+            case 'AppStorage':
+                return StorageType.APP_STORAGE;
+            case 'SubscribedAbstractProperty':
+                return StorageType.SUBSCRIBED_ABSTRACT_PROPERTY;
+            case 'LocalStorage':
+                return StorageType.LOCAL_STORAGE;
+            default:
+                return StorageType.Undefined;
+        }
+    }
+    processStorageAPI(cs, cid, storageType, calleeName, pagBuilder) {
+        let srcNodes = [];
+        switch (calleeName) {
+            case 'setOrCreate':
+                this.processStorageSetOrCreate(cs, cid, storageType, srcNodes);
+                break;
+            case 'link':
+                this.processStorageLink(cs, cid, storageType, srcNodes);
+                break;
+            case 'prop':
+                this.processStorageProp(cs, cid, storageType, srcNodes);
+                break;
+            case 'set':
+                this.processStorageSet(cs, cid, storageType, srcNodes);
+                break;
+            case 'get':
+                this.processStorageGet(cs, cid, storageType, srcNodes);
+                break;
+            default:
+                break;
+        }
+        ;
+        return srcNodes;
+    }
+    processStorageSetOrCreate(cs, cid, storageType, srcNodes) {
+        let propertyStr = this.getPropertyName(cs.args[0]);
+        if (!propertyStr) {
+            return;
+        }
+        let propertyName = propertyStr;
+        let propertyNode = this.getOrNewPropertyNode(StorageType.APP_STORAGE, propertyName);
+        if (storageType === StorageType.APP_STORAGE) {
+            let storageObj = cs.args[1];
+            this.addPropertyLinkEdge(propertyNode, storageObj, cid, cs.callStmt, StorageLinkEdgeType.Local2Property, srcNodes);
+        }
+        else if (storageType === StorageType.LOCAL_STORAGE) {
+            // TODO: WIP
+        }
+        return;
+    }
+    /**
+     * search the storage map to get propertyNode with given storage and propertyFieldName
+     * @param storage storage type: AppStorage, LocalStorage etc.
+     * @param propertyName string property key
+     * @returns propertyNode: PagLocalNode
+     */
+    getOrNewPropertyNode(storage, propertyName) {
+        let storageMap = this.storagePropertyMap.get(storage);
+        let propertyLocal = storageMap.get(propertyName);
+        if (!propertyLocal) {
+            switch (storage) {
+                case StorageType.APP_STORAGE:
+                    propertyLocal = new Local_1.Local('AppStorage.' + propertyName);
+                    break;
+                case StorageType.LOCAL_STORAGE:
+                    propertyLocal = new Local_1.Local('LocalStorage.' + propertyName);
+                    break;
+                default:
+                    propertyLocal = new Local_1.Local(propertyName);
+            }
+            ;
+            storageMap.set(propertyName, propertyLocal);
+        }
+        return this.pag.getOrNewNode(-1, propertyLocal);
+    }
+    /**
+     * add PagEdge
+     * @param edgeKind: edge kind differs from API
+     * @param propertyNode: PAG node created by protpertyName
+     * @param obj: heapObj stored with Storage API
+     */
+    addPropertyLinkEdge(propertyNode, storageObj, cid, stmt, edgeKind, srcNodes) {
+        if (!(storageObj.getType() instanceof Type_1.ClassType)) {
+            return;
+        }
+        let objNode = this.pag.getOrNewNode(cid, storageObj);
+        if (edgeKind === StorageLinkEdgeType.Property2Local) {
+            // propertyNode --> objNode
+            this.pag.addPagEdge(propertyNode, objNode, Pag_1.PagEdgeKind.Copy, stmt);
+            srcNodes.push(propertyNode.getID());
+        }
+        else if (edgeKind === StorageLinkEdgeType.Local2Property) {
+            // propertyNode <-- objNode
+            this.pag.addPagEdge(objNode, propertyNode, Pag_1.PagEdgeKind.Copy, stmt);
+            srcNodes.push(objNode.getID());
+        }
+        else if (edgeKind === StorageLinkEdgeType.TwoWay) {
+            // propertyNode <-> objNode
+            this.pag.addPagEdge(propertyNode, objNode, Pag_1.PagEdgeKind.Copy, stmt);
+            this.pag.addPagEdge(objNode, propertyNode, Pag_1.PagEdgeKind.Copy, stmt);
+            srcNodes.push(propertyNode.getID(), objNode.getID());
+        }
+        return;
+    }
+    processStorageLink(cs, cid, storageType, srcNodes) {
+        let propertyStr = this.getPropertyName(cs.args[0]);
+        if (!propertyStr) {
+            return;
+        }
+        let propertyName = propertyStr;
+        let propertyNode = this.getOrNewPropertyNode(StorageType.APP_STORAGE, propertyName);
+        let leftOp = cs.callStmt.getLeftOp();
+        let linkedOpNode = this.pag.getOrNewNode(cid, leftOp);
+        if (storageType === StorageType.APP_STORAGE) {
+            if (linkedOpNode instanceof Pag_1.PagLocalNode) {
+                linkedOpNode.setStorageLink(StorageType.APP_STORAGE, propertyName);
+            }
+            this.pag.addPagEdge(propertyNode, linkedOpNode, Pag_1.PagEdgeKind.Copy);
+            this.pag.addPagEdge(linkedOpNode, propertyNode, Pag_1.PagEdgeKind.Copy);
+            srcNodes.push(propertyNode.getID(), linkedOpNode.getID());
+        }
+        else if (storageType === StorageType.LOCAL_STORAGE) {
+            // TODO: WIP
+        }
+        return;
+    }
+    processStorageProp(cs, cid, storageType, srcNodes) {
+        let propertyStr = this.getPropertyName(cs.args[0]);
+        if (!propertyStr) {
+            return;
+        }
+        let propertyName = propertyStr;
+        let propertyNode = this.getOrNewPropertyNode(StorageType.APP_STORAGE, propertyName);
+        let leftOp = cs.callStmt.getLeftOp();
+        let propedOpNode = this.pag.getOrNewNode(cid, leftOp);
+        if (storageType === StorageType.APP_STORAGE) {
+            if (propedOpNode instanceof Pag_1.PagLocalNode) {
+                propedOpNode.setStorageLink(StorageType.APP_STORAGE, propertyName);
+            }
+            this.pag.addPagEdge(propertyNode, propedOpNode, Pag_1.PagEdgeKind.Copy);
+            srcNodes.push(propertyNode.getID());
+        }
+        else if (storageType === StorageType.LOCAL_STORAGE) {
+            // TODO: WIP
+        }
+        return;
+    }
+    processStorageSet(cs, cid, storageType, srcNodes) {
+        let ivkExpr = cs.callStmt.getInvokeExpr();
+        if (ivkExpr instanceof Expr_1.ArkInstanceInvokeExpr) {
+            let base = ivkExpr.getBase();
+            let baseNode = this.pag.getOrNewNode(cid, base);
+            if (baseNode.isStorageLinked()) {
+                let argsNode = this.pag.getOrNewNode(cid, cs.args[0]);
+                this.pag.addPagEdge(argsNode, baseNode, Pag_1.PagEdgeKind.Copy);
+                srcNodes.push(argsNode.getID());
+                return;
+            }
+        }
+        else if (ivkExpr instanceof Expr_1.ArkStaticInvokeExpr) {
+            // TODO: process AppStorage.set()
+        }
+        return;
+    }
+    processStorageGet(cs, cid, storageType, srcNodes) {
+        if (!(cs.callStmt instanceof Stmt_1.ArkAssignStmt)) {
+            return;
+        }
+        let leftOp = cs.callStmt.getLeftOp();
+        let leftOpNode = this.pag.getOrNewNode(cid, leftOp);
+        let ivkExpr = cs.callStmt.getInvokeExpr();
+        let propertyName;
+        if (ivkExpr instanceof Expr_1.ArkStaticInvokeExpr) {
+            let propertyStr = this.getPropertyName(cs.args[0]);
+            if (propertyStr) {
+                propertyName = propertyStr;
+            }
+            let propertyNode = this.getOrNewPropertyNode(storageType, propertyName);
+            if (!propertyNode) {
+                return;
+            }
+            this.pag.addPagEdge(propertyNode, leftOpNode, Pag_1.PagEdgeKind.Copy, cs.callStmt);
+            srcNodes.push(propertyNode.getID());
+        }
+        else if (ivkExpr instanceof Expr_1.ArkInstanceInvokeExpr) {
+            let baseNode = this.pag.getOrNewNode(cid, ivkExpr.getBase());
+            this.pag.addPagEdge(baseNode, leftOpNode, Pag_1.PagEdgeKind.Copy, cs.callStmt);
+            srcNodes.push(baseNode.getID());
+        }
+        return;
+    }
+    getPropertyName(value) {
+        if (value instanceof Local_1.Local) {
+            let type = value.getType();
+            if (type instanceof Type_1.StringType) {
+                return type.getName();
+            }
+        }
+        else if (value instanceof Constant_1.Constant) {
+            return value.getValue();
+        }
+        return undefined;
+    }
+}
+exports.StoragePlugin = StoragePlugin;

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

@@ -120,6 +120,7 @@ export declare class ArkPtrInvokeExpr extends AbstractInvokeExpr {
     constructor(methodSignature: MethodSignature, ptr: Local | AbstractFieldRef, args: Value[], realGenericTypes?: Type[]);
     setFunPtrLocal(ptr: Local | AbstractFieldRef): void;
     getFuncPtrLocal(): Local | AbstractFieldRef;
+    inferType(arkMethod: ArkMethod): AbstractInvokeExpr;
     toString(): string;
     getUses(): Value[];
 }

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

@@ -1 +1 @@
-{"version":3,"file":"Expr.d.ts","sourceRoot":"","sources":["../../../src/core/base/Expr.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Expr.d.ts","sourceRoot":"","sources":["../../../src/core/base/Expr.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAGH,SAAS,EAGT,SAAS,EAMT,IAAI,EAKP,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,gBAAgB,EAAuD,MAAM,OAAO,CAAC;AAE9F,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAG/C,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,QAAQ,EAAiB,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAG7C;;GAEG;AACH,8BAAsB,YAAa,YAAW,KAAK;IAC/C,QAAQ,CAAC,OAAO,IAAI,KAAK,EAAE;IAE3B,QAAQ,CAAC,OAAO,IAAI,IAAI;IAExB,QAAQ,CAAC,QAAQ,IAAI,MAAM;IAEpB,SAAS,CAAC,SAAS,EAAE,SAAS,GAAG,YAAY;CAGvD;AAED,8BAAsB,kBAAmB,SAAQ,YAAY;IACzD,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,IAAI,CAAU;IACtB,OAAO,CAAC,gBAAgB,CAAC,CAAS;gBAEtB,eAAe,EAAE,eAAe,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,gBAAgB,CAAC,EAAE,IAAI,EAAE;IAOtF;;;;;;;;;;;;;OAaG;IACI,kBAAkB,IAAI,eAAe;IAIrC,kBAAkB,CAAC,kBAAkB,EAAE,eAAe,GAAG,IAAI;IAIpE;;;;OAIG;IACI,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK;IAInC;;;;;;;;;;;;;;;;;;;;;OAqBG;IACI,OAAO,IAAI,KAAK,EAAE;IAIlB,OAAO,CAAC,OAAO,EAAE,KAAK,EAAE,GAAG,IAAI;IAI/B,OAAO,IAAI,IAAI;IASf,mBAAmB,IAAI,IAAI,EAAE,GAAG,SAAS;IAIzC,mBAAmB,CAAC,SAAS,EAAE,IAAI,EAAE,GAAG,SAAS,GAAG,IAAI;IAMxD,OAAO,IAAI,KAAK,EAAE;CAQ5B;AAED,qBAAa,qBAAsB,SAAQ,kBAAkB;IACzD,OAAO,CAAC,IAAI,CAAQ;gBAER,IAAI,EAAE,KAAK,EAAE,eAAe,EAAE,eAAe,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,gBAAgB,CAAC,EAAE,IAAI,EAAE;IAKnG;;;OAGG;IACI,OAAO,IAAI,KAAK;IAIhB,OAAO,CAAC,OAAO,EAAE,KAAK,GAAG,IAAI;IAIpC;;;;;OAKG;IACI,OAAO,IAAI,KAAK,EAAE;IAWlB,QAAQ,IAAI,MAAM;IAkBlB,SAAS,CAAC,SAAS,EAAE,SAAS,GAAG,kBAAkB;CAG7D;AAED,qBAAa,mBAAoB,SAAQ,kBAAkB;gBAC3C,eAAe,EAAE,eAAe,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,gBAAgB,CAAC,EAAE,IAAI,EAAE;IAI/E,QAAQ,IAAI,MAAM;IAgBlB,SAAS,CAAC,SAAS,EAAE,SAAS,GAAG,kBAAkB;CAG7D;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,qBAAa,gBAAiB,SAAQ,kBAAkB;IACpD,OAAO,CAAC,MAAM,CAA2B;gBAE7B,eAAe,EAAE,eAAe,EAAE,GAAG,EAAE,KAAK,GAAG,gBAAgB,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,gBAAgB,CAAC,EAAE,IAAI,EAAE;IAK9G,cAAc,CAAC,GAAG,EAAE,KAAK,GAAG,gBAAgB,GAAG,IAAI;IAInD,eAAe,IAAI,KAAK,GAAG,gBAAgB;IAI3C,SAAS,CAAC,SAAS,EAAE,SAAS,GAAG,kBAAkB;IAUnD,QAAQ,IAAI,MAAM;IAwBlB,OAAO,IAAI,KAAK,EAAE;CAS5B;AAED,qBAAa,UAAW,SAAQ,YAAY;IACxC,OAAO,CAAC,SAAS,CAAY;gBAEjB,SAAS,EAAE,SAAS;IAKzB,YAAY,IAAI,SAAS;IAIzB,OAAO,IAAI,KAAK,EAAE;IAIlB,OAAO,IAAI,IAAI;IAIf,QAAQ,IAAI,MAAM;IAIlB,SAAS,CAAC,SAAS,EAAE,SAAS,GAAG,UAAU;IAyBlD,OAAO,CAAC,oBAAoB;CAW/B;AAED,qBAAa,eAAgB,SAAQ,YAAY;IAC7C,OAAO,CAAC,QAAQ,CAAO;IACvB,OAAO,CAAC,IAAI,CAAQ;IAEpB,OAAO,CAAC,WAAW,CAAU;gBAEjB,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,GAAE,OAAe;IAO9D,OAAO,IAAI,KAAK;IAIhB,OAAO,CAAC,OAAO,EAAE,KAAK,GAAG,IAAI;IAI7B,OAAO,IAAI,SAAS;IAIpB,WAAW,IAAI,IAAI;IAInB,WAAW,CAAC,OAAO,EAAE,IAAI,GAAG,IAAI;IAIhC,aAAa,IAAI,OAAO;IAIxB,SAAS,CAAC,SAAS,EAAE,SAAS,GAAG,eAAe;IAQhD,OAAO,IAAI,KAAK,EAAE;IAMlB,QAAQ,IAAI,MAAM;CAG5B;AAED,qBAAa,aAAc,SAAQ,YAAY;IAC3C,OAAO,CAAC,KAAK,CAAmB;gBAEpB,KAAK,EAAE,gBAAgB;IAK5B,QAAQ,IAAI,gBAAgB;IAI5B,QAAQ,CAAC,QAAQ,EAAE,gBAAgB,GAAG,IAAI;IAI1C,OAAO,IAAI,IAAI;IAIf,OAAO,IAAI,KAAK,EAAE;IAOlB,QAAQ,IAAI,MAAM;CAG5B;AAED,qBAAa,YAAa,SAAQ,YAAY;IAC1C,OAAO,CAAC,OAAO,CAAQ;gBAEX,OAAO,EAAE,KAAK;IAKnB,UAAU,IAAI,KAAK;IAInB,UAAU,CAAC,UAAU,EAAE,KAAK,GAAG,IAAI;IAInC,OAAO,IAAI,IAAI;IAUf,SAAS,CAAC,SAAS,EAAE,SAAS,GAAG,YAAY;IAK7C,OAAO,IAAI,KAAK,EAAE;IAOlB,QAAQ,IAAI,MAAM;CAI5B;AAED,qBAAa,YAAa,SAAQ,YAAY;IAC1C,OAAO,CAAC,UAAU,CAAQ;gBAEd,UAAU,EAAE,KAAK;IAKtB,aAAa,IAAI,KAAK;IAItB,aAAa,CAAC,aAAa,EAAE,KAAK,GAAG,IAAI;IAIzC,OAAO,IAAI,IAAI;IAIf,OAAO,IAAI,KAAK,EAAE;IAOlB,QAAQ,IAAI,MAAM;CAI5B;AAED,oBAAY,oBAAoB;IAE5B,iBAAiB,OAAO;IAGxB,cAAc,OAAO;IACrB,QAAQ,MAAM;IACd,QAAQ,MAAM;IACd,WAAW,MAAM;IACjB,cAAc,MAAM;IACpB,SAAS,MAAM;IAGf,SAAS,OAAO;IAChB,UAAU,OAAO;IACjB,kBAAkB,QAAQ;IAG1B,UAAU,MAAM;IAChB,SAAS,MAAM;IACf,UAAU,MAAM;IAGhB,UAAU,OAAO;IACjB,SAAS,OAAO;CACnB;AAED,oBAAY,wBAAwB;IAChC,QAAQ,MAAM;IACd,eAAe,OAAO;IACtB,WAAW,MAAM;IACjB,kBAAkB,OAAO;IACzB,QAAQ,OAAO;IACf,UAAU,OAAO;IACjB,cAAc,QAAQ;IACtB,gBAAgB,QAAQ;IACxB,YAAY,OAAO;CACtB;AAED,MAAM,MAAM,cAAc,GAAG,oBAAoB,GAAG,wBAAwB,CAAC;AAG7E,8BAAsB,iBAAkB,SAAQ,YAAY;IACxD,SAAS,CAAC,GAAG,EAAE,KAAK,CAAC;IACrB,SAAS,CAAC,GAAG,EAAE,KAAK,CAAC;IACrB,SAAS,CAAC,QAAQ,EAAE,cAAc,CAAC;IAEnC,SAAS,CAAC,IAAI,EAAG,IAAI,CAAC;gBAEV,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,cAAc;IAO5D;;;;OAIG;IACI,MAAM,IAAI,KAAK;IAIf,MAAM,CAAC,MAAM,EAAE,KAAK,GAAG,IAAI;IAIlC;;;;OAIG;IACI,MAAM,IAAI,KAAK;IAIf,MAAM,CAAC,MAAM,EAAE,KAAK,GAAG,IAAI;IAIlC;;;;;;;;;;;;;;OAcG;IACI,WAAW,IAAI,cAAc;IAI7B,OAAO,IAAI,IAAI;IAOf,OAAO,IAAI,KAAK,EAAE;IASlB,QAAQ,IAAI,MAAM;IAIzB,SAAS,CAAC,WAAW,CAAC,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,SAAS,GAAG,IAAI;IAM5D,SAAS,CAAC,OAAO,IAAI,IAAI;IA2ElB,SAAS,CAAC,SAAS,EAAE,SAAS,GAAG,iBAAiB;CAM5D;AAED,qBAAa,gBAAiB,SAAQ,iBAAiB;gBACvC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,wBAAwB;IAI/D,SAAS,CAAC,SAAS,EAAE,SAAS,GAAG,gBAAgB;CAiB3D;AAED,qBAAa,kBAAmB,SAAQ,iBAAiB;gBACzC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,oBAAoB;CAGrE;AAED,qBAAa,aAAc,SAAQ,YAAY;IAC3C,OAAO,CAAC,EAAE,CAAQ;gBAEN,EAAE,EAAE,KAAK;IAKd,KAAK,IAAI,KAAK;IAId,KAAK,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAIzB,OAAO,IAAI,KAAK,EAAE;IAOlB,OAAO,IAAI,IAAI;IAIf,QAAQ,IAAI,MAAM;IAIlB,SAAS,CAAC,SAAS,EAAE,SAAS,GAAG,YAAY;CAMvD;AAED,qBAAa,iBAAkB,SAAQ,YAAY;IAC/C,OAAO,CAAC,EAAE,CAAQ;IAClB,OAAO,CAAC,SAAS,CAAO;gBAEZ,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI;IAM/B,KAAK,IAAI,KAAK;IAId,KAAK,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAIzB,YAAY,IAAI,IAAI;IAIpB,OAAO,IAAI,IAAI;IAIf,OAAO,IAAI,KAAK,EAAE;IAOlB,QAAQ,IAAI,MAAM;IAIlB,SAAS,CAAC,SAAS,EAAE,SAAS,GAAG,YAAY;CAUvD;AAGD,qBAAa,WAAY,SAAQ,YAAY;IACzC,OAAO,CAAC,EAAE,CAAQ;IAClB,OAAO,CAAC,IAAI,CAAO;gBAEP,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI;IAM1B,KAAK,IAAI,KAAK;IAId,KAAK,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAIzB,OAAO,IAAI,KAAK,EAAE;IAOlB,OAAO,IAAI,IAAI;IAIf,SAAS,CAAC,SAAS,EAAE,SAAS,GAAG,YAAY;IAW7C,QAAQ,IAAI,MAAM;CAG5B;AAED,qBAAa,UAAW,SAAQ,YAAY;IACxC,OAAO,CAAC,IAAI,CAAU;IACtB,OAAO,CAAC,UAAU,CAAyB;;IAQpC,OAAO,IAAI,KAAK,EAAE;IAMlB,OAAO,IAAI,KAAK,EAAE;IAIlB,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI;IAI5B,aAAa,IAAI,GAAG,CAAC,KAAK,EAAE,UAAU,CAAC;IAIvC,aAAa,CAAC,UAAU,EAAE,GAAG,CAAC,KAAK,EAAE,UAAU,CAAC,GAAG,IAAI;IAIvD,OAAO,IAAI,IAAI;IAIf,QAAQ,IAAI,MAAM;CAa5B;AAED,oBAAY,aAAa;IACrB,GAAG,MAAM;IACT,UAAU,MAAM;IAChB,UAAU,MAAM;CACnB;AAGD,qBAAa,WAAY,SAAQ,YAAY;IACzC,OAAO,CAAC,EAAE,CAAQ;IAClB,OAAO,CAAC,QAAQ,CAAgB;gBAEpB,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,aAAa;IAMvC,OAAO,IAAI,KAAK,EAAE;IAOlB,KAAK,IAAI,KAAK;IAId,KAAK,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAIzB,OAAO,IAAI,IAAI;IAItB;;;OAGG;IACI,WAAW,IAAI,aAAa;IAI5B,QAAQ,IAAI,MAAM;CAG5B;AAED,MAAM,MAAM,sBAAsB,GAAG,IAAI,GAAG,UAAU,GAAG,KAAK,GAAG,QAAQ,GAAG,SAAS,GAAG,QAAQ,CAAC;AAEjG;;;;;;;;;;;;;;;;GAgBG;AACH,qBAAa,aAAc,SAAQ,YAAY;IAC3C,OAAO,CAAC,cAAc,CAAyB;IAC/C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAkB;IACrD,OAAO,CAAC,gBAAgB,CAAC,CAAS;gBAEtB,cAAc,EAAE,sBAAsB,EAAE,kBAAkB,CAAC,EAAE,OAAO;IAQzE,iBAAiB,IAAI,sBAAsB;IAI3C,iBAAiB,CAAC,MAAM,EAAE,sBAAsB,GAAG,IAAI;IAIvD,qBAAqB,IAAI,OAAO;IAIhC,mBAAmB,CAAC,gBAAgB,EAAE,IAAI,EAAE,GAAG,IAAI;IAInD,mBAAmB,IAAI,IAAI,EAAE,GAAG,SAAS;IAIzC,OAAO,IAAI,IAAI;IA0Cf,SAAS,CAAC,SAAS,EAAE,SAAS,GAAG,YAAY;IAIpD;;;OAGG;IACI,OAAO,IAAI,KAAK,EAAE;IAIlB,QAAQ,IAAI,MAAM;WAoCX,wBAAwB,CAAC,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,sBAAsB;CAUxF"}

package/lib/core/base/Expr.js

@@ -231,6 +231,15 @@ class ArkPtrInvokeExpr extends AbstractInvokeExpr {
     getFuncPtrLocal() {
         return this.funPtr;
     }
+    inferType(arkMethod) {
+        this.getArgs().forEach(arg => TypeInference_1.TypeInference.inferValueType(arg, arkMethod));
+        const ptrType = this.funPtr.getType();
+        if (ptrType instanceof Type_1.FunctionType) {
+            this.setMethodSignature(ptrType.getMethodSignature());
+        }
+        IRInference_1.IRInference.inferArgs(this, arkMethod);
+        return IRInference_1.IRInference.inferStaticInvokeExpr(this, arkMethod);
+    }
     toString() {
         let strs = [];
         strs.push('ptrinvoke <');

package/lib/core/common/DummyMainCreater.js

@@ -228,7 +228,7 @@ class DummyMainCreater {
         const whileStmt = new Stmt_1.ArkIfStmt(conditionTrue);
         firstBlock.addStmt(countAssignStmt);
         dummyCfg.addBlock(firstBlock);
-        dummyCfg.setStartingStmt(firstBlock.getStmts()[0]);
+        dummyCfg.setStartingStmt(firstBlock.getHead());
         const whileBlock = new BasicBlock_1.BasicBlock();
         whileBlock.addStmt(whileStmt);
         dummyCfg.addBlock(whileBlock);

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

@@ -25,7 +25,7 @@ export declare class IRInference {
     static inferFieldRef(ref: ArkInstanceFieldRef, arkMethod: ArkMethod): AbstractRef;
     private static inferBase;
     static inferThisLocal(arkMethod: ArkMethod): Local | null;
-    private static inferArgs;
+    static inferArgs(expr: AbstractInvokeExpr, arkMethod: ArkMethod): void;
     private static inferArg;
     static inferRightWithSdkType(leftType: Type, rightType: Type, ackClass: ArkClass): void;
     static inferArgTypeWithSdk(sdkType: ClassType, scene: Scene, argType: Type): void;

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

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

package/lib/core/common/IRInference.js

@@ -325,6 +325,7 @@ class IRInference {
         }
     }
     static inferArg(expr, argType, paramType, scene, realTypes) {
+        var _a;
         if (paramType instanceof Type_1.UnionType) {
             paramType.getTypes().forEach(t => this.inferArg(expr, argType, t, scene, realTypes));
         }
@@ -346,10 +347,11 @@ class IRInference {
             realTypes.push(argType);
         }
         else if (paramType instanceof Type_1.FunctionType && argType instanceof Type_1.FunctionType) {
-            if (paramType.getMethodSignature().getParamLength() > 0 && paramType.getMethodSignature().getType() instanceof Type_1.GenericType) {
+            const returnType = paramType.getMethodSignature().getType();
+            if (paramType.getMethodSignature().getParamLength() > 0 && returnType instanceof Type_1.GenericType) {
                 const paramMethod = scene.getMethod(expr.getMethodSignature());
                 const argMethod = scene.getMethod(argType.getMethodSignature());
-                if (paramMethod && paramMethod.getGenericTypes() && argMethod) {
+                if (argMethod && ((_a = paramMethod === null || paramMethod === void 0 ? void 0 : paramMethod.getGenericTypes()) === null || _a === void 0 ? void 0 : _a.find(t => t === returnType))) {
                     TypeInference_1.TypeInference.inferTypeInMethod(argMethod);
                 }
             }
@@ -671,7 +673,9 @@ class IRInference {
                 if (type instanceof Type_1.FunctionType) {
                     this.assignAnonMethod(scene.getMethod(type.getMethodSignature()), property);
                 }
-                anonField.setSignature(new ArkSignature_1.FieldSignature(anonField.getName(), property.getDeclaringArkClass().getSignature(), new Type_1.FunctionType(property.getSignature())));
+                if (type instanceof Type_1.UnknownType) {
+                    anonField.setSignature(new ArkSignature_1.FieldSignature(anonField.getName(), property.getDeclaringArkClass().getSignature(), new Type_1.FunctionType(property.getSignature())));
+                }
             }
         }
         for (const anonMethod of anon.getMethods()) {

package/lib/core/common/ModelUtils.js

@@ -516,7 +516,7 @@ function getArkFile(im) {
         const originPath = path_1.default.resolve(parentPath, from);
         return getArkFileFromScene(im, originPath);
     }
-    else if (/^@[a-z|\-]+?\//.test(from)) {
+    else if ((moduleMap === null || moduleMap === void 0 ? void 0 : moduleMap.get(from)) || /^@[a-z|\-]+?\//.test(from)) {
         //module path
         const arkFile = getArkFileFromOtherModule(im);
         if (arkFile) {