arkanalyzer 1.0.6 → 1.0.8

package/lib/core/model/ArkMethod.js

@@ -17,19 +17,22 @@ 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 Decorator_1 = require("../base/Decorator");
+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'];
 /**
  * @category core/model
  */
-class ArkMethod {
+class ArkMethod extends ArkBaseModel_1.ArkBaseModel {
     constructor() {
-        this.lineCol = 0;
-        this.modifiers = new Set();
+        super();
         this.isGeneratedFlag = false;
         this.asteriskToken = false;
     }
@@ -37,26 +40,145 @@ class ArkMethod {
         return ArkExport_1.ExportType.METHOD;
     }
     getName() {
-        return this.methodSignature.getMethodSubSignature().getMethodName();
+        return this.getSignature().getMethodSubSignature().getMethodName();
     }
+    /**
+     * Returns the codes of method as a **string.**
+     * @returns the codes of method.
+     */
     getCode() {
         return this.code;
     }
     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.
+     */
     getDeclaringArkClass() {
         return this.declaringArkClass;
     }
@@ -66,15 +188,6 @@ class ArkMethod {
     getDeclaringArkFile() {
         return this.declaringArkClass.getDeclaringArkFile();
     }
-    isExported() {
-        return this.modifiers.has('ExportKeyword');
-    }
-    isStatic() {
-        if (this.modifiers.has('StaticKeyword')) {
-            return true;
-        }
-        return false;
-    }
     isDefaultArkMethod() {
         return this.getName() === Const_1.DEFAULT_ARK_METHOD_NAME;
     }
@@ -82,51 +195,185 @@ class ArkMethod {
         return this.getName().startsWith(Const_1.ANONYMOUS_METHOD_PREFIX);
     }
     getParameters() {
-        return this.methodSignature.getMethodSubSignature().getParameters();
+        return this.getSignature().getMethodSubSignature().getParameters();
     }
     getReturnType() {
-        return this.methodSignature.getType();
-    }
+        return this.getSignature().getType();
+    }
+    /**
+     * 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. Get the signature of method mtd.
+
+     ```typescript
+     let signature = mtd.getSignature();
+     // ... ...
+     ```
+     */
     getSignature() {
-        return this.methodSignature;
-    }
-    setSignature(methodSignature) {
-        this.methodSignature = methodSignature;
+        var _a;
+        return (_a = this.methodSignature) !== null && _a !== void 0 ? _a : this.methodDeclareSignatures[0];
+    }
+    /**
+     * 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.methodDeclareSignatures = [signatures];
+        }
     }
-    getSubSignature() {
-        return this.methodSignature.getMethodSubSignature();
+    /**
+     * 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;
     }
-    getModifiers() {
-        return this.modifiers;
+    /**
+     * 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;
     }
-    addModifier(name) {
-        this.modifiers.add(name);
+    getSubSignature() {
+        return this.getSignature().getMethodSubSignature();
     }
     getGenericTypes() {
         return this.genericTypes;
     }
     isGenericsMethod() {
-        return this.genericTypes != undefined;
+        return this.genericTypes !== undefined;
     }
     setGenericTypes(genericTypes) {
         this.genericTypes = genericTypes;
     }
-    containsModifier(name) {
-        return this.modifiers.has(name);
-    }
+    getBodyBuilder() {
+        return this.bodyBuilder;
+    }
+    /**
+     * Get {@link ArkBody} of a Method.
+     * A {@link ArkBody} contains the CFG and actual instructions or operations to be executed for a method.
+     * It is analogous to the body of a function or method in high-level programming languages,
+     * which contains the statements and expressions that define what the function does.
+     * @returns The {@link ArkBody} of a method.
+     * @example
+     * 1. Get cfg or stmt through ArkBody.
+
+     ```typescript
+     let cfg = this.scene.getMethod()?.getBody().getCfg();
+     const body = arkMethod.getBody()
+     ```
+
+     2. Get local variable through ArkBody.
+
+     ```typescript
+     arkClass.getDefaultArkMethod()?.getBody().getLocals.forEach(local=>{...})
+     let locals = arkFile().getDefaultClass().getDefaultArkMethod()?.getBody()?.getLocals();
+     ```
+     */
     getBody() {
         return this.body;
     }
     setBody(body) {
         this.body = body;
     }
+    /**
+     * Get the CFG (i.e., control flow graph) of a method.
+     * The CFG is a graphical representation of all possible control flow paths within a method's body.
+     * A CFG consists of blocks, statements and goto control jumps.
+     * @returns The CFG (i.e., control flow graph) of a method.
+     * @example
+     * 1. get stmt through ArkBody cfg.
+
+     ```typescript
+     body = arkMethod.getBody();
+     const cfg = body.getCfg();
+     for (const threeAddressStmt of cfg.getStmts()) {
+     ... ...
+     }
+     ```
+
+     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) + ' ';
+     }
+     // ... ...
+     }
+     ```
+     */
     getCfg() {
         var _a;
         return (_a = this.body) === null || _a === void 0 ? void 0 : _a.getCfg();
     }
     getOriginalCfg() {
-        var _a;
-        return (_a = this.body) === null || _a === void 0 ? void 0 : _a.getOriginalCfg();
+        return undefined;
     }
     getParameterInstances() {
         // 获取方法体中参数Local实例
@@ -142,7 +389,7 @@ class ArkMethod {
                     results.push(stmt.getLeftOp());
                 }
             }
-            if (results.length == this.getParameters().length) {
+            if (results.length === this.getParameters().length) {
                 return results;
             }
         }
@@ -182,17 +429,6 @@ class ArkMethod {
     getReturnStmt() {
         return this.getCfg().getStmts().filter(stmt => stmt instanceof Stmt_1.ArkReturnStmt);
     }
-    getDecorators() {
-        return Array.from(this.modifiers).filter((item) => {
-            return item instanceof Decorator_1.Decorator;
-        });
-    }
-    hasBuilderDecorator() {
-        let decorators = this.getDecorators();
-        return decorators.filter((value) => {
-            return value.getKind() == 'Builder';
-        }).length != 0;
-    }
     setViewTree(viewTree) {
         this.viewTree = viewTree;
     }
@@ -200,7 +436,7 @@ class ArkMethod {
         return this.viewTree;
     }
     hasViewTree() {
-        return this.viewTree != undefined;
+        return this.viewTree !== undefined;
     }
     setBodyBuilder(bodyBuilder) {
         this.bodyBuilder = bodyBuilder;
@@ -230,5 +466,86 @@ class ArkMethod {
     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

@@ -1,19 +1,19 @@
-import { Decorator } from '../base/Decorator';
 import { ArkExport, ExportInfo, ExportType } from './ArkExport';
 import { ArkClass } from './ArkClass';
 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
  */
-export declare class ArkNamespace implements ArkExport {
+export declare class ArkNamespace extends ArkBaseModel implements ArkExport {
     private code;
     private lineCol;
     private declaringArkFile;
     private declaringArkNamespace;
     private declaringInstance;
-    private modifiers;
     private exportInfos;
     private defaultClass;
     private namespaces;
@@ -41,14 +41,10 @@ export declare class ArkNamespace implements ArkExport {
     setDeclaringArkFile(declaringArkFile: ArkFile): void;
     getDeclaringArkNamespace(): ArkNamespace | null;
     setDeclaringArkNamespace(declaringArkNamespace: ArkNamespace): void;
-    getModifiers(): Set<string | Decorator>;
-    addModifier(name: string | Decorator): void;
-    containsModifier(name: string): boolean;
     getClass(classSignature: ClassSignature): ArkClass | null;
     getClassWithName(Class: string): ArkClass | null;
     getClasses(): ArkClass[];
     addArkClass(arkClass: ArkClass): void;
-    isExported(): boolean;
     getExportInfos(): ExportInfo[];
     getExportInfoBy(name: string): ExportInfo | undefined;
     addExportInfo(exportInfo: ExportInfo): void;
@@ -57,8 +53,10 @@ export declare class ArkNamespace implements ArkExport {
     getAllMethodsUnderThisNamespace(): ArkMethod[];
     getAllClassesUnderThisNamespace(): ArkClass[];
     getAllNamespacesUnderThisNamespace(): ArkNamespace[];
-    getDecorators(): Decorator[];
     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,MAAM,mBAAmB,CAAC;AAC9C,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;AAIpE;;GAEG;AACH,qBAAa,YAAa,YAAW,SAAS;IAC1C,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,SAAS,CAA0D;IAC3E,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;;IAKlC,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,YAAY;IAIZ,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS;IAIpC,gBAAgB,CAAC,IAAI,EAAE,MAAM;IAI7B,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,UAAU,IAAI,OAAO;IAIrB,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,aAAa,IAAI,SAAS,EAAE;IAM5B,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

@@ -15,19 +15,19 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ArkNamespace = void 0;
-const Decorator_1 = require("../base/Decorator");
 const ArkExport_1 = require("./ArkExport");
 const TSConst_1 = require("../common/TSConst");
 const Position_1 = require("../base/Position");
+const ArkBaseModel_1 = require("./ArkBaseModel");
 /**
  * @category core/model
  */
-class ArkNamespace {
+class ArkNamespace extends ArkBaseModel_1.ArkBaseModel {
     constructor() {
+        super();
         this.code = '';
         this.lineCol = 0;
         this.declaringArkNamespace = null;
-        this.modifiers = new Set();
         this.exportInfos = new Map();
         // name to model
         this.namespaces = new Map(); // don't contain nested namespace
@@ -95,15 +95,6 @@ class ArkNamespace {
     setDeclaringArkNamespace(declaringArkNamespace) {
         this.declaringArkNamespace = declaringArkNamespace;
     }
-    getModifiers() {
-        return this.modifiers;
-    }
-    addModifier(name) {
-        this.modifiers.add(name);
-    }
-    containsModifier(name) {
-        return this.modifiers.has(name);
-    }
     getClass(classSignature) {
         const className = classSignature.getClassName();
         return this.getClassWithName(className);
@@ -117,9 +108,6 @@ class ArkNamespace {
     addArkClass(arkClass) {
         this.classes.set(arkClass.getName(), arkClass);
     }
-    isExported() {
-        return this.containsModifier('ExportKeyword');
-    }
     getExportInfos() {
         const exportInfos = [];
         this.exportInfos.forEach((value, key) => {
@@ -167,16 +155,24 @@ class ArkNamespace {
         });
         return namespaces;
     }
-    getDecorators() {
-        return Array.from(this.modifiers).filter((item) => {
-            return item instanceof Decorator_1.Decorator;
-        });
-    }
     getAnonymousClassNumber() {
         return this.anonymousClassNumber++;
     }
     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;