arkanalyzer 1.0.6 → 1.0.8

package/lib/save/source/SourceBody.js

@@ -47,6 +47,15 @@ const CfgStructualAnalysis_1 = require("../../utils/CfgStructualAnalysis");
 const ModelUtils_1 = require("../../core/common/ModelUtils");
 const SourceUtils_1 = require("./SourceUtils");
 const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER, 'SourceBody');
+class AliasStmt extends Stmt_1.Stmt {
+    constructor(position) {
+        super();
+        this.originalPosition = position;
+    }
+    toString() {
+        return '';
+    }
+}
 class SourceBody {
     constructor(indent, method, inBuilder) {
         this.stmts = [];
@@ -133,26 +142,30 @@ class SourceBody {
         this.buildTypeAliasStmt();
     }
     buildTypeAliasStmt() {
-        for (const [_, [aliasType, declaration]] of this.arkBody.getAliasTypeMap()) {
-            let stmt = new Stmt_1.OriginalStmt('', declaration.getPosition());
+        let map = this.arkBody.getAliasTypeMap();
+        if (!map) {
+            return;
+        }
+        for (const [_, [aliasType, declaration]] of map) {
+            let stmt = new AliasStmt(declaration.getPosition());
             this.pushStmt(new SourceStmt_1.SourceTypeAliasStmt(this, stmt, aliasType));
         }
     }
     buildBasicBlock(block, type) {
-        if (type == CfgStructualAnalysis_1.CodeBlockType.BREAK) {
+        if (type === CfgStructualAnalysis_1.CodeBlockType.BREAK) {
             this.pushStmt(new SourceStmt_1.SourceBreakStmt(this, this.lastStmt));
             return;
         }
-        else if (type == CfgStructualAnalysis_1.CodeBlockType.CONTINUE) {
+        else if (type === CfgStructualAnalysis_1.CodeBlockType.CONTINUE) {
             this.pushStmt(new SourceStmt_1.SourceContinueStmt(this, this.lastStmt));
         }
-        else if (type == CfgStructualAnalysis_1.CodeBlockType.COMPOUND_END) {
+        else if (type === CfgStructualAnalysis_1.CodeBlockType.COMPOUND_END) {
             this.pushStmt(new SourceStmt_1.SourceCompoundEndStmt(this, this.lastStmt, '}'));
         }
-        else if (type == CfgStructualAnalysis_1.CodeBlockType.ELSE) {
+        else if (type === CfgStructualAnalysis_1.CodeBlockType.ELSE) {
             this.pushStmt(new SourceStmt_1.SourceElseStmt(this, this.lastStmt));
         }
-        else if (type == CfgStructualAnalysis_1.CodeBlockType.DO) {
+        else if (type === CfgStructualAnalysis_1.CodeBlockType.DO) {
             this.pushStmt(new SourceStmt_1.SourceDoStmt(this, this.lastStmt));
         }
         if (!block) {
@@ -166,17 +179,17 @@ class SourceBody {
                 continue;
             }
             if (stmt instanceof Stmt_1.ArkIfStmt) {
-                if (type == CfgStructualAnalysis_1.CodeBlockType.IF) {
+                if (type === CfgStructualAnalysis_1.CodeBlockType.IF) {
                     this.pushStmt(new SourceStmt_1.SourceIfStmt(this, stmt));
                 }
-                else if (type == CfgStructualAnalysis_1.CodeBlockType.WHILE) {
+                else if (type === CfgStructualAnalysis_1.CodeBlockType.WHILE) {
                     this.pushStmt(new SourceStmt_1.SourceWhileStmt(this, stmt, block));
                 }
-                else if (type == CfgStructualAnalysis_1.CodeBlockType.FOR) {
+                else if (type === CfgStructualAnalysis_1.CodeBlockType.FOR) {
                     let inc = this.cfgUtils.getForIncBlock(block);
                     this.pushStmt(new SourceStmt_1.SourceForStmt(this, stmt, block, inc));
                 }
-                else if (type == CfgStructualAnalysis_1.CodeBlockType.DO_WHILE) {
+                else if (type === CfgStructualAnalysis_1.CodeBlockType.DO_WHILE) {
                     this.pushStmt(new SourceStmt_1.SourceDoWhileStmt(this, stmt, block));
                 }
             }
@@ -227,7 +240,7 @@ class SourceBody {
         for (let i = stmts.length - 1; i > 0; i--) {
             if (stmts[i] instanceof Stmt_1.ArkInvokeStmt && stmts[i].getInvokeExpr()) {
                 let instanceInvokeExpr = stmts[i].getInvokeExpr();
-                if ('constructor' == instanceInvokeExpr.getMethodSignature().getMethodSubSignature().getMethodName()) {
+                if ('constructor' === instanceInvokeExpr.getMethodSignature().getMethodSubSignature().getMethodName()) {
                     let localName = instanceInvokeExpr.getBase().getName();
                     let newExprIdx = findNewExpr(i, localName);
                     if (newExprIdx >= 0 && newExprIdx < i - 1) {
@@ -243,7 +256,7 @@ class SourceBody {
                     continue;
                 }
                 if (stmts[j].getLeftOp() instanceof Local_1.Local) {
-                    if (stmts[j].getLeftOp().getName() == name) {
+                    if (stmts[j].getLeftOp().getName() === name) {
                         return j;
                     }
                 }
@@ -282,7 +295,7 @@ class StmtReader {
         return stmt;
     }
     rollback() {
-        if (this.pos == 0) {
+        if (this.pos === 0) {
             logger.error('SourceBody: StmtReader->rollback No more stmt to rollback.');
             throw new Error('No more stmt to rollback.');
         }

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

@@ -1 +1 @@
-{"version":3,"file":"SourceClass.d.ts","sourceRoot":"","sources":["../../../src/save/source/SourceClass.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,QAAQ,EAAiB,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAOhD,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAG7D;;GAEG;AACH,qBAAa,WAAY,SAAQ,UAAU;IACvC,SAAS,CAAC,GAAG,EAAE,QAAQ,CAAC;IACxB,OAAO,CAAC,WAAW,CAAoB;gBAEpB,GAAG,EAAE,QAAQ,EAAE,MAAM,GAAE,MAAW;IAM9C,wBAAwB,IAAI,YAAY,GAAG,SAAS;IAIpD,OAAO,IAAI,MAAM;IAIjB,IAAI,IAAI,MAAM;IAoDd,YAAY,IAAI,MAAM;IAI7B,OAAO,CAAC,UAAU;IAwBlB,OAAO,CAAC,eAAe;IAmBvB,SAAS,CAAC,YAAY,IAAI,IAAI,EAAE;IAgBhC,OAAO,CAAC,WAAW;IAiBnB,OAAO,CAAC,oBAAoB;CAU/B;AAED,qBAAa,kBAAmB,SAAQ,WAAW;gBAC5B,GAAG,EAAE,QAAQ,EAAE,MAAM,GAAE,MAAW;IAI9C,OAAO,IAAI,MAAM;IAIjB,IAAI,IAAI,MAAM;IAKd,YAAY,IAAI,MAAM;CAmBhC"}
+{"version":3,"file":"SourceClass.d.ts","sourceRoot":"","sources":["../../../src/save/source/SourceClass.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,QAAQ,EAAiB,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAOhD,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAI7D;;GAEG;AACH,qBAAa,WAAY,SAAQ,UAAU;IACvC,SAAS,CAAC,GAAG,EAAE,QAAQ,CAAC;IACxB,OAAO,CAAC,WAAW,CAAoB;gBAEpB,GAAG,EAAE,QAAQ,EAAE,MAAM,GAAE,MAAW;IAM9C,wBAAwB,IAAI,YAAY,GAAG,SAAS;IAIpD,OAAO,IAAI,MAAM;IAIjB,IAAI,IAAI,MAAM;IAsDd,YAAY,IAAI,MAAM;IAI7B,OAAO,CAAC,UAAU;IAwBlB,OAAO,CAAC,eAAe;IAmBvB,SAAS,CAAC,YAAY,IAAI,IAAI,EAAE;IAgBhC,OAAO,CAAC,WAAW;IAiBnB,OAAO,CAAC,oBAAoB;CAU/B;AAED,qBAAa,kBAAmB,SAAQ,WAAW;gBAC5B,GAAG,EAAE,QAAQ,EAAE,MAAM,GAAE,MAAW;IAI9C,OAAO,IAAI,MAAM;IAIjB,IAAI,IAAI,MAAM;IAKd,YAAY,IAAI,MAAM;CAmBhC"}

package/lib/save/source/SourceClass.js

@@ -24,6 +24,7 @@ const SourceTransformer_1 = require("./SourceTransformer");
 const SourceUtils_1 = require("./SourceUtils");
 const Const_1 = require("../../core/common/Const");
 const ArkField_1 = require("../../core/model/ArkField");
+const ArkMetadata_1 = require("../../core/model/ArkMetadata");
 /**
  * @category save
  */
@@ -41,13 +42,16 @@ class SourceClass extends SourceBase_1.SourceBase {
     }
     dump() {
         this.printer.clear();
-        if (this.cls.getCategory() == ArkClass_1.ClassCategory.OBJECT) {
+        (this.cls.getMetadata(ArkMetadata_1.ArkMetadataKind.LEADING_COMMENTS) || []).forEach((comment) => {
+            this.printer.writeIndent().writeLine(comment);
+        });
+        if (this.cls.getCategory() === ArkClass_1.ClassCategory.OBJECT) {
             return this.dumpObject();
         }
-        if (this.cls.getCategory() == ArkClass_1.ClassCategory.TYPE_LITERAL) {
+        if (this.cls.getCategory() === ArkClass_1.ClassCategory.TYPE_LITERAL) {
             return this.dumpTypeLiteral();
         }
-        this.printDecorator(this.cls.getModifiers());
+        this.printDecorator(this.cls.getDecorators());
         // print export class name<> + extends c0 implements x1, x2 {
         this.printer
             .writeIndent()
@@ -99,7 +103,7 @@ class SourceClass extends SourceBase_1.SourceBase {
             if (instanceInitializer.has(field.getName())) {
                 this.printer.write(`: ${instanceInitializer.get(field.getName())}`);
             }
-            if (index != array.length - 1) {
+            if (index !== array.length - 1) {
                 this.printer.write(`, `);
             }
         });
@@ -116,7 +120,7 @@ class SourceClass extends SourceBase_1.SourceBase {
             else {
                 this.printer.write(`'${name}': ${this.transformer.typeToString(field.getType())}`);
             }
-            if (index != array.length - 1) {
+            if (index !== array.length - 1) {
                 this.printer.write(`, `);
             }
         });
@@ -143,10 +147,10 @@ class SourceClass extends SourceBase_1.SourceBase {
         let staticInitializer = this.parseFieldInitMethod(Const_1.STATIC_INIT_METHOD_NAME);
         let items = [];
         for (let field of this.cls.getFields()) {
-            if (field.getCategory() == ArkField_1.FieldCategory.GET_ACCESSOR) {
+            if (field.getCategory() === ArkField_1.FieldCategory.GET_ACCESSOR) {
                 continue;
             }
-            if (field.getModifiers().has('StaticKeyword')) {
+            if (field.isStatic()) {
                 items.push(new SourceField_1.SourceField(field, this.printer.getIndent(), staticInitializer));
             }
             else {
@@ -157,7 +161,7 @@ class SourceClass extends SourceBase_1.SourceBase {
     }
     parseFieldInitMethod(name) {
         let method = this.cls.getMethodWithName(name);
-        if (!method || (method === null || method === void 0 ? void 0 : method.getBody()) == undefined) {
+        if (!method || (method === null || method === void 0 ? void 0 : method.getBody()) === undefined) {
             return new Map();
         }
         let srcBody = new SourceBody_1.SourceBody(this.printer.getIndent(), method, false);

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

@@ -1 +1 @@
-{"version":3,"file":"SourceField.d.ts","sourceRoot":"","sources":["../../../src/save/source/SourceField.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,QAAQ,EAAiB,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAI1C;;GAEG;AACH,qBAAa,WAAY,SAAQ,UAAU;IACvC,OAAO,CAAC,KAAK,CAAW;IACxB,OAAO,CAAC,WAAW,CAAoB;IACvC,OAAO,CAAC,WAAW,CAAsB;gBAEtB,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAa,EAAE,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;IAOlF,OAAO,IAAI,MAAM;IAGjB,IAAI,IAAI,MAAM;IAiCd,YAAY,IAAI,MAAM;CAGhC"}
+{"version":3,"file":"SourceField.d.ts","sourceRoot":"","sources":["../../../src/save/source/SourceField.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,QAAQ,EAAiB,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAK1C;;GAEG;AACH,qBAAa,WAAY,SAAQ,UAAU;IACvC,OAAO,CAAC,KAAK,CAAW;IACxB,OAAO,CAAC,WAAW,CAAoB;IACvC,OAAO,CAAC,WAAW,CAAsB;gBAEtB,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAa,EAAE,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;IAOlF,OAAO,IAAI,MAAM;IAGjB,IAAI,IAAI,MAAM;IAoCd,YAAY,IAAI,MAAM;CAGhC"}

package/lib/save/source/SourceField.js

@@ -19,6 +19,7 @@ const ArkField_1 = require("../../core/model/ArkField");
 const SourceBase_1 = require("./SourceBase");
 const SourceTransformer_1 = require("./SourceTransformer");
 const Type_1 = require("../../core/base/Type");
+const ArkMetadata_1 = require("../../core/model/ArkMetadata");
 /**
  * @category save
  */
@@ -34,7 +35,10 @@ class SourceField extends SourceBase_1.SourceBase {
     }
     dump() {
         this.printer.clear();
-        this.printDecorator(this.field.getModifiers());
+        (this.field.getMetadata(ArkMetadata_1.ArkMetadataKind.LEADING_COMMENTS) || []).forEach((comment) => {
+            this.printer.writeIndent().writeLine(comment);
+        });
+        this.printDecorator(this.field.getDecorators());
         this.printer.writeIndent();
         if (this.field.getCategory() !== ArkField_1.FieldCategory.ENUM_MEMBER) {
             this.printer.writeSpace(this.modifiersToString(this.field.getModifiers()));
@@ -53,7 +57,7 @@ class SourceField extends SourceBase_1.SourceBase {
         if (this.initializer.has(this.field.getName())) {
             this.printer.write(` = ${this.initializer.get(this.field.getName())}`);
         }
-        if (this.field.getCategory() == ArkField_1.FieldCategory.ENUM_MEMBER) {
+        if (this.field.getCategory() === ArkField_1.FieldCategory.ENUM_MEMBER) {
             this.printer.writeLine(',');
         }
         else {

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

@@ -1 +1 @@
-{"version":3,"file":"SourceMethod.d.ts","sourceRoot":"","sources":["../../../src/save/source/SourceMethod.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAEvD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAI1C,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAE7D;;GAEG;AACH,qBAAa,YAAa,SAAQ,UAAU;IACxC,OAAO,CAAC,MAAM,CAAY;IAC1B,OAAO,CAAC,WAAW,CAAoB;gBAEpB,MAAM,EAAE,SAAS,EAAE,MAAM,GAAE,MAAW;IAOlD,wBAAwB,IAAI,YAAY,GAAG,SAAS;IAIpD,YAAY,CAAC,SAAS,EAAE,OAAO,GAAG,IAAI;IAItC,IAAI,IAAI,MAAM;IAUd,YAAY,IAAI,MAAM;IAItB,OAAO,IAAI,MAAM;IAoBjB,iBAAiB,IAAI,UAAU,EAAE;IAKxC,OAAO,CAAC,WAAW;IAsBnB,OAAO,CAAC,SAAS;IAKjB,SAAS,CAAC,mBAAmB,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM;IA+CjD,yBAAyB,IAAI,MAAM;IAuB1C,OAAO,CAAC,aAAa;CAQxB"}
+{"version":3,"file":"SourceMethod.d.ts","sourceRoot":"","sources":["../../../src/save/source/SourceMethod.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAEvD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAI1C,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAG7D;;GAEG;AACH,qBAAa,YAAa,SAAQ,UAAU;IACxC,OAAO,CAAC,MAAM,CAAY;IAC1B,OAAO,CAAC,WAAW,CAAoB;gBAEpB,MAAM,EAAE,SAAS,EAAE,MAAM,GAAE,MAAW;IAOlD,wBAAwB,IAAI,YAAY,GAAG,SAAS;IAIpD,YAAY,CAAC,SAAS,EAAE,OAAO,GAAG,IAAI;IAItC,IAAI,IAAI,MAAM;IAad,YAAY,IAAI,MAAM;IAItB,OAAO,IAAI,MAAM;IAuBjB,iBAAiB,IAAI,UAAU,EAAE;IAKxC,OAAO,CAAC,WAAW;IAsBnB,OAAO,CAAC,SAAS;IAKjB,SAAS,CAAC,mBAAmB,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM;IA+CjD,yBAAyB,IAAI,MAAM;IAuB1C,OAAO,CAAC,aAAa;CAQxB"}

package/lib/save/source/SourceMethod.js

@@ -21,6 +21,7 @@ const SourceBase_1 = require("./SourceBase");
 const SourceBody_1 = require("./SourceBody");
 const SourceTransformer_1 = require("./SourceTransformer");
 const SourceUtils_1 = require("./SourceUtils");
+const ArkMetadata_1 = require("../../core/model/ArkMetadata");
 /**
  * @category save
  */
@@ -39,6 +40,9 @@ class SourceMethod extends SourceBase_1.SourceBase {
     }
     dump() {
         this.printer.clear();
+        (this.method.getMetadata(ArkMetadata_1.ArkMetadataKind.LEADING_COMMENTS) || []).forEach((comment) => {
+            this.printer.writeIndent().writeLine(comment);
+        });
         if (!this.method.isDefaultArkMethod()) {
             this.printMethod(this.method);
         }
@@ -52,6 +56,9 @@ class SourceMethod extends SourceBase_1.SourceBase {
     }
     getLine() {
         let line = this.method.getLine();
+        if (line === null) {
+            line = 0;
+        }
         if (line > 0) {
             return line;
         }
@@ -72,7 +79,7 @@ class SourceMethod extends SourceBase_1.SourceBase {
         return srcBody.getStmts();
     }
     printMethod(method) {
-        this.printDecorator(method.getModifiers());
+        this.printDecorator(method.getDecorators());
         this.printer.writeIndent().write(this.methodProtoToString(method));
         // abstract function no body
         if (!method.getBody()) {
@@ -162,8 +169,8 @@ class SourceMethod extends SourceBase_1.SourceBase {
     }
     initInBuilder() {
         return (this.method.hasBuilderDecorator() ||
-            ((this.method.getName() == 'build' || this.method.getName() == 'pageTransition') &&
-                !this.method.containsModifier('StaticKeyword') &&
+            ((this.method.getName() === 'build' || this.method.getName() === 'pageTransition') &&
+                !this.method.isStatic() &&
                 this.method.getDeclaringArkClass().hasViewTree()));
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"SourceModule.d.ts","sourceRoot":"","sources":["../../../src/save/source/SourceModule.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,UAAU,EAAc,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,qBAAa,gBAAiB,SAAQ,UAAU;IAC5C,IAAI,EAAE,UAAU,CAAC;gBAEE,IAAI,EAAE,UAAU,EAAE,MAAM,GAAE,MAAW;IAKjD,OAAO,IAAI,MAAM;IAIjB,IAAI,IAAI,MAAM;IA4Cd,YAAY,IAAI,MAAM;CAGhC;AAED,qBAAa,gBAAiB,SAAQ,UAAU;IAC5C,IAAI,EAAE,UAAU,CAAC;gBAEE,IAAI,EAAE,UAAU,EAAE,MAAM,GAAE,MAAW;IAKjD,OAAO,IAAI,MAAM;IAIjB,IAAI,IAAI,MAAM;IAuDd,YAAY,IAAI,MAAM;CAGhC"}
+{"version":3,"file":"SourceModule.d.ts","sourceRoot":"","sources":["../../../src/save/source/SourceModule.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,UAAU,EAAc,MAAM,4BAA4B,CAAC;AACpE,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAExD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,qBAAa,gBAAiB,SAAQ,UAAU;IAC5C,IAAI,EAAE,UAAU,CAAC;gBAEE,IAAI,EAAE,UAAU,EAAE,MAAM,GAAE,MAAW;IAKjD,OAAO,IAAI,MAAM;IAIjB,IAAI,IAAI,MAAM;IAuCd,YAAY,IAAI,MAAM;CAGhC;AAED,qBAAa,gBAAiB,SAAQ,UAAU;IAC5C,IAAI,EAAE,UAAU,CAAC;gBAEE,IAAI,EAAE,UAAU,EAAE,MAAM,GAAE,MAAW;IAKjD,OAAO,IAAI,MAAM;IAIjB,IAAI,IAAI,MAAM;IAwCd,YAAY,IAAI,MAAM;CAGhC"}

package/lib/save/source/SourceModule.js

@@ -15,7 +15,9 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SourceImportInfo = exports.SourceExportInfo = void 0;
+const ArkBaseModel_1 = require("../../core/model/ArkBaseModel");
 const ArkExport_1 = require("../../core/model/ArkExport");
+const ArkMetadata_1 = require("../../core/model/ArkMetadata");
 const SourceBase_1 = require("./SourceBase");
 class SourceExportInfo extends SourceBase_1.SourceBase {
     constructor(info, indent = '') {
@@ -28,21 +30,24 @@ class SourceExportInfo extends SourceBase_1.SourceBase {
     dump() {
         var _a;
         this.printer.clear();
-        if (((_a = this.info.getArkExport()) === null || _a === void 0 ? void 0 : _a.getModifiers().has('ExportKeyword')) || this.info.getExportClauseType() == ArkExport_1.ExportType.LOCAL) {
+        (this.info.getMetadata(ArkMetadata_1.ArkMetadataKind.LEADING_COMMENTS) || []).forEach((comment) => {
+            this.printer.writeIndent().writeLine(comment);
+        });
+        if (!this.info.getFrom() &&
+            (((_a = this.info.getArkExport()) === null || _a === void 0 ? void 0 : _a.containsModifier(ArkBaseModel_1.ModifierType.EXPORT)) ||
+                this.info.getExportClauseType() === ArkExport_1.ExportType.LOCAL ||
+                this.info.getExportClauseType() === ArkExport_1.ExportType.TYPE)) {
             return this.printer.toString();
         }
         if (this.info.getExportClauseName() === '*') {
             // just like: export * as xx from './yy'
-            if (this.info.getNameBeforeAs() &&
-                this.info.getNameBeforeAs() != '*') {
+            if (this.info.getNameBeforeAs() && this.info.getNameBeforeAs() !== '*') {
                 this.printer
                     .writeIndent()
                     .write(`export ${this.info.getNameBeforeAs()} as ${this.info.getExportClauseName()}`);
             }
             else {
-                this.printer
-                    .writeIndent()
-                    .write(`export ${this.info.getExportClauseName()}`);
+                this.printer.writeIndent().write(`export ${this.info.getExportClauseName()}`);
             }
         }
         else {
@@ -74,6 +79,9 @@ class SourceImportInfo extends SourceBase_1.SourceBase {
         return this.info.getOriginTsPosition().getLineNo();
     }
     dump() {
+        (this.info.getMetadata(ArkMetadata_1.ArkMetadataKind.LEADING_COMMENTS) || []).forEach((comment) => {
+            this.printer.writeIndent().writeLine(comment);
+        });
         if (this.info.getImportType() === 'Identifier') {
             // sample: import fs from 'fs'
             this.printer
@@ -99,7 +107,7 @@ class SourceImportInfo extends SourceBase_1.SourceBase {
                 .writeIndent()
                 .writeLine(`import * as ${this.info.getImportClauseName()} from '${this.info.getFrom()}';`);
         }
-        else if (this.info.getImportType() == 'EqualsImport') {
+        else if (this.info.getImportType() === 'EqualsImport') {
             // sample: import mmmm = require('./xxx')
             this.printer
                 .writeIndent()
@@ -107,9 +115,7 @@ class SourceImportInfo extends SourceBase_1.SourceBase {
         }
         else {
             // sample: import '../xxx'
-            this.printer
-                .writeIndent()
-                .writeLine(`import '${this.info.getFrom()}';`);
+            this.printer.writeIndent().writeLine(`import '${this.info.getFrom()}';`);
         }
         return this.printer.toString();
     }

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

@@ -1 +1 @@
-{"version":3,"file":"SourceNamespace.d.ts","sourceRoot":"","sources":["../../../src/save/source/SourceNamespace.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAQ,UAAU,EAAE,MAAM,cAAc,CAAC;AAMhD;;GAEG;AACH,qBAAa,eAAgB,SAAQ,UAAU;IAC3C,EAAE,EAAE,YAAY,CAAC;gBAEE,EAAE,EAAE,YAAY,EAAE,MAAM,GAAE,MAAW;IAKjD,OAAO,IAAI,MAAM;IAIjB,IAAI,IAAI,MAAM;IA2Dd,YAAY,IAAI,MAAM;CAGhC"}
+{"version":3,"file":"SourceNamespace.d.ts","sourceRoot":"","sources":["../../../src/save/source/SourceNamespace.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAQ,UAAU,EAAE,MAAM,cAAc,CAAC;AAMhD;;GAEG;AACH,qBAAa,eAAgB,SAAQ,UAAU;IAC3C,EAAE,EAAE,YAAY,CAAC;gBAEE,EAAE,EAAE,YAAY,EAAE,MAAM,GAAE,MAAW;IAKjD,OAAO,IAAI,MAAM;IAIjB,IAAI,IAAI,MAAM;IA8Dd,YAAY,IAAI,MAAM;CAGhC"}

package/lib/save/source/SourceNamespace.js

@@ -15,6 +15,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SourceNamespace = void 0;
+const ArkMetadata_1 = require("../../core/model/ArkMetadata");
 const SourceBase_1 = require("./SourceBase");
 const SourceClass_1 = require("./SourceClass");
 const SourceMethod_1 = require("./SourceMethod");
@@ -32,6 +33,9 @@ class SourceNamespace extends SourceBase_1.SourceBase {
         return this.ns.getLine();
     }
     dump() {
+        (this.ns.getMetadata(ArkMetadata_1.ArkMetadataKind.LEADING_COMMENTS) || []).forEach((comment) => {
+            this.printer.writeIndent().writeLine(comment);
+        });
         this.printer
             .writeIndent()
             .writeSpace(this.modifiersToString(this.ns.getModifiers()))

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

@@ -84,7 +84,7 @@ export declare class SourceWhileStmt extends SourceStmt {
     /**
      * $temp2 = $temp1.next()
      * $temp3 = $temp2.done()
-     * if $temp3 == true
+     * if $temp3 === true
      *  $temp4 = $temp2.value
      *  $temp5 = <> cast
      * @returns

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

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

package/lib/save/source/SourceStmt.js

@@ -50,6 +50,8 @@ const SourceTransformer_1 = require("./SourceTransformer");
 const SourceUtils_1 = require("./SourceUtils");
 const ValueUtil_1 = require("../../core/common/ValueUtil");
 const ArkClass_1 = require("../../core/model/ArkClass");
+const ArkBaseModel_1 = require("../../core/model/ArkBaseModel");
+const ArkMetadata_1 = require("../../core/model/ArkMetadata");
 const logger = logger_1.default.getLogger(logger_1.LOG_MODULE_TYPE.ARKANALYZER, 'SourceStmt');
 const IGNOR_TYPES = new Set(['any', 'Map', 'Set']);
 class SourceStmt {
@@ -75,10 +77,15 @@ class SourceStmt {
     beforeDump() { }
     afterDump() { }
     dumpTs() {
+        let content = [];
+        let comments = this.original.getMetadata(ArkMetadata_1.ArkMetadataKind.LEADING_COMMENTS) || [];
+        comments.forEach((v) => {
+            content.push(`${this.printer.getIndent()}${v}\n`);
+        });
         if (this.text.length > 0) {
-            return `${this.printer.getIndent()}${this.text}\n`;
+            content.push(`${this.printer.getIndent()}${this.text}\n`);
         }
-        return ``;
+        return content.join('');
     }
     get printer() {
         return this.context.getPrinter();
@@ -118,8 +125,8 @@ class SourceAssignStmt extends SourceStmt {
     transfer2ts() {
         this.leftOp = this.original.getLeftOp();
         this.rightOp = this.original.getRightOp();
-        if ((this.leftOp instanceof Local_1.Local && this.leftOp.getName() == 'this') ||
-            (this.rightOp instanceof Constant_1.Constant && this.rightOp.getValue() == 'undefined') ||
+        if ((this.leftOp instanceof Local_1.Local && this.leftOp.getName() === 'this') ||
+            (this.rightOp instanceof Constant_1.Constant && this.rightOp.getValue() === 'undefined') ||
             this.rightOp instanceof Ref_1.ArkParameterRef) {
             this.setText('');
             this.dumpType = AssignStmtDumpType.NORMAL;
@@ -145,11 +152,11 @@ class SourceAssignStmt extends SourceStmt {
         if (this.isLocalTempValue(this.leftOp)) {
             this.context.setTempCode(this.leftOp.getName(), this.rightCode);
         }
-        if ((this.leftOp instanceof Ref_1.ArkInstanceFieldRef && this.leftOp.getBase().getName() == 'this') ||
+        if ((this.leftOp instanceof Ref_1.ArkInstanceFieldRef && this.leftOp.getBase().getName() === 'this') ||
             this.leftOp instanceof Ref_1.ArkStaticFieldRef) {
             this.context.setTempCode(this.leftOp.getFieldName(), this.rightCode);
         }
-        if (this.dumpType == undefined) {
+        if (this.dumpType === undefined) {
             this.setText(`${this.leftCode} = ${this.rightCode}`);
             this.dumpType = AssignStmtDumpType.TEMP_REPLACE;
         }
@@ -171,7 +178,7 @@ class SourceAssignStmt extends SourceStmt {
         }
     }
     beforeDump() {
-        if (this.dumpType != AssignStmtDumpType.TEMP_REPLACE) {
+        if (this.dumpType !== AssignStmtDumpType.TEMP_REPLACE) {
             return;
         }
         if (this.context.hasTempVisit(this.leftCode)) {
@@ -209,7 +216,7 @@ class SourceAssignStmt extends SourceStmt {
         }
     }
     afterDump() {
-        if (this.dumpType == AssignStmtDumpType.COMPONENT_CREATE) {
+        if (this.dumpType === AssignStmtDumpType.COMPONENT_CREATE) {
             this.printer.incIndent();
         }
     }
@@ -235,16 +242,16 @@ class SourceAssignStmt extends SourceStmt {
             let rollback = true;
             if (stmt instanceof Stmt_1.ArkInvokeStmt && stmt.getInvokeExpr()) {
                 let instanceInvokeExpr = stmt.getInvokeExpr();
-                if ('constructor' == instanceInvokeExpr.getMethodSignature().getMethodSubSignature().getMethodName() &&
-                    instanceInvokeExpr.getBase().getName() == this.leftOp.getName()) {
+                if ('constructor' === instanceInvokeExpr.getMethodSignature().getMethodSubSignature().getMethodName() &&
+                    instanceInvokeExpr.getBase().getName() === this.leftOp.getName()) {
                     let args = [];
                     instanceInvokeExpr.getArgs().forEach((v) => {
                         args.push(this.transformer.valueToString(v));
                     });
-                    if (originType == SourceUtils_1.CLASS_CATEGORY_COMPONENT) {
+                    if (originType === SourceUtils_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) {
+                    else if (originType === ArkClass_1.ClassCategory.TYPE_LITERAL || originType === ArkClass_1.ClassCategory.OBJECT) {
                         this.rightCode = `${this.transformer.literalObjectToString(this.rightOp.getType())}`;
                     }
                     else {
@@ -257,10 +264,10 @@ class SourceAssignStmt extends SourceStmt {
                 this.context.getStmtReader().rollback();
             }
         }
-        if (originType == SourceUtils_1.CLASS_CATEGORY_COMPONENT) {
+        if (originType === SourceUtils_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) {
+        else if (originType === ArkClass_1.ClassCategory.TYPE_LITERAL || originType === ArkClass_1.ClassCategory.OBJECT) {
             this.rightCode = `${this.transformer.typeToString(this.rightOp.getType())}`;
         }
         else {
@@ -280,7 +287,7 @@ class SourceAssignStmt extends SourceStmt {
             let stmt = this.context.getStmtReader().next();
             if (stmt instanceof Stmt_1.ArkAssignStmt) {
                 let left = stmt.getLeftOp();
-                if (left instanceof Ref_1.ArkArrayRef && left.getBase().getName() == localName) {
+                if (left instanceof Ref_1.ArkArrayRef && left.getBase().getName() === localName) {
                     arrayExpr.addInitValue(this.transformer.valueToString(stmt.getRightOp()));
                 }
                 else {
@@ -393,7 +400,7 @@ class SourceWhileStmt extends SourceStmt {
     /**
      * $temp2 = $temp1.next()
      * $temp3 = $temp2.done()
-     * if $temp3 == true
+     * if $temp3 === true
      *  $temp4 = $temp2.value
      *  $temp5 = <> cast
      * @returns
@@ -406,7 +413,7 @@ class SourceWhileStmt extends SourceStmt {
         if (!(firstStmt instanceof Stmt_1.ArkAssignStmt)) {
             return false;
         }
-        if (!(this.isLocalTempValue(temp3) && op2 instanceof Constant_1.Constant && op2.getValue() == 'true')) {
+        if (!(this.isLocalTempValue(temp3) && op2 instanceof Constant_1.Constant && op2.getValue() === 'true')) {
             return false;
         }
         let stmt = temp3.getDeclaringStmt();
@@ -417,7 +424,7 @@ class SourceWhileStmt extends SourceStmt {
         if (!(done instanceof Ref_1.ArkInstanceFieldRef)) {
             return false;
         }
-        if (done.getFieldSignature().toString() != '@ES2015/BuiltinClass: IteratorResult.done') {
+        if (done.getFieldSignature().toString() !== '@ES2015/BuiltinClass: IteratorResult.done') {
             return false;
         }
         let temp2 = done.getBase();
@@ -432,7 +439,7 @@ class SourceWhileStmt extends SourceStmt {
         if (!(next instanceof Expr_1.ArkInstanceInvokeExpr)) {
             return false;
         }
-        if (next.getMethodSignature().getMethodSubSignature().getMethodName() != 'next') {
+        if (next.getMethodSignature().getMethodSubSignature().getMethodName() !== 'next') {
             return false;
         }
         let temp1 = next.getBase();
@@ -447,11 +454,11 @@ class SourceWhileStmt extends SourceStmt {
         if (!(iterator instanceof Expr_1.ArkInstanceInvokeExpr)) {
             return false;
         }
-        if (iterator.getMethodSignature().getMethodSubSignature().getMethodName() != 'iterator') {
+        if (iterator.getMethodSignature().getMethodSubSignature().getMethodName() !== 'iterator') {
             return false;
         }
         let successors = this.block.getSuccessors();
-        if (successors.length != 2) {
+        if (successors.length !== 2) {
             return false;
         }
         let stmts = successors[0].getStmts();
@@ -489,7 +496,7 @@ class SourceWhileStmt extends SourceStmt {
             if (!(ref instanceof Ref_1.ArkArrayRef)) {
                 break;
             }
-            if (ref.getBase().getName() != valueName) {
+            if (ref.getBase().getName() !== valueName) {
                 break;
             }
             let name = stmt.getLeftOp().getName();
@@ -520,12 +527,12 @@ class SourceWhileStmt extends SourceStmt {
                 continue;
             }
             if (SourceUtils_1.SourceUtils.isDeIncrementStmt(stmt, Expr_1.NormalBinaryOperator.Addition) &&
-                stmt.getLeftOp().getName() == value.getName()) {
+                stmt.getLeftOp().getName() === value.getName()) {
                 this.context.setSkipStmt(stmt);
                 return `${value.getName()}++`;
             }
             if (SourceUtils_1.SourceUtils.isDeIncrementStmt(stmt, Expr_1.NormalBinaryOperator.Subtraction) &&
-                stmt.getLeftOp().getName() == value.getName()) {
+                stmt.getLeftOp().getName() === value.getName()) {
                 this.context.setSkipStmt(stmt);
                 return `${value.getName()}--`;
             }
@@ -718,7 +725,12 @@ class SourceTypeAliasStmt extends SourceStmt {
         this.aliasType = aliasType;
     }
     transfer2ts() {
-        this.setText(`type ${this.aliasType.getName()} = ${this.transformer.typeToString(this.aliasType.getOriginalType())};`);
+        let modifier = '';
+        let modifiersArray = (0, ArkBaseModel_1.modifiers2stringArray)(this.aliasType.getModifiers());
+        if (modifiersArray.length > 0) {
+            modifier = `${modifiersArray.join(' ')} `;
+        }
+        this.setText(`${modifier}type ${this.aliasType.getName()} = ${this.transformer.typeToString(this.aliasType.getOriginalType())};`);
     }
 }
 exports.SourceTypeAliasStmt = SourceTypeAliasStmt;

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

@@ -26,6 +26,7 @@ export declare class SourceTransformer {
     private anonymousClassToString;
     instanceInvokeExprToString(invokeExpr: ArkInstanceInvokeExpr): string;
     staticInvokeExprToString(invokeExpr: ArkStaticInvokeExpr): string;
+    private genericTypesToString;
     typeArrayToString(types: Type[], split?: string): string;
     static constToString(value: Constant): string;
     private exprToString;
@@ -33,5 +34,10 @@ export declare class SourceTransformer {
     valueToString(value: Value, operator?: string): string;
     literalObjectToString(type: ClassType): string;
     typeToString(type: Type): string;
+    private literalType2string;
+    private unionType2string;
+    private arrayType2string;
+    private unclearReferenceType2string;
+    private classType2string;
 }
 //# sourceMappingURL=SourceTransformer.d.ts.map

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,EAEH,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;IACtB,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;IAiBrE,wBAAwB,CAAC,UAAU,EAAE,mBAAmB,GAAG,MAAM;IAwDjE,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;CAmF1C"}
+{"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,EAEH,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;IAoDvC,OAAO,CAAC,kBAAkB;IAQ1B,OAAO,CAAC,gBAAgB;IAQxB,OAAO,CAAC,gBAAgB;IAaxB,OAAO,CAAC,2BAA2B;IAQnC,OAAO,CAAC,gBAAgB;CAkB3B"}