arkanalyzer 1.0.7 → 1.0.9

package/lib/core/model/ArkMethod.js

@@ -17,10 +17,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ArkMethod = exports.arkMethodNodeKind = void 0;
 const Ref_1 = require("../base/Ref");
 const Stmt_1 = require("../base/Stmt");
+const Type_1 = require("../base/Type");
+const ArkClass_1 = require("./ArkClass");
 const ArkExport_1 = require("./ArkExport");
 const Const_1 = require("../common/Const");
 const Position_1 = require("../base/Position");
 const ArkBaseModel_1 = require("./ArkBaseModel");
+const ArkError_1 = require("../common/ArkError");
+const EtsConst_1 = require("../common/EtsConst");
 exports.arkMethodNodeKind = ['MethodDeclaration', 'Constructor', 'FunctionDeclaration', 'GetAccessor',
     'SetAccessor', 'ArrowFunction', 'FunctionExpression', 'MethodSignature', 'ConstructSignature', 'CallSignature'];
 /**
@@ -29,7 +33,6 @@ exports.arkMethodNodeKind = ['MethodDeclaration', 'Constructor', 'FunctionDeclar
 class ArkMethod extends ArkBaseModel_1.ArkBaseModel {
     constructor() {
         super();
-        this.lineCol = 0;
         this.isGeneratedFlag = false;
         this.asteriskToken = false;
     }
@@ -49,18 +52,129 @@ class ArkMethod extends ArkBaseModel_1.ArkBaseModel {
     setCode(code) {
         this.code = code;
     }
+    /**
+     * Get all lines of the method's declarations or null if the method has no seperated declaration.
+     * @returns null or the lines of the method's declarations with number type.
+     */
+    getDeclareLines() {
+        if (this.methodDeclareLineCols === undefined) {
+            return null;
+        }
+        let lines = [];
+        this.methodDeclareLineCols.forEach(lineCol => {
+            lines.push((0, Position_1.getLineNo)(lineCol));
+        });
+        return lines;
+    }
+    /**
+     * Get all columns of the method's declarations or null if the method has no seperated declaration.
+     * @returns null or the columns of the method's declarations with number type.
+     */
+    getDeclareColumns() {
+        if (this.methodDeclareLineCols === undefined) {
+            return null;
+        }
+        let columns = [];
+        this.methodDeclareLineCols.forEach(lineCol => {
+            columns.push((0, Position_1.getColNo)(lineCol));
+        });
+        return columns;
+    }
+    /**
+     * Set lines and columns of the declarations with number type inputs and then encoded them to LineCol type.
+     * The length of lines and columns should be the same otherwise they cannot be encoded together.
+     * @param lines - the number of lines.
+     * @param columns - the number of columns.
+     * @returns
+     */
+    setDeclareLinesAndCols(lines, columns) {
+        if ((lines === null || lines === void 0 ? void 0 : lines.length) !== (columns === null || columns === void 0 ? void 0 : columns.length)) {
+            return;
+        }
+        this.methodDeclareLineCols = [];
+        lines.forEach((line, index) => {
+            let lineCol = 0;
+            lineCol = (0, Position_1.setLine)(lineCol, line);
+            lineCol = (0, Position_1.setCol)(lineCol, columns[index]);
+            this.methodDeclareLineCols.push(lineCol);
+        });
+    }
+    /**
+     * Set lineCols of the declarations directly with LineCol type input.
+     * @param lineCols - the encoded lines and columns with LineCol type.
+     * @returns
+     */
+    setDeclareLineCols(lineCols) {
+        this.methodDeclareLineCols = lineCols;
+    }
+    /**
+     * Get encoded lines and columns of the method's declarations or null if the method has no seperated declaration.
+     * @returns null or the encoded lines and columns of the method's declarations with LineCol type.
+     */
+    getDeclareLineCols() {
+        var _a;
+        return (_a = this.methodDeclareLineCols) !== null && _a !== void 0 ? _a : null;
+    }
+    /**
+     * Get line of the method's implementation or null if the method has no implementation.
+     * @returns null or the number of the line.
+     */
     getLine() {
+        if (this.lineCol === undefined) {
+            return null;
+        }
         return (0, Position_1.getLineNo)(this.lineCol);
     }
+    /**
+     * Set line of the implementation with line number input.
+     * The line number will be encoded together with the original column number.
+     * @param line - the line number of the method implementation.
+     * @returns
+     */
     setLine(line) {
+        if (this.lineCol === undefined) {
+            this.lineCol = 0;
+        }
         this.lineCol = (0, Position_1.setLine)(this.lineCol, line);
     }
+    /**
+     * Get column of the method's implementation or null if the method has no implementation.
+     * @returns null or the number of the column.
+     */
     getColumn() {
+        if (this.lineCol === undefined) {
+            return null;
+        }
         return (0, Position_1.getColNo)(this.lineCol);
     }
+    /**
+     * Set column of the implementation with column number input.
+     * The column number will be encoded together with the original line number.
+     * @param column - the column number of the method implementation.
+     * @returns
+     */
     setColumn(column) {
+        if (this.lineCol === undefined) {
+            this.lineCol = 0;
+        }
         this.lineCol = (0, Position_1.setCol)(this.lineCol, column);
     }
+    /**
+     * Get encoded line and column of the method's implementation or null if the method has no implementation.
+     * @returns null or the encoded line and column of the method's implementation with LineCol type.
+     */
+    getLineCol() {
+        var _a;
+        return (_a = this.lineCol) !== null && _a !== void 0 ? _a : null;
+    }
+    /**
+     * Set lineCol of the implementation directly with LineCol type input.
+     * @param lineCol - the encoded line and column with LineCol type.
+     * @returns
+     */
+    setLineCol(lineCol) {
+        this.lineCol = lineCol;
+    }
     /**
      * Returns the declaring class of the method.
      * @returns The declaring class of the method.
@@ -87,36 +201,96 @@ class ArkMethod extends ArkBaseModel_1.ArkBaseModel {
         return this.getSignature().getType();
     }
     /**
-     * <font color="red">?建议明确返回类型？</font>
-     * Get the method signature. It includes two fields. one is ClassSignature,
-     * the other is MethodSubSignature. The former indicates what class this method belong to,
-     * the latter indicates the detail info of this method,
-     * such as method name, parameters, returnType, etc.
+     * Get all declare signatures.
+     * The results could be null if there is no seperated declaration of the method.
+     * @returns null or the method declare signatures.
+     */
+    getDeclareSignatures() {
+        var _a;
+        return (_a = this.methodDeclareSignatures) !== null && _a !== void 0 ? _a : null;
+    }
+    /**
+     * Get the index of the matched method declare signature among all declare signatures.
+     * The index will be -1 if there is no matched signature found.
+     * @param targetSignature - the target declare signature want to search.
+     * @returns -1 or the index of the matched signature.
+     */
+    getDeclareSignatureIndex(targetSignature) {
+        let declareSignatures = this.methodDeclareSignatures;
+        if (declareSignatures === undefined) {
+            return -1;
+        }
+        for (let i = 0; i < declareSignatures.length; i++) {
+            if (declareSignatures[i].isMatch(targetSignature)) {
+                return i;
+            }
+        }
+        return -1;
+    }
+    /**
+     * Get the method signature of the implementation.
+     * The signature could be null if the method is only a declaration which body is undefined.
+     * @returns null or the method implementation signature.
+     */
+    getImplementationSignature() {
+        var _a;
+        return (_a = this.methodSignature) !== null && _a !== void 0 ? _a : null;
+    }
+    /**
+     * Get the method signature of the implementation or the first declaration if there is no implementation.
+     * For a method, the implementation and declaration signatures must not be undefined at the same time.
+     * A {@link MethodSignature} includes:
+     * - Class Signature: indicates which class this method belong to.
+     * - Method SubSignature: indicates the detail info of this method such as method name, parameters, returnType, etc.
      * @returns The method signature.
      * @example
-     * 1. New a body.
+     * 1. Get the signature of method mtd.
 
-    ```typescript
-    let mtd = new ArkMethod();
-    // ... ...
-    let mtd = mtd.getSignature();
-    // ... ...
-    ```
+     ```typescript
+     let signature = mtd.getSignature();
+     // ... ...
+     ```
      */
     getSignature() {
-        return this.methodSignature[0];
-    }
-    getAllSignature() {
-        return this.methodSignature;
+        var _a;
+        return (_a = this.methodSignature) !== null && _a !== void 0 ? _a : this.methodDeclareSignatures[0];
     }
-    setSignature(methodSignature) {
-        if (Array.isArray(methodSignature)) {
-            this.methodSignature = methodSignature;
+    /**
+     * Set signatures of all declarations.
+     * It will reset the declaration signatures if they are already defined before.
+     * @param signatures - one signature or a list of signatures.
+     * @returns
+     */
+    setDeclareSignatures(signatures) {
+        if (Array.isArray(signatures)) {
+            this.methodDeclareSignatures = signatures;
         }
         else {
-            this.methodSignature = [methodSignature];
+            this.methodDeclareSignatures = [signatures];
         }
     }
+    /**
+     * Reset signature of one declaration with the specified index.
+     * Will do nothing if the index doesn't exist.
+     * @param signature - new signature want to set.
+     * @param index - index of signature want to set.
+     * @returns
+     */
+    setDeclareSignatureWithIndex(signature, index) {
+        if (this.methodDeclareSignatures === undefined || this.methodDeclareSignatures.length <= index) {
+            return;
+        }
+        this.methodDeclareSignatures[index] = signature;
+    }
+    /**
+     * Set signature of implementation.
+     * It will reset the implementation signature if it is already defined before.
+     * @param signature - signature of implementation.
+     * @returns
+     */
+    setImplementationSignature(signature) {
+        this.methodSignature = signature;
+    }
     getSubSignature() {
         return this.getSignature().getMethodSubSignature();
     }
@@ -141,17 +315,17 @@ class ArkMethod extends ArkBaseModel_1.ArkBaseModel {
      * @example
      * 1. Get cfg or stmt through ArkBody.
 
-    ```typescript
-    let cfg = this.scene.getMethod()?.getBody().getCfg();
-    const body = arkMethod.getBody()
-    ```
+     ```typescript
+     let cfg = this.scene.getMethod()?.getBody().getCfg();
+     const body = arkMethod.getBody()
+     ```
 
-    2. Get local variable through ArkBody.
+     2. Get local variable through ArkBody.
 
-    ```typescript
-    arkClass.getDefaultArkMethod()?.getBody().getLocals.forEach(local=>{...})
-    let locals = arkFile().getDefaultClass().getDefaultArkMethod()?.getBody()?.getLocals();
-    ```
+     ```typescript
+     arkClass.getDefaultArkMethod()?.getBody().getLocals.forEach(local=>{...})
+     let locals = arkFile().getDefaultClass().getDefaultArkMethod()?.getBody()?.getLocals();
+     ```
      */
     getBody() {
         return this.body;
@@ -167,32 +341,32 @@ class ArkMethod extends ArkBaseModel_1.ArkBaseModel {
      * @example
      * 1. get stmt through ArkBody cfg.
 
-    ```typescript
-    body = arkMethod.getBody();
-    const cfg = body.getCfg();
-    for (const threeAddressStmt of cfg.getStmts()) {
-    ... ...
-    }
-    ```
+     ```typescript
+     body = arkMethod.getBody();
+     const cfg = body.getCfg();
+     for (const threeAddressStmt of cfg.getStmts()) {
+     ... ...
+     }
+     ```
 
-    2. get blocks through ArkBody cfg.
+     2. get blocks through ArkBody cfg.
 
-    ```typescript
-    const body = arkMethod.getBody();
-    const blocks = [...body.getCfg().getBlocks()];
-    for (let i=0; i<blocks.length; i++) {
-    const block = blocks[i];
-    ... ...
-    for (const stmt of block.getStmts()) {
-        ... ...
-    }
-    let text = "next;"
-    for (const next of block.getSuccessors()) {
-        text += blocks.indexOf(next) + ' ';
-    }
-    // ... ...
-    }
-    ```
+     ```typescript
+     const body = arkMethod.getBody();
+     const blocks = [...body.getCfg().getBlocks()];
+     for (let i=0; i<blocks.length; i++) {
+     const block = blocks[i];
+     ... ...
+     for (const stmt of block.getStmts()) {
+     ... ...
+     }
+     let text = "next;"
+     for (const next of block.getSuccessors()) {
+     text += blocks.indexOf(next) + ' ';
+     }
+     // ... ...
+     }
+     ```
      */
     getCfg() {
         var _a;
@@ -292,5 +466,86 @@ class ArkMethod extends ArkBaseModel_1.ArkBaseModel {
     setAsteriskToken(asteriskToken) {
         this.asteriskToken = asteriskToken;
     }
+    validate() {
+        const declareSignatures = this.getDeclareSignatures();
+        const declareLineCols = this.getDeclareLineCols();
+        const signature = this.getImplementationSignature();
+        const lineCol = this.getLineCol();
+        if (declareSignatures === null && signature === null) {
+            return {
+                errCode: ArkError_1.ArkErrorCode.METHOD_SIGNATURE_UNDEFINED,
+                errMsg: 'methodDeclareSignatures and methodSignature are both undefined.'
+            };
+        }
+        if ((declareSignatures === null) !== (declareLineCols === null)) {
+            return {
+                errCode: ArkError_1.ArkErrorCode.METHOD_SIGNATURE_LINE_UNMATCHED,
+                errMsg: 'methodDeclareSignatures and methodDeclareLineCols are not matched.'
+            };
+        }
+        if (declareSignatures !== null && declareLineCols !== null && declareSignatures.length !== declareLineCols.length) {
+            return {
+                errCode: ArkError_1.ArkErrorCode.METHOD_SIGNATURE_LINE_UNMATCHED,
+                errMsg: 'methodDeclareSignatures and methodDeclareLineCols are not matched.'
+            };
+        }
+        if ((signature === null) !== (lineCol === null)) {
+            return {
+                errCode: ArkError_1.ArkErrorCode.METHOD_SIGNATURE_LINE_UNMATCHED,
+                errMsg: 'methodSignature and lineCol are not matched.'
+            };
+        }
+        return this.validateFields(['declaringArkClass']);
+    }
+    matchMethodSignature(args) {
+        var _a, _b, _c;
+        const signatures = (_a = this.methodDeclareSignatures) === null || _a === void 0 ? void 0 : _a.filter(f => {
+            const parameters = f.getMethodSubSignature().getParameters();
+            const max = parameters.length;
+            let min = 0;
+            while (min < max && !parameters[min].isOptional()) {
+                min++;
+            }
+            return args.length >= min && args.length <= max;
+        });
+        function match(paramType, argType, scene) {
+            var _a;
+            if (paramType instanceof Type_1.UnionType) {
+                let matched = false;
+                for (const e of paramType.getTypes()) {
+                    if (argType.constructor === e.constructor) {
+                        matched = true;
+                        break;
+                    }
+                }
+                return matched;
+            }
+            else if (argType instanceof Type_1.FunctionType && paramType instanceof Type_1.ClassType &&
+                paramType.getClassSignature().getClassName().includes(EtsConst_1.CALL_BACK)) {
+                return true;
+            }
+            else if (paramType instanceof Type_1.NumberType && argType instanceof Type_1.ClassType && ArkClass_1.ClassCategory.ENUM ===
+                ((_a = scene.getClass(argType.getClassSignature())) === null || _a === void 0 ? void 0 : _a.getCategory())) {
+                return true;
+            }
+            return argType.constructor === paramType.constructor;
+        }
+        const scene = this.getDeclaringArkFile().getScene();
+        return (_c = (_b = signatures === null || signatures === void 0 ? void 0 : signatures.find(p => {
+            const parameters = p.getMethodSubSignature().getParameters();
+            for (let i = 0; i < parameters.length; i++) {
+                if (!args[i]) {
+                    return parameters[i].isOptional();
+                }
+                const paramType = parameters[i].getType();
+                const argType = args[i];
+                const isMatched = match(paramType, argType, scene);
+                if (!isMatched) {
+                    return false;
+                }
+            }
+            return true;
+        })) !== null && _b !== void 0 ? _b : signatures === null || signatures === void 0 ? void 0 : signatures[0]) !== null && _c !== void 0 ? _c : this.getSignature();
+    }
 }
 exports.ArkMethod = ArkMethod;

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

@@ -4,6 +4,7 @@ import { ArkFile } from './ArkFile';
 import { ArkMethod } from './ArkMethod';
 import { ClassSignature, NamespaceSignature } from './ArkSignature';
 import { ArkBaseModel } from './ArkBaseModel';
+import { ArkError } from '../common/ArkError';
 /**
  * @category core/model
  */
@@ -54,5 +55,8 @@ export declare class ArkNamespace extends ArkBaseModel implements ArkExport {
     getAllNamespacesUnderThisNamespace(): ArkNamespace[];
     getAnonymousClassNumber(): number;
     getExportType(): ExportType;
+    removeArkClass(arkClass: ArkClass): boolean;
+    removeNamespace(namespace: ArkNamespace): boolean;
+    validate(): ArkError;
 }
 //# sourceMappingURL=ArkNamespace.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ArkNamespace.d.ts","sourceRoot":"","sources":["../../../src/core/model/ArkNamespace.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAChE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAGpE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C;;GAEG;AACH,qBAAa,YAAa,SAAQ,YAAa,YAAW,SAAS;IAC/D,OAAO,CAAC,IAAI,CAAa;IACzB,OAAO,CAAC,OAAO,CAAc;IAE7B,OAAO,CAAC,gBAAgB,CAAW;IACnC,OAAO,CAAC,qBAAqB,CAA6B;IAE1D,OAAO,CAAC,iBAAiB,CAA0B;IAEnD,OAAO,CAAC,WAAW,CAA0D;IAE7E,OAAO,CAAC,YAAY,CAAY;IAGhC,OAAO,CAAC,UAAU,CAA8D;IAChF,OAAO,CAAC,OAAO,CAAsD;IAErE,OAAO,CAAC,kBAAkB,CAAsB;IAEhD,OAAO,CAAC,oBAAoB,CAAa;;IAMlC,YAAY,CAAC,SAAS,EAAE,YAAY;IAIpC,YAAY,CAAC,kBAAkB,EAAE,kBAAkB,GAAG,YAAY,GAAG,IAAI;IAKzE,oBAAoB,CAAC,aAAa,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI;IAIhE,aAAa,IAAI,YAAY,EAAE;IAI/B,YAAY,CAAC,kBAAkB,EAAE,kBAAkB,GAAG,IAAI;IAI1D,YAAY;IAIZ,qBAAqB;IAIrB,OAAO;IAIP,OAAO;IAIP,OAAO,CAAC,IAAI,EAAE,MAAM;IAIpB,OAAO;IAIP,OAAO,CAAC,IAAI,EAAE,MAAM;IAIpB,SAAS;IAIT,SAAS,CAAC,MAAM,EAAE,MAAM;IAIxB,oBAAoB;IAIpB,oBAAoB,CAAC,iBAAiB,EAAE,OAAO,GAAG,YAAY;IAI9D,mBAAmB;IAInB,mBAAmB,CAAC,gBAAgB,EAAE,OAAO;IAI7C,wBAAwB;IAIxB,wBAAwB,CAAC,qBAAqB,EAAE,YAAY;IAI5D,QAAQ,CAAC,cAAc,EAAE,cAAc,GAAG,QAAQ,GAAG,IAAI;IAKzD,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI;IAIhD,UAAU,IAAI,QAAQ,EAAE;IAIxB,WAAW,CAAC,QAAQ,EAAE,QAAQ;IAI9B,cAAc,IAAI,UAAU,EAAE;IAU9B,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS;IAIrD,aAAa,CAAC,UAAU,EAAE,UAAU;IAIpC,eAAe;IAIf,eAAe,CAAC,YAAY,EAAE,QAAQ;IAItC,+BAA+B,IAAI,SAAS,EAAE;IAW9C,+BAA+B,IAAI,QAAQ,EAAE;IAS7C,kCAAkC,IAAI,YAAY,EAAE;IASpD,uBAAuB;IAI9B,aAAa,IAAI,UAAU;CAG9B"}
+{"version":3,"file":"ArkNamespace.d.ts","sourceRoot":"","sources":["../../../src/core/model/ArkNamespace.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAChE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAGpE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C;;GAEG;AACH,qBAAa,YAAa,SAAQ,YAAa,YAAW,SAAS;IAC/D,OAAO,CAAC,IAAI,CAAa;IACzB,OAAO,CAAC,OAAO,CAAc;IAE7B,OAAO,CAAC,gBAAgB,CAAW;IACnC,OAAO,CAAC,qBAAqB,CAA6B;IAE1D,OAAO,CAAC,iBAAiB,CAA0B;IAEnD,OAAO,CAAC,WAAW,CAA0D;IAE7E,OAAO,CAAC,YAAY,CAAY;IAGhC,OAAO,CAAC,UAAU,CAA8D;IAChF,OAAO,CAAC,OAAO,CAAsD;IAErE,OAAO,CAAC,kBAAkB,CAAsB;IAEhD,OAAO,CAAC,oBAAoB,CAAa;;IAMlC,YAAY,CAAC,SAAS,EAAE,YAAY;IAIpC,YAAY,CAAC,kBAAkB,EAAE,kBAAkB,GAAG,YAAY,GAAG,IAAI;IAKzE,oBAAoB,CAAC,aAAa,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI;IAIhE,aAAa,IAAI,YAAY,EAAE;IAI/B,YAAY,CAAC,kBAAkB,EAAE,kBAAkB,GAAG,IAAI;IAI1D,YAAY;IAIZ,qBAAqB;IAIrB,OAAO;IAIP,OAAO;IAIP,OAAO,CAAC,IAAI,EAAE,MAAM;IAIpB,OAAO;IAIP,OAAO,CAAC,IAAI,EAAE,MAAM;IAIpB,SAAS;IAIT,SAAS,CAAC,MAAM,EAAE,MAAM;IAIxB,oBAAoB;IAIpB,oBAAoB,CAAC,iBAAiB,EAAE,OAAO,GAAG,YAAY;IAI9D,mBAAmB;IAInB,mBAAmB,CAAC,gBAAgB,EAAE,OAAO;IAI7C,wBAAwB;IAIxB,wBAAwB,CAAC,qBAAqB,EAAE,YAAY;IAI5D,QAAQ,CAAC,cAAc,EAAE,cAAc,GAAG,QAAQ,GAAG,IAAI;IAKzD,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI;IAIhD,UAAU,IAAI,QAAQ,EAAE;IAIxB,WAAW,CAAC,QAAQ,EAAE,QAAQ;IAI9B,cAAc,IAAI,UAAU,EAAE;IAU9B,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,GAAG,SAAS;IAIrD,aAAa,CAAC,UAAU,EAAE,UAAU;IAIpC,eAAe;IAIf,eAAe,CAAC,YAAY,EAAE,QAAQ;IAItC,+BAA+B,IAAI,SAAS,EAAE;IAW9C,+BAA+B,IAAI,QAAQ,EAAE;IAS7C,kCAAkC,IAAI,YAAY,EAAE;IASpD,uBAAuB;IAI9B,aAAa,IAAI,UAAU;IAIpB,cAAc,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO;IAM3C,eAAe,CAAC,SAAS,EAAE,YAAY,GAAG,OAAO;IAMjD,QAAQ,IAAI,QAAQ;CAG9B"}

package/lib/core/model/ArkNamespace.js

@@ -161,5 +161,18 @@ class ArkNamespace extends ArkBaseModel_1.ArkBaseModel {
     getExportType() {
         return ArkExport_1.ExportType.NAME_SPACE;
     }
+    removeArkClass(arkClass) {
+        let rtn = this.classes.delete(arkClass.getName());
+        rtn && (rtn = this.getDeclaringArkFile().getScene().removeClass(arkClass));
+        return rtn;
+    }
+    removeNamespace(namespace) {
+        let rtn = this.namespaces.delete(namespace.getName());
+        rtn && (rtn = this.getDeclaringArkFile().getScene().removeNamespace(namespace));
+        return rtn;
+    }
+    validate() {
+        return this.validateFields(['declaringArkFile', 'declaringInstance', 'namespaceSignature', 'defaultClass']);
+    }
 }
 exports.ArkNamespace = ArkNamespace;

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

@@ -10,11 +10,13 @@ export interface ArkSignature {
 export declare class FileSignature {
     private projectName;
     private fileName;
+    private hashcode;
     static readonly DEFAULT: FileSignature;
     constructor(projectName: string, fileName: string);
     getProjectName(): string;
     getFileName(): string;
     toString(): string;
+    toMapKey(): string;
 }
 export declare class NamespaceSignature {
     private namespaceName;
@@ -26,6 +28,7 @@ export declare class NamespaceSignature {
     getDeclaringFileSignature(): FileSignature;
     getDeclaringNamespaceSignature(): NamespaceSignature | null;
     toString(): string;
+    toMapKey(): string;
 }
 export declare class ClassSignature {
     private declaringFileSignature;
@@ -51,6 +54,7 @@ export declare class ClassSignature {
     setClassName(className: string): void;
     getType(): ClassType;
     toString(): string;
+    toMapKey(): string;
 }
 export type BaseSignature = ClassSignature | NamespaceSignature;
 export declare class FieldSignature {
@@ -78,6 +82,7 @@ export declare class MethodSubSignature {
     getParameters(): MethodParameter[];
     getParameterTypes(): Type[];
     getReturnType(): Type;
+    setReturnType(returnType: Type): void;
     isStatic(): boolean;
     toString(): string;
 }
@@ -91,17 +96,17 @@ export declare class MethodSignature {
     /**
      * Return the declaring class signature.
      * A {@link ClassSignature} includes:
-     * - File Signature: including the **string** names of the project and file, respectively. The default value of project's name is "_UnknownProjectName" and the default value of file's name is "_UnknownFileName".
+     * - File Signature: including the **string** names of the project and file, respectively. The default value of project's name is "%unk" and the default value of file's name is "%unk".
      * - Namespace Signature | **null**:  it may be a namespace signature or **null**. A namespace signature can indicate its **string** name of namespace and its file signature.
      * - Class Name: the **string** name of this class.
      * @returns The declaring class signature.
      * @example
      * 1. get class signature from ArkMethod.
 
-    ```typescript
-    let methodSignature = expr.getMethodSignature();
-    let name = methodSignature.getDeclaringClassSignature().getClassName();
-    ```
+     ```typescript
+     let methodSignature = expr.getMethodSignature();
+     let name = methodSignature.getDeclaringClassSignature().getClassName();
+     ```
      *
      */
     getDeclaringClassSignature(): ClassSignature;
@@ -114,6 +119,7 @@ export declare class MethodSignature {
     getMethodSubSignature(): MethodSubSignature;
     getType(): Type;
     toString(): string;
+    toMapKey(): string;
     isMatch(signature: MethodSignature): boolean;
 }
 export declare class LocalSignature {

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

@@ -1 +1 @@
-{"version":3,"file":"ArkSignature.d.ts","sourceRoot":"","sources":["../../../src/core/model/ArkSignature.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAG7D,MAAM,MAAM,SAAS,GACjB,aAAa,GACX,kBAAkB,GAClB,cAAc,GACd,eAAe,GACf,cAAc,GACd,cAAc,CAAC;AAErB,MAAM,WAAW,YAAY;IACzB,YAAY,IAAI,SAAS,CAAC;CAC7B;AAED;;GAEG;AACH,qBAAa,aAAa;IACtB,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,QAAQ,CAAS;IAEzB,gBAAuB,OAAO,EAAE,aAAa,CAA8D;gBAE/F,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAK1C,cAAc;IAId,WAAW;IAIX,QAAQ,IAAI,MAAM;CAK5B;AAED,qBAAa,kBAAkB;IAC3B,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,sBAAsB,CAAgB;IAC9C,OAAO,CAAC,2BAA2B,CAA4B;IAE/D,gBAAuB,OAAO,EAAE,kBAAkB,CACjB;gBAErB,aAAa,EAAE,MAAM,EAAE,sBAAsB,EAAE,aAAa,EAC5D,2BAA2B,GAAE,kBAAkB,GAAG,IAAW;IAMlE,gBAAgB;IAIhB,yBAAyB;IAIzB,8BAA8B;IAI9B,QAAQ,IAAI,MAAM;CAO5B;AAED,qBAAa,cAAc;IACvB,OAAO,CAAC,sBAAsB,CAAgB;IAC9C,OAAO,CAAC,2BAA2B,CAA4B;IAC/D,OAAO,CAAC,SAAS,CAAS;IAE1B,gBAAuB,OAAO,EAAE,cAAc,CACpC;gBAEE,SAAS,EAAE,MAAM,EAAE,sBAAsB,EAAE,aAAa,EACxD,2BAA2B,GAAE,kBAAkB,GAAG,IAAW;IAMzE;;;OAGG;IACI,yBAAyB;IAIhC;;;OAGG;IACI,8BAA8B;IAIrC;;;OAGG;IACI,YAAY;IAIZ,YAAY,CAAC,SAAS,EAAE,MAAM;IAI9B,OAAO,IAAI,SAAS;IAIpB,QAAQ,IAAI,MAAM;CAO5B;AAED,MAAM,MAAM,aAAa,GAAG,cAAc,GAAG,kBAAkB,CAAC;AAEhE,qBAAa,cAAc;IACvB,OAAO,CAAC,kBAAkB,CAAgB;IAC1C,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,IAAI,CAAO;IACnB,OAAO,CAAC,UAAU,CAAU;gBAEhB,SAAS,EAAE,MAAM,EAAE,kBAAkB,EAAE,aAAa,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,GAAE,OAAe;IAOlG,qBAAqB;IAIrB,WAAW;IAKX,YAAY;IAIZ,OAAO,IAAI,IAAI;IAIf,QAAQ,IAAI,OAAO;IAKnB,OAAO,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IAKzB,aAAa,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI;IAIlC,QAAQ,IAAI,MAAM;CAO5B;AAED,qBAAa,kBAAkB;IAC3B,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,UAAU,CAAoB;IACtC,OAAO,CAAC,UAAU,CAAO;IACzB,OAAO,CAAC,UAAU,CAAU;gBAEhB,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,eAAe,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,GAAE,OAAe;IAOrG,aAAa;IAIb,aAAa;IAIb,iBAAiB,IAAI,IAAI,EAAE;IAQ3B,aAAa,IAAI,IAAI;IAIrB,QAAQ,IAAI,OAAO;IAcnB,QAAQ,IAAI,MAAM;CAY5B;AAED;;GAEG;AACH,qBAAa,eAAe;IACxB,OAAO,CAAC,uBAAuB,CAAiB;IAChD,OAAO,CAAC,kBAAkB,CAAqB;gBAEnC,uBAAuB,EAAE,cAAc,EAAE,kBAAkB,EAAE,kBAAkB;IAK3F;;;;;;;;;;;;;;;OAeG;IACI,0BAA0B;IAIjC;;;;;OAKG;IACI,qBAAqB;IAIrB,OAAO,IAAI,IAAI;IAIf,QAAQ,IAAI,MAAM;IAIlB,OAAO,CAAC,SAAS,EAAE,eAAe,GAAG,OAAO;CAGtD;AAED,qBAAa,cAAc;IACvB,OAAO,CAAC,IAAI,CAAS;IACrB,OAAO,CAAC,wBAAwB,CAAkB;gBAEtC,IAAI,EAAE,MAAM,EAAE,wBAAwB,EAAE,eAAe;IAK5D,OAAO,IAAI,MAAM;IAIjB,8BAA8B;IAI9B,QAAQ,IAAI,MAAM;CAG5B;AAGD,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,cAAc,GAAG,OAAO,CAMhG;AAED,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,eAAe,GAAG,OAAO,CAMnG;AAED,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAAE,kBAAkB,GAAG,OAAO,CAM5G;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,cAAc,GAAG,OAAO,CAMhG;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,aAAa,GAAG,OAAO,CAK7F;AAcD,wBAAgB,yBAAyB,CAAC,WAAW,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,GAAG,MAAM,CAE/F"}
+{"version":3,"file":"ArkSignature.d.ts","sourceRoot":"","sources":["../../../src/core/model/ArkSignature.ts"],"names":[],"mappings":"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"}