arkanalyzer 1.0.6 → 1.0.8

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;
@@ -33,12 +36,25 @@ export declare class ClassSignature {
     private className;
     static readonly DEFAULT: ClassSignature;
     constructor(className: string, declaringFileSignature: FileSignature, declaringNamespaceSignature?: NamespaceSignature | null);
+    /**
+     * Returns the declaring file signature.
+     * @returns The declaring file signature.
+     */
     getDeclaringFileSignature(): FileSignature;
+    /**
+     * Get the declaring namespace's signature.
+     * @returns the declaring namespace's signature.
+     */
     getDeclaringNamespaceSignature(): NamespaceSignature | null;
+    /**
+     * Get the **string** name of class from the the class signature. The default value is `""`.
+     * @returns The name of this class.
+     */
     getClassName(): string;
     setClassName(className: string): void;
     getType(): ClassType;
     toString(): string;
+    toMapKey(): string;
 }
 export type BaseSignature = ClassSignature | NamespaceSignature;
 export declare class FieldSignature {
@@ -66,6 +82,7 @@ export declare class MethodSubSignature {
     getParameters(): MethodParameter[];
     getParameterTypes(): Type[];
     getReturnType(): Type;
+    setReturnType(returnType: Type): void;
     isStatic(): boolean;
     toString(): string;
 }
@@ -76,10 +93,34 @@ export declare class MethodSignature {
     private declaringClassSignature;
     private methodSubSignature;
     constructor(declaringClassSignature: ClassSignature, methodSubSignature: MethodSubSignature);
+    /**
+     * 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 "%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();
+     ```
+     *
+     */
     getDeclaringClassSignature(): ClassSignature;
+    /**
+     * Returns the sub-signature of this method signature.
+     * The sub-signature is part of the method signature, which is used to
+     * identify the name of the method, its parameters and the return value type.
+     * @returns The sub-signature of this method signature.
+     */
     getMethodSubSignature(): MethodSubSignature;
     getType(): Type;
     toString(): string;
+    toMapKey(): string;
+    isMatch(signature: MethodSignature): boolean;
 }
 export declare class LocalSignature {
     private name;

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

package/lib/core/model/ArkSignature.js

@@ -13,18 +13,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.genSignature4ImportClause = exports.fileSignatureCompare = exports.classSignatureCompare = exports.methodSubSignatureCompare = exports.methodSignatureCompare = exports.fieldSignatureCompare = exports.LocalSignature = exports.MethodSignature = exports.MethodSubSignature = exports.FieldSignature = exports.ClassSignature = exports.NamespaceSignature = exports.FileSignature = void 0;
+const path_1 = __importDefault(require("path"));
 const pathTransfer_1 = require("../../utils/pathTransfer");
 const Type_1 = require("../base/Type");
 const Const_1 = require("../common/Const");
+const crypto_utils_1 = require("../../utils/crypto_utils");
 /**
  * @category core/model
  */
 class FileSignature {
     constructor(projectName, fileName) {
         this.projectName = projectName;
-        this.fileName = fileName;
+        this.fileName = (0, pathTransfer_1.transfer2UnixPath)(fileName);
+        this.hashcode = crypto_utils_1.CryptoUtils.hashcode(this.toString());
     }
     getProjectName() {
         return this.projectName;
@@ -33,9 +39,10 @@ class FileSignature {
         return this.fileName;
     }
     toString() {
-        let tmpSig = (0, pathTransfer_1.transfer2UnixPath)(this.fileName);
-        tmpSig = '@' + this.projectName + '/' + tmpSig + ': ';
-        return tmpSig;
+        return `@${this.projectName}/${this.fileName}: `;
+    }
+    toMapKey() {
+        return `${this.hashcode}${path_1.default.basename(this.fileName)}`;
     }
 }
 exports.FileSignature = FileSignature;
@@ -63,6 +70,14 @@ class NamespaceSignature {
             return this.declaringFileSignature.toString() + this.namespaceName;
         }
     }
+    toMapKey() {
+        if (this.declaringNamespaceSignature) {
+            return this.declaringNamespaceSignature.toMapKey() + '.' + this.namespaceName;
+        }
+        else {
+            return this.declaringFileSignature.toMapKey() + this.namespaceName;
+        }
+    }
 }
 exports.NamespaceSignature = NamespaceSignature;
 NamespaceSignature.DEFAULT = new NamespaceSignature(Const_1.UNKNOWN_NAMESPACE_NAME, FileSignature.DEFAULT, null);
@@ -72,12 +87,24 @@ class ClassSignature {
         this.declaringFileSignature = declaringFileSignature;
         this.declaringNamespaceSignature = declaringNamespaceSignature;
     }
+    /**
+     * Returns the declaring file signature.
+     * @returns The declaring file signature.
+     */
     getDeclaringFileSignature() {
         return this.declaringFileSignature;
     }
+    /**
+     * Get the declaring namespace's signature.
+     * @returns the declaring namespace's signature.
+     */
     getDeclaringNamespaceSignature() {
         return this.declaringNamespaceSignature;
     }
+    /**
+     * Get the **string** name of class from the the class signature. The default value is `""`.
+     * @returns The name of this class.
+     */
     getClassName() {
         return this.className;
     }
@@ -95,6 +122,14 @@ class ClassSignature {
             return this.declaringFileSignature.toString() + this.className;
         }
     }
+    toMapKey() {
+        if (this.declaringNamespaceSignature) {
+            return this.declaringNamespaceSignature.toMapKey() + '.' + this.className;
+        }
+        else {
+            return this.declaringFileSignature.toMapKey() + this.className;
+        }
+    }
 }
 exports.ClassSignature = ClassSignature;
 ClassSignature.DEFAULT = new ClassSignature(Const_1.UNKNOWN_CLASS_NAME, FileSignature.DEFAULT, null);
@@ -161,18 +196,12 @@ class MethodSubSignature {
     getReturnType() {
         return this.returnType;
     }
+    setReturnType(returnType) {
+        this.returnType = returnType;
+    }
     isStatic() {
         return this.staticFlag;
     }
-    // // temp for being compatible with existing type inference
-    // public setReturnType(returnType: Type): void {
-    //     this.returnType = returnType;
-    // }
-    //
-    // // temp for being compatible with existing type inference
-    // public setStaticFlag(flag: boolean): void {
-    //     this.staticFlag = flag;
-    // }
     toString() {
         let paraStr = "";
         this.getParameterTypes().forEach((parameterType) => {
@@ -195,9 +224,31 @@ class MethodSignature {
         this.declaringClassSignature = declaringClassSignature;
         this.methodSubSignature = methodSubSignature;
     }
+    /**
+     * 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 "%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();
+     ```
+     *
+     */
     getDeclaringClassSignature() {
         return this.declaringClassSignature;
     }
+    /**
+     * Returns the sub-signature of this method signature.
+     * The sub-signature is part of the method signature, which is used to
+     * identify the name of the method, its parameters and the return value type.
+     * @returns The sub-signature of this method signature.
+     */
     getMethodSubSignature() {
         return this.methodSubSignature;
     }
@@ -207,6 +258,12 @@ class MethodSignature {
     toString() {
         return this.declaringClassSignature.toString() + '.' + this.methodSubSignature.toString();
     }
+    toMapKey() {
+        return this.declaringClassSignature.toMapKey() + '.' + this.methodSubSignature.toString();
+    }
+    isMatch(signature) {
+        return ((this.toString() === signature.toString()) && (this.getType().toString() === signature.getType().toString()));
+    }
 }
 exports.MethodSignature = MethodSignature;
 class LocalSignature {
@@ -228,7 +285,7 @@ exports.LocalSignature = LocalSignature;
 //TODO, reconstruct
 function fieldSignatureCompare(leftSig, rightSig) {
     if (leftSig.getDeclaringSignature().toString() === rightSig.getDeclaringSignature().toString() &&
-        (leftSig.getFieldName() == rightSig.getFieldName())) {
+        (leftSig.getFieldName() === rightSig.getFieldName())) {
         return true;
     }
     return false;
@@ -243,7 +300,7 @@ function methodSignatureCompare(leftSig, rightSig) {
 }
 exports.methodSignatureCompare = methodSignatureCompare;
 function methodSubSignatureCompare(leftSig, rightSig) {
-    if ((leftSig.getMethodName() == rightSig.getMethodName()) && arrayCompare(leftSig.getParameterTypes(), rightSig.getParameterTypes()) && leftSig.getReturnType() == rightSig.getReturnType()) {
+    if ((leftSig.getMethodName() === rightSig.getMethodName()) && arrayCompare(leftSig.getParameterTypes(), rightSig.getParameterTypes()) && leftSig.getReturnType() === rightSig.getReturnType()) {
         return true;
     }
     return false;
@@ -251,25 +308,25 @@ function methodSubSignatureCompare(leftSig, rightSig) {
 exports.methodSubSignatureCompare = methodSubSignatureCompare;
 function classSignatureCompare(leftSig, rightSig) {
     if ((fileSignatureCompare(leftSig.getDeclaringFileSignature(), rightSig.getDeclaringFileSignature())) &&
-        (leftSig.getClassName() == rightSig.getClassName())) {
+        (leftSig.getClassName() === rightSig.getClassName())) {
         return true;
     }
     return false;
 }
 exports.classSignatureCompare = classSignatureCompare;
 function fileSignatureCompare(leftSig, rightSig) {
-    if ((leftSig.getFileName() == rightSig.getFileName()) && (leftSig.getProjectName() == rightSig.getProjectName())) {
+    if ((leftSig.getFileName() === rightSig.getFileName()) && (leftSig.getProjectName() === rightSig.getProjectName())) {
         return true;
     }
     return false;
 }
 exports.fileSignatureCompare = fileSignatureCompare;
 function arrayCompare(leftArray, rightArray) {
-    if (leftArray.length != rightArray.length) {
+    if (leftArray.length !== rightArray.length) {
         return false;
     }
     for (let i = 0; i < leftArray.length; i++) {
-        if (leftArray[i] != rightArray[i]) {
+        if (leftArray[i] !== rightArray[i]) {
             return false;
         }
     }

package/lib/core/model/builder/ArkClassBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ArkClassBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/ArkClassBuilder.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,EAAE,MAAM,iBAAiB,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAiB,MAAM,aAAa,CAAC;AAqBtD,MAAM,MAAM,aAAa,GACrB,EAAE,CAAC,gBAAgB,GACnB,EAAE,CAAC,oBAAoB,GACvB,EAAE,CAAC,eAAe,GAClB,EAAE,CAAC,eAAe,GAClB,EAAE,CAAC,eAAe,GAClB,EAAE,CAAC,iBAAiB,GACpB,EAAE,CAAC,uBAAuB,CAAC;AAE/B,wBAAgB,+BAA+B,CAAC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,CAAC,UAAU,QAG/G;AAED,wBAAgB,oCAAoC,CAAC,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,QAAQ,EAClD,MAAM,EAAE,EAAE,CAAC,iBAAiB,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,QAI3G;AAED,wBAAgB,gCAAgC,CAAC,OAAO,EAAE,EAAE,CAAC,eAAe,EAC3B,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,QAOxF;AAED,wBAAgB,8BAA8B,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EACvD,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,eAAe,CAAC,EAAE,SAAS,QAYpG;AAED,wBAAgB,mCAAmC,CAAC,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,YAAY,EAAE,GAAG,EAAE,QAAQ,EACjE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,eAAe,CAAC,EAAE,SAAS,QAazG;AAgBD,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,eAAe,CAAC,EAAE,SAAS,QAwBhI"}
+{"version":3,"file":"ArkClassBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/ArkClassBuilder.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,EAAE,MAAM,iBAAiB,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAiB,MAAM,aAAa,CAAC;AAqBtD,MAAM,MAAM,aAAa,GACrB,EAAE,CAAC,gBAAgB,GACnB,EAAE,CAAC,oBAAoB,GACvB,EAAE,CAAC,eAAe,GAClB,EAAE,CAAC,eAAe,GAClB,EAAE,CAAC,eAAe,GAClB,EAAE,CAAC,iBAAiB,GACpB,EAAE,CAAC,uBAAuB,CAAC;AAU/B,wBAAgB,+BAA+B,CAAC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,CAAC,UAAU,QAG/G;AAED,wBAAgB,oCAAoC,CAAC,YAAY,EAAE,YAAY,EAAE,YAAY,EAAE,QAAQ,EAClD,MAAM,EAAE,EAAE,CAAC,iBAAiB,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,QAI3G;AAED,wBAAgB,gCAAgC,CAAC,OAAO,EAAE,EAAE,CAAC,eAAe,EAC3B,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,QAOxF;AAED,wBAAgB,8BAA8B,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EACvD,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,eAAe,CAAC,EAAE,SAAS,QAYpG;AAED,wBAAgB,mCAAmC,CAAC,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,YAAY,EAAE,GAAG,EAAE,QAAQ,EACjE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,eAAe,CAAC,EAAE,SAAS,QAazG;AAgBD,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,eAAe,CAAC,EAAE,SAAS,QA2BhI"}

package/lib/core/model/builder/ArkClassBuilder.js

@@ -133,7 +133,10 @@ function buildNormalArkClass(clsNode, cls, sourceFile, declaringMethod) {
         case ohos_typescript_1.default.SyntaxKind.ObjectLiteralExpression:
             buildObjectLiteralExpression2ArkClass(clsNode, cls, sourceFile, declaringMethod);
             break;
+        default:
+            ;
     }
+    IRUtils_1.IRUtils.setLeadingComments(cls, clsNode, sourceFile, cls.getDeclaringArkFile().getScene().getOptions());
 }
 exports.buildNormalArkClass = buildNormalArkClass;
 function init4InstanceInitMethod(cls) {
@@ -142,7 +145,9 @@ function init4InstanceInitMethod(cls) {
     instanceInit.setIsGeneratedFlag(true);
     const methodSubSignature = ArkSignatureBuilder_1.ArkSignatureBuilder.buildMethodSubSignatureFromMethodName(Const_1.INSTANCE_INIT_METHOD_NAME);
     const methodSignature = new ArkSignature_1.MethodSignature(instanceInit.getDeclaringArkClass().getSignature(), methodSubSignature);
-    instanceInit.setSignature(methodSignature);
+    instanceInit.setImplementationSignature(methodSignature);
+    instanceInit.setLineCol(0);
+    (0, ArkMethodBuilder_1.checkAndUpdateMethod)(instanceInit, cls);
     cls.addMethod(instanceInit);
     cls.setInstanceInitMethod(instanceInit);
 }
@@ -152,7 +157,9 @@ function init4StaticInitMethod(cls) {
     staticInit.setIsGeneratedFlag(true);
     const methodSubSignature = ArkSignatureBuilder_1.ArkSignatureBuilder.buildMethodSubSignatureFromMethodName(Const_1.STATIC_INIT_METHOD_NAME);
     const methodSignature = new ArkSignature_1.MethodSignature(staticInit.getDeclaringArkClass().getSignature(), methodSubSignature);
-    staticInit.setSignature(methodSignature);
+    staticInit.setImplementationSignature(methodSignature);
+    staticInit.setLineCol(0);
+    (0, ArkMethodBuilder_1.checkAndUpdateMethod)(staticInit, cls);
     cls.addMethod(staticInit);
     cls.setStaticInitMethod(staticInit);
 }
@@ -174,7 +181,7 @@ function buildStruct2ArkClass(clsNode, cls, sourceFile, declaringMethod) {
     }
     if (clsNode.heritageClauses) {
         for (let [key, value] of (0, builderUtils_1.buildHeritageClauses)(clsNode.heritageClauses)) {
-            if (value == 'ExtendsKeyword') {
+            if (value === 'ExtendsKeyword') {
                 cls.setSuperClassName(key);
             }
             else {
@@ -182,9 +189,8 @@ function buildStruct2ArkClass(clsNode, cls, sourceFile, declaringMethod) {
             }
         }
     }
-    (0, builderUtils_1.buildModifiers)(clsNode, sourceFile).forEach((modifier) => {
-        cls.addModifier(modifier);
-    });
+    cls.setModifiers((0, builderUtils_1.buildModifiers)(clsNode));
+    cls.setDecorators((0, builderUtils_1.buildDecorators)(clsNode, sourceFile));
     cls.setCategory(ArkClass_1.ClassCategory.STRUCT);
     init4InstanceInitMethod(cls);
     init4StaticInitMethod(cls);
@@ -208,7 +214,7 @@ function buildClass2ArkClass(clsNode, cls, sourceFile, declaringMethod) {
     }
     if (clsNode.heritageClauses) {
         for (let [key, value] of (0, builderUtils_1.buildHeritageClauses)(clsNode.heritageClauses)) {
-            if (value == 'ExtendsKeyword') {
+            if (value === 'ExtendsKeyword') {
                 cls.setSuperClassName(key);
             }
             else {
@@ -216,9 +222,8 @@ function buildClass2ArkClass(clsNode, cls, sourceFile, declaringMethod) {
             }
         }
     }
-    (0, builderUtils_1.buildModifiers)(clsNode, sourceFile).forEach((modifier) => {
-        cls.addModifier(modifier);
-    });
+    cls.setModifiers((0, builderUtils_1.buildModifiers)(clsNode));
+    cls.setDecorators((0, builderUtils_1.buildDecorators)(clsNode, sourceFile));
     cls.setCategory(ArkClass_1.ClassCategory.CLASS);
     init4InstanceInitMethod(cls);
     init4StaticInitMethod(cls);
@@ -242,7 +247,7 @@ function buildInterface2ArkClass(clsNode, cls, sourceFile, declaringMethod) {
     }
     if (clsNode.heritageClauses) {
         for (let [key, value] of (0, builderUtils_1.buildHeritageClauses)(clsNode.heritageClauses)) {
-            if (value == 'ExtendsKeyword') {
+            if (value === 'ExtendsKeyword') {
                 cls.setSuperClassName(key);
             }
             else {
@@ -250,9 +255,8 @@ function buildInterface2ArkClass(clsNode, cls, sourceFile, declaringMethod) {
             }
         }
     }
-    (0, builderUtils_1.buildModifiers)(clsNode, sourceFile).forEach((modifier) => {
-        cls.addModifier(modifier);
-    });
+    cls.setModifiers((0, builderUtils_1.buildModifiers)(clsNode));
+    cls.setDecorators((0, builderUtils_1.buildDecorators)(clsNode, sourceFile));
     cls.setCategory(ArkClass_1.ClassCategory.INTERFACE);
     buildArkClassMembers(clsNode, cls, sourceFile);
 }
@@ -267,9 +271,8 @@ function buildEnum2ArkClass(clsNode, cls, sourceFile, declaringMethod) {
     }
     const classSignature = new ArkSignature_1.ClassSignature(className, cls.getDeclaringArkFile().getFileSignature(), ((_a = cls.getDeclaringArkNamespace()) === null || _a === void 0 ? void 0 : _a.getSignature()) || null);
     cls.setSignature(classSignature);
-    (0, builderUtils_1.buildModifiers)(clsNode, sourceFile).forEach((modifier) => {
-        cls.addModifier(modifier);
-    });
+    cls.setModifiers((0, builderUtils_1.buildModifiers)(clsNode));
+    cls.setDecorators((0, builderUtils_1.buildDecorators)(clsNode, sourceFile));
     cls.setCategory(ArkClass_1.ClassCategory.ENUM);
     init4StaticInitMethod(cls);
     buildArkClassMembers(clsNode, cls, sourceFile);
@@ -295,13 +298,14 @@ function buildObjectLiteralExpression2ArkClass(clsNode, cls, sourceFile, declari
     cls.setCategory(ArkClass_1.ClassCategory.OBJECT);
     let arkMethods = [];
     init4InstanceInitMethod(cls);
-    const instanceInitStmtMap = new Map();
     const instanceIRTransformer = new ArkIRTransformer_1.ArkIRTransformer(sourceFile, cls.getInstanceInitMethod());
+    const instanceFieldInitializerStmts = [];
     clsNode.properties.forEach((property) => {
         if (ohos_typescript_1.default.isPropertyAssignment(property) || ohos_typescript_1.default.isShorthandPropertyAssignment(property) || ohos_typescript_1.default.isSpreadAssignment(property)) {
             const arkField = (0, ArkFieldBuilder_1.buildProperty2ArkField)(property, sourceFile, cls);
             if (ohos_typescript_1.default.isPropertyAssignment(property)) {
-                getInitStmts(instanceIRTransformer, arkField, instanceInitStmtMap, property.initializer);
+                getInitStmts(instanceIRTransformer, arkField, property.initializer);
+                instanceFieldInitializerStmts.push(...arkField.getInitializer());
             }
         }
         else {
@@ -310,8 +314,9 @@ function buildObjectLiteralExpression2ArkClass(clsNode, cls, sourceFile, declari
             (0, ArkMethodBuilder_1.buildArkMethodFromArkClass)(property, cls, arkMethod, sourceFile);
         }
     });
-    (0, ArkMethodBuilder_1.buildInitMethod)(cls.getInstanceInitMethod(), instanceInitStmtMap, instanceIRTransformer.getThisLocal());
+    (0, ArkMethodBuilder_1.buildInitMethod)(cls.getInstanceInitMethod(), instanceFieldInitializerStmts, instanceIRTransformer.getThisLocal());
     arkMethods.forEach((mtd) => {
+        (0, ArkMethodBuilder_1.checkAndUpdateMethod)(mtd, cls);
         cls.addMethod(mtd);
     });
 }
@@ -335,6 +340,7 @@ function buildArkClassMembers(clsNode, cls, sourceFile) {
     if (ohos_typescript_1.default.isObjectLiteralExpression(clsNode)) {
         return;
     }
+    buildMethodsForClass(clsNode, cls, sourceFile);
     let instanceIRTransformer;
     let staticIRTransformer;
     if (ohos_typescript_1.default.isClassDeclaration(clsNode) || ohos_typescript_1.default.isClassExpression(clsNode) || ohos_typescript_1.default.isStructDeclaration(clsNode)) {
@@ -344,41 +350,28 @@ function buildArkClassMembers(clsNode, cls, sourceFile) {
     if (ohos_typescript_1.default.isEnumDeclaration(clsNode)) {
         staticIRTransformer = new ArkIRTransformer_1.ArkIRTransformer(sourceFile, cls.getStaticInitMethod());
     }
-    const instanceInitStmtMap = new Map();
-    const staticInitStmtMap = new Map();
-    // 先构建所有method，再构建field
-    clsNode.members.forEach((member) => {
-        if (ohos_typescript_1.default.isMethodDeclaration(member) ||
-            ohos_typescript_1.default.isConstructorDeclaration(member) ||
-            ohos_typescript_1.default.isMethodSignature(member) ||
-            ohos_typescript_1.default.isConstructSignatureDeclaration(member) ||
-            ohos_typescript_1.default.isAccessor(member) ||
-            ohos_typescript_1.default.isCallSignatureDeclaration(member)) {
-            let mthd = new ArkMethod_1.ArkMethod();
-            (0, ArkMethodBuilder_1.buildArkMethodFromArkClass)(member, cls, mthd, sourceFile);
-            cls.addMethod(mthd);
-            if (ohos_typescript_1.default.isGetAccessor(member)) {
-                (0, ArkFieldBuilder_1.buildGetAccessor2ArkField)(member, mthd, sourceFile);
-            }
-        }
-    });
+    const staticFieldInitializerStmts = [];
+    const instanceFieldInitializerStmts = [];
     clsNode.members.forEach((member) => {
         if (ohos_typescript_1.default.isPropertyDeclaration(member) || ohos_typescript_1.default.isPropertySignature(member)) {
             const arkField = (0, ArkFieldBuilder_1.buildProperty2ArkField)(member, sourceFile, cls);
             if (ohos_typescript_1.default.isClassDeclaration(clsNode) || ohos_typescript_1.default.isClassExpression(clsNode) || ohos_typescript_1.default.isStructDeclaration(clsNode)) {
                 if (arkField.isStatic()) {
-                    getInitStmts(staticIRTransformer, arkField, staticInitStmtMap, member.initializer);
+                    getInitStmts(staticIRTransformer, arkField, member.initializer);
+                    staticFieldInitializerStmts.push(...arkField.getInitializer());
                 }
                 else {
                     if (!instanceIRTransformer)
                         console.log(clsNode.getText(sourceFile));
-                    getInitStmts(instanceIRTransformer, arkField, instanceInitStmtMap, member.initializer);
+                    getInitStmts(instanceIRTransformer, arkField, member.initializer);
+                    instanceFieldInitializerStmts.push(...arkField.getInitializer());
                 }
             }
         }
         else if (ohos_typescript_1.default.isEnumMember(member)) {
             const arkField = (0, ArkFieldBuilder_1.buildProperty2ArkField)(member, sourceFile, cls);
-            getInitStmts(staticIRTransformer, arkField, staticInitStmtMap, member.initializer);
+            getInitStmts(staticIRTransformer, arkField, member.initializer);
+            staticFieldInitializerStmts.push(...arkField.getInitializer());
         }
         else if (ohos_typescript_1.default.isIndexSignatureDeclaration(member)) {
             (0, ArkFieldBuilder_1.buildIndexSignature2ArkField)(member, sourceFile, cls);
@@ -391,14 +384,30 @@ function buildArkClassMembers(clsNode, cls, sourceFile) {
         }
     });
     if (ohos_typescript_1.default.isClassDeclaration(clsNode) || ohos_typescript_1.default.isClassExpression(clsNode) || ohos_typescript_1.default.isStructDeclaration(clsNode)) {
-        (0, ArkMethodBuilder_1.buildInitMethod)(cls.getInstanceInitMethod(), instanceInitStmtMap, instanceIRTransformer.getThisLocal());
-        (0, ArkMethodBuilder_1.buildInitMethod)(cls.getStaticInitMethod(), staticInitStmtMap, staticIRTransformer.getThisLocal());
+        (0, ArkMethodBuilder_1.buildInitMethod)(cls.getInstanceInitMethod(), instanceFieldInitializerStmts, instanceIRTransformer.getThisLocal());
+        (0, ArkMethodBuilder_1.buildInitMethod)(cls.getStaticInitMethod(), staticFieldInitializerStmts, staticIRTransformer.getThisLocal());
     }
     if (ohos_typescript_1.default.isEnumDeclaration(clsNode)) {
-        (0, ArkMethodBuilder_1.buildInitMethod)(cls.getStaticInitMethod(), staticInitStmtMap, staticIRTransformer.getThisLocal());
+        (0, ArkMethodBuilder_1.buildInitMethod)(cls.getStaticInitMethod(), staticFieldInitializerStmts, staticIRTransformer.getThisLocal());
     }
 }
-function getInitStmts(transformer, field, initStmtMap, initNode) {
+function buildMethodsForClass(clsNode, cls, sourceFile) {
+    clsNode.members.forEach((member) => {
+        if (ohos_typescript_1.default.isMethodDeclaration(member) ||
+            ohos_typescript_1.default.isConstructorDeclaration(member) ||
+            ohos_typescript_1.default.isMethodSignature(member) ||
+            ohos_typescript_1.default.isConstructSignatureDeclaration(member) ||
+            ohos_typescript_1.default.isAccessor(member) ||
+            ohos_typescript_1.default.isCallSignatureDeclaration(member)) {
+            let mthd = new ArkMethod_1.ArkMethod();
+            (0, ArkMethodBuilder_1.buildArkMethodFromArkClass)(member, cls, mthd, sourceFile);
+            if (ohos_typescript_1.default.isGetAccessor(member)) {
+                (0, ArkFieldBuilder_1.buildGetAccessor2ArkField)(member, mthd, sourceFile);
+            }
+        }
+    });
+}
+function getInitStmts(transformer, field, initNode) {
     if (initNode) {
         const stmts = [];
         let { value: initValue, valueOriginalPositions: initPositions, stmts: initStmts, } = transformer.tsNodeToValueAndStmts(initNode);
@@ -409,13 +418,15 @@ function getInitStmts(transformer, field, initStmtMap, initNode) {
             stmts.push(...initStmts);
         }
         const fieldRef = new Ref_1.ArkInstanceFieldRef(transformer.getThisLocal(), field.getSignature());
-        const fieldRefPositons = [Position_1.FullPosition.DEFAULT, Position_1.FullPosition.DEFAULT];
+        const fieldRefPositions = [Position_1.FullPosition.DEFAULT, Position_1.FullPosition.DEFAULT];
         const assignStmt = new Stmt_1.ArkAssignStmt(fieldRef, initValue);
-        assignStmt.setOperandOriginalPositions([...fieldRefPositons, ...initPositions]);
+        assignStmt.setOperandOriginalPositions([...fieldRefPositions, ...initPositions]);
         stmts.push(assignStmt);
+        const fieldSourceCode = field.getCode();
+        const fieldOriginPosition = field.getOriginPosition();
         for (const stmt of stmts) {
-            const originStmt = new Stmt_1.OriginalStmt(field.getCode(), field.getOriginPosition());
-            initStmtMap.set(stmt, originStmt);
+            stmt.setOriginPositionInfo(fieldOriginPosition);
+            stmt.setOriginalText(fieldSourceCode);
         }
         field.setInitializer(stmts);
     }

package/lib/core/model/builder/ArkExportBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ArkExportBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/ArkExportBuilder.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,MAAM,iBAAiB,CAAC;AACjC,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,UAAU,EAAc,QAAQ,EAAE,MAAM,cAAc,CAAC;AAG3E,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAGrC,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,CAAC;AAE1E,iBAAS,eAAe,CAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,eAAe,GAAG,UAAU,CASpG;AAGD,wBAAgB,sBAAsB,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,SAAS,cAOxF;AAED,iBAAS,sBAAsB,CAAC,IAAI,EAAE,EAAE,CAAC,iBAAiB,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,GAAG,UAAU,EAAE,CA0CrH;AAED,iBAAS,qBAAqB,CAAC,IAAI,EAAE,EAAE,CAAC,gBAAgB,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,GAAG,UAAU,EAAE,CA0CnH;AAED;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,EAAE,CAAC,iBAAiB,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,GAAG,UAAU,EAAE,CAiBlI;AAED;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,EAAE,CAAC,oBAAoB,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,GAAG,UAAU,EAAE,CAexI;AAED,wBAAgB,UAAU,CAAC,aAAa,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,YAAY,CAAC,GAAG,SAAS,GAAG,OAAO,CAU5F"}
+{"version":3,"file":"ArkExportBuilder.d.ts","sourceRoot":"","sources":["../../../../src/core/model/builder/ArkExportBuilder.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,MAAM,iBAAiB,CAAC;AACjC,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,UAAU,EAAc,QAAQ,EAAE,MAAM,cAAc,CAAC;AAE3E,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAKrC,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,CAAC;AAE1E,iBAAS,eAAe,CAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,eAAe,GAAG,UAAU,CASpG;AAGD,wBAAgB,sBAAsB,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,SAAS,cAOxF;AAED,iBAAS,sBAAsB,CAAC,IAAI,EAAE,EAAE,CAAC,iBAAiB,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,GAAG,UAAU,EAAE,CA4CrH;AAED,iBAAS,qBAAqB,CAAC,IAAI,EAAE,EAAE,CAAC,gBAAgB,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,GAAG,UAAU,EAAE,CA4CnH;AAED;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,EAAE,CAAC,iBAAiB,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,GAAG,UAAU,EAAE,CAiBlI;AAED;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,EAAE,CAAC,oBAAoB,EAAE,UAAU,EAAE,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,GAAG,UAAU,EAAE,CAexI;AAED,wBAAgB,UAAU,CAAC,aAAa,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,YAAY,CAAC,GAAG,SAAS,GAAG,OAAO,CAU5F"}

package/lib/core/model/builder/ArkExportBuilder.js

@@ -23,6 +23,8 @@ const Position_1 = require("../../base/Position");
 const ArkExport_1 = require("../ArkExport");
 const builderUtils_1 = require("./builderUtils");
 const TSConst_1 = require("../../common/TSConst");
+const ArkBaseModel_1 = require("../ArkBaseModel");
+const IRUtils_1 = require("../../common/IRUtils");
 function buildExportInfo(arkInstance, arkFile, line) {
     return new ArkExport_1.ExportInfo.Builder()
         .exportClauseName(arkInstance.getName())
@@ -47,7 +49,7 @@ exports.buildDefaultExportInfo = buildDefaultExportInfo;
 function buildExportDeclaration(node, sourceFile, arkFile) {
     const originTsPosition = Position_1.LineColPosition.buildFromNode(node, sourceFile);
     const tsSourceCode = node.getText(sourceFile);
-    const modifiers = node.modifiers ? (0, builderUtils_1.buildModifiers)(node, sourceFile) : new Set();
+    const modifiers = node.modifiers ? (0, builderUtils_1.buildModifiers)(node) : 0;
     let exportFrom = '';
     if (node.moduleSpecifier && ohos_typescript_1.default.isStringLiteral(node.moduleSpecifier)) {
         exportFrom = node.moduleSpecifier.text;
@@ -63,6 +65,7 @@ function buildExportDeclaration(node, sourceFile, arkFile) {
                 .exportFrom(exportFrom)
                 .originTsPosition(originTsPosition)
                 .declaringArkFile(arkFile)
+                .setLeadingComments(IRUtils_1.IRUtils.getLeadingComments(node, sourceFile, arkFile.getScene().getOptions()))
                 .modifiers(modifiers);
             if (element.propertyName && ohos_typescript_1.default.isIdentifier(element.propertyName)) {
                 builder.nameBeforeAs(element.propertyName.text);
@@ -78,6 +81,7 @@ function buildExportDeclaration(node, sourceFile, arkFile) {
         .tsSourceCode(tsSourceCode)
         .exportFrom(exportFrom)
         .declaringArkFile(arkFile)
+        .setLeadingComments(IRUtils_1.IRUtils.getLeadingComments(node, sourceFile, arkFile.getScene().getOptions()))
         .originTsPosition(originTsPosition);
     if (node.exportClause && ohos_typescript_1.default.isNamespaceExport(node.exportClause) && ohos_typescript_1.default.isIdentifier(node.exportClause.name)) { // just like: export * as xx from './yy'
         exportInfos.push(builder1.exportClauseName(node.exportClause.name.text).build());
@@ -95,9 +99,9 @@ function buildExportAssignment(node, sourceFile, arkFile) {
     }
     const originTsPosition = Position_1.LineColPosition.buildFromNode(node, sourceFile);
     const tsSourceCode = node.getText(sourceFile);
-    const modifiers = (0, builderUtils_1.buildModifiers)(node, sourceFile);
+    let modifiers = (0, builderUtils_1.buildModifiers)(node);
     if (isKeyword(node.getChildren(sourceFile), ohos_typescript_1.default.SyntaxKind.DefaultKeyword)) {
-        modifiers.add(ohos_typescript_1.default.SyntaxKind[ohos_typescript_1.default.SyntaxKind.DefaultKeyword]);
+        modifiers |= ArkBaseModel_1.ModifierType.DEFAULT;
     }
     if (ohos_typescript_1.default.isObjectLiteralExpression(node.expression) && node.expression.properties) { // just like: export default {a,b,c}
         node.expression.properties.forEach((property) => {
@@ -110,6 +114,7 @@ function buildExportAssignment(node, sourceFile, arkFile) {
                     .tsSourceCode(tsSourceCode)
                     .originTsPosition(originTsPosition)
                     .declaringArkFile(arkFile)
+                    .setLeadingComments(IRUtils_1.IRUtils.getLeadingComments(node, sourceFile, arkFile.getScene().getOptions()))
                     .build();
                 exportInfos.push(exportInfo);
             }
@@ -122,7 +127,8 @@ function buildExportAssignment(node, sourceFile, arkFile) {
             .tsSourceCode(tsSourceCode)
             .originTsPosition(originTsPosition)
             .declaringArkFile(arkFile)
-            .exportClauseName(TSConst_1.DEFAULT);
+            .exportClauseName(TSConst_1.DEFAULT)
+            .setLeadingComments(IRUtils_1.IRUtils.getLeadingComments(node, sourceFile, arkFile.getScene().getOptions()));
         if (ohos_typescript_1.default.isIdentifier(node.expression)) { // just like: export default xx
             exportInfo.nameBeforeAs(node.expression.text);
         }
@@ -143,7 +149,7 @@ exports.buildExportAssignment = buildExportAssignment;
 function buildExportVariableStatement(node, sourceFile, arkFile) {
     let exportInfos = [];
     const originTsPosition = Position_1.LineColPosition.buildFromNode(node, sourceFile);
-    const modifiers = node.modifiers ? (0, builderUtils_1.buildModifiers)(node, sourceFile) : new Set();
+    const modifiers = node.modifiers ? (0, builderUtils_1.buildModifiers)(node) : 0;
     const tsSourceCode = node.getText(sourceFile);
     node.declarationList.declarations.forEach(dec => {
         const exportInfo = new ArkExport_1.ExportInfo.Builder()
@@ -168,7 +174,7 @@ exports.buildExportVariableStatement = buildExportVariableStatement;
 function buildExportTypeAliasDeclaration(node, sourceFile, arkFile) {
     let exportInfos = [];
     const originTsPosition = Position_1.LineColPosition.buildFromNode(node, sourceFile);
-    const modifiers = node.modifiers ? (0, builderUtils_1.buildModifiers)(node, sourceFile) : new Set();
+    const modifiers = node.modifiers ? (0, builderUtils_1.buildModifiers)(node) : 0;
     const tsSourceCode = node.getText(sourceFile);
     const exportInfo = new ArkExport_1.ExportInfo.Builder()
         .exportClauseName(node.name.text)