@idlizer/arktscgen 2.1.9-arktscgen-6 → 2.1.9-arktscgen-9

package/build/libarkts-copy/src/plugin-utils.ts

@@ -17,20 +17,18 @@ import {
     Es2pandaContextState,
     PluginContext,
     ImportStorage,
-    setBaseOverloads,
     arktsGlobal,
     ChainExpressionFilter,
     ProgramTransformer,
     Program,
-    inferVoidReturnType,
     ProgramProvider,
-    CompilationOptions
+    CompilationOptions,
+    dumpProgramSrcFormatted
 } from "./arkts-api"
-import { AstNode } from "./reexport-for-generated"
 
 export interface RunTransformerHooks {
-    onProgramTransformStart?(options: CompilationOptions): void
-    onProgramTransformEnd?(options: CompilationOptions): void
+    onProgramTransformStart?(options: CompilationOptions, program: Program): void
+    onProgramTransformEnd?(options: CompilationOptions, program: Program): void
 }
 
 class ASTCache {
@@ -44,33 +42,50 @@ class ASTCache {
     }
 }
 
+export class DumpingHooks implements RunTransformerHooks {
+    constructor(private state: Es2pandaContextState, private pluginName: string, private dumpAst: boolean = false) {
+        if (process.env.KOALA_DUMP_PLUGIN_AST) {
+            this.dumpAst = true
+        }
+    }
+    onProgramTransformStart(options: CompilationOptions, program: Program) {
+        if (this.dumpAst) {
+            console.log(`BEFORE ${this.pluginName}:`)
+            dumpProgramSrcFormatted(program, true)
+        }
+        if (!options.isProgramForCodegeneration) arktsGlobal.profiler.transformDepStarted()
+    }
+    onProgramTransformEnd(options: CompilationOptions, program: Program) {
+        if (!options.isProgramForCodegeneration) arktsGlobal.profiler.transformDepEnded(this.state, this.pluginName)
+        if (this.dumpAst) {
+            console.log(`AFTER ${this.pluginName}:`)
+            dumpProgramSrcFormatted(program, true)
+        }
+    }
+}
+
+
 export function runTransformerOnProgram(program: Program, options: CompilationOptions, transform: ProgramTransformer | undefined, pluginContext: PluginContext, hooks: RunTransformerHooks = {}) {
     // Perform some additional actions before the transformation start
-    hooks.onProgramTransformStart?.(options)
-
-    // AST to be transformed
-    const ast = program.ast
+    hooks.onProgramTransformStart?.(options, program)
 
     // Save currently existing imports in the program
-    const importStorage = new ImportStorage(program, options.stage == Es2pandaContextState.ES2PANDA_STATE_PARSED)
-
-    // Run some common plugins that should be run before plugin usage and depends on the current stage
-    stageSpecificPreFilters(ast, options.stage)
+    const importStorage = new ImportStorage(program, options.state == Es2pandaContextState.ES2PANDA_STATE_PARSED)
 
     // Run the plugin itself
     transform?.(program, options, pluginContext)
 
-    // Run some common plugins that should be run after plugin usage and depends on the current stage
-    stageSpecificPostFilters(ast, options.stage)
+    // Run some common plugins that should be run after plugin usage and depends on the current state
+    stateSpecificPostFilters(program, options.state)
 
     // Update internal import information based on import modification by plugin
     importStorage.update()
 
     // Perform some additional actions after the transformation end
-    hooks.onProgramTransformEnd?.(options)
+    hooks.onProgramTransformEnd?.(options, program)
 }
 
-export function runTransformer(prog: Program, state: Es2pandaContextState, restart: boolean, transform: ProgramTransformer | undefined, pluginContext: PluginContext, hooks: RunTransformerHooks = {}) {
+export function runTransformer(prog: Program, state: Es2pandaContextState, transform: ProgramTransformer | undefined, pluginContext: PluginContext, hooks: RunTransformerHooks = {}) {
     // Program provider used to provide programs to transformer dynamically relative to inserted imports
     const provider = new ProgramProvider(prog)
 
@@ -81,15 +96,13 @@ export function runTransformer(prog: Program, state: Es2pandaContextState, resta
     while (currentProgram) {
         // Options passed to plugin and hooks
         const options: CompilationOptions = {
-            isMainProgram,
-            stage: state,
-            restart,
+            isProgramForCodegeneration: isProgramForCodegeneration(currentProgram, isMainProgram),
+            state,
         }
 
         runTransformerOnProgram(currentProgram, options, transform, pluginContext, hooks)
 
-        // The first program is always the main program, so break here if should not proceed external sources
-        if (restart) break
+        // The first program is always the main program
         isMainProgram = false
 
         // Proceed to the next program
@@ -97,18 +110,18 @@ export function runTransformer(prog: Program, state: Es2pandaContextState, resta
     }
 }
 
-function setAllParents(ast: AstNode) {
-    arktsGlobal.es2panda._AstNodeUpdateAll(arktsGlobal.context, ast.peer)
-}
-
-function stageSpecificPreFilters(script: AstNode, state: Es2pandaContextState) {
+function stateSpecificPostFilters(program: Program, state: Es2pandaContextState) {
     if (state == Es2pandaContextState.ES2PANDA_STATE_CHECKED) {
-        inferVoidReturnType(script)
+        program.setAst(new ChainExpressionFilter().visitor(program.ast))
     }
 }
 
-function stageSpecificPostFilters(script: AstNode, state: Es2pandaContextState) {
-    if (state == Es2pandaContextState.ES2PANDA_STATE_CHECKED) {
-        new ChainExpressionFilter().visitor(script)
+function isProgramForCodegeneration(
+    program: Program,
+    isMainProgram: boolean,
+): boolean {
+    if (!arktsGlobal.isContextGenerateAbcForExternalSourceFiles) {
+        return isMainProgram
     }
+    return program.isGenAbcForExternal
 }

package/build/libarkts-copy/src/reexport-for-generated.ts

@@ -31,4 +31,13 @@ export {
 export { nodeByType } from "./arkts-api/class-by-peer"
 export { global } from "./arkts-api/static/global"
 export { Es2pandaMemberExpressionKind } from "./generated/Es2pandaEnums"
-export { methodDefinitionSetChildrenParentPtr, methodDefinitionOnUpdate } from "./arkts-api/utilities/method-definition"
+export {
+    extension_ETSModuleGetNamespaceFlag,
+    extension_MethodDefinitionOnUpdate,
+    extension_MethodDefinitionSetChildrenParentPtr,
+    extension_ScriptFunctionGetSignaturePointer,
+    extension_ScriptFunctionSetSignaturePointer,
+    extension_ScriptFunctionGetPreferredReturnTypePointer,
+    extension_ScriptFunctionSetPreferredReturnTypePointer,
+    extension_ProgramGetExternalSources,
+} from "./arkts-api/utilities/extensions"

package/build/libarkts-copy/src/ts-api/factory/nodeFactory.ts

@@ -85,7 +85,7 @@ import {
     ImportSpecifier,
 } from "../types"
 
-// TODO: add flags and base
+// Improve: add flags and base
 export function createNodeFactory() {
     return {
         createSourceFile,
@@ -154,7 +154,7 @@ export function createNodeFactory() {
         return new SourceFile(node)
     }
 
-    // TODO: fix (now doesn't create a new node)
+    // Improve: fix (now doesn't create a new node)
     // @api
     // updateSourceFile(
     //     node: SourceFile,
@@ -315,7 +315,7 @@ export function createNodeFactory() {
     ): VariableDeclaration {
         return new VariableDeclaration(
             arkts.factory.createVariableDeclarator(
-                // TODO: maybe incorrect
+                // Improve: maybe incorrect
                 Es2pandaVariableDeclaratorFlag.VARIABLE_DECLARATOR_FLAG_UNKNOWN,
                 passIdentifier(name, type),
                 passNode(initializer)
@@ -341,7 +341,7 @@ export function createNodeFactory() {
         return new VariableDeclaration(
             arkts.factory.updateVariableDeclarator(
                 node.node,
-                // TODO: maybe incorrect
+                // Improve: maybe incorrect
                 Es2pandaVariableDeclaratorFlag.VARIABLE_DECLARATOR_FLAG_UNKNOWN,
                 passIdentifier(name, type),
                 passNode(initializer)
@@ -867,7 +867,7 @@ export function createNodeFactory() {
         )
     }
 
-    // TODO: rewrite maybe
+    // Improve: rewrite maybe
     // @api
     // createToken(
     //     token: SyntaxKind._
@@ -1017,7 +1017,7 @@ export function createNodeFactory() {
                     passNodeArray(members),
                     // passModifiers(modifiers) | es2panda_ModifierFlags.MODIFIER_FLAGS_PUBLIC | es2panda_ModifierFlags.MODIFIER_FLAGS_STATIC,
                     Es2pandaModifierFlags.MODIFIER_FLAGS_NONE,
-                    // TODO: pass through modifiers
+                    // Improve: pass through modifiers
                     Es2pandaClassDefinitionModifiers.CLASS_DEFINITION_MODIFIERS_NONE,
                     passTypeParams(typeParameters),
                     undefined
@@ -1052,7 +1052,7 @@ export function createNodeFactory() {
                     passNodeArray(members),
                     // passModifiers(modifiers) | es2panda_ModifierFlags.MODIFIER_FLAGS_PUBLIC | es2panda_ModifierFlags.MODIFIER_FLAGS_STATIC,
                     Es2pandaModifierFlags.MODIFIER_FLAGS_NONE,
-                    // TODO: pass through modifiers
+                    // Improve: pass through modifiers
                     Es2pandaClassDefinitionModifiers.CLASS_DEFINITION_MODIFIERS_NONE,
                     passTypeParams(typeParameters)
                 )
@@ -1109,7 +1109,7 @@ export function createNodeFactory() {
         )
     }
 
-    // TODO: fix modifiers
+    // Improve: fix modifiers
     // @api
     // createMethodDeclaration(
     //     modifiers: readonly ModifierLike[] | undefined,
@@ -1186,7 +1186,7 @@ export function createNodeFactory() {
                 Es2pandaMethodDefinitionKind.METHOD_DEFINITION_KIND_METHOD,
                 _name,
                 arkts.factory.createFunctionExpression(
-                    // TODO: maybe fix
+                    // Improve: maybe fix
                     arkts.factory.updateScriptFunction(
                         node.node.scriptFunction,
                         passNode(body),
@@ -1231,7 +1231,7 @@ export function createNodeFactory() {
                         arkts.FunctionSignature.create(
                             undefined,
                             passNodeArray(parameters),
-                            // TODO: change to void maybe
+                            // Improve: change to void maybe
                             undefined
                         ),
                         passModifiersToScriptFunction(modifiers) | Es2pandaScriptFunctionFlags.SCRIPT_FUNCTION_FLAGS_CONSTRUCTOR,
@@ -1269,14 +1269,14 @@ export function createNodeFactory() {
                 Es2pandaMethodDefinitionKind.METHOD_DEFINITION_KIND_CONSTRUCTOR,
                 _name,
                 arkts.factory.createFunctionExpression(
-                    // TODO: maybe fix
+                    // Improve: maybe fix
                     arkts.factory.updateScriptFunction(
                         node.node.scriptFunction,
                         passNode(body),
                         arkts.FunctionSignature.create(
                             undefined,
                             passNodeArray(parameters),
-                            // TODO: change to void maybe
+                            // Improve: change to void maybe
                             undefined
                         ),
                         passModifiersToScriptFunction(modifiers) | Es2pandaScriptFunctionFlags.SCRIPT_FUNCTION_FLAGS_CONSTRUCTOR,
@@ -1324,7 +1324,7 @@ export function createNodeFactory() {
         expression: Expression
     ): ParenthesizedExpression {
         return expression
-        // TODO:
+        // Improve:
         // return new ParenthesizedExpression(
         //     expression
         // )
@@ -1340,7 +1340,7 @@ export function createNodeFactory() {
         expression: Expression
     ): ParenthesizedExpression {
         return expression
-        // TODO:
+        // Improve:
         // return new ParenthesizedExpression(
         //     expression
         // )

package/build/libarkts-copy/src/ts-api/index.ts

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-// TODO: remove private export
+// Improve: remove private export
 export * from "./utilities/private"
 export * from "./utilities/public"
 export * from "./types"

package/build/libarkts-copy/src/ts-api/types.ts

@@ -19,7 +19,7 @@ import * as arkts from "../arkts-api"
 import { throwError } from "../utils"
 import {
     passModifiers,
-    todo,
+    emptyImplementation,
     unpackModifiers,
     unpackNode,
     unpackNodeArray,
@@ -27,13 +27,13 @@ import {
 } from "./utilities/private"
 import { SyntaxKind } from "./static/enums"
 
-// TODO: write implementation
+// Improve: write implementation
 export interface TransformationContext {}
 
-// TODO: write implementation
+// Improve: write implementation
 export interface Program {}
 
-// TODO: remove U type param
+// Improve: remove U type param
 export type NodeArray<T extends Node<U>, U extends arkts.AstNode | undefined = arkts.AstNode | undefined> = ts.NodeArray<T>
 
 export abstract class Node<T extends arkts.AstNode | undefined = arkts.AstNode | undefined> implements ts.Node {
@@ -43,7 +43,7 @@ export abstract class Node<T extends arkts.AstNode | undefined = arkts.AstNode |
 
     readonly node: T
 
-    // TODO: remove any
+    // Improve: remove any
     get parent(): any {
         if (this.node === undefined) {
             throwError('trying to get parent of undefined _node')
@@ -74,7 +74,7 @@ export abstract class Node<T extends arkts.AstNode | undefined = arkts.AstNode |
 
     abstract kind: SyntaxKind
 
-    // TODO:
+    // Improve:
     forEachChild<T>(cbNode: (node: ts.Node) => T | undefined, cbNodeArray?: ((nodes: ts.NodeArray<ts.Node>) => T | undefined) | undefined): T | undefined { throw new Error("Method not implemented.") }
     getSourceFile(): ts.SourceFile { throw new Error("Method not implemented.") }
     getChildCount(sourceFile?: ts.SourceFile | undefined): number { throw new Error("Method not implemented.") }
@@ -92,13 +92,13 @@ export abstract class Node<T extends arkts.AstNode | undefined = arkts.AstNode |
     getFirstToken(sourceFile?: ts.SourceFile | undefined): ts.Node | undefined { throw new Error("Method not implemented.") }
     getLastToken(sourceFile?: ts.SourceFile | undefined): ts.Node | undefined { throw new Error("Method not implemented.") }
 
-    get symbol(): ts.Symbol { return todo() }
-    get flags(): ts.NodeFlags { return todo() }
-    get pos(): number { return todo() }
-    get end(): number { return todo() }
+    get symbol(): ts.Symbol { return emptyImplementation() }
+    get flags(): ts.NodeFlags { return emptyImplementation() }
+    get pos(): number { return emptyImplementation() }
+    get end(): number { return emptyImplementation() }
 }
 
-// TODO: add all tokens
+// Improve: add all tokens
 export type BinaryOperator =
     | ts.SyntaxKind.PlusToken
     | ts.SyntaxKind.MinusToken
@@ -107,7 +107,7 @@ export type BinaryOperator =
 
 export type BinaryOperatorToken = Token<BinaryOperator>;
 
-// TODO: rethink maybe (temporary solution)
+// Improve: rethink maybe (temporary solution)
 export class Token<TKind extends ts.TokenSyntaxKind> extends Node<undefined> {
     constructor(kind: TKind) {
         super(undefined)
@@ -149,7 +149,7 @@ export class Modifier extends Node<undefined> {
 }
 
 export abstract class Expression extends Node<arkts.AstNode> implements ts.Expression {
-    // TODO: support minimal interface
+    // Improve: support minimal interface
     _expressionBrand: any
 }
 
@@ -212,8 +212,8 @@ export class Identifier extends Node<arkts.Identifier> implements ts.Identifier,
     readonly text: string
     readonly kind: ts.SyntaxKind.Identifier = ts.SyntaxKind.Identifier
 
-    // TODO:
-    get escapedText(): ts.__String { return todo() }
+    // Improve:
+    get escapedText(): ts.__String { return emptyImplementation() }
 
     // brands
     _primaryExpressionBrand: any
@@ -237,8 +237,8 @@ export class PrivateIdentifier extends Node<arkts.Identifier> implements ts.Priv
     readonly text: string
     readonly kind: ts.SyntaxKind.PrivateIdentifier = ts.SyntaxKind.PrivateIdentifier
 
-    // TODO:
-    get escapedText(): ts.__String { return todo() }
+    // Improve:
+    get escapedText(): ts.__String { return emptyImplementation() }
 
     // brands
     _primaryExpressionBrand: any
@@ -278,23 +278,23 @@ export class SourceFile extends Node<arkts.EtsScript> implements ts.SourceFile {
     readonly statements: NodeArray<Statement>
     readonly kind: ts.SyntaxKind.SourceFile = ts.SyntaxKind.SourceFile
 
-    // TODO:
+    // Improve:
     getLineAndCharacterOfPosition(pos: number): ts.LineAndCharacter { throw new Error("Method not implemented.") }
     getLineEndOfPosition(pos: number): number { throw new Error("Method not implemented.") }
     getLineStarts(): readonly number[] { throw new Error("Method not implemented.") }
     getPositionOfLineAndCharacter(line: number, character: number): number { throw new Error("Method not implemented.") }
     update(newText: string, textChangeRange: ts.TextChangeRange): ts.SourceFile { throw new Error("Method not implemented.") }
-    get endOfFileToken(): ts.Token<ts.SyntaxKind.EndOfFileToken> { return todo() }
-    get fileName(): string { return todo() }
-    get text() { return todo() }
-    get amdDependencies(): readonly ts.AmdDependency[] { return todo() }
-    get referencedFiles(): readonly ts.FileReference[] { return todo() }
-    get typeReferenceDirectives(): readonly ts.FileReference[] { return todo() }
-    get libReferenceDirectives(): readonly ts.FileReference[] { return todo() }
-    get languageVariant(): ts.LanguageVariant { return todo() }
-    get isDeclarationFile(): boolean { return todo() }
-    get hasNoDefaultLib(): boolean { return todo() }
-    get languageVersion(): ts.ScriptTarget { return todo() }
+    get endOfFileToken(): ts.Token<ts.SyntaxKind.EndOfFileToken> { return emptyImplementation() }
+    get fileName(): string { return emptyImplementation() }
+    get text() { return emptyImplementation() }
+    get amdDependencies(): readonly ts.AmdDependency[] { return emptyImplementation() }
+    get referencedFiles(): readonly ts.FileReference[] { return emptyImplementation() }
+    get typeReferenceDirectives(): readonly ts.FileReference[] { return emptyImplementation() }
+    get libReferenceDirectives(): readonly ts.FileReference[] { return emptyImplementation() }
+    get languageVariant(): ts.LanguageVariant { return emptyImplementation() }
+    get isDeclarationFile(): boolean { return emptyImplementation() }
+    get hasNoDefaultLib(): boolean { return emptyImplementation() }
+    get languageVersion(): ts.ScriptTarget { return emptyImplementation() }
 
     // brands
     _declarationBrand: any
@@ -407,11 +407,11 @@ export abstract class ClassElement extends Node<arkts.AstNode> implements ts.Cla
 
 export type MemberName = Identifier | PrivateIdentifier;
 
-// TODO: support
+// Improve: support
 // export type PropertyName = Identifier | StringLiteral | NumericLiteral | ts.ComputedPropertyName | PrivateIdentifier;
 export type PropertyName = Identifier | StringLiteral | NumericLiteral | PrivateIdentifier;
 
-// TODO: support
+// Improve: support
 export type DeclarationName =
     | PropertyName
     // | JsxAttributeName
@@ -440,7 +440,7 @@ export interface FunctionLikeDeclarationBase extends SignatureDeclarationBase {
     _functionLikeDeclarationBrand: any;
 }
 
-// TODO: support
+// Improve: support
 // export type FunctionLikeDeclaration = FunctionDeclaration | MethodDeclaration | ts.GetAccessorDeclaration | ts.SetAccessorDeclaration | ConstructorDeclaration | FunctionExpression | ArrowFunction;
 export type FunctionLikeDeclaration = FunctionDeclaration | MethodDeclaration | ConstructorDeclaration | FunctionExpression | ArrowFunction;
 
@@ -453,7 +453,7 @@ export class MethodSignature extends Node<arkts.AstNode> implements ts.MethodSig
     // readonly parameters: NodeArray<ParameterDeclaration>
     readonly kind: ts.SyntaxKind.MethodSignature = ts.SyntaxKind.MethodSignature
 
-    // TODO:
+    // Improve:
     name: any
     parameters: any
 
@@ -508,7 +508,7 @@ export class ConstructorDeclaration extends Node<arkts.MethodDefinition> impleme
     _declarationBrand: any
 }
 
-// TODO: specify arkts.AstNode type
+// Improve: specify arkts.AstNode type
 export class PropertySignature extends Node<arkts.AstNode> implements ts.TypeElement {
     constructor(node: arkts.AstNode) {
         super(node)
@@ -522,7 +522,7 @@ export class PropertySignature extends Node<arkts.AstNode> implements ts.TypeEle
     _declarationBrand: any
 }
 
-// TODO: specify arkts.AstNode type
+// Improve: specify arkts.AstNode type
 export class PropertyDeclaration extends Node<arkts.AstNode> implements ts.PropertyDeclaration, ClassElement {
     constructor(node: arkts.AstNode) {
         super(node)
@@ -530,7 +530,7 @@ export class PropertyDeclaration extends Node<arkts.AstNode> implements ts.Prope
 
     readonly kind: ts.SyntaxKind.PropertyDeclaration = ts.SyntaxKind.PropertyDeclaration
 
-    // TODO:
+    // Improve:
     name: any
 
     // brands
@@ -538,7 +538,7 @@ export class PropertyDeclaration extends Node<arkts.AstNode> implements ts.Prope
     _declarationBrand: any
 }
 
-// TODO: specify arkts.AstNode type
+// Improve: specify arkts.AstNode type
 export class GetAccessorDeclaration extends Node<arkts.AstNode> implements ts.GetAccessorDeclaration, FunctionLikeDeclarationBase, ClassElement {
     constructor(node: arkts.AstNode) {
         super(node)
@@ -548,7 +548,7 @@ export class GetAccessorDeclaration extends Node<arkts.AstNode> implements ts.Ge
     // readonly parameters: NodeArray<ParameterDeclaration>
     readonly kind: ts.SyntaxKind.GetAccessor = ts.SyntaxKind.GetAccessor
 
-    // TODO:
+    // Improve:
     name: any
     parameters: any
 
@@ -560,7 +560,7 @@ export class GetAccessorDeclaration extends Node<arkts.AstNode> implements ts.Ge
     _objectLiteralBrand: any
 }
 
-// TODO: specify arkts.AstNode type
+// Improve: specify arkts.AstNode type
 export class SetAccessorDeclaration extends Node<arkts.AstNode> implements ts.SetAccessorDeclaration, FunctionLikeDeclarationBase, ClassElement {
     constructor(node: arkts.AstNode) {
         super(node)
@@ -570,7 +570,7 @@ export class SetAccessorDeclaration extends Node<arkts.AstNode> implements ts.Se
     // readonly parameters: NodeArray<ParameterDeclaration>
     readonly kind: ts.SyntaxKind.SetAccessor = ts.SyntaxKind.SetAccessor
 
-    // TODO:
+    // Improve:
     name: any
     parameters: any
 
@@ -589,7 +589,7 @@ export class ParameterDeclaration extends Node<arkts.ETSParameterExpression> imp
 
     readonly kind: ts.SyntaxKind.Parameter = ts.SyntaxKind.Parameter
 
-    // TODO:
+    // Improve:
     name: any
 
     // brands
@@ -671,7 +671,7 @@ export class TypeReferenceNode extends Node<arkts.AstNode> implements ts.TypeRef
 
     readonly kind: ts.SyntaxKind.TypeReference = ts.SyntaxKind.TypeReference
 
-    // TODO:
+    // Improve:
     typeName: any
 
     // brands
@@ -686,7 +686,7 @@ export class FunctionTypeNode extends Node<arkts.AstNode> implements ts.Function
     readonly name?: DeclarationName
     readonly kind: ts.SyntaxKind.FunctionType = ts.SyntaxKind.FunctionType
 
-    // TODO: support minimal interface
+    // Improve: support minimal interface
     parameters: any
     type: any
 
@@ -728,7 +728,7 @@ export class IfStatement extends Node<arkts.IfStatement> implements ts.IfStateme
 
     readonly kind: ts.SyntaxKind.IfStatement = ts.SyntaxKind.IfStatement
 
-    // TODO:
+    // Improve:
     thenStatement: any
     expression: any
 
@@ -743,7 +743,7 @@ export class BinaryExpression extends Node<arkts.BinaryExpression> implements ts
 
     readonly kind: ts.SyntaxKind.BinaryExpression = ts.SyntaxKind.BinaryExpression
 
-    // TODO:
+    // Improve:
     left: any
     right: any
     operatorToken: any
@@ -760,7 +760,7 @@ export class AssignmentExpression extends Node<arkts.AssignmentExpression> imple
 
     readonly kind: ts.SyntaxKind.BinaryExpression = ts.SyntaxKind.BinaryExpression
 
-    // TODO:
+    // Improve:
     right: any
     left: any
     operatorToken: any
@@ -785,7 +785,7 @@ export class ArrowFunction extends Node<arkts.ArrowFunctionExpression> implement
     readonly parameters: NodeArray<ParameterDeclaration>
     readonly kind: ts.SyntaxKind.ArrowFunction = ts.SyntaxKind.ArrowFunction
 
-    // TODO:
+    // Improve:
     equalsGreaterThanToken: any
 
     // brands
@@ -840,13 +840,13 @@ export class HeritageClause extends Node<arkts.SuperExpression> implements ts.He
     // token: ts.SyntaxKind.ExtendsKeyword | ts.SyntaxKind.ImplementsKeyword
     // types: ts.NodeArray<ts.ExpressionWithTypeArguments>
 
-    // TODO:
+    // Improve:
     token: any
     types: any
 }
 
 
-// TODO: there is no ParenthesizedExpression in ArkTS,
+// Improve: there is no ParenthesizedExpression in ArkTS,
 // so for temporary solution we're just gonna ignore this type of nodes
 // and replace it with Expression underneath
 export type ParenthesizedExpression = Expression
@@ -868,7 +868,7 @@ export type ParenthesizedExpression = Expression
 //     _expressionBrand: any
 // }
 
-// TODO:
+// Improve:
 export class ImportDeclaration extends Node<arkts.UnsupportedNode> implements ts.ImportDeclaration {
     constructor(node: arkts.UnsupportedNode) {
         super(node)
@@ -876,14 +876,14 @@ export class ImportDeclaration extends Node<arkts.UnsupportedNode> implements ts
 
     readonly kind: ts.SyntaxKind.ImportDeclaration = ts.SyntaxKind.ImportDeclaration
 
-    // TODO:
+    // Improve:
     moduleSpecifier: any
 
     // brands
     _statementBrand: any
 }
 
-// TODO:
+// Improve:
 export class ImportClause extends Node<arkts.UnsupportedNode> implements ts.ImportClause {
     constructor(node: arkts.UnsupportedNode) {
         super(node)
@@ -891,14 +891,14 @@ export class ImportClause extends Node<arkts.UnsupportedNode> implements ts.Impo
 
     readonly kind: ts.SyntaxKind.ImportClause = ts.SyntaxKind.ImportClause
 
-    // TODO:
+    // Improve:
     isTypeOnly: any
 
     // brands
     _declarationBrand: any
 }
 
-// TODO:
+// Improve:
 export class NamedImports extends Node<arkts.UnsupportedNode> implements ts.NamedImports {
     constructor(node: arkts.UnsupportedNode) {
         super(node)
@@ -906,7 +906,7 @@ export class NamedImports extends Node<arkts.UnsupportedNode> implements ts.Name
 
     readonly kind: ts.SyntaxKind.NamedImports = ts.SyntaxKind.NamedImports
 
-    // TODO:
+    // Improve:
     elements: any
 }
 
@@ -919,7 +919,7 @@ export class ImportSpecifier extends Node<arkts.Identifier> implements ts.Import
     readonly name: Identifier
     readonly kind: ts.SyntaxKind.ImportSpecifier = ts.SyntaxKind.ImportSpecifier
 
-    // TODO:
+    // Improve:
     isTypeOnly: any
 
     // brands