arkanalyzer 1.0.17 → 1.0.19

package/lib/save/source/SourceStmt.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Copyright (c) 2024-2025 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -47,7 +47,7 @@ const Type_1 = require("../../core/base/Type");
 const logger_1 = __importStar(require("../../utils/logger"));
 const SourceBody_1 = require("./SourceBody");
 const SourceTransformer_1 = require("./SourceTransformer");
-const SourceUtils_1 = require("./SourceUtils");
+const PrinterUtils_1 = require("../base/PrinterUtils");
 const ValueUtil_1 = require("../../core/common/ValueUtil");
 const ArkClass_1 = require("../../core/model/ArkClass");
 const ArkBaseModel_1 = require("../../core/model/ArkBaseModel");
@@ -108,7 +108,7 @@ class SourceStmt {
         if (!(value instanceof Local_1.Local)) {
             return false;
         }
-        return SourceUtils_1.SourceUtils.isTemp(value.getName());
+        return PrinterUtils_1.PrinterUtils.isTemp(value.getName());
     }
 }
 exports.SourceStmt = SourceStmt;
@@ -144,11 +144,11 @@ class SourceAssignStmt extends SourceStmt {
         else if (this.leftOp instanceof Local_1.Local && this.rightOp instanceof Expr_1.ArkNewArrayExpr) {
             this.transferRightNewArrayExpr();
         }
-        else if (this.rightOp instanceof Expr_1.ArkStaticInvokeExpr && SourceUtils_1.SourceUtils.isComponentCreate(this.rightOp)) {
+        else if (this.rightOp instanceof Expr_1.ArkStaticInvokeExpr && PrinterUtils_1.PrinterUtils.isComponentCreate(this.rightOp)) {
             this.transferRightComponentCreate();
         }
         else if (this.rightOp instanceof Expr_1.ArkInstanceInvokeExpr &&
-            SourceUtils_1.SourceUtils.isComponentAttributeInvoke(this.rightOp)) {
+            PrinterUtils_1.PrinterUtils.isComponentAttributeInvoke(this.rightOp)) {
             this.transferRightComponentAttribute();
         }
         else {
@@ -168,7 +168,7 @@ class SourceAssignStmt extends SourceStmt {
         let leftOpType = this.leftOp.getType();
         if (leftOpType instanceof Type_1.ClassType) {
             let name = leftOpType.getClassSignature().getClassName();
-            if (SourceUtils_1.SourceUtils.isAnonymousClass(name)) {
+            if (PrinterUtils_1.PrinterUtils.isAnonymousClass(name)) {
                 this.leftTypeCode = 'any';
             }
             else {
@@ -189,7 +189,7 @@ class SourceAssignStmt extends SourceStmt {
         if (this.context.hasTempVisit(this.leftCode)) {
             this.setText('');
         }
-        else if (SourceUtils_1.SourceUtils.isTemp(this.leftCode)) {
+        else if (PrinterUtils_1.PrinterUtils.isTemp(this.leftCode)) {
             this.setText(`${this.rightCode};`);
         }
         else {
@@ -234,7 +234,7 @@ class SourceAssignStmt extends SourceStmt {
         if (!cls) {
             return undefined;
         }
-        return SourceUtils_1.SourceUtils.getOriginType(cls);
+        return PrinterUtils_1.PrinterUtils.getOriginType(cls);
     }
     /**
      * temp1 = new Person
@@ -253,7 +253,7 @@ class SourceAssignStmt extends SourceStmt {
                     instanceInvokeExpr.getArgs().forEach((v) => {
                         args.push(this.transformer.valueToString(v));
                     });
-                    if (originType === SourceUtils_1.CLASS_CATEGORY_COMPONENT) {
+                    if (originType === PrinterUtils_1.CLASS_CATEGORY_COMPONENT) {
                         this.rightCode = `${this.transformer.typeToString(this.rightOp.getType())}(${args.join(', ')})`;
                     }
                     else if (originType === ArkClass_1.ClassCategory.TYPE_LITERAL || originType === ArkClass_1.ClassCategory.OBJECT) {
@@ -269,7 +269,7 @@ class SourceAssignStmt extends SourceStmt {
                 this.context.getStmtReader().rollback();
             }
         }
-        if (originType === SourceUtils_1.CLASS_CATEGORY_COMPONENT) {
+        if (originType === PrinterUtils_1.CLASS_CATEGORY_COMPONENT) {
             this.rightCode = `${this.transformer.typeToString(this.rightOp.getType())}()`;
         }
         else if (originType === ArkClass_1.ClassCategory.TYPE_LITERAL || originType === ArkClass_1.ClassCategory.OBJECT) {
@@ -313,7 +313,7 @@ class SourceAssignStmt extends SourceStmt {
             let stmt = this.context.getStmtReader().next();
             if (stmt instanceof Stmt_1.ArkInvokeStmt) {
                 let expr = stmt.getInvokeExpr();
-                if (expr instanceof Expr_1.ArkStaticInvokeExpr && SourceUtils_1.SourceUtils.isComponentPop(expr)) {
+                if (expr instanceof Expr_1.ArkStaticInvokeExpr && PrinterUtils_1.PrinterUtils.isComponentPop(expr)) {
                     this.setText(`${this.rightCode}`);
                     this.dumpType = AssignStmtDumpType.NORMAL;
                     return;
@@ -340,18 +340,18 @@ class SourceInvokeStmt extends SourceStmt {
         let code = '';
         let isAttr = false;
         if (invokeExpr instanceof Expr_1.ArkStaticInvokeExpr) {
-            if (SourceUtils_1.SourceUtils.isComponentPop(invokeExpr)) {
+            if (PrinterUtils_1.PrinterUtils.isComponentPop(invokeExpr)) {
                 code = '}';
                 isAttr = true;
             }
             else {
                 code = this.transformer.staticInvokeExprToString(invokeExpr);
-                isAttr = SourceUtils_1.SourceUtils.isComponentIfElseInvoke(invokeExpr);
+                isAttr = PrinterUtils_1.PrinterUtils.isComponentIfElseInvoke(invokeExpr);
             }
         }
         else if (invokeExpr instanceof Expr_1.ArkInstanceInvokeExpr) {
             code = this.transformer.instanceInvokeExprToString(invokeExpr);
-            isAttr = SourceUtils_1.SourceUtils.isComponentAttributeInvoke(invokeExpr);
+            isAttr = PrinterUtils_1.PrinterUtils.isComponentAttributeInvoke(invokeExpr);
         }
         if (code.length > 0 && !isAttr) {
             this.setText(`${code};`);
@@ -362,15 +362,15 @@ class SourceInvokeStmt extends SourceStmt {
     }
     beforeDump() {
         let invokeExpr = this.original.getInvokeExpr();
-        if ((invokeExpr instanceof Expr_1.ArkStaticInvokeExpr && SourceUtils_1.SourceUtils.isComponentPop(invokeExpr)) ||
-            (invokeExpr instanceof Expr_1.ArkStaticInvokeExpr && SourceUtils_1.SourceUtils.isComponentIfElseInvoke(invokeExpr))) {
+        if ((invokeExpr instanceof Expr_1.ArkStaticInvokeExpr && PrinterUtils_1.PrinterUtils.isComponentPop(invokeExpr)) ||
+            (invokeExpr instanceof Expr_1.ArkStaticInvokeExpr && PrinterUtils_1.PrinterUtils.isComponentIfElseInvoke(invokeExpr))) {
             this.printer.decIndent();
             return;
         }
     }
     afterDump() {
         let invokeExpr = this.original.getInvokeExpr();
-        if (invokeExpr instanceof Expr_1.ArkStaticInvokeExpr && SourceUtils_1.SourceUtils.isComponentIfElseInvoke(invokeExpr)) {
+        if (invokeExpr instanceof Expr_1.ArkStaticInvokeExpr && PrinterUtils_1.PrinterUtils.isComponentIfElseInvoke(invokeExpr)) {
             this.printer.incIndent();
             return;
         }
@@ -531,12 +531,12 @@ class SourceWhileStmt extends SourceStmt {
             if (!(stmt instanceof Stmt_1.ArkAssignStmt)) {
                 continue;
             }
-            if (SourceUtils_1.SourceUtils.isDeIncrementStmt(stmt, Expr_1.NormalBinaryOperator.Addition) &&
+            if (PrinterUtils_1.PrinterUtils.isDeIncrementStmt(stmt, Expr_1.NormalBinaryOperator.Addition) &&
                 stmt.getLeftOp().getName() === value.getName()) {
                 this.context.setSkipStmt(stmt);
                 return `${value.getName()}++`;
             }
-            if (SourceUtils_1.SourceUtils.isDeIncrementStmt(stmt, Expr_1.NormalBinaryOperator.Subtraction) &&
+            if (PrinterUtils_1.PrinterUtils.isDeIncrementStmt(stmt, Expr_1.NormalBinaryOperator.Subtraction) &&
                 stmt.getLeftOp().getName() === value.getName()) {
                 this.context.setSkipStmt(stmt);
                 return `${value.getName()}--`;
@@ -694,33 +694,20 @@ class SourceTypeAliasStmt extends SourceStmt {
         this.aliasType = aliasType;
     }
     transfer2ts() {
-        let modifier = '';
         let modifiersArray = (0, ArkBaseModel_1.modifiers2stringArray)(this.aliasType.getModifiers());
-        if (modifiersArray.length > 0) {
-            modifier = `${modifiersArray.join(' ')} `;
-        }
+        let modifier = modifiersArray.length > 0 ? `${modifiersArray.join(' ')} ` : '';
         const expr = this.original.getAliasTypeExpr();
-        let typeOf = '';
-        if (expr.getTransferWithTypeOf()) {
-            typeOf = 'typeof ';
-        }
-        let realGenericTypes = '';
-        if (expr.getRealGenericTypes()) {
-            let types = expr.getRealGenericTypes().join(', ');
-            if (types) {
-                realGenericTypes = `<${types}>`;
-            }
-        }
-        let genericTypes = '';
-        if (this.aliasType.getGenericTypes()) {
-            let types = this.aliasType.getGenericTypes().join(', ');
-            if (types) {
-                genericTypes = `<${types}>`;
-            }
-        }
+        let typeOf = expr.getTransferWithTypeOf() ? 'typeof ' : '';
+        let realGenericTypes = expr.getRealGenericTypes() ? `<${expr.getRealGenericTypes().join(', ')}>` : '';
+        let genericTypes = this.aliasType.getGenericTypes() ? `<${this.transformer.typeArrayToString(this.aliasType.getGenericTypes())}>` : '';
         let typeObject = expr.getOriginalObject();
         if (typeObject instanceof Type_1.Type) {
-            this.setText(`${modifier}type ${this.aliasType.getName()}${genericTypes} = ${typeOf}${this.transformer.typeToString(typeObject)}${realGenericTypes};`);
+            if (typeObject instanceof Type_1.AliasType) {
+                this.setText(`${modifier}type ${this.aliasType.getName()}${genericTypes} = ${typeOf}${typeObject.getName()}${realGenericTypes};`);
+            }
+            else {
+                this.setText(`${modifier}type ${this.aliasType.getName()}${genericTypes} = ${typeOf}${this.transformer.typeToString(typeObject)}${realGenericTypes};`);
+            }
             return;
         }
         if (typeObject instanceof ArkImport_1.ImportInfo) {

package/lib/save/source/SourceTransformer.d.ts

@@ -35,8 +35,12 @@ export declare class SourceTransformer {
     literalObjectToString(type: ClassType): string;
     typeToString(type: Type): string;
     private literalType2string;
-    private unionType2string;
+    private multipleType2string;
     private arrayType2string;
+    private tupleType2string;
+    private aliasType2string;
+    private keyofTypeExpr2string;
+    private typeQueryExpr2string;
     private unclearReferenceType2string;
     private classType2string;
 }

package/lib/save/source/SourceTransformer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SourceTransformer.d.ts","sourceRoot":"","sources":["../../../src/save/source/SourceTransformer.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAMH,qBAAqB,EAKrB,mBAAmB,EAKtB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAiB,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChF,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAI7C,OAAO,EAGH,SAAS,EAMT,IAAI,EAKP,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAmE,MAAM,qBAAqB,CAAC;AACnH,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AASnD,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAI7D,MAAM,WAAW,kBAAkB;IAC/B,UAAU,IAAI,OAAO,CAAC;IAEtB,wBAAwB,IAAI,YAAY,GAAG,SAAS,CAAC;IAErD,SAAS,CAAC,SAAS,EAAE,eAAe,GAAG,SAAS,GAAG,IAAI,CAAC;IAExD,QAAQ,CAAC,SAAS,EAAE,cAAc,GAAG,QAAQ,GAAG,IAAI,CAAC;IAErD,UAAU,IAAI,aAAa,CAAC;IAE5B,cAAc,CAAC,IAAI,EAAE,KAAK,GAAG,MAAM,CAAC;IAEpC,iBAAiB,IAAI,OAAO,CAAC;CAChC;AAED,qBAAa,iBAAiB;IAC1B,SAAS,CAAC,OAAO,EAAE,kBAAkB,CAAC;gBAE1B,OAAO,EAAE,kBAAkB;IAIvC,OAAO,CAAC,uBAAuB;IAM/B,OAAO,CAAC,sBAAsB;IAKvB,0BAA0B,CAAC,UAAU,EAAE,qBAAqB,GAAG,MAAM;IAkBrE,wBAAwB,CAAC,UAAU,EAAE,mBAAmB,GAAG,MAAM;IA0DxE,OAAO,CAAC,oBAAoB;IAYrB,iBAAiB,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,KAAK,GAAE,MAAa,GAAG,MAAM;WASvD,aAAa,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM;IAQpD,OAAO,CAAC,YAAY;IA2Db,WAAW,CAAC,KAAK,EAAE,WAAW,GAAG,MAAM;IA8BvC,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM;IAiDtD,qBAAqB,CAAC,IAAI,EAAE,SAAS,GAAG,MAAM;IAW9C,YAAY,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM;IAwDvC,OAAO,CAAC,kBAAkB;IAQ1B,OAAO,CAAC,gBAAgB;IAQxB,OAAO,CAAC,gBAAgB;IAaxB,OAAO,CAAC,2BAA2B;IAQnC,OAAO,CAAC,gBAAgB;CAkB3B"}
+{"version":3,"file":"SourceTransformer.d.ts","sourceRoot":"","sources":["../../../src/save/source/SourceTransformer.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAMH,qBAAqB,EAKrB,mBAAmB,EAKtB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAiB,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChF,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAI7C,OAAO,EAGH,SAAS,EAQT,IAAI,EAKP,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAmE,MAAM,qBAAqB,CAAC;AACnH,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AASnD,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAS7D,MAAM,WAAW,kBAAkB;IAC/B,UAAU,IAAI,OAAO,CAAC;IAEtB,wBAAwB,IAAI,YAAY,GAAG,SAAS,CAAC;IAErD,SAAS,CAAC,SAAS,EAAE,eAAe,GAAG,SAAS,GAAG,IAAI,CAAC;IAExD,QAAQ,CAAC,SAAS,EAAE,cAAc,GAAG,QAAQ,GAAG,IAAI,CAAC;IAErD,UAAU,IAAI,aAAa,CAAC;IAE5B,cAAc,CAAC,IAAI,EAAE,KAAK,GAAG,MAAM,CAAC;IAEpC,iBAAiB,IAAI,OAAO,CAAC;CAChC;AAED,qBAAa,iBAAiB;IAC1B,SAAS,CAAC,OAAO,EAAE,kBAAkB,CAAC;gBAE1B,OAAO,EAAE,kBAAkB;IAIvC,OAAO,CAAC,uBAAuB;IAM/B,OAAO,CAAC,sBAAsB;IAKvB,0BAA0B,CAAC,UAAU,EAAE,qBAAqB,GAAG,MAAM;IAkBrE,wBAAwB,CAAC,UAAU,EAAE,mBAAmB,GAAG,MAAM;IA0DxE,OAAO,CAAC,oBAAoB;IAYrB,iBAAiB,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,KAAK,GAAE,MAAa,GAAG,MAAM;WASvD,aAAa,CAAC,KAAK,EAAE,QAAQ,GAAG,MAAM;IAQpD,OAAO,CAAC,YAAY;IA2Db,WAAW,CAAC,KAAK,EAAE,WAAW,GAAG,MAAM;IA8BvC,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM;IAiDtD,qBAAqB,CAAC,IAAI,EAAE,SAAS,GAAG,MAAM;IAW9C,YAAY,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM;IA+DvC,OAAO,CAAC,kBAAkB;IAQ1B,OAAO,CAAC,mBAAmB;IAgB3B,OAAO,CAAC,gBAAgB;IAcxB,OAAO,CAAC,gBAAgB;IASxB,OAAO,CAAC,gBAAgB;IAcxB,OAAO,CAAC,oBAAoB;IAO5B,OAAO,CAAC,oBAAoB;IAmB5B,OAAO,CAAC,2BAA2B;IAQnC,OAAO,CAAC,gBAAgB;CAkB3B"}

package/lib/save/source/SourceTransformer.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Copyright (c) 2024-2025 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -42,8 +42,9 @@ const Constant_1 = require("../../core/base/Constant");
 const Expr_1 = require("../../core/base/Expr");
 const Local_1 = require("../../core/base/Local");
 const ArkClass_1 = require("../../core/model/ArkClass");
+const ArkMethod_1 = require("../../core/model/ArkMethod");
 const logger_1 = __importStar(require("../../utils/logger"));
-const SourceUtils_1 = require("./SourceUtils");
+const PrinterUtils_1 = require("../base/PrinterUtils");
 const SourceMethod_1 = require("./SourceMethod");
 const Type_1 = require("../../core/base/Type");
 const SourceClass_1 = require("./SourceClass");
@@ -51,6 +52,12 @@ const Ref_1 = require("../../core/base/Ref");
 const EtsConst_1 = require("../../core/common/EtsConst");
 const Const_1 = require("../../core/common/Const");
 const Stmt_1 = require("../../core/base/Stmt");
+const ArkNamespace_1 = require("../../core/model/ArkNamespace");
+const TypeExpr_1 = require("../../core/base/TypeExpr");
+const ArkBaseModel_1 = require("../../core/model/ArkBaseModel");
+const ArkField_1 = require("../../core/model/ArkField");
+const ArkExport_1 = require("../../core/model/ArkExport");
+const ArkImport_1 = require("../../core/model/ArkImport");
 const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER, 'SourceTransformer');
 class SourceTransformer {
     constructor(context) {
@@ -75,7 +82,7 @@ class SourceTransformer {
             args.push(this.valueToString(v));
         });
         let genericCode = this.genericTypesToString(invokeExpr.getRealGenericTypes());
-        if (SourceUtils_1.SourceUtils.isComponentAttributeInvoke(invokeExpr) && this.context.isInBuilderMethod()) {
+        if (PrinterUtils_1.PrinterUtils.isComponentAttributeInvoke(invokeExpr) && this.context.isInBuilderMethod()) {
             return `.${methodName}${genericCode}(${args.join(', ')})`;
         }
         return `${this.valueToString(invokeExpr.getBase())}.${methodName}${genericCode}(${args.join(', ')})`;
@@ -83,11 +90,11 @@ class SourceTransformer {
     staticInvokeExprToString(invokeExpr) {
         let methodSignature = invokeExpr.getMethodSignature();
         let method = this.context.getMethod(methodSignature);
-        if (method && SourceUtils_1.SourceUtils.isAnonymousMethod(method.getName())) {
+        if (method && PrinterUtils_1.PrinterUtils.isAnonymousMethod(method.getName())) {
             return this.anonymousMethodToString(method, this.context.getPrinter().getIndent());
         }
         let classSignature = methodSignature.getDeclaringClassSignature();
-        let className = SourceUtils_1.SourceUtils.getStaticInvokeClassFullName(classSignature, this.context.getDeclaringArkNamespace());
+        let className = PrinterUtils_1.PrinterUtils.getStaticInvokeClassFullName(classSignature, this.context.getDeclaringArkNamespace());
         let methodName = methodSignature.getMethodSubSignature().getMethodName();
         let args = [];
         invokeExpr.getArgs().forEach((v) => {
@@ -107,13 +114,13 @@ class SourceTransformer {
                     return '';
                 }
             }
-            if (SourceUtils_1.SourceUtils.isComponentCreate(invokeExpr)) {
+            if (PrinterUtils_1.PrinterUtils.isComponentCreate(invokeExpr)) {
                 if (className === EtsConst_1.COMPONENT_IF) {
                     return `if (${args.join(', ')})`;
                 }
                 return `${className}${genericCode}(${args.join(', ')})`;
             }
-            if (SourceUtils_1.SourceUtils.isComponentIfBranchInvoke(invokeExpr)) {
+            if (PrinterUtils_1.PrinterUtils.isComponentIfBranchInvoke(invokeExpr)) {
                 let arg0 = invokeExpr.getArg(0);
                 if (arg0.getValue() === '0') {
                     return ``;
@@ -122,7 +129,7 @@ class SourceTransformer {
                     return '} else {';
                 }
             }
-            if (SourceUtils_1.SourceUtils.isComponentPop(invokeExpr)) {
+            if (PrinterUtils_1.PrinterUtils.isComponentPop(invokeExpr)) {
                 return '}';
             }
         }
@@ -150,7 +157,7 @@ class SourceTransformer {
     }
     static constToString(value) {
         if (value.getType().toString() === 'string') {
-            return `'${SourceUtils_1.SourceUtils.escape(value.getValue())}'`;
+            return `'${PrinterUtils_1.PrinterUtils.escape(value.getValue())}'`;
         }
         else {
             return value.getValue();
@@ -212,7 +219,7 @@ class SourceTransformer {
             let index = value.getIndex();
             if (index instanceof Constant_1.Constant &&
                 index.getType() instanceof Type_1.StringType &&
-                SourceUtils_1.SourceUtils.isTemp(index.getValue())) {
+                PrinterUtils_1.PrinterUtils.isTemp(index.getValue())) {
                 return `${this.valueToString(value.getBase())}[${this.valueToString(new Local_1.Local(index.getValue()))}]`;
             }
             return `${this.valueToString(value.getBase())}[${this.valueToString(value.getIndex())}]`;
@@ -235,14 +242,14 @@ class SourceTransformer {
             return SourceTransformer.constToString(value);
         }
         if (value instanceof Local_1.Local) {
-            if (SourceUtils_1.SourceUtils.isAnonymousMethod(value.getName())) {
+            if (PrinterUtils_1.PrinterUtils.isAnonymousMethod(value.getName())) {
                 let methodSignature = value.getType().getMethodSignature();
                 let anonymousMethod = this.context.getMethod(methodSignature);
                 if (anonymousMethod) {
                     return this.anonymousMethodToString(anonymousMethod, this.context.getPrinter().getIndent());
                 }
             }
-            if (SourceUtils_1.SourceUtils.isAnonymousClass(value.getName())) {
+            if (PrinterUtils_1.PrinterUtils.isAnonymousClass(value.getName())) {
                 let clsSignature = value.getType().getClassSignature();
                 let cls = this.context.getClass(clsSignature);
                 if (cls) {
@@ -252,7 +259,7 @@ class SourceTransformer {
             if (operator === Expr_1.NormalBinaryOperator.Division ||
                 operator === Expr_1.NormalBinaryOperator.Multiplication ||
                 operator === Expr_1.NormalBinaryOperator.Remainder) {
-                if (SourceUtils_1.SourceUtils.isTemp(value.getName())) {
+                if (PrinterUtils_1.PrinterUtils.isTemp(value.getName())) {
                     let stmt = value.getDeclaringStmt();
                     if (stmt instanceof Stmt_1.ArkAssignStmt && stmt.getRightOp() instanceof Expr_1.ArkNormalBinopExpr) {
                         return `(${this.context.transTemp2Code(value)})`;
@@ -266,7 +273,7 @@ class SourceTransformer {
     }
     literalObjectToString(type) {
         let name = type.getClassSignature().getClassName();
-        if (SourceUtils_1.SourceUtils.isAnonymousClass(name)) {
+        if (PrinterUtils_1.PrinterUtils.isAnonymousClass(name)) {
             let cls = this.context.getClass(type.getClassSignature());
             if (cls) {
                 return this.anonymousClassToString(cls, this.context.getPrinter().getIndent());
@@ -278,11 +285,11 @@ class SourceTransformer {
         if (type instanceof Type_1.LiteralType) {
             return this.literalType2string(type);
         }
-        if (type instanceof Type_1.PrimitiveType) {
+        if (type instanceof Type_1.PrimitiveType || type instanceof Type_1.GenericType) {
             return type.getName();
         }
-        if (type instanceof Type_1.UnionType) {
-            return this.unionType2string(type);
+        if (type instanceof Type_1.UnionType || type instanceof Type_1.IntersectionType) {
+            return this.multipleType2string(type);
         }
         if (type instanceof Type_1.UnknownType) {
             return 'any';
@@ -296,21 +303,27 @@ class SourceTransformer {
         if (type instanceof Type_1.ArrayType) {
             return this.arrayType2string(type);
         }
+        if (type instanceof Type_1.TupleType) {
+            return this.tupleType2string(type);
+        }
         if (type instanceof Type_1.FunctionType) {
             let methodSignature = type.getMethodSignature();
             let method = this.context.getMethod(methodSignature);
-            if (method && SourceUtils_1.SourceUtils.isAnonymousMethod(method.getName())) {
+            if (method && PrinterUtils_1.PrinterUtils.isAnonymousMethod(method.getName())) {
                 return new SourceMethod_1.SourceMethod(method).toArrowFunctionTypeString();
             }
         }
         if (type instanceof Type_1.UnclearReferenceType) {
             return this.unclearReferenceType2string(type);
         }
-        if (type instanceof Type_1.GenericType) {
-            return type.getName();
-        }
         if (type instanceof Type_1.AliasType) {
-            return type.getName();
+            return this.aliasType2string(type);
+        }
+        if (type instanceof TypeExpr_1.KeyofTypeExpr) {
+            return this.keyofTypeExpr2string(type);
+        }
+        if (type instanceof TypeExpr_1.TypeQueryExpr) {
+            return this.typeQueryExpr2string(type);
         }
         if (!type) {
             return 'any';
@@ -325,37 +338,98 @@ class SourceTransformer {
         }
         return `${literalName}`;
     }
-    unionType2string(type) {
+    multipleType2string(type) {
         let typesStr = [];
         for (const member of type.getTypes()) {
-            typesStr.push(this.typeToString(member));
+            if (member instanceof Type_1.UnionType || member instanceof Type_1.IntersectionType) {
+                typesStr.push(`(${this.typeToString(member)})`);
+            }
+            else {
+                typesStr.push(this.typeToString(member));
+            }
+        }
+        if (type instanceof Type_1.UnionType) {
+            return typesStr.join(' | ');
+        }
+        else {
+            return typesStr.join(' & ');
         }
-        return typesStr.join(' | ');
     }
     arrayType2string(type) {
+        const readonly = type.getReadonlyFlag() ? 'readonly ' : '';
         const dimensions = [];
         for (let i = 0; i < type.getDimension(); i++) {
             dimensions.push('[]');
         }
         let baseType = type.getBaseType();
-        if (baseType instanceof Type_1.UnionType) {
-            return `(${this.typeToString(baseType)})${dimensions.join('')}`;
+        if (baseType instanceof Type_1.UnionType || baseType instanceof Type_1.IntersectionType || baseType instanceof TypeExpr_1.AbstractTypeExpr) {
+            return `${readonly}(${this.typeToString(baseType)})${dimensions.join('')}`;
+        }
+        return `${readonly}${this.typeToString(baseType)}${dimensions.join('')}`;
+    }
+    tupleType2string(type) {
+        const readonly = type.getReadonlyFlag() ? 'readonly ' : '';
+        let typesStr = [];
+        for (const member of type.getTypes()) {
+            typesStr.push(this.typeToString(member));
+        }
+        return `${readonly}[${typesStr.join(', ')}]`;
+    }
+    aliasType2string(type) {
+        var _a;
+        let typesStr = [];
+        let genericTypes = (_a = type.getRealGenericTypes()) !== null && _a !== void 0 ? _a : type.getGenericTypes();
+        if (genericTypes) {
+            for (const gType of genericTypes) {
+                typesStr.push(this.typeToString(gType));
+            }
+        }
+        if (typesStr.length > 0) {
+            return `${type.getName()}<${typesStr.join(', ')}>`;
+        }
+        return type.getName();
+    }
+    keyofTypeExpr2string(type) {
+        if (type.getOpType() instanceof Type_1.UnionType || type.getOpType() instanceof Type_1.IntersectionType) {
+            return `keyof (${this.typeToString(type.getOpType())})`;
+        }
+        return `keyof ${this.typeToString(type.getOpType())}`;
+    }
+    typeQueryExpr2string(type) {
+        const gTypes = type.getGenerateTypes();
+        const genericStr = this.genericTypesToString(gTypes);
+        const opValue = type.getOpValue();
+        if (opValue instanceof ArkBaseModel_1.ArkBaseModel) {
+            if (opValue instanceof ArkClass_1.ArkClass || opValue instanceof ArkMethod_1.ArkMethod || opValue instanceof ArkNamespace_1.ArkNamespace || opValue instanceof ArkField_1.ArkField) {
+                return `typeof ${opValue.getName()}${genericStr}`;
+            }
+            else if (opValue instanceof ArkExport_1.ExportInfo) {
+                return `typeof ${opValue.getExportClauseName()}${genericStr}`;
+            }
+            else if (opValue instanceof ArkImport_1.ImportInfo) {
+                return `typeof ${opValue.getImportClauseName()}${genericStr}`;
+            }
+            else {
+                return `typeof *invalid*`;
+            }
+        }
+        else {
+            return `typeof ${this.valueToString(opValue)}${genericStr}`;
         }
-        return `${this.typeToString(baseType)}${dimensions.join('')}`;
     }
     unclearReferenceType2string(type) {
         let genericTypes = type.getGenericTypes();
         if (genericTypes.length > 0) {
-            return `${type.getName()}<${genericTypes.join(', ')}>`;
+            return `${type.getName()}<${genericTypes.map((value) => this.typeToString(value)).join(', ')}>`;
         }
         return type.getName();
     }
     classType2string(type) {
-        const name = SourceUtils_1.SourceUtils.getStaticInvokeClassFullName(type.getClassSignature());
-        if (SourceUtils_1.SourceUtils.isDefaultClass(name)) {
+        const name = PrinterUtils_1.PrinterUtils.getStaticInvokeClassFullName(type.getClassSignature());
+        if (PrinterUtils_1.PrinterUtils.isDefaultClass(name)) {
             return 'any';
         }
-        if (SourceUtils_1.SourceUtils.isAnonymousClass(name)) {
+        if (PrinterUtils_1.PrinterUtils.isAnonymousClass(name)) {
             let cls = this.context.getClass(type.getClassSignature());
             if (cls && cls.getCategory() === ArkClass_1.ClassCategory.TYPE_LITERAL) {
                 return this.anonymousClassToString(cls, this.context.getPrinter().getIndent());
@@ -364,7 +438,7 @@ class SourceTransformer {
         }
         let genericTypes = type.getRealGenericTypes();
         if (genericTypes && genericTypes.length > 0) {
-            return `${name}<${genericTypes.join(', ')}>`;
+            return `${name}${this.genericTypesToString(genericTypes)}`;
         }
         return name;
     }

package/lib/utils/SparseBitVector.d.ts

@@ -38,9 +38,12 @@ declare class SparseBitVectorElement {
     private bits;
     constructor(elementSize?: number);
     word(idx: number): number;
+    clone(): Word;
     get elementSize(): number;
+    get bitWordNum(): number;
     isEmpty(): boolean;
     set(bitIdx: number): void;
+    setWord(word: Word): void;
     reset(bitIdx: number): void;
     test(bitIdx: number): boolean;
     test_and_set(bitIdx: number): boolean;
@@ -50,6 +53,7 @@ declare class SparseBitVectorElement {
     equals(rhs: SparseBitVectorElement): boolean;
     unionWith(other: SparseBitVectorElement): boolean;
     intersectWith(other: SparseBitVectorElement): boolean;
+    subtractWith(rhs: SparseBitVectorElement): boolean;
     countBitsV2(word: number): number;
     countBits(word: number): number;
     isZero(): boolean;
@@ -65,10 +69,12 @@ export declare class SparseBitVector {
     test(bitIdx: number): boolean;
     testAndSet(bitIdx: number): boolean;
     reset(bitIdx: number): void;
+    clear(): void;
+    clone(): SparseBitVector;
     findFirst(): number;
     count(): number;
     isEmpty(): boolean;
-    [Symbol.iterator](): Iterator<number>;
+    [Symbol.iterator](): IterableIterator<number>;
     /**
      * Check if this SparseBitVector is equal to another SparseBitVector.
      */
@@ -84,8 +90,11 @@ export declare class SparseBitVector {
      */
     intersectWith(rhs: SparseBitVector): boolean;
     /**
-     * Dump as string.
+     * Subtract another SparseBitVector from this one.
+     * This operation modifies the current SparseBitVector in place.
+     * Return True if the current SparseBitVector was modified, false otherwise.
      */
+    subtractWith(rhs: SparseBitVector): boolean;
     toString(): string;
 }
 export {};

package/lib/utils/SparseBitVector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SparseBitVector.d.ts","sourceRoot":"","sources":["../../src/utils/SparseBitVector.ts"],"names":[],"mappings":"AAeA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AAEH,MAAM,MAAM,IAAI,GAAG,WAAW,CAAC;AAE/B,cAAM,sBAAsB;IACxB,OAAO,CAAC,YAAY,CAAC;IACrB,OAAO,CAAC,YAAY,CAAC;IACrB,OAAO,CAAC,IAAI,CAAO;gBAEP,WAAW,GAAE,MAAY;IAMrC,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAIzB,IAAI,WAAW,IAAI,MAAM,CAExB;IAGD,OAAO,IAAI,OAAO;IAKlB,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAOzB,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAO3B,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAO7B,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAUrC,KAAK,IAAI,MAAM;IASf,SAAS,IAAI,MAAM;IAUnB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAuBhC,MAAM,CAAC,GAAG,EAAE,sBAAsB,GAAG,OAAO;IAW5C,SAAS,CAAC,KAAK,EAAE,sBAAsB,GAAG,OAAO;IAajD,aAAa,CAAC,KAAK,EAAE,sBAAsB,GAAG,OAAO;IAarD,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAUjC,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAgB/B,MAAM,IAAI,OAAO;IAUjB,OAAO,CAAC,kBAAkB;CAwB7B;AAED,qBAAa,eAAe;IACxB,OAAO,CAAC,YAAY,CAAS;IAG7B,OAAO,CAAC,QAAQ,CAAkD;gBAEtD,YAAY,GAAE,MAAY;IAGtC,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,IAAI,KAAK,IAAI,GAAG,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAE/C;IAGD,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAWzB,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAO7B,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAUnC,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAY3B,SAAS,IAAI,MAAM;IAYnB,KAAK,IAAI,MAAM;IASf,OAAO,IAAI,OAAO;IAIlB,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,MAAM,CAAC;IAgCrC;;OAEG;IACH,MAAM,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO;IAcrC;;;OAGG;IACH,SAAS,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO;IAwBxC;;;OAGG;IACH,aAAa,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO;IAoC5C;;OAEG;IACH,QAAQ,IAAI,MAAM;CAIrB"}
+{"version":3,"file":"SparseBitVector.d.ts","sourceRoot":"","sources":["../../src/utils/SparseBitVector.ts"],"names":[],"mappings":"AAeA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AAEH,MAAM,MAAM,IAAI,GAAG,WAAW,CAAC;AAE/B,cAAM,sBAAsB;IACxB,OAAO,CAAC,YAAY,CAAC;IACrB,OAAO,CAAC,YAAY,CAAC;IACrB,OAAO,CAAC,IAAI,CAAO;gBAEP,WAAW,GAAE,MAAY;IAMrC,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAIzB,KAAK,IAAI,IAAI;IAIb,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,IAAI,UAAU,IAAI,MAAM,CAEvB;IAGD,OAAO,IAAI,OAAO;IAKlB,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAMzB,OAAO,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI;IAKzB,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAO3B,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAO7B,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAUrC,KAAK,IAAI,MAAM;IASf,SAAS,IAAI,MAAM;IAUnB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAuBhC,MAAM,CAAC,GAAG,EAAE,sBAAsB,GAAG,OAAO;IAW5C,SAAS,CAAC,KAAK,EAAE,sBAAsB,GAAG,OAAO;IAajD,aAAa,CAAC,KAAK,EAAE,sBAAsB,GAAG,OAAO;IAarD,YAAY,CAAC,GAAG,EAAE,sBAAsB,GAAG,OAAO;IAiBlD,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAUjC,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAgB/B,MAAM,IAAI,OAAO;IAUjB,OAAO,CAAC,kBAAkB;CAwB7B;AAED,qBAAa,eAAe;IACxB,OAAO,CAAC,YAAY,CAAS;IAG7B,OAAO,CAAC,QAAQ,CAAkD;gBAEtD,YAAY,GAAE,MAAY;IAItC,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,IAAI,KAAK,IAAI,GAAG,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAE/C;IAGD,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAWzB,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAO7B,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAUnC,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAY3B,KAAK,IAAI,IAAI;IAKb,KAAK,IAAI,eAAe;IAaxB,SAAS,IAAI,MAAM;IAYnB,KAAK,IAAI,MAAM;IASf,OAAO,IAAI,OAAO;IAIlB,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,gBAAgB,CAAC,MAAM,CAAC;IAsC7C;;OAEG;IACH,MAAM,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO;IAcrC;;;OAGG;IACH,SAAS,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO;IAwBxC;;;OAGG;IACH,aAAa,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO;IAoC5C;;;;OAIG;IACH,YAAY,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO;IA2B3C,QAAQ,IAAI,MAAM;CAIrB"}