arkanalyzer 1.0.90 → 1.0.91

package/lib/core/graph/ModuleDepGraph.js

@@ -0,0 +1,421 @@
+"use strict";
+/*
+ * Copyright (c) 2026 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.ModuleDepGraph = exports.DependencyType = void 0;
+const BaseImplicitGraph_1 = require("./BaseImplicitGraph");
+const Scc_1 = require("./Scc");
+/**
+ * Dependency type enum, indicating the source of a dependency edge.
+ * Used during SCC post-processing to remove edges by priority when splitting oversized module groups.
+ *
+ * Priority (removal priority; higher value = removed first):
+ *   - DEV_DEPENDENCIES (devDependencies): only needed during development, removed first
+ *   - DYNAMIC (dynamicDependencies): runtime dynamic loading, removed next
+ *   - DEPENDENCIES (dependencies): core dependency, removed last
+ */
+var DependencyType;
+(function (DependencyType) {
+    DependencyType[DependencyType["DEPENDENCIES"] = 0] = "DEPENDENCIES";
+    DependencyType[DependencyType["DYNAMIC"] = 1] = "DYNAMIC";
+    DependencyType[DependencyType["DEV_DEPENDENCIES"] = 2] = "DEV_DEPENDENCIES";
+})(DependencyType = exports.DependencyType || (exports.DependencyType = {}));
+/**
+ * Module dependency graph, based on BaseImplicitGraph.
+ * The node type is ArkModule, and edges represent dependency relationships between modules.
+ *
+ * Differences from DependsGraph (BaseExplicitGraph):
+ * - No BaseNode/BaseEdge objects needed; the node is the ArkModule itself
+ * - Edge information is implicitly stored via succMap/predMap (Map<NodeID, NodeID[]>)
+ * - Works with Canonicalizer<ArkModule> to provide bidirectional ArkModule <-> NodeID mapping
+ *
+ * SCCDetection has been generalized to accept any graph implementing GraphTraits<any>,
+ * i.e. one providing nodesItor(), getNode(id), getNodeID(node), succ(id) methods.
+ * ModuleDepGraph satisfies these methods by inheriting from BaseImplicitGraph,
+ * without requiring nodes to have BaseNode methods like getID() or getOutgoingEdges().
+ */
+class ModuleDepGraph extends BaseImplicitGraph_1.BaseImplicitGraph {
+    constructor(moduleCanonicalizer) {
+        super();
+        /**
+         * Edge type map, key is `${srcId}->${dstId}`, value is the dependency type.
+         * Used during SCC post-processing to remove edges by dependency type priority.
+         */
+        this.edgeTypeMap = new Map();
+        /**
+         * Topological order of nodes after SCC refinement, populated by refineSCCGroups.
+         * Depended-on modules appear before their dependents.
+         */
+        this.topoOrder = [];
+        /**
+         * SCC groups: NodeID -> all NodeIDs in the same SCC group.
+         * Populated by refineSCCGroups and retained for later queries.
+         */
+        this.sccGroups = new Map();
+        /**
+         * SCC post-processing threshold: the maximum allowed number of modules in a group; SCCs
+         * exceeding this size are split. Default 3; set to Number.MAX_SAFE_INTEGER to disable.
+         */
+        this.maxSCCGroupSize = 3;
+        this.moduleCanonicalizer = moduleCanonicalizer;
+        this.nodeToIdMap = new Map();
+        this.idToNodeMap = new Map();
+        this.succMap = new Map();
+        this.predMap = new Map();
+        this.edgeTypeMap = new Map();
+    }
+    getGraphName() {
+        return 'ModuleDepGraph';
+    }
+    /**
+     * Add a module node to the graph.
+     * The node's NodeID directly uses the ModuleID assigned by the Canonicalizer.
+     */
+    addModule(module) {
+        const id = this.moduleCanonicalizer.getId(module);
+        this.nodeToIdMap.set(module, id);
+        this.idToNodeMap.set(id, module);
+        // Ensure the node has corresponding entries in succMap and predMap (empty arrays)
+        if (!this.succMap.has(id)) {
+            this.succMap.set(id, []);
+        }
+        if (!this.predMap.has(id)) {
+            this.predMap.set(id, []);
+        }
+    }
+    /**
+     * Add a dependency edge: src depends on dst (src -> dst).
+     * succMap stores successors (dependency targets), predMap stores predecessors (dependents).
+     * @param type Dependency type, used for edge removal priority during SCC post-processing.
+     *              When the same edge is added twice, the type with the lower removal priority is kept (i.e. the more core dependency).
+     */
+    addDependencyEdge(srcId, dstId, type = DependencyType.DEPENDENCIES) {
+        // Add successor
+        let succs = this.succMap.get(srcId);
+        if (!succs) {
+            succs = [];
+            this.succMap.set(srcId, succs);
+        }
+        if (!succs.includes(dstId)) {
+            succs.push(dstId);
+        }
+        // Add predecessor
+        let preds = this.predMap.get(dstId);
+        if (!preds) {
+            preds = [];
+            this.predMap.set(dstId, preds);
+        }
+        if (!preds.includes(srcId)) {
+            preds.push(srcId);
+        }
+        // Record edge type: when the same edge is added twice, keep the type with the lower removal priority (smaller value = more core)
+        const edgeKey = `${srcId}->${dstId}`;
+        const existingType = this.edgeTypeMap.get(edgeKey);
+        if (existingType === undefined || type < existingType) {
+            this.edgeTypeMap.set(edgeKey, type);
+        }
+    }
+    /**
+     * Remove a dependency edge.
+     */
+    removeDependencyEdge(srcId, dstId) {
+        this.removeFromAdjacencyList(this.succMap, srcId, dstId);
+        this.removeFromAdjacencyList(this.predMap, dstId, srcId);
+        this.edgeTypeMap.delete(`${srcId}->${dstId}`);
+    }
+    /**
+     * Remove a node ID from an adjacency list entry.
+     */
+    removeFromAdjacencyList(adjMap, key, value) {
+        const list = adjMap.get(key);
+        if (!list) {
+            return;
+        }
+        const idx = list.indexOf(value);
+        if (idx >= 0) {
+            list.splice(idx, 1);
+        }
+    }
+    /**
+     * Get the dependency type of a specific edge.
+     * @returns The dependency type, or undefined if the edge does not exist.
+     */
+    getEdgeType(srcId, dstId) {
+        return this.edgeTypeMap.get(`${srcId}->${dstId}`);
+    }
+    /**
+     * Get all successor (dependency target) module IDs of the specified module.
+     */
+    getSuccModuleIds(moduleId) {
+        var _a;
+        return (_a = this.succMap.get(moduleId)) !== null && _a !== void 0 ? _a : [];
+    }
+    /**
+     * Get all predecessor (dependent) module IDs of the specified module.
+     */
+    getPredModuleIds(moduleId) {
+        var _a;
+        return (_a = this.predMap.get(moduleId)) !== null && _a !== void 0 ? _a : [];
+    }
+    /**
+     * Check whether a dependency edge exists between two modules.
+     */
+    hasDependencyEdge(srcId, dstId) {
+        const succs = this.succMap.get(srcId);
+        return succs !== undefined && succs.includes(dstId);
+    }
+    /**
+     * Get the total number of edges in the graph.
+     */
+    getEdgeCount() {
+        let count = 0;
+        for (const succs of this.succMap.values()) {
+            count += succs.length;
+        }
+        return count;
+    }
+    /**
+     * Get the topological order produced by the last refineSCCGroups call.
+     * Depended-on modules appear before their dependents.
+     */
+    getTopoOrder() {
+        return this.topoOrder;
+    }
+    /**
+     * Get the SCC groups map (NodeID -> all NodeIDs in the same SCC group) produced by the last
+     * refineSCCGroups call.
+     */
+    getSCCGroups() {
+        return this.sccGroups;
+    }
+    /**
+     * Set the SCC post-processing threshold. SCCs larger than this size are split.
+     * Set to Number.MAX_SAFE_INTEGER to disable post-processing.
+     */
+    setMaxSCCGroupSize(maxGroupSize) {
+        this.maxSCCGroupSize = maxGroupSize;
+    }
+    /** Current SCC post-processing threshold. */
+    getMaxSCCGroupSize() {
+        return this.maxSCCGroupSize;
+    }
+    /**
+     * Detect strong bridges in the SCC subgraph.
+     * A strong bridge is a directed edge whose removal increases the number of SCCs.
+     * For each edge u->v, check if removing it causes u and v to no longer be
+     * mutually reachable. If either u cannot reach v or v cannot reach u without
+     * the edge, then u->v is a strong bridge.
+     * @param members Node IDs in the large SCC
+     * @returns Array of strong bridge edges with their dependency types
+     */
+    findStrongBridges(members) {
+        var _a;
+        const memberSet = new Set(members);
+        const bridges = [];
+        // Collect all internal edges
+        const edges = [];
+        for (const srcId of members) {
+            const succs = this.getSuccModuleIds(srcId);
+            for (const dstId of succs) {
+                if (memberSet.has(dstId)) {
+                    edges.push({ src: srcId, dst: dstId });
+                }
+            }
+        }
+        // For each edge u->v, it is a strong bridge if removing it causes
+        // u and v to no longer be in the same SCC.
+        for (const edge of edges) {
+            const uCanReachV = this.canReachWithoutEdge(edge.src, edge.dst, edge.src, edge.dst, memberSet);
+            const vCanReachU = this.canReachWithoutEdge(edge.dst, edge.src, edge.src, edge.dst, memberSet);
+            if (!uCanReachV || !vCanReachU) {
+                const type = (_a = this.getEdgeType(edge.src, edge.dst)) !== null && _a !== void 0 ? _a : DependencyType.DEPENDENCIES;
+                bridges.push({ src: edge.src, dst: edge.dst, type });
+            }
+        }
+        return bridges;
+    }
+    /**
+     * Check if 'from' can reach 'to' in the subgraph, excluding edge excludedSrc->excludedDst.
+     * Uses DFS over successor edges within the member set.
+     */
+    canReachWithoutEdge(from, to, excludedSrc, excludedDst, memberSet) {
+        if (from === to) {
+            return true;
+        }
+        const visited = new Set([from]);
+        const stack = [from];
+        while (stack.length > 0) {
+            const u = stack.pop();
+            const succs = this.getSuccModuleIds(u);
+            for (const v of succs) {
+                if (!memberSet.has(v)) {
+                    continue;
+                }
+                // Skip the excluded edge
+                if (u === excludedSrc && v === excludedDst) {
+                    continue;
+                }
+                if (v === to) {
+                    return true;
+                }
+                if (!visited.has(v)) {
+                    visited.add(v);
+                    stack.push(v);
+                }
+            }
+        }
+        return false;
+    }
+    /**
+     * Build a temporary subgraph excluding specified edges, for SCC post-processing.
+     * Does not modify the original graph. Edge type labels are preserved from the original graph.
+     * @param sccMembers Node IDs in the SCC subgraph
+     * @param excludedEdges Set of edge keys ("srcId->dstId") to exclude
+     * @returns A new ModuleDepGraph containing only the SCC subgraph without excluded edges
+     */
+    buildTempGraphWithoutEdges(sccMembers, excludedEdges) {
+        var _a;
+        const tempGraph = new ModuleDepGraph(this.moduleCanonicalizer);
+        const memberSet = new Set(sccMembers);
+        for (const memberId of sccMembers) {
+            const module = this.moduleCanonicalizer.get(memberId);
+            if (module) {
+                tempGraph.addModule(module);
+            }
+        }
+        for (const srcId of sccMembers) {
+            const succs = this.getSuccModuleIds(srcId);
+            for (const dstId of succs) {
+                if (memberSet.has(dstId) && !excludedEdges.has(`${srcId}->${dstId}`)) {
+                    const type = (_a = this.getEdgeType(srcId, dstId)) !== null && _a !== void 0 ? _a : DependencyType.DEPENDENCIES;
+                    tempGraph.addDependencyEdge(srcId, dstId, type);
+                }
+            }
+        }
+        return tempGraph;
+    }
+    /**
+     * Recompute SCC on a temporary subgraph excluding specified edges, returning group results.
+     * @param members Node IDs in the SCC
+     * @param excludedEdges Set of edge keys to exclude from the temporary subgraph
+     * @returns Array of SCC groups, each group is an array of NodeIDs
+     */
+    recomputeSCC(members, excludedEdges) {
+        const tempGraph = this.buildTempGraphWithoutEdges(members, excludedEdges);
+        const tempScc = new Scc_1.SCCDetection(tempGraph);
+        tempScc.find();
+        const tempTopo = tempScc.getTopoAndCollapsedNodeStack();
+        const groups = [];
+        for (const repId of tempTopo) {
+            const groupMembers = Array.from(tempScc.getMySCCNodes(repId));
+            groups.push(groupMembers);
+        }
+        return groups;
+    }
+    /**
+     * Split a single large SCC using strong bridge detection first,
+     * then fall back to dependency type priority for remaining edges.
+     * Does not modify the original graph.
+     * @param members Node IDs in the large SCC
+     * @param maxGroupSize Maximum allowed group size after splitting
+     * @returns Array of split groups, each group is an array of NodeIDs
+     */
+    splitLargeSCC(members, maxGroupSize) {
+        var _a;
+        const excludedEdges = new Set();
+        const memberSet = new Set(members);
+        // Phase 1: Try removing strong bridges first (precise split)
+        const bridges = this.findStrongBridges(members);
+        bridges.sort((a, b) => b.type - a.type); // Higher removal priority first
+        for (const bridge of bridges) {
+            const currentGroups = this.recomputeSCC(members, excludedEdges);
+            if (currentGroups.every(g => g.length <= maxGroupSize)) {
+                return currentGroups;
+            }
+            excludedEdges.add(`${bridge.src}->${bridge.dst}`);
+            const newGroups = this.recomputeSCC(members, excludedEdges);
+            if (newGroups.every(g => g.length <= maxGroupSize)) {
+                return newGroups;
+            }
+        }
+        // Phase 2: Fall back to removing remaining edges by dependency type priority
+        const edges = [];
+        for (const srcId of members) {
+            const succs = this.getSuccModuleIds(srcId);
+            for (const dstId of succs) {
+                if (memberSet.has(dstId) && !excludedEdges.has(`${srcId}->${dstId}`)) {
+                    const type = (_a = this.getEdgeType(srcId, dstId)) !== null && _a !== void 0 ? _a : DependencyType.DEPENDENCIES;
+                    edges.push({ src: srcId, dst: dstId, type });
+                }
+            }
+        }
+        edges.sort((a, b) => b.type - a.type);
+        for (const edge of edges) {
+            const currentGroups = this.recomputeSCC(members, excludedEdges);
+            if (currentGroups.every(g => g.length <= maxGroupSize)) {
+                return currentGroups;
+            }
+            excludedEdges.add(`${edge.src}->${edge.dst}`);
+            const newGroups = this.recomputeSCC(members, excludedEdges);
+            if (newGroups.every(g => g.length <= maxGroupSize)) {
+                return newGroups;
+            }
+        }
+        return this.recomputeSCC(members, excludedEdges);
+    }
+    /**
+     * Refine SCC groups: split groups exceeding maxGroupSize using strong bridge
+     * detection and dependency type priority fallback.
+     * Stores the resulting groups in {@link sccGroups} and returns the same map.
+     * Also populates the topoOrder field with nodes in dependency order (depended-on first).
+     * @param maxGroupSize Maximum allowed group size; Number.MAX_SAFE_INTEGER disables post-processing
+     * @returns Map from each member NodeID to its group members array
+     */
+    refineSCCGroups(maxGroupSize) {
+        const scc = new Scc_1.SCCDetection(this);
+        scc.find();
+        const topoStack = scc.getTopoAndCollapsedNodeStack();
+        const sccGroups = new Map();
+        this.topoOrder = [];
+        const added = new Set();
+        for (const repId of topoStack) {
+            const members = scc.nodeIsInCycle(repId) ? Array.from(scc.getMySCCNodes(repId)) : [repId];
+            const groups = members.length <= maxGroupSize ? [members] : this.splitLargeSCC(members, maxGroupSize);
+            if (!scc.nodeIsInCycle(repId)) {
+                this.addToTopoAndGroups([repId], [repId], sccGroups, added);
+            }
+            else {
+                for (const group of groups) {
+                    this.addToTopoAndGroups(group, group, sccGroups, added);
+                }
+            }
+        }
+        this.sccGroups = sccGroups;
+        return sccGroups;
+    }
+    /**
+     * Add members to topoOrder and sccGroups, skipping already-added members.
+     */
+    addToTopoAndGroups(members, group, sccGroups, added) {
+        for (const memberId of members) {
+            if (!added.has(memberId)) {
+                added.add(memberId);
+                this.topoOrder.push(memberId);
+            }
+            sccGroups.set(memberId, group);
+        }
+    }
+}
+exports.ModuleDepGraph = ModuleDepGraph;

package/lib/core/graph/Scc.d.ts

@@ -1,4 +1,3 @@
-import { BaseNode } from './BaseExplicitGraph';
 import { NodeID, GraphTraits } from './GraphTraits';
 type NodeSet = Set<NodeID>;
 type NodeStack = NodeID[];
@@ -22,7 +21,7 @@ declare class NodeSCCInfo {
  *   Wave Propagation and Deep Propagation for pointer Analysis
  *   CGO 2009
  */
-export declare class SCCDetection<Graph extends GraphTraits<BaseNode>> {
+export declare class SCCDetection<Graph extends GraphTraits<any>> {
     private _G;
     private _I;
     private _D;
@@ -39,7 +38,6 @@ export declare class SCCDetection<Graph extends GraphTraits<BaseNode>> {
     private setInSCC;
     private setRep;
     private getRep;
-    private getNode;
     private visit;
     private clear;
     /**

package/lib/core/graph/Scc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Scc.d.ts","sourceRoot":"","sources":["../../../src/core/graph/Scc.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEpD,KAAK,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC;AAC3B,KAAK,SAAS,GAAG,MAAM,EAAE,CAAC;AAC1B,KAAK,kBAAkB,GAAG,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AAGnD;;GAEG;AACH,cAAM,WAAW;IACb,OAAO,CAAC,IAAI,CAAS;IACrB,OAAO,CAAC,SAAS,CAAU;;IAO3B,IAAI,GAAG,IAAI,MAAM,CAEhB;IAED,IAAI,GAAG,CAAC,CAAC,EAAE,MAAM,EAEhB;IAED,WAAW,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI;IAI5B,IAAI,QAAQ,IAAI,OAAO,CAEtB;CACJ;AAED;;;;;;GAMG;AACH,qBAAa,YAAY,CAAC,KAAK,SAAS,WAAW,CAAC,QAAQ,CAAC;IAEzD,OAAO,CAAC,EAAE,CAAQ;IAElB,OAAO,CAAC,EAAE,CAAS;IAInB,OAAO,CAAC,EAAE,CAAe;IAGzB,OAAO,CAAC,EAAE,CAAqB;IAG/B,OAAO,CAAC,EAAE,CAAY;IAKtB,OAAO,CAAC,EAAE,CAAY;IACtB,OAAO,CAAC,QAAQ,CAAU;IAC1B,OAAO,CAAC,YAAY,CAAc;IAClC,OAAO,CAAC,UAAU,CAAc;gBAEpB,EAAE,EAAE,KAAK;IAYrB,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,KAAK;IAIb,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,QAAQ;IAIhB,OAAO,CAAC,MAAM;IAoBd,OAAO,CAAC,MAAM;IASd,OAAO,CAAC,OAAO;IAQf,OAAO,CAAC,KAAK;IA0Cb,OAAO,CAAC,KAAK;IAWb;;;OAGG;IACI,UAAU,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM;IASpC;;OAEG;IACI,IAAI,IAAI,IAAI;IAWZ,4BAA4B,IAAI,SAAS;IAIzC,kBAAkB,IAAI,kBAAkB;IAKxC,aAAa,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO;IAqBjC,aAAa,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO;IAMjC,WAAW,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO;IAc/B,WAAW,IAAI,OAAO;CAGhC"}
+{"version":3,"file":"Scc.d.ts","sourceRoot":"","sources":["../../../src/core/graph/Scc.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEpD,KAAK,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC;AAC3B,KAAK,SAAS,GAAG,MAAM,EAAE,CAAC;AAC1B,KAAK,kBAAkB,GAAG,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AAGnD;;GAEG;AACH,cAAM,WAAW;IACb,OAAO,CAAC,IAAI,CAAS;IACrB,OAAO,CAAC,SAAS,CAAU;;IAO3B,IAAI,GAAG,IAAI,MAAM,CAEhB;IAED,IAAI,GAAG,CAAC,CAAC,EAAE,MAAM,EAEhB;IAED,WAAW,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI;IAI5B,IAAI,QAAQ,IAAI,OAAO,CAEtB;CACJ;AAED;;;;;;GAMG;AACH,qBAAa,YAAY,CAAC,KAAK,SAAS,WAAW,CAAC,GAAG,CAAC;IAEpD,OAAO,CAAC,EAAE,CAAQ;IAElB,OAAO,CAAC,EAAE,CAAS;IAInB,OAAO,CAAC,EAAE,CAAe;IAGzB,OAAO,CAAC,EAAE,CAAqB;IAG/B,OAAO,CAAC,EAAE,CAAY;IAKtB,OAAO,CAAC,EAAE,CAAY;IACtB,OAAO,CAAC,QAAQ,CAAU;IAC1B,OAAO,CAAC,YAAY,CAAc;IAClC,OAAO,CAAC,UAAU,CAAc;gBAEpB,EAAE,EAAE,KAAK;IAYrB,OAAO,CAAC,SAAS;IAIjB,OAAO,CAAC,KAAK;IAIb,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,QAAQ;IAIhB,OAAO,CAAC,MAAM;IAoBd,OAAO,CAAC,MAAM;IASd,OAAO,CAAC,KAAK;IAwCb,OAAO,CAAC,KAAK;IAWb;;;OAGG;IACI,UAAU,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM;IASpC;;OAEG;IACI,IAAI,IAAI,IAAI;IAWZ,4BAA4B,IAAI,SAAS;IAIzC,kBAAkB,IAAI,kBAAkB;IAKxC,aAAa,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO;IAiBjC,aAAa,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO;IAMjC,WAAW,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO;IAc/B,WAAW,IAAI,OAAO;CAGhC"}

package/lib/core/graph/Scc.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- * Copyright (c) 2024-2025 Huawei Device Co., Ltd.
+ * Copyright (c) 2024-2026 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
@@ -93,22 +93,13 @@ class SCCDetection {
         }
         return info.rep;
     }
-    getNode(id) {
-        let n = this._G.getNode(id);
-        if (!n) {
-            throw new Error('Node is not found');
-        }
-        return n;
-    }
     visit(v) {
         var _a;
         this._I += 1;
         this._D.set(v, this._I);
         this.setRep(v, v);
         this.setVisited(v);
-        let node = this.getNode(v);
-        (_a = node.getOutgoingEdges()) === null || _a === void 0 ? void 0 : _a.forEach(e => {
-            let w = e.getDstID();
+        (_a = this._G.succ(v)) === null || _a === void 0 ? void 0 : _a.forEach(w => {
             if (!this.isVisited(w)) {
                 this.visit(w);
             }
@@ -170,7 +161,7 @@ class SCCDetection {
         this.clear();
         let nodeIt = this._G.nodesItor();
         for (let node of nodeIt) {
-            const nodeId = node.getID();
+            const nodeId = this._G.getNodeID(node);
             if (!this.isVisited(nodeId) && !this._D.has(nodeId)) {
                 this.visit(nodeId);
             }
@@ -191,13 +182,9 @@ class SCCDetection {
             return true;
         }
         // self-cycle: a call a
-        let repNode = this._G.getNode(rep);
-        const outgoingEdges = repNode === null || repNode === void 0 ? void 0 : repNode.getOutgoingEdges();
-        if (!outgoingEdges) {
-            return false;
-        }
-        for (const e of outgoingEdges) {
-            if (e.getDstID() === rep) {
+        const successors = this._G.succ(rep);
+        for (const w of successors) {
+            if (w === rep) {
                 return true;
             }
         }

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

@@ -1 +1 @@
-{"version":3,"file":"CfgBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/graph/builder/CfgBuilder.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAEtC,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAAE,sBAAsB,EAAoE,MAAM,iBAAiB,CAAC;AAC3H,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAC7B,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAIlD,OAAO,EAAE,SAAS,EAA0D,MAAM,iBAAiB,CAAC;AACpG,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAa3C,qBAAa,gBAAgB;IACzB,IAAI,EAAE,MAAM,CAAC;IAEb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAC9B,KAAK,EAAE,GAAG,CAAC,gBAAgB,CAAC,CAAC;IAC7B,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IAEd,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,EAAE,CAAC,IAAI,GAAG,IAAI,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,EAAE,CAAM;IAC5B,KAAK,EAAE,YAAY,GAAG,IAAI,CAAC;IAC3B,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,MAAM,CAAK;IACtB,eAAe,EAAE,MAAM,CAAK;IAC5B,SAAS,EAAE,OAAO,CAAS;IAC3B,cAAc,EAAE,OAAO,CAAS;gBAEpB,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,CAAC,IAAI,GAAG,IAAI,EAAE,OAAO,EAAE,MAAM;CAcnF;AAED,qBAAa,yBAA0B,SAAQ,gBAAgB;IAC3D,KAAK,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAC/B,KAAK,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAC/B,SAAS,EAAE,YAAY,GAAG,IAAI,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,gBAAgB,GAAG,IAAI,CAAQ;gBAEhC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM;CAO5E;AAED,qBAAa,sBAAuB,SAAQ,gBAAgB;IACxD,KAAK,EAAE,gBAAgB,EAAE,CAAC;IAC1B,KAAK,EAAE,IAAI,EAAE,CAAM;IACnB,OAAO,EAAE,gBAAgB,GAAG,IAAI,CAAQ;IACxC,WAAW,EAAE,gBAAgB,GAAG,IAAI,CAAQ;gBAEhC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM;CAI5E;AAED,qBAAa,mBAAoB,SAAQ,gBAAgB;IACrD,QAAQ,EAAE,gBAAgB,GAAG,IAAI,CAAQ;IACzC,OAAO,EAAE,gBAAgB,GAAG,IAAI,CAAQ;IACxC,cAAc,EAAE,gBAAgB,GAAG,IAAI,CAAQ;IAC/C,UAAU,EAAE,MAAM,CAAM;IACxB,gBAAgB,EAAE,gBAAgB,GAAG,IAAI,CAAQ;IACjD,UAAU,EAAE,gBAAgB,GAAG,IAAI,CAAQ;gBAE/B,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM;CAG5E;AAED,qBAAa,IAAI;IACb,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,gBAAgB,CAAC;IACvB,SAAS,EAAG,EAAE,CAAC,IAAI,CAAC;gBAER,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,gBAAgB;CAIpD;AAED,qBAAa,WAAW;IACpB,GAAG,EAAE,gBAAgB,CAAC;IACtB,GAAG,EAAE,gBAAgB,CAAC;gBAEV,GAAG,EAAE,gBAAgB,EAAE,GAAG,EAAE,gBAAgB;CAI3D;AAED,qBAAa,QAAQ;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,gBAAgB,CAAC;IAC1B,MAAM,EAAE,WAAW,EAAE,CAAC;IACtB,UAAU,EAAE,QAAQ,EAAE,CAAM;IAC5B,MAAM,EAAE,QAAQ,GAAG,IAAI,CAAQ;gBAEnB,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB;CAKtD;AAED,qBAAa,KAAK;IACd,EAAE,EAAE,MAAM,CAAC;gBAEC,EAAE,EAAE,MAAM;CAGzB;AAED,qBAAa,YAAY;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,gBAAgB,EAAE,CAAC;IAC1B,KAAK,EAAE,YAAY,EAAE,CAAM;IAC3B,KAAK,EAAE,YAAY,EAAE,CAAM;IAC3B,MAAM,EAAE,OAAO,CAAS;gBAEZ,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,EAAE;IAK1C,sBAAsB,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO;IASpD,oBAAoB,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO;CAQ5D;AAED,qBAAa,KAAK;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;gBAEN,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;CAM7E;AAED,qBAAa,SAAU,SAAQ,KAAK;gBACpB,OAAO,EAAE,MAAM;CAO9B;AAED,qBAAa,UAAU;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC;IACjB,KAAK,EAAE,gBAAgB,CAAC;IACxB,IAAI,EAAE,gBAAgB,CAAC;IACvB,SAAS,EAAE,yBAAyB,EAAE,CAAC;IACvC,eAAe,EAAE,gBAAgB,EAAE,CAAC;IACpC,SAAS,EAAE,UAAU,EAAE,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,gBAAgB,EAAE,CAAC;IACnC,QAAQ,EAAE,MAAM,EAAE,EAAE,CAAC;IACrB,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,gBAAgB,CAAC;IAChC,MAAM,EAAE,YAAY,EAAE,CAAC;IACvB,yBAAyB,EAAE,MAAM,CAAC;IAClC,SAAS,EAAE,QAAQ,EAAE,CAAC;IACtB,cAAc,EAAE,QAAQ,CAAC;IACzB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,OAAO,EAAE,KAAK,EAAE,CAAC;IACjB,KAAK,EAAE,gBAAgB,EAAE,CAAM;IAC/B,SAAS,EAAE,OAAO,CAAS;IAC3B,yBAAyB,EAAE,OAAO,CAAS;IAE3C,OAAO,CAAC,UAAU,CAAgB;IAClC,OAAO,CAAC,eAAe,CAAY;gBAEvB,GAAG,EAAE,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,eAAe,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU;IAyBtF,kBAAkB,IAAI,SAAS;IAItC,aAAa,CAAC,CAAC,EAAE,gBAAgB,EAAE,aAAa,EAAE,gBAAgB,GAAG,IAAI;IAwBzE,qBAAqB,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,aAAa,EAAE,gBAAgB,GAAG,IAAI;IAmBxE,kBAAkB,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,EAAE,aAAa,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,GAAG,gBAAgB;IA+BzG,qBAAqB,CAAC,CAAC,EAAE,EAAE,CAAC,cAAc,EAAE,aAAa,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,GAAG,gBAAgB;IA4B/G,mBAAmB,CAAC,CAAC,EAAE,EAAE,CAAC,kBAAkB,GAAG,EAAE,CAAC,YAAY,EAAE,aAAa,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,GAAG,gBAAgB;IAoCnI,kBAAkB,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,EAAE,aAAa,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,GAAG,gBAAgB;IAmCzG,sBAAsB,CAAC,CAAC,EAAE,EAAE,CAAC,eAAe,EAAE,aAAa,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,GAAG,gBAAgB;IAiDjH,mBAAmB,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,EAAE,aAAa,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,GAAG,gBAAgB;IAsD3G,OAAO,CAAC,aAAa,EAAE,gBAAgB,EAAE,aAAa,EAAE,gBAAgB,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,EAAE,GAAG,IAAI;IA8DjG,sBAAsB,IAAI,IAAI;IAU9B,wBAAwB,CAAC,IAAI,EAAE,yBAAyB,EAAE,IAAI,EAAE,gBAAgB,GAAG,IAAI;IAcvF,qBAAqB,CAAC,IAAI,EAAE,sBAAsB,EAAE,IAAI,EAAE,gBAAgB,GAAG,IAAI;IAgBjF,UAAU,IAAI,IAAI;IAUlB,OAAO,CAAC,iBAAiB;IAgBzB,OAAO,CAAC,kBAAkB;IAU1B,OAAO,CAAC,iBAAiB;IAOzB,OAAO,CAAC,iCAAiC;IAQzC,mCAAmC,CAAC,IAAI,EAAE,gBAAgB,EAAE,SAAS,EAAE,gBAAgB,EAAE,GAAG,gBAAgB,GAAG,IAAI;IAqBnH,sBAAsB,CAAC,IAAI,EAAE,gBAAgB,EAAE,SAAS,EAAE,gBAAgB,EAAE,GAAG,gBAAgB,GAAG,IAAI;IA8BtG,WAAW,IAAI,IAAI;IAmCnB,wBAAwB,CAAC,eAAe,EAAE,yBAAyB,EAAE,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,OAAO,GAAG,IAAI;IAazH,qBAAqB,CAAC,eAAe,EAAE,sBAAsB,EAAE,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,OAAO,GAAG,IAAI;IAiBnH,qBAAqB,CAAC,eAAe,EAAE,gBAAgB,EAAE,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,OAAO,GAAG,IAAI;IAQ7G,mBAAmB,IAAI,IAAI;IAe3B,cAAc,CAAC,eAAe,EAAE,gBAAgB,EAAE,cAAc,EAAE,gBAAgB,EAAE,GAAG,IAAI;IA2B3F,aAAa,IAAI,IAAI;IAqCrB,WAAW,IAAI,IAAI;IAMnB,sBAAsB,IAAI,IAAI;IAU9B,gBAAgB,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI;IA2C9C,WAAW,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI;IAoCzC,SAAS,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI;IASvC,mCAAmC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,GAAG,IAAI;IAQxD,OAAO,CAAC,qCAAqC;IAU7C,eAAe,IAAI,IAAI;IAmDvB,OAAO,CAAC,aAAa;IAYd,WAAW,IAAI,OAAO;IAItB,QAAQ,IAAI;QACf,GAAG,EAAE,GAAG,CAAC;QACT,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;QACnB,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC;QACvC,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,SAAS,EAAE,sBAAsB,CAAC,CAAC,CAAC;QAC/D,KAAK,EAAE,IAAI,EAAE,CAAC;KACjB;IAQM,8BAA8B,IAAI;QACrC,GAAG,EAAE,GAAG,CAAC;QACT,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;QACnB,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC;QACvC,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,SAAS,EAAE,sBAAsB,CAAC,CAAC,CAAC;QAC/D,KAAK,EAAE,IAAI,EAAE,CAAC;KACjB;IA2CM,cAAc,IAAI;QACrB,GAAG,EAAE,GAAG,CAAC;QACT,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;QACnB,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC;QACvC,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,SAAS,EAAE,sBAAsB,CAAC,CAAC,CAAC;QAC/D,KAAK,EAAE,IAAI,EAAE,CAAC;KACjB;IAkCD;;OAEG;IACH,OAAO,CAAC,sBAAsB;IAqC9B,OAAO,CAAC,iBAAiB;IA6CzB,OAAO,CAAC,eAAe;IAWvB,OAAO,CAAC,aAAa;IAsDrB,OAAO,CAAC,kBAAkB;IAoB1B,OAAO,CAAC,YAAY;IAsBpB,OAAO,CAAC,SAAS;IAgBjB,OAAO,CAAC,oBAAoB;IAmC5B,OAAO,CAAC,eAAe;WAmBT,gCAAgC,CAAC,sBAAsB,EAAE,GAAG,CAAC,YAAY,EAAE,UAAU,CAAC,EAChG,eAAe,EAAE,YAAY,EAAE,eAAe,EAAE,YAAY,GAAG,IAAI;WAWzD,mBAAmB,CAAC,eAAe,EAAE,YAAY,EAAE,eAAe,EAAE,YAAY,GAAG,IAAI;WAKvF,iCAAiC,CAAC,eAAe,EAAE,YAAY,EACzE,eAAe,EAAE,YAAY,GAAG,IAAI;WAgB1B,+BAA+B,CAAC,eAAe,EAAE,YAAY,EAAE,eAAe,EAAE,YAAY,GAAG,IAAI;WAgBnG,gCAAgC,CAAC,YAAY,EAAE,YAAY,GAAG,IAAI;WAOlE,8BAA8B,CAAC,YAAY,EAAE,YAAY,GAAG,IAAI;WAOhE,kBAAkB,CAAC,WAAW,EAAE,YAAY,EAAE,SAAS,EAAE,YAAY,GAAG,IAAI;WAK5E,6CAA6C,CAAC,YAAY,EAAE,YAAY,GAAG,IAAI;WAK/E,iBAAiB,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO;WAYtD,iBAAiB,CAAC,aAAa,EAAE,UAAU,EAAE,aAAa,EAAE,UAAU,GAAG,IAAI;WAM7E,+BAA+B,CAAC,aAAa,EAAE,UAAU,EAAE,aAAa,EAAE,UAAU,GAAG,IAAI;WAgB3F,6BAA6B,CAAC,aAAa,EAAE,UAAU,EAAE,cAAc,EAAE,UAAU,EAAE,GAAG,IAAI;WAkB5F,4BAA4B,CAAC,UAAU,EAAE,UAAU,EAAE,YAAY,EAAE,UAAU,EAAE,GAAG,IAAI;WAMtF,8BAA8B,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI;WAO5D,4BAA4B,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI;WAO1D,2BAA2B,CAAC,YAAY,EAAE,UAAU,EAAE,mBAAmB,EAAE,UAAU,EAC/F,oBAAoB,EAAE,UAAU,GAAG,IAAI;WAK7B,2CAA2C,CAAC,UAAU,EAAE,UAAU,GAAG,IAAI;WAKzE,eAAe,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO;WAYhD,cAAc,CAAC,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,GAAG,IAAI;WAKpE,gBAAgB,CAAC,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,GAAG,IAAI;WAKtE,yBAAyB,CAAC,WAAW,EAAE,UAAU,EAAE,oBAAoB,EAAE,UAAU,GAAG,IAAI;CAI3G"}
+{"version":3,"file":"CfgBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/graph/builder/CfgBuilder.ts"],"names":[],"mappings":"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"}

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

@@ -1,6 +1,6 @@
 "use strict";
 /*
- * Copyright (c) 2024-2025 Huawei Device Co., Ltd.
+ * Copyright (c) 2024-2026 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
@@ -554,6 +554,12 @@ class CfgBuilder {
             else if (ts.isSwitchStatement(c)) {
                 lastStatement = this.ASTNodeSwitchStatement(c, lastStatement, scope.id);
             }
+            else if (ts.isLabeledStatement(c)) {
+                let labelExit = new StatementBuilder('labelExit', '', c, scope.id);
+                this.exits.push(labelExit);
+                this.walkAST(lastStatement, labelExit, [c.statement]);
+                lastStatement = labelExit;
+            }
             else if (ts.isBlock(c)) {
                 let blockExit = new StatementBuilder('blockExit', '', c, scope.id);
                 this.exits.push(blockExit);

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

@@ -32,5 +32,6 @@ export declare class TrapBuilder {
     private copyFinallyBlocks;
     private copyBlocks;
     private copyStmt;
+    private copyOriginPosition;
 }
 //# sourceMappingURL=TrapBuilder.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"TrapBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/graph/builder/TrapBuilder.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAcvC,OAAO,EAAE,YAAY,EAAmC,MAAM,cAAc,CAAC;AAK7E;;GAEG;AACH,qBAAa,WAAW;IACpB,OAAO,CAAC,+BAA+B,CAAoB;IAC3D,OAAO,CAAC,gBAAgB,CAAmB;IAC3C,OAAO,CAAC,aAAa,CAAkB;IACvC,OAAO,CAAC,sBAAsB,CAAgC;IAC9D,OAAO,CAAC,sBAAsB,CAAoB;gBAEtC,sBAAsB,EAAE,GAAG,CAAC,YAAY,CAAC,EAAE,sBAAsB,EAAE,GAAG,CAAC,YAAY,EAAE,UAAU,CAAC,EACxG,gBAAgB,EAAE,gBAAgB,EAClC,aAAa,EAAE,GAAG,CAAC,UAAU,CAAC;IAQ3B,UAAU,IAAI,IAAI,EAAE;IAS3B,OAAO,CAAC,cAAc;IA8CtB,OAAO,CAAC,oBAAoB;IAa5B,OAAO,CAAC,kBAAkB;IAY1B,OAAO,CAAC,sBAAsB;IAM9B,OAAO,CAAC,eAAe;IASvB,OAAO,CAAC,gBAAgB;IAMxB,OAAO,CAAC,eAAe;IAiBvB,OAAO,CAAC,iBAAiB;IAiBzB,OAAO,CAAC,oBAAoB;IAQ5B,OAAO,CAAC,gBAAgB;IA6BxB,OAAO,CAAC,qBAAqB;IAkC7B,OAAO,CAAC,yBAAyB;IAYjC,OAAO,CAAC,+BAA+B;IAMvC,OAAO,CAAC,qBAAqB;IAiC7B,OAAO,CAAC,wBAAwB;IAyDhC,OAAO,CAAC,eAAe;IAsCvB,OAAO,CAAC,iBAAiB;IA0BzB,OAAO,CAAC,UAAU;IAgClB,OAAO,CAAC,QAAQ;CAoBnB"}
+{"version":3,"file":"TrapBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/graph/builder/TrapBuilder.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAcvC,OAAO,EAAE,YAAY,EAAmC,MAAM,cAAc,CAAC;AAK7E;;GAEG;AACH,qBAAa,WAAW;IACpB,OAAO,CAAC,+BAA+B,CAAoB;IAC3D,OAAO,CAAC,gBAAgB,CAAmB;IAC3C,OAAO,CAAC,aAAa,CAAkB;IACvC,OAAO,CAAC,sBAAsB,CAAgC;IAC9D,OAAO,CAAC,sBAAsB,CAAoB;gBAEtC,sBAAsB,EAAE,GAAG,CAAC,YAAY,CAAC,EAAE,sBAAsB,EAAE,GAAG,CAAC,YAAY,EAAE,UAAU,CAAC,EACxG,gBAAgB,EAAE,gBAAgB,EAClC,aAAa,EAAE,GAAG,CAAC,UAAU,CAAC;IAQ3B,UAAU,IAAI,IAAI,EAAE;IAS3B,OAAO,CAAC,cAAc;IA8CtB,OAAO,CAAC,oBAAoB;IAa5B,OAAO,CAAC,kBAAkB;IAY1B,OAAO,CAAC,sBAAsB;IAM9B,OAAO,CAAC,eAAe;IASvB,OAAO,CAAC,gBAAgB;IAMxB,OAAO,CAAC,eAAe;IAiBvB,OAAO,CAAC,iBAAiB;IAiBzB,OAAO,CAAC,oBAAoB;IAQ5B,OAAO,CAAC,gBAAgB;IA6BxB,OAAO,CAAC,qBAAqB;IAkC7B,OAAO,CAAC,yBAAyB;IAYjC,OAAO,CAAC,+BAA+B;IAMvC,OAAO,CAAC,qBAAqB;IAiC7B,OAAO,CAAC,wBAAwB;IAyDhC,OAAO,CAAC,eAAe;IAsCvB,OAAO,CAAC,iBAAiB;IA0BzB,OAAO,CAAC,UAAU;IAgClB,OAAO,CAAC,QAAQ;IAmChB,OAAO,CAAC,kBAAkB;CAM7B"}

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

@@ -373,30 +373,50 @@ class TrapBuilder {
     }
     copyStmt(sourceStmt) {
         if (sourceStmt instanceof Stmt_1.ArkAssignStmt) {
-            return new Stmt_1.ArkAssignStmt(sourceStmt.getLeftOp(), sourceStmt.getRightOp());
+            const target = new Stmt_1.ArkAssignStmt(sourceStmt.getLeftOp(), sourceStmt.getRightOp());
+            this.copyOriginPosition(sourceStmt, target);
+            return target;
         }
         else if (sourceStmt instanceof Stmt_1.ArkInvokeStmt) {
-            return new Stmt_1.ArkInvokeStmt(sourceStmt.getInvokeExpr());
+            const target = new Stmt_1.ArkInvokeStmt(sourceStmt.getInvokeExpr());
+            this.copyOriginPosition(sourceStmt, target);
+            return target;
         }
         else if (sourceStmt instanceof Stmt_1.ArkIfStmt) {
-            return new Stmt_1.ArkIfStmt(sourceStmt.getConditionExpr());
+            const target = new Stmt_1.ArkIfStmt(sourceStmt.getConditionExpr());
+            this.copyOriginPosition(sourceStmt, target);
+            return target;
         }
         else if (sourceStmt instanceof Stmt_1.ArkReturnStmt) {
-            return new Stmt_1.ArkReturnStmt(sourceStmt.getOp());
+            const target = new Stmt_1.ArkReturnStmt(sourceStmt.getOp());
+            this.copyOriginPosition(sourceStmt, target);
+            return target;
         }
         else if (sourceStmt instanceof Stmt_1.ArkReturnVoidStmt) {
-            return new Stmt_1.ArkReturnVoidStmt();
+            const target = new Stmt_1.ArkReturnVoidStmt();
+            this.copyOriginPosition(sourceStmt, target);
+            return target;
         }
         else if (sourceStmt instanceof Stmt_1.ArkThrowStmt) {
-            return new Stmt_1.ArkThrowStmt(sourceStmt.getOp());
+            const target = new Stmt_1.ArkThrowStmt(sourceStmt.getOp());
+            this.copyOriginPosition(sourceStmt, target);
+            return target;
         }
         else if (sourceStmt instanceof Stmt_1.ArkAliasTypeDefineStmt) {
-            return new Stmt_1.ArkAliasTypeDefineStmt(sourceStmt.getAliasType(), sourceStmt.getAliasTypeExpr());
+            const target = new Stmt_1.ArkAliasTypeDefineStmt(sourceStmt.getAliasType(), sourceStmt.getAliasTypeExpr());
+            this.copyOriginPosition(sourceStmt, target);
+            return target;
         }
         else {
             logger.error(`unsupported statement type`);
             return null;
         }
     }
+    copyOriginPosition(source, target) {
+        const originPos = source.getOriginFullPosition();
+        if (originPos) {
+            target.setOriginFullPosition(originPos);
+        }
+    }
 }
 exports.TrapBuilder = TrapBuilder;

package/lib/core/model/ArkBody.d.ts

@@ -22,5 +22,6 @@ export declare class ArkBody {
     getAliasTypeByName(name: string): AliasType | null;
     getTraps(): Trap[] | undefined;
     getExportLocalByName(name: string): Local | null;
+    clearAllReferences(): void;
 }
 //# sourceMappingURL=ArkBody.d.ts.map

package/lib/core/model/ArkBody.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ArkBody.d.ts","sourceRoot":"","sources":["../../../src/core/model/ArkBody.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAGtD,qBAAa,OAAO;IAChB,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,WAAW,CAAC,CAAqB;IACzC,OAAO,CAAC,GAAG,CAAM;IACjB,OAAO,CAAC,YAAY,CAAC,CAAmD;IACxE,OAAO,CAAC,KAAK,CAAC,CAAS;gBAEX,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,SAAS,EAAE,sBAAsB,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,IAAI,EAAE;IAQlH,SAAS,IAAI,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC;IAI/B,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,GAAG,IAAI;IAKnC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,IAAI;IAI1C,cAAc,IAAI,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,SAAS;IAIhD,cAAc,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,IAAI;IAIjD,MAAM,IAAI,GAAG;IAIb,MAAM,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI;IAItB,eAAe,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC,SAAS,EAAE,sBAAsB,CAAC,CAAC,GAAG,SAAS;IAI/E,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAQlD,QAAQ,IAAI,IAAI,EAAE,GAAG,SAAS;IAI9B,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,GAAG,IAAI;CAQ1D"}
+{"version":3,"file":"ArkBody.d.ts","sourceRoot":"","sources":["../../../src/core/model/ArkBody.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAGtD,qBAAa,OAAO;IAChB,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,WAAW,CAAC,CAAqB;IACzC,OAAO,CAAC,GAAG,CAAM;IACjB,OAAO,CAAC,YAAY,CAAC,CAAmD;IACxE,OAAO,CAAC,KAAK,CAAC,CAAS;gBAEX,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,SAAS,EAAE,sBAAsB,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,IAAI,EAAE;IAQlH,SAAS,IAAI,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC;IAI/B,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,GAAG,IAAI;IAKnC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,IAAI;IAI1C,cAAc,IAAI,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,SAAS;IAIhD,cAAc,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,IAAI;IAIjD,MAAM,IAAI,GAAG;IAIb,MAAM,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI;IAItB,eAAe,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC,SAAS,EAAE,sBAAsB,CAAC,CAAC,GAAG,SAAS;IAI/E,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAQlD,QAAQ,IAAI,IAAI,EAAE,GAAG,SAAS;IAI9B,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,GAAG,IAAI;IAShD,kBAAkB,IAAI,IAAI;CAOpC"}