arkanalyzer 1.0.42 → 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/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/SdkUtils.d.ts

@@ -9,8 +9,8 @@ export declare class SdkUtils {
     private static sdkImportMap;
     static BUILT_IN_NAME: string;
     private static BUILT_IN_PATH;
-    static BUILT_IN_SDK: Sdk;
     static setEsVersion(buildProfile: any): void;
+    static getBuiltInSdk(): Sdk;
     static fetchBuiltInFiles(builtInPath: string): string[];
     private static dfsFiles;
     static dispose(): void;

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

@@ -1 +1 @@
-{"version":3,"file":"SdkUtils.d.ts","sourceRoot":"","sources":["../../../src/core/common/SdkUtils.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAc,MAAM,oBAAoB,CAAC;AAO3D,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAG/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAG/C,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAMnC,qBAAa,QAAQ;IACjB,OAAO,CAAC,MAAM,CAAC,SAAS,CAAoB;IAC5C,OAAO,CAAC,MAAM,CAAC,YAAY,CAGxB;IAEH,OAAO,CAAC,MAAM,CAAC,YAAY,CAAoD;IAC/E,OAAc,aAAa,SAAc;IACzC,OAAO,CAAC,MAAM,CAAC,aAAa,CAAsC;IAClE,OAAc,YAAY,EAAE,GAAG,CAI7B;WAEY,YAAY,CAAC,YAAY,EAAE,GAAG,GAAG,IAAI;WAQrC,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE;IAuB9D,OAAO,CAAC,MAAM,CAAC,QAAQ;WAaT,OAAO,IAAI,IAAI;WAIf,iBAAiB,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI;WAOtC,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS;IAIjE,OAAO,CAAC,MAAM,CAAC,YAAY;WAUb,aAAa,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAI;WAqBrE,cAAc,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAI;WAWtE,OAAO,CAAC,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,QAAQ,GAAE,OAAe,GAAG,IAAI;WAY3F,eAAe,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAI;IAgBrF,OAAO,CAAC,MAAM,CAAC,SAAS;IAiBxB,OAAO,CAAC,MAAM,CAAC,eAAe;IA0B9B,OAAO,CAAC,MAAM,CAAC,WAAW;WAkBZ,iBAAiB,CAAC,MAAM,EAAE,gBAAgB,EAAE,SAAS,EAAE,SAAS,GAAG,IAAI;CAUxF"}
+{"version":3,"file":"SdkUtils.d.ts","sourceRoot":"","sources":["../../../src/core/common/SdkUtils.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAc,MAAM,oBAAoB,CAAC;AAO3D,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAG/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAG/C,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAMnC,qBAAa,QAAQ;IACjB,OAAO,CAAC,MAAM,CAAC,SAAS,CAAoB;IAC5C,OAAO,CAAC,MAAM,CAAC,YAAY,CAGxB;IAEH,OAAO,CAAC,MAAM,CAAC,YAAY,CAAoD;IAC/E,OAAc,aAAa,SAAc;IACzC,OAAO,CAAC,MAAM,CAAC,aAAa,CAAsC;WAEpD,YAAY,CAAC,YAAY,EAAE,GAAG,GAAG,IAAI;WAQrC,aAAa,IAAI,GAAG;WAkBpB,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE;IAW9D,OAAO,CAAC,MAAM,CAAC,QAAQ;WAaT,OAAO,IAAI,IAAI;WAIf,iBAAiB,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI;WAOtC,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS;IAIjE,OAAO,CAAC,MAAM,CAAC,YAAY;WAUb,aAAa,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAI;WAqBrE,cAAc,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAI;WAWtE,OAAO,CAAC,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,QAAQ,GAAE,OAAe,GAAG,IAAI;WAY3F,eAAe,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAI;IAgBrF,OAAO,CAAC,MAAM,CAAC,SAAS;IAiBxB,OAAO,CAAC,MAAM,CAAC,eAAe;IA0B9B,OAAO,CAAC,MAAM,CAAC,WAAW;WAkBZ,iBAAiB,CAAC,MAAM,EAAE,gBAAgB,EAAE,SAAS,EAAE,SAAS,GAAG,IAAI;CAUxF"}

package/lib/core/common/SdkUtils.js

@@ -63,21 +63,26 @@ class SdkUtils {
             this.esVersion = version;
         }
     }
+    static getBuiltInSdk() {
+        let builtInPath;
+        try {
+            // If arkanalyzer is used as dependency by other project, the base directory should be the module path.
+            const moduleRoot = path_1.default.dirname(path_1.default.dirname(require.resolve('arkanalyzer')));
+            builtInPath = path_1.default.join(moduleRoot, this.BUILT_IN_PATH);
+            logger.debug(`arkanalyzer is used as dependency, so using builtin sdk file in ${builtInPath}.`);
+        }
+        catch (_a) {
+            builtInPath = path_1.default.resolve(this.BUILT_IN_PATH);
+            logger.debug(`use builtin sdk file in ${builtInPath}.`);
+        }
+        return {
+            moduleName: '',
+            name: this.BUILT_IN_NAME,
+            path: builtInPath
+        };
+    }
     static fetchBuiltInFiles(builtInPath) {
         var _a;
-        if (!builtInPath) {
-            try {
-                // If arkanalyzer is used as dependency by other project, the base directory should be the module path.
-                const moduleRoot = path_1.default.dirname(path_1.default.dirname(require.resolve('arkanalyzer')));
-                builtInPath = path_1.default.join(moduleRoot, this.BUILT_IN_PATH);
-                logger.debug(`arkanalyzer is used as dependency, so using builtin sdk file in ${builtInPath}.`);
-            }
-            catch (_b) {
-                builtInPath = path_1.default.resolve(this.BUILT_IN_PATH);
-                logger.debug(`use builtin sdk file in ${builtInPath}.`);
-            }
-            this.BUILT_IN_SDK.path = builtInPath;
-        }
         const filePath = path_1.default.resolve(builtInPath, (_a = this.esVersionMap.get(this.esVersion)) !== null && _a !== void 0 ? _a : '');
         if (!fs_1.default.existsSync(filePath)) {
             logger.error(`built in directory ${filePath} is not exist, please check!`);
@@ -261,8 +266,3 @@ SdkUtils.esVersionMap = new Map([
 SdkUtils.sdkImportMap = new Map();
 SdkUtils.BUILT_IN_NAME = 'built-in';
 SdkUtils.BUILT_IN_PATH = 'node_modules/ohos-typescript/lib';
-SdkUtils.BUILT_IN_SDK = {
-    moduleName: '',
-    name: `${SdkUtils.BUILT_IN_NAME}`,
-    path: ''
-};

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

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

package/lib/core/common/TypeInference.js

@@ -752,8 +752,8 @@ class TypeInference {
         return this.parseArkExport2Type(arkExport);
     }
     static inferTypeByName(typeName, arkClass) {
-        var _a, _b, _c, _d, _e;
-        let arkExport = (_e = (_a = ModelUtils_1.ModelUtils.getClassWithName(typeName, arkClass)) !== null && _a !== void 0 ? _a : (_d = (_c = (_b = ModelUtils_1.ModelUtils.getDefaultClass(arkClass)) === null || _b === void 0 ? void 0 : _b.getDefaultArkMethod()) === null || _c === void 0 ? void 0 : _c.getBody()) === null || _d === void 0 ? void 0 : _d.getAliasTypeByName(typeName)) !== null && _e !== void 0 ? _e : ModelUtils_1.ModelUtils.getArkExportInImportInfoWithName(typeName, arkClass.getDeclaringArkFile());
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        let arkExport = (_k = (_f = (_a = ModelUtils_1.ModelUtils.getClassWithName(typeName, arkClass)) !== null && _a !== void 0 ? _a : (_e = (_d = (_c = (_b = ModelUtils_1.ModelUtils.getDefaultClass(arkClass)) === null || _b === void 0 ? void 0 : _b.getDefaultArkMethod()) === null || _c === void 0 ? void 0 : _c.getBody()) === null || _d === void 0 ? void 0 : _d.getLocals()) === null || _e === void 0 ? void 0 : _e.get(typeName)) !== null && _f !== void 0 ? _f : (_j = (_h = (_g = ModelUtils_1.ModelUtils.getDefaultClass(arkClass)) === null || _g === void 0 ? void 0 : _g.getDefaultArkMethod()) === null || _h === void 0 ? void 0 : _h.getBody()) === null || _j === void 0 ? void 0 : _j.getAliasTypeByName(typeName)) !== null && _k !== void 0 ? _k : ModelUtils_1.ModelUtils.getArkExportInImportInfoWithName(typeName, arkClass.getDeclaringArkFile());
         if (!arkExport && !arkClass.getDeclaringArkFile().getImportInfoBy(typeName)) {
             arkExport = arkClass.getDeclaringArkFile().getScene().getSdkGlobal(typeName);
         }

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

@@ -1192,7 +1192,7 @@ class CfgBuilder {
         }
         const cfg = new Cfg_1.Cfg();
         const startingBasicBlock = blockBuilderToCfgBlock.get(this.blocks[0]);
-        cfg.setStartingStmt(startingBasicBlock.getStmts()[0]);
+        cfg.setStartingStmt(startingBasicBlock.getHead());
         currBlockId = 0;
         for (const basicBlock of basicBlockSet) {
             basicBlock.setId(currBlockId++);

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

@@ -178,7 +178,7 @@ class ConditionBuilder {
         return { firstIfTruePos, firstIfFalsePos, firstEndPos };
     }
     removeUnnecessaryBlocksInConditionalOperator(bottomBlock, allBlocks) {
-        const firstStmtInBottom = bottomBlock.getStmts()[0];
+        const firstStmtInBottom = bottomBlock.getHead();
         if (!(firstStmtInBottom instanceof Stmt_1.ArkAssignStmt)) {
             return [bottomBlock];
         }