arkanalyzer 1.0.6 → 1.0.8

package/lib/core/graph/BasicBlock.js

@@ -13,10 +13,42 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BasicBlock = void 0;
+const Stmt_1 = require("../base/Stmt");
+const ArkError_1 = require("../common/ArkError");
+const logger_1 = __importStar(require("../../utils/logger"));
+const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER, 'BasicBlock');
 /**
  * @category core/graph
+ * A `BasicBlock` is composed of:
+ * - ID: a **number** that uniquely identify the basic block, initialized as -1.
+ * - Statements: an **array** of statements in the basic block.
+ * - Predecessors:  an **array** of basic blocks in front of the current basic block. More accurately, these basic blocks can reach the current block through edges.
+ * - Successors: an **array** of basic blocks after the current basic block. More accurately, the current block can reach these basic blocks through edges.
  */
 class BasicBlock {
     constructor() {
@@ -31,28 +63,128 @@ class BasicBlock {
     setId(id) {
         this.id = id;
     }
+    /**
+     * Returns an array of the statements in a basic block.
+     * @returns An array of statements in a basic block.
+     */
     getStmts() {
         return this.stmts;
     }
     addStmt(stmt) {
         this.stmts.push(stmt);
     }
+    /**
+     * Adds the given stmt at the beginning of the basic block.
+     * @param stmt
+     */
+    addHead(stmt) {
+        if (stmt instanceof Stmt_1.Stmt) {
+            this.stmts.unshift(stmt);
+        }
+        else {
+            this.stmts.unshift(...stmt);
+        }
+    }
+    /**
+     * Adds the given stmt at the end of the basic block.
+     * @param stmt
+     */
+    addTail(stmt) {
+        if (stmt instanceof Stmt_1.Stmt) {
+            this.stmts.push(stmt);
+        }
+        else {
+            this.stmts.push(...stmt);
+        }
+    }
+    /**
+     * Inserts toInsert in the basic block after point.
+     * @param toInsert
+     * @param point
+     * @returns The number of successfully inserted statements
+     */
+    insertAfter(toInsert, point) {
+        let index = this.stmts.indexOf(point);
+        if (index < 0) {
+            return 0;
+        }
+        return this.insertPos(index + 1, toInsert);
+    }
+    /**
+     * Inserts toInsert in the basic block befor point.
+     * @param toInsert
+     * @param point
+     * @returns The number of successfully inserted statements
+     */
+    insertBefore(toInsert, point) {
+        let index = this.stmts.indexOf(point);
+        if (index < 0) {
+            return 0;
+        }
+        return this.insertPos(index, toInsert);
+    }
+    /**
+     * Removes the given stmt from this basic block.
+     * @param stmt
+     * @returns
+     */
+    remove(stmt) {
+        let index = this.stmts.indexOf(stmt);
+        if (index < 0) {
+            return;
+        }
+        this.stmts.splice(index, 1);
+    }
+    /**
+     * Removes the first stmt from this basic block.
+     */
+    removeHead() {
+        this.stmts.splice(0, 1);
+    }
+    /**
+     * Removes the last stmt from this basic block.
+     */
+    removeTail() {
+        this.stmts.splice(this.stmts.length - 1, 1);
+    }
     getHead() {
-        if (this.stmts.length == 0) {
+        if (this.stmts.length === 0) {
             return null;
         }
         return this.stmts[0];
     }
     getTail() {
         let size = this.stmts.length;
-        if (size == 0) {
+        if (size === 0) {
             return null;
         }
         return this.stmts[size - 1];
     }
+    /**
+     * Returns successors of the current basic block, whose types are also basic blocks (i.e.{@link BasicBlock}).
+     * @returns Successors of the current basic block.
+     * @example
+     * 1. get block successors.
+
+    ```typescript
+    const body = arkMethod.getBody();
+    const blocks = [...body.getCfg().getBlocks()]
+    for (let i = 0; i < blocks.length; i++) {
+    const block = blocks[i]
+        ...
+        for (const next of block.getSuccessors()) {
+        ...
+        }
+    }
+    ```
+     */
     getSuccessors() {
         return this.successorBlocks;
     }
+    /**
+     * Returns predecessors of the current basic block, whose types are also basic blocks.
+     * @returns An array of basic blocks.
+     */
     getPredecessors() {
         return this.predecessorBlocks;
     }
@@ -75,7 +207,7 @@ class BasicBlock {
     }
     // Temp just for SSA
     addStmtToFirst(stmt) {
-        this.stmts.splice(0, 0, stmt);
+        this.addHead(stmt);
     }
     // Temp just for SSA
     addSuccessorBlock(block) {
@@ -88,5 +220,35 @@ class BasicBlock {
         }
         return strs.join('');
     }
+    validate() {
+        let branchStmts = [];
+        for (const stmt of this.stmts) {
+            if (stmt instanceof Stmt_1.ArkIfStmt ||
+                stmt instanceof Stmt_1.ArkReturnStmt ||
+                stmt instanceof Stmt_1.ArkReturnVoidStmt ||
+                stmt instanceof Stmt_1.ArkSwitchStmt) {
+                branchStmts.push(stmt);
+            }
+        }
+        if (branchStmts.length > 1) {
+            let errMsg = `More than one branch or return stmts in the block: ${branchStmts.map((value) => value.toString()).join('\n')}`;
+            logger.error(errMsg);
+            return { errCode: ArkError_1.ArkErrorCode.BB_MORE_THAN_ONE_BRANCH_RET_STMT, errMsg: errMsg };
+        }
+        if (branchStmts.length === 1 && branchStmts[0] !== this.stmts[this.stmts.length - 1]) {
+            let errMsg = `${branchStmts[0].toString()} not at the end of block.`;
+            logger.error(errMsg);
+            return { errCode: ArkError_1.ArkErrorCode.BB_BRANCH_RET_STMT_NOT_AT_END, errMsg: errMsg };
+        }
+        return { errCode: ArkError_1.ArkErrorCode.OK };
+    }
+    insertPos(index, toInsert) {
+        if (toInsert instanceof Stmt_1.Stmt) {
+            this.stmts.splice(index, 0, toInsert);
+            return 1;
+        }
+        this.stmts.splice(index, 0, ...toInsert);
+        return toInsert.length;
+    }
 }
 exports.BasicBlock = BasicBlock;

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

@@ -1,5 +1,6 @@
 import { DefUseChain } from '../base/DefUseChain';
 import { Stmt } from '../base/Stmt';
+import { ArkError } from '../common/ArkError';
 import { ArkMethod } from '../model/ArkMethod';
 import { BasicBlock } from './BasicBlock';
 /**
@@ -13,7 +14,32 @@ export declare class Cfg {
     private declaringMethod;
     constructor();
     getStmts(): Stmt[];
-    insertBefore(beforeStmt: Stmt, newStmt: Stmt): void;
+    /**
+     * Inserts toInsert in the basic block in CFG after point.
+     * @param toInsert
+     * @param point
+     * @returns The number of successfully inserted statements
+     */
+    insertAfter(toInsert: Stmt | Stmt[], point: Stmt): number;
+    /**
+     * Inserts toInsert in the basic block in CFG befor point.
+     * @param toInsert
+     * @param point
+     * @returns The number of successfully inserted statements
+     */
+    insertBefore(toInsert: Stmt | Stmt[], point: Stmt): number;
+    /**
+     * Removes the given stmt from the basic block in CFG.
+     * @param stmt
+     * @returns
+     */
+    remove(stmt: Stmt): void;
+    /**
+     * Update stmtToBlock Map
+     * @param block
+     * @param changed
+     */
+    updateStmt2BlockMap(block: BasicBlock, changed?: Stmt | Stmt[]): void;
     addBlock(block: BasicBlock): void;
     getBlocks(): Set<BasicBlock>;
     getStartingBlock(): BasicBlock | undefined;
@@ -25,5 +51,8 @@ export declare class Cfg {
     toString(): string;
     buildDefUseStmt(): void;
     buildDefUseChain(): void;
+    getUnreachableBlocks(): Set<BasicBlock>;
+    validate(): ArkError;
+    private dfsPostOrder;
 }
 //# sourceMappingURL=Cfg.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Cfg.d.ts","sourceRoot":"","sources":["../../../src/core/graph/Cfg.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD,OAAO,EAAgB,IAAI,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C;;GAEG;AACH,qBAAa,GAAG;IACZ,OAAO,CAAC,MAAM,CAA8B;IAC5C,OAAO,CAAC,WAAW,CAAoC;IACvD,OAAO,CAAC,YAAY,CAAuD;IAE3E,OAAO,CAAC,YAAY,CAAqB;IACzC,OAAO,CAAC,eAAe,CAA8B;;IAM9C,QAAQ,IAAI,IAAI,EAAE;IASlB,YAAY,CAAC,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,GAAG,IAAI;IAQnD,QAAQ,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IASjC,SAAS,IAAI,GAAG,CAAC,UAAU,CAAC;IAK5B,gBAAgB,IAAI,UAAU,GAAG,SAAS;IAI1C,eAAe,IAAI,IAAI;IAIvB,eAAe,CAAC,eAAe,EAAE,IAAI,GAAG,IAAI;IAI5C,kBAAkB,IAAI,SAAS;IAI/B,kBAAkB,CAAC,MAAM,EAAE,SAAS;IAIpC,eAAe,IAAI,WAAW,EAAE;IAKhC,QAAQ,IAAI,MAAM;IAIlB,eAAe;IAiBf,gBAAgB;CAyD1B"}
+{"version":3,"file":"Cfg.d.ts","sourceRoot":"","sources":["../../../src/core/graph/Cfg.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAgB,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAI1C;;GAEG;AACH,qBAAa,GAAG;IACZ,OAAO,CAAC,MAAM,CAA8B;IAC5C,OAAO,CAAC,WAAW,CAAoC;IACvD,OAAO,CAAC,YAAY,CAAQ;IAE5B,OAAO,CAAC,YAAY,CAAqB;IACzC,OAAO,CAAC,eAAe,CAA8B;;IAI9C,QAAQ,IAAI,IAAI,EAAE;IAQzB;;;;;OAKG;IACI,WAAW,CAAC,QAAQ,EAAE,IAAI,GAAG,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,GAAG,MAAM;IAUhE;;;;;OAKG;IACI,YAAY,CAAC,QAAQ,EAAE,IAAI,GAAG,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,GAAG,MAAM;IAUjE;;;;OAIG;IACI,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IAS/B;;;;OAIG;IACI,mBAAmB,CAAC,KAAK,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE,IAAI,GAAG,IAAI,EAAE,GAAG,IAAI;IAerE,QAAQ,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IAQjC,SAAS,IAAI,GAAG,CAAC,UAAU,CAAC;IAI5B,gBAAgB,IAAI,UAAU,GAAG,SAAS;IAI1C,eAAe,IAAI,IAAI;IAIvB,eAAe,CAAC,eAAe,EAAE,IAAI,GAAG,IAAI;IAI5C,kBAAkB,IAAI,SAAS;IAI/B,kBAAkB,CAAC,MAAM,EAAE,SAAS;IAIpC,eAAe,IAAI,WAAW,EAAE;IAKhC,QAAQ,IAAI,MAAM;IAIlB,eAAe;IAiBf,gBAAgB;IA0DhB,oBAAoB,IAAI,GAAG,CAAC,UAAU,CAAC;IAevC,QAAQ,IAAI,QAAQ;IAoB3B,OAAO,CAAC,YAAY;CAevB"}

package/lib/core/graph/Cfg.js

@@ -13,13 +13,38 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Cfg = void 0;
 const DefUseChain_1 = require("../base/DefUseChain");
 const Local_1 = require("../base/Local");
 const Stmt_1 = require("../base/Stmt");
+const ArkError_1 = require("../common/ArkError");
 const ArkMethod_1 = require("../model/ArkMethod");
-const Position_1 = require("../base/Position");
+const logger_1 = __importStar(require("../../utils/logger"));
+const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER, 'BasicBlock');
 /**
  * @category core/graph
  */
@@ -27,7 +52,6 @@ class Cfg {
     constructor() {
         this.blocks = new Set();
         this.stmtToBlock = new Map();
-        this.startingStmt = new Stmt_1.OriginalStmt('', Position_1.LineColPosition.DEFAULT);
         this.defUseChains = [];
         this.declaringMethod = new ArkMethod_1.ArkMethod();
     }
@@ -38,12 +62,66 @@ class Cfg {
         }
         return stmts;
     }
-    // TODO
-    insertBefore(beforeStmt, newStmt) {
-        const block = this.stmtToBlock.get(beforeStmt);
-        // Simplify edition just for SSA
-        block.addStmtToFirst(newStmt);
-        this.stmtToBlock.set(newStmt, block);
+    /**
+     * Inserts toInsert in the basic block in CFG after point.
+     * @param toInsert
+     * @param point
+     * @returns The number of successfully inserted statements
+     */
+    insertAfter(toInsert, point) {
+        const block = this.stmtToBlock.get(point);
+        if (!block) {
+            return 0;
+        }
+        this.updateStmt2BlockMap(block, toInsert);
+        return block.insertAfter(toInsert, point);
+    }
+    /**
+     * Inserts toInsert in the basic block in CFG befor point.
+     * @param toInsert
+     * @param point
+     * @returns The number of successfully inserted statements
+     */
+    insertBefore(toInsert, point) {
+        const block = this.stmtToBlock.get(point);
+        if (!block) {
+            return 0;
+        }
+        this.updateStmt2BlockMap(block, toInsert);
+        return block.insertBefore(toInsert, point);
+    }
+    /**
+     * Removes the given stmt from the basic block in CFG.
+     * @param stmt
+     * @returns
+     */
+    remove(stmt) {
+        const block = this.stmtToBlock.get(stmt);
+        if (!block) {
+            return;
+        }
+        this.stmtToBlock.delete(stmt);
+        block.remove(stmt);
+    }
+    /**
+     * Update stmtToBlock Map
+     * @param block
+     * @param changed
+     */
+    updateStmt2BlockMap(block, changed) {
+        if (!changed) {
+            for (const stmt of block.getStmts()) {
+                this.stmtToBlock.set(stmt, block);
+            }
+        }
+        else if (changed instanceof Stmt_1.Stmt) {
+            this.stmtToBlock.set(changed, block);
+        }
+        else {
+            for (const insert of changed) {
+                this.stmtToBlock.set(insert, block);
+            }
+        }
     }
     // TODO: 添加block之间的边
     addBlock(block) {
@@ -104,13 +182,13 @@ class Cfg {
                     // 判断本block之前有无对应def
                     for (let i = stmtIndex - 1; i >= 0; i--) {
                         const beforeStmt = block.getStmts()[i];
-                        if (beforeStmt.getDef() && ((_a = beforeStmt.getDef()) === null || _a === void 0 ? void 0 : _a.toString()) == name) {
+                        if (beforeStmt.getDef() && ((_a = beforeStmt.getDef()) === null || _a === void 0 ? void 0 : _a.toString()) === name) {
                             defStmts.push(beforeStmt);
                             break;
                         }
                     }
                     // 本block有对应def直接结束,否则找所有的前序block
-                    if (defStmts.length != 0) {
+                    if (defStmts.length !== 0) {
                         this.defUseChains.push(new DefUseChain_1.DefUseChain(value, defStmts[0], stmt));
                     }
                     else {
@@ -128,7 +206,7 @@ class Cfg {
                             let predecessorHasDef = false;
                             for (let i = predecessorStmts.length - 1; i >= 0; i--) {
                                 const beforeStmt = predecessorStmts[i];
-                                if (beforeStmt.getDef() && ((_b = beforeStmt.getDef()) === null || _b === void 0 ? void 0 : _b.toString()) == name) {
+                                if (beforeStmt.getDef() && ((_b = beforeStmt.getDef()) === null || _b === void 0 ? void 0 : _b.toString()) === name) {
                                     defStmts.push(beforeStmt);
                                     predecessorHasDef = true;
                                     break;
@@ -150,5 +228,47 @@ class Cfg {
             }
         }
     }
+    getUnreachableBlocks() {
+        let unreachable = new Set();
+        let startBB = this.getStartingBlock();
+        if (!startBB) {
+            return unreachable;
+        }
+        let postOrder = this.dfsPostOrder(startBB);
+        for (const bb of this.blocks) {
+            if (!postOrder.has(bb)) {
+                unreachable.add(bb);
+            }
+        }
+        return unreachable;
+    }
+    validate() {
+        let startBB = this.getStartingBlock();
+        if (!startBB) {
+            let errMsg = `Not found starting block}`;
+            logger.error(errMsg);
+            return { errCode: ArkError_1.ArkErrorCode.CFG_NOT_FOUND_START_BLOCK, errMsg: errMsg };
+        }
+        let unreachable = this.getUnreachableBlocks();
+        if (unreachable.size !== 0) {
+            let errMsg = `Unreachable blocks: ${Array.from(unreachable)
+                .map((value) => value.toString())
+                .join('\n')}`;
+            logger.error(errMsg);
+            return { errCode: ArkError_1.ArkErrorCode.CFG_HAS_UNREACHABLE_BLOCK, errMsg: errMsg };
+        }
+        return { errCode: ArkError_1.ArkErrorCode.OK };
+    }
+    dfsPostOrder(node, visitor = new Set(), postOrder = new Set()) {
+        visitor.add(node);
+        for (const succ of node.getSuccessors()) {
+            if (visitor.has(succ)) {
+                continue;
+            }
+            this.dfsPostOrder(succ, visitor, postOrder);
+        }
+        postOrder.add(node);
+        return postOrder;
+    }
 }
 exports.Cfg = Cfg;

package/lib/core/graph/DominanceFinder.js

@@ -37,20 +37,20 @@ class DominanceFinder {
         while (isChanged) {
             isChanged = false;
             for (const block of this.blocks) {
-                if (block == startingBlock) {
+                if (block === startingBlock) {
                     continue;
                 }
                 let blockIdx = this.blockToIdx.get(block);
                 let preds = Array.from(block.getPredecessors());
                 let newIdom = this.getFirstDefinedBlockPredIdx(preds);
-                if (preds.length > 0 && newIdom != -1) {
+                if (preds.length > 0 && newIdom !== -1) {
                     for (const pred of preds) {
                         let predIdx = this.blockToIdx.get(pred);
-                        if (this.idoms[predIdx] != -1) {
+                        if (this.idoms[predIdx] !== -1) {
                             newIdom = this.intersect(newIdom, predIdx);
                         }
                     }
-                    if (this.idoms[blockIdx] != newIdom) {
+                    if (this.idoms[blockIdx] !== newIdom) {
                         this.idoms[blockIdx] = newIdom;
                         isChanged = true;
                     }
@@ -68,7 +68,7 @@ class DominanceFinder {
                 let blockIdx = this.blockToIdx.get(block);
                 for (const pred of preds) {
                     let predIdx = this.blockToIdx.get(pred);
-                    while (predIdx != this.idoms[blockIdx]) {
+                    while (predIdx !== this.idoms[blockIdx]) {
                         this.domFrontiers[predIdx].push(blockIdx);
                         predIdx = this.idoms[predIdx];
                     }
@@ -100,14 +100,14 @@ class DominanceFinder {
     getFirstDefinedBlockPredIdx(preds) {
         for (const block of preds) {
             let idx = this.blockToIdx.get(block);
-            if (this.idoms[idx] != -1) {
+            if (this.idoms[idx] !== -1) {
                 return idx;
             }
         }
         return -1;
     }
     intersect(a, b) {
-        while (a != b) {
+        while (a !== b) {
             if (a > b) {
                 a = this.idoms[a];
             }

package/lib/core/graph/DominanceTree.js

@@ -29,11 +29,11 @@ class DominanceTree {
         this.children = new Array(treeSize);
         this.parents = new Array(treeSize);
         for (let i = 0; i < treeSize; i++) {
-            this.children[i] = new Array();
+            this.children[i] = [];
             this.parents[i] = -1;
         }
         for (let i = 0; i < treeSize; i++) {
-            if (idoms[i] != i) {
+            if (idoms[i] !== i) {
                 this.parents[i] = idoms[i];
                 this.children[idoms[i]].push(i);
             }
@@ -43,11 +43,11 @@ class DominanceTree {
         let dfsBlocks = new Array();
         let queue = new Array();
         queue.push(this.getRoot());
-        while (queue.length != 0) {
+        while (queue.length !== 0) {
             let curr = queue.splice(0, 1)[0];
             dfsBlocks.push(curr);
             let childList = this.getChildren(curr);
-            if (childList.length != 0) {
+            if (childList.length !== 0) {
                 for (let i = childList.length - 1; i >= 0; i--) {
                     queue.splice(0, 0, childList[i]);
                 }

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

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

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

@@ -49,6 +49,7 @@ const EtsConst_1 = require("../../common/EtsConst");
 const ArkClass_1 = require("../../model/ArkClass");
 const logger_1 = __importStar(require("../../../utils/logger"));
 const ModelUtils_1 = require("../../common/ModelUtils");
+const Const_1 = require("../../common/Const");
 const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER, 'ViewTreeBuilder');
 const COMPONENT_CREATE_FUNCTIONS = new Set([EtsConst_1.COMPONENT_CREATE_FUNCTION, EtsConst_1.COMPONENT_BRANCH_FUNCTION]);
 function backtraceLocalInitValue(value) {
@@ -58,7 +59,7 @@ function backtraceLocalInitValue(value) {
         if (rightOp instanceof Local_1.Local) {
             return backtraceLocalInitValue(rightOp);
         }
-        else if (rightOp instanceof Ref_1.ArkInstanceFieldRef && rightOp.getBase().getName().startsWith('$temp')) {
+        else if (rightOp instanceof Ref_1.ArkInstanceFieldRef && rightOp.getBase().getName().startsWith(Const_1.TEMP_LOCAL_PREFIX)) {
             return backtraceLocalInitValue(rightOp.getBase());
         }
         return rightOp;
@@ -423,7 +424,7 @@ class TreeNodeStack {
             return;
         }
         let node = this.stack[this.stack.length - 1];
-        if (name != node.name && !this.isContainer(node.name)) {
+        if (name !== node.name && !this.isContainer(node.name)) {
             this.stack.pop();
         }
     }
@@ -432,7 +433,7 @@ class TreeNodeStack {
      */
     popComponentExpect(name) {
         for (let i = this.stack.length - 1; i >= 0; i--) {
-            if (this.stack[i].name != name) {
+            if (this.stack[i].name !== name) {
                 this.stack.pop();
             }
             else {
@@ -822,7 +823,7 @@ class ViewTreeImpl extends TreeNodeStack {
         if (builder) {
             let method = this.findMethod(builder.getType().getMethodSignature());
             if (!(method === null || method === void 0 ? void 0 : method.hasBuilderDecorator())) {
-                method === null || method === void 0 ? void 0 : method.addModifier(new Decorator_1.Decorator(EtsConst_1.BUILDER_DECORATOR));
+                method === null || method === void 0 ? void 0 : method.addDecorator(new Decorator_1.Decorator(EtsConst_1.BUILDER_DECORATOR));
             }
             if (!(method === null || method === void 0 ? void 0 : method.hasViewTree())) {
                 method === null || method === void 0 ? void 0 : method.setViewTree(new ViewTreeImpl(method));
@@ -970,7 +971,7 @@ class ViewTreeImpl extends TreeNodeStack {
             return component;
         }
         let name = expr.getBase().getName();
-        if (name.startsWith('$temp')) {
+        if (name.startsWith(Const_1.TEMP_LOCAL_PREFIX)) {
             let initValue = backtraceLocalInitValue(expr.getBase());
             if (initValue instanceof Ref_1.ArkThisRef) {
                 name = 'this';

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

@@ -0,0 +1,59 @@
+import ts from 'ohos-typescript';
+import { Decorator } from '../base/Decorator';
+import { ArkError } from '../common/ArkError';
+import { ArkMetadata, ArkMetadataKind, ArkMetadataType } from './ArkMetadata';
+export declare enum ModifierType {
+    PRIVATE = 1,
+    PROTECTED = 2,
+    PUBLIC = 4,
+    EXPORT = 8,
+    STATIC = 16,
+    ABSTRACT = 32,
+    ASYNC = 64,
+    CONST = 128,
+    ACCESSOR = 256,
+    DEFAULT = 512,
+    IN = 1024,
+    READONLY = 2048,
+    OUT = 4096,
+    OVERRIDE = 8192,
+    DECLARE = 16384
+}
+export declare const MODIFIER_TYPE_MASK = 65535;
+export declare function modifierKind2Enum(kind: ts.SyntaxKind): ModifierType;
+export declare function modifiers2stringArray(modifiers: number): string[];
+export declare abstract class ArkBaseModel {
+    protected modifiers?: number;
+    protected decorators?: Set<Decorator>;
+    protected metadata?: ArkMetadata;
+    getMetadata(kind: ArkMetadataKind): ArkMetadataType | undefined;
+    setMetadata(kind: ArkMetadataKind, value: ArkMetadataType): void;
+    getModifiers(): number;
+    setModifiers(modifiers: number): void;
+    addModifier(modifier: ModifierType | number): void;
+    removeModifier(modifier: ModifierType): void;
+    isStatic(): boolean;
+    isProtected(): boolean;
+    isPrivate(): boolean;
+    isPublic(): boolean;
+    isReadonly(): boolean;
+    isAbstract(): boolean;
+    isExport(): boolean;
+    /** @deprecated Use {@link isExport} instead. */
+    isExported(): boolean;
+    isDeclare(): boolean;
+    containsModifier(modifierType: ModifierType): boolean;
+    getDecorators(): Decorator[];
+    setDecorators(decorators: Set<Decorator>): void;
+    addDecorator(decorator: Decorator): void;
+    removeDecorator(kind: string): void;
+    hasBuilderDecorator(): boolean;
+    getStateDecorators(): Decorator[];
+    hasBuilderParamDecorator(): boolean;
+    hasEntryDecorator(): boolean;
+    hasComponentDecorator(): boolean;
+    hasDecorator(kind: string | Set<string>): boolean;
+    protected validateFields(fields: string[]): ArkError;
+    abstract validate(): ArkError;
+}
+//# sourceMappingURL=ArkBaseModel.d.ts.map