diff --git a/arkui-plugins/ui-plugins/property-translators/utils.ts b/arkui-plugins/ui-plugins/property-translators/utils.ts
index 4157572a951bab5d7ca637498723fa227168b7b1..e0a5f75db5287a2763569902394f7a017fe581c5 100644
--- a/arkui-plugins/ui-plugins/property-translators/utils.ts
+++ b/arkui-plugins/ui-plugins/property-translators/utils.ts
@@ -290,7 +290,7 @@ export function getValueInAnnotation(node: arkts.ClassProperty, decoratorName: D
 }
 
 export interface ProvideOptions {
-    alias: string;
+    alias: string | undefined;
     allowOverride: boolean;
 }
 
@@ -299,7 +299,7 @@ export function getValueInProvideAnnotation(node: arkts.ClassProperty): ProvideO
     for (let i = 0; i < annotations.length; i++) {
         const anno: arkts.AnnotationUsage = annotations[i];
         if (anno.expr && arkts.isIdentifier(anno.expr) && anno.expr.name === DecoratorNames.PROVIDE) {
-            const alias: string = getValueInObjectAnnotation(anno, DecoratorNames.PROVIDE, 'alias');
+            const alias = getValueInObjectAnnotation(anno, DecoratorNames.PROVIDE, 'alias') as string | undefined;
             const allowOverride: boolean = getValueInObjectAnnotation(anno, DecoratorNames.PROVIDE, 'allowOverride')
                 ? true
                 : false;
@@ -309,7 +309,7 @@ export function getValueInProvideAnnotation(node: arkts.ClassProperty): ProvideO
     return undefined;
 }
 
-function getValueInObjectAnnotation(anno: arkts.AnnotationUsage, decoratorName: DecoratorNames, key: string): any {
+function getValueInObjectAnnotation(anno: arkts.AnnotationUsage, decoratorName: DecoratorNames, key: string): string | boolean | undefined {
     const isSuitableAnnotation: boolean =
         !!anno.expr && arkts.isIdentifier(anno.expr) && anno.expr.name === decoratorName;
     if (!isSuitableAnnotation) {
diff --git a/arkui-plugins/ui-plugins/struct-translators/factory.ts b/arkui-plugins/ui-plugins/struct-translators/factory.ts
index 304c792b63b432d752dfa0416631e1c794e05c00..a9d420d21a75f0bf56fd705fa8e8eddd143de75f 100644
--- a/arkui-plugins/ui-plugins/struct-translators/factory.ts
+++ b/arkui-plugins/ui-plugins/struct-translators/factory.ts
@@ -320,6 +320,9 @@ export class factory {
      * add headers for animation & @AnimatableExtend in CommonMethod
      */
     static modifyExternalComponentCommon(node: arkts.TSInterfaceDeclaration): arkts.TSInterfaceDeclaration {
+        if (!node.body) {
+            return node;
+        }
         const animationStart = factory.createAnimationMethod(AnimationNames.ANIMATION_START);
         const animationStop = factory.createAnimationMethod(AnimationNames.ANIMATION_STOP);
         const createOrSetAniProperty = factory.createOrSetAniProperty();
diff --git a/koala-wrapper/koalaui/interop/src/cpp/crashdump.h b/koala-wrapper/koalaui/interop/src/cpp/crashdump.h
index 7d1bac04091f24210182e07dbba90b5a21e9e7fa..467e57abff23a73e72d8b1b3e564db7d389586b0 100644
--- a/koala-wrapper/koalaui/interop/src/cpp/crashdump.h
+++ b/koala-wrapper/koalaui/interop/src/cpp/crashdump.h
@@ -26,7 +26,9 @@ static void onCrashHandler(int signo) {
     void* stack[20];
     size_t size = backtrace(stack, 20);
     backtrace_symbols_fd(stack, size, STDERR_FILENO);
-    if (oldCrashHandler) oldCrashHandler(signo);
+    if (oldCrashHandler) {
+        oldCrashHandler(signo);
+    }
 }
 
 static void installCrashHandlers() {
diff --git a/koala-wrapper/koalaui/interop/src/cpp/ets/convertors-ets.cc b/koala-wrapper/koalaui/interop/src/cpp/ets/convertors-ets.cc
index 450804338d0de802cb9cb0c532dfa3baaf3faacb..a98e2179fce037173dddef1516d2bca3b2b8f437 100644
--- a/koala-wrapper/koalaui/interop/src/cpp/ets/convertors-ets.cc
+++ b/koala-wrapper/koalaui/interop/src/cpp/ets/convertors-ets.cc
@@ -30,7 +30,7 @@ static bool registerNatives(ets_env *env, const ets_class clazz, const std::vect
     std::vector<EtsNativeMethod> methods;
     methods.reserve(impls.size());
     bool result = true;
-    for (const auto &[name, type, func, flag] : impls) {
+    for (const auto &[name, _, func, flag] : impls) {
         EtsNativeMethod method;
         method.name = name.c_str();
         method.func = func;
diff --git a/koala-wrapper/koalaui/interop/src/cpp/interop-logging.cc b/koala-wrapper/koalaui/interop/src/cpp/interop-logging.cc
index 073878547499ebbd380b71b222a5e9e39b6b8113..4d721f08c218eece1a4510a0d792ccdee77e35ac 100644
--- a/koala-wrapper/koalaui/interop/src/cpp/interop-logging.cc
+++ b/koala-wrapper/koalaui/interop/src/cpp/interop-logging.cc
@@ -30,7 +30,9 @@ void startGroupedLog(int index) {
     if (index >= (int)groupedLogs.size()) {
         groupedLogs.resize(index + 1);
         for (int i = 0; i <= index; i++) {
-            if (!groupedLogs[i]) groupedLogs[i] = new Log();
+            if (!groupedLogs[i]) {
+                groupedLogs[i] = new Log();
+            }
         }
     }
     groupedLogs[index]->isActive = true;
diff --git a/koala-wrapper/native/BUILD.gn b/koala-wrapper/native/BUILD.gn
index f3055944c7e2f3b93da6e0141d921dc8f2b64016..a72d1d7a9afcebe52b52a65fc752996528684a46 100644
--- a/koala-wrapper/native/BUILD.gn
+++ b/koala-wrapper/native/BUILD.gn
@@ -117,7 +117,6 @@ shared_library("es2panda") {
       "-Xclang",
       "-instcombine-lower-dbg-declare=0",
       "-no-canonical-prefixes",
-      "-static",
       "-rtlib=compiler-rt",
       "-stdlib=libc++",
       "-lunwind",
@@ -128,13 +127,6 @@ shared_library("es2panda") {
       "-fno-strict-aliasing",
       "-Wno-builtin-macro-redefined",
       "-fms-extensions",
-      "-static",
-      "-rtlib=compiler-rt",
-      "-stdlib=libc++",
-      "-std=c++17",
-      "-lunwind",
-      "-lpthread",
-      "-Qunused-arguments",
       "-target",
       "x86_64-pc-windows-gnu",
       "-D__CUSTOM_SECURITY_LIBRARY",
diff --git a/koala-wrapper/native/include/common.h b/koala-wrapper/native/include/common.h
index 399d28d2229fe63c5d7a8f730469ef5694ccb3a0..2803e71afb507bb20963e59965e9eadb6e235288 100644
--- a/koala-wrapper/native/include/common.h
+++ b/koala-wrapper/native/include/common.h
@@ -13,8 +13,8 @@
  * limitations under the License.
  */
 
- #ifndef COMMON_H
-#define COMMON_H
+#ifndef COMMON_H_
+#define COMMON_H_
 
 #include "dynamic-loader.h"
 #include "es2panda_lib.h"
@@ -24,16 +24,16 @@
 #include <iostream>
 #include <vector>
 
-using std::string, std::cout, std::endl, std::vector;
+using std::string;
 
 es2panda_Impl *GetImpl();
 
-string getString(KStringPtr ptr);
+string getString(const KStringPtr &ptr);
 
-char* getStringCopy(KStringPtr& ptr);
+char* getStringCopy(const KStringPtr& ptr);
 
 KUInt unpackUInt(const KByte* bytes);
 
 es2panda_ContextState intToState(KInt state);
 
-#endif // COMMON_H
\ No newline at end of file
+#endif // COMMON_H_
\ No newline at end of file
diff --git a/koala-wrapper/native/src/bridges.cc b/koala-wrapper/native/src/bridges.cc
index 3cc1282ac5484d50b0fedce2e75bcdf0bc97e244..0a6ee1100838f11cfa9db4d57fdf99fd60406004 100644
--- a/koala-wrapper/native/src/bridges.cc
+++ b/koala-wrapper/native/src/bridges.cc
@@ -538,6 +538,7 @@ KNativePointer impl_SourceRangeEnd(KNativePointer context, KNativePointer range)
     return result;
 }
 KOALA_INTEROP_2(SourceRangeEnd, KNativePointer, KNativePointer, KNativePointer)
+
 bool impl_ClassPropertyIsDefaultAccessModifierConst(KNativePointer context, KNativePointer receiver)
 {
     const auto _context = reinterpret_cast<es2panda_Context*>(context);
diff --git a/koala-wrapper/native/src/common.cc b/koala-wrapper/native/src/common.cc
index 1f4fee8aa699f7c52e5eb1a6c90ec2e806a575e7..29baa82db80f92c41980e9f36373686a97da7f75 100644
--- a/koala-wrapper/native/src/common.cc
+++ b/koala-wrapper/native/src/common.cc
@@ -31,8 +31,10 @@ static es2panda_Impl *impl = nullptr;
 
     #ifdef __x86_64__
         #define PLUGIN_DIR "linux_host_tools"
-    #else
+    #elif defined(__aarch64__)
         #define PLUGIN_DIR "linux_arm64_host_tools"
+    #else
+        #error "Unsupported architecture!"
     #endif
 
     #define LIB_PREFIX "lib"
@@ -107,11 +109,13 @@ es2panda_ContextState intToState(KInt state)
     return es2panda_ContextState(state);
 }
 
-string getString(KStringPtr ptr) {
+string getString(const KStringPtr& ptr)
+{
     return ptr.data();
 }
 
-char* getStringCopy(KStringPtr& ptr) {
+char* getStringCopy(const KStringPtr& ptr)
+{
     return strdup(ptr.c_str());
 }
 
diff --git a/koala-wrapper/native/src/generated/bridges.cc b/koala-wrapper/native/src/generated/bridges.cc
index 69bac2b1914024241cace0c04e4574e51f6f711f..01b34d85ab7fdc7ec393e8b9d5c21f07411a392d 100644
--- a/koala-wrapper/native/src/generated/bridges.cc
+++ b/koala-wrapper/native/src/generated/bridges.cc
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-#include <common.h>
+#include "common.h"
 
 KNativePointer impl_CreateLabelledStatement(KNativePointer context, KNativePointer ident, KNativePointer body)
 {
diff --git a/koala-wrapper/src/arkts-api/class-by-peer.ts b/koala-wrapper/src/arkts-api/class-by-peer.ts
index a12afcba877e8284d8cf61eec1898067b3089889..4306cff12a48d89144fcc6bff6ca23b33a8c5e09 100644
--- a/koala-wrapper/src/arkts-api/class-by-peer.ts
+++ b/koala-wrapper/src/arkts-api/class-by-peer.ts
@@ -19,7 +19,8 @@ import { global } from './static/global';
 import { KNativePointer, nullptr } from '@koalaui/interop';
 import { AstNode, UnsupportedNode } from './peers/AstNode';
 
-export const nodeByType = new Map<Es2pandaAstNodeType, { new (peer: KNativePointer): AstNode }>([]);
+type AstNodeConstructor = new (peer: KNativePointer) => AstNode;
+export const nodeByType = new Map<Es2pandaAstNodeType, AstNodeConstructor>([]);
 
 const cache = new Map<KNativePointer, AstNode>();
 export function clearNodeCache(): void {
diff --git a/koala-wrapper/src/arkts-api/factory/nodeFactory.ts b/koala-wrapper/src/arkts-api/factory/nodeFactory.ts
index 8450b4bc12f50f5a44daffbada701a64a52d4a03..73fade7ba7196cfb52d622a18d440eb4af8f5e85 100644
--- a/koala-wrapper/src/arkts-api/factory/nodeFactory.ts
+++ b/koala-wrapper/src/arkts-api/factory/nodeFactory.ts
@@ -13,7 +13,6 @@
  * limitations under the License.
  */
 
-import { updateNodeByNode } from '../utilities/private';
 import {
     ArrowFunctionExpression,
     AssignmentExpression,
@@ -32,7 +31,6 @@ import {
     ETSStringLiteralType,
 } from '../types';
 import { MemberExpression } from '../to-be-generated/MemberExpression';
-import { AstNode } from '../peers/AstNode';
 import {
     AnnotationUsage,
     BinaryExpression,
@@ -84,8 +82,6 @@ import {
     SwitchStatement,
     SwitchCaseStatement,
 } from '../../generated';
-import { Es2pandaModifierFlags } from '../../generated/Es2pandaEnums';
-import { classPropertySetOptional, hasModifierFlag } from '../utilities/public';
 import { updateIdentifier } from '../node-utilities/Identifier';
 import { updateCallExpression } from '../node-utilities/CallExpression';
 import { updateExpressionStatement } from '../node-utilities/ExpressionStatement';
diff --git a/koala-wrapper/src/arkts-api/factory/nodeTests.ts b/koala-wrapper/src/arkts-api/factory/nodeTests.ts
index 62c02275a505a51ae282d041066c946d32d22dd1..16b845726f0aeac29fa2ad29c76f272a8a04f7be 100644
--- a/koala-wrapper/src/arkts-api/factory/nodeTests.ts
+++ b/koala-wrapper/src/arkts-api/factory/nodeTests.ts
@@ -24,7 +24,6 @@ import {
     FunctionExpression,
     IfStatement,
     MethodDefinition,
-    // ScriptFunction,
     StructDeclaration,
     VariableDeclaration,
     VariableDeclarator,
@@ -35,15 +34,15 @@ import { MemberExpression } from "../to-be-generated/MemberExpression"
 import { AstNode } from "../peers/AstNode"
 
 export function isCallExpression(node: AstNode): node is CallExpression {
-    return node instanceof CallExpression
+    return node instanceof CallExpression;
 }
 
 export function isMemberExpression(node: AstNode): node is MemberExpression {
-    return node instanceof MemberExpression
+    return node instanceof MemberExpression;
 }
 
 export function isFunctionDeclaration(node: AstNode): node is FunctionDeclaration {
-    return node instanceof FunctionDeclaration
+    return node instanceof FunctionDeclaration;
 }
 
 export function isMethodDefinition(node: AstNode): node is MethodDefinition {
@@ -51,43 +50,39 @@ export function isMethodDefinition(node: AstNode): node is MethodDefinition {
 }
 
 export function isEtsScript(node: AstNode): node is EtsScript {
-    return node instanceof EtsScript
+    return node instanceof EtsScript;
 }
 
 export function isExpressionStatement(node: AstNode): node is ExpressionStatement {
-    return node instanceof ExpressionStatement
+    return node instanceof ExpressionStatement;
 }
 
 export function isArrowFunctionExpression(node: AstNode): node is ArrowFunctionExpression {
-    return node instanceof ArrowFunctionExpression
+    return node instanceof ArrowFunctionExpression;
 }
 
 export function isStructDeclaration(node: AstNode): node is StructDeclaration {
-    return node instanceof StructDeclaration
+    return node instanceof StructDeclaration;
 }
 
 export function isFunctionExpression(node: AstNode): node is FunctionExpression {
-    return node instanceof FunctionExpression
+    return node instanceof FunctionExpression;
 }
 
 export function isEtsParameterExpression(node: AstNode): node is ETSParameterExpression {
-    return node instanceof ETSParameterExpression
+    return node instanceof ETSParameterExpression;
 }
 
 export function isVariableDeclaration(node: AstNode): node is VariableDeclaration {
-    return node instanceof VariableDeclaration
+    return node instanceof VariableDeclaration;
 }
 
-// export function isScriptFunction(node: AstNode): node is ScriptFunction {
-//     return node instanceof ScriptFunction
-// }
-
 export function isIfStatement(node: AstNode): node is IfStatement {
-    return node instanceof IfStatement
+    return node instanceof IfStatement;
 }
 
 export function isVariableDeclarator(node: AstNode): node is VariableDeclarator {
-    return node instanceof VariableDeclarator
+    return node instanceof VariableDeclarator;
 }
 
 export function isAssignmentExpression(node: AstNode): node is AssignmentExpression {
diff --git a/koala-wrapper/src/arkts-api/node-utilities/ClassDefinition.ts b/koala-wrapper/src/arkts-api/node-utilities/ClassDefinition.ts
index 1e9ae0ffb4e7634a52eb5a304e477c238aa786b9..feeac630221456f06585187ee9cef3b4e87e0e9c 100644
--- a/koala-wrapper/src/arkts-api/node-utilities/ClassDefinition.ts
+++ b/koala-wrapper/src/arkts-api/node-utilities/ClassDefinition.ts
@@ -33,7 +33,7 @@ export function updateClassDefinition(
     ident: Identifier | undefined,
     typeParams: TSTypeParameterDeclaration | undefined,
     superTypeParams: TSTypeParameterInstantiation | undefined,
-    _implements: readonly TSClassImplements[],
+    classImplements: readonly TSClassImplements[],
     ctor: MethodDefinition | undefined,
     superClass: Expression | undefined,
     body: readonly AstNode[],
@@ -44,7 +44,7 @@ export function updateClassDefinition(
         isSameNativeObject(ident, original.ident) &&
         isSameNativeObject(typeParams, original.typeParams) &&
         isSameNativeObject(superTypeParams, original.superTypeParams) &&
-        isSameNativeObject(_implements, original.implements) &&
+        isSameNativeObject(classImplements, original.implements) &&
         isSameNativeObject(superClass, original.super) &&
         isSameNativeObject(body, original.body) &&
         isSameNativeObject(modifiers, original.modifiers) &&
@@ -63,7 +63,7 @@ export function updateClassDefinition(
         ident,
         typeParams,
         superTypeParams,
-        _implements,
+        classImplements,
         undefined,
         superClass,
         body,
diff --git a/koala-wrapper/src/arkts-api/peers/AstNode.ts b/koala-wrapper/src/arkts-api/peers/AstNode.ts
index 2a8b90fa6911fb0c75dd3f1c8dd3365a0a48df66..6d49f5da998e17e29a875d811c038959fc96cb90 100644
--- a/koala-wrapper/src/arkts-api/peers/AstNode.ts
+++ b/koala-wrapper/src/arkts-api/peers/AstNode.ts
@@ -19,7 +19,6 @@ import { allFlags, unpackNode, unpackNodeArray, unpackNonNullableNode, unpackStr
 import { throwError } from '../../utils';
 import { Es2pandaModifierFlags } from '../../generated/Es2pandaEnums';
 import { ArktsObject } from './ArktsObject';
-import { Es2pandaAstNodeType } from '../../Es2pandaEnums';
 import { SourcePosition } from './SourcePosition';
 
 export abstract class AstNode extends ArktsObject {
@@ -76,7 +75,7 @@ export abstract class AstNode extends ArktsObject {
 
     public dump(indentation: number = 0): string {
         const children = this.getChildren().map((it) => it.dump(indentation + 1));
-        const msg = `${indentation}_` + ` <mods: ${this.modifiers}>` + this.dumpMessage();
+        const msg = `${indentation}_ <mods: ${this.modifiers}>${this.dumpMessage()}`;
         return '> ' + ' '.repeat(4 * indentation) + msg + '\n' + children.join('');
     }
 
diff --git a/koala-wrapper/src/arkts-api/peers/ImportPathManager.ts b/koala-wrapper/src/arkts-api/peers/ImportPathManager.ts
index eeeecf1dc3efbf2b8bafbc74c554e80429345195..23e4ab7820475d95e77db77be44a723095da54c4 100644
--- a/koala-wrapper/src/arkts-api/peers/ImportPathManager.ts
+++ b/koala-wrapper/src/arkts-api/peers/ImportPathManager.ts
@@ -29,8 +29,4 @@ export class ImportPathManager extends ArktsObject {
             global.es2panda._ETSParserGetImportPathManager(global.context)
         );
     }
-
-    resolvePath(currentModulePath: string, importPath: string): string {
-        return ''; // TODO: no longer support this.
-    }
 }
\ No newline at end of file
diff --git a/koala-wrapper/src/arkts-api/static/global.ts b/koala-wrapper/src/arkts-api/static/global.ts
index 551b6c83f295771f6ce0b57db4204766d55e354e..fe5e598a28b62820255661706fec8087f18078fa 100644
--- a/koala-wrapper/src/arkts-api/static/global.ts
+++ b/koala-wrapper/src/arkts-api/static/global.ts
@@ -67,7 +67,9 @@ export class global {
 
     private static _interop: InteropNativeModule | undefined = undefined
     public static get interop(): InteropNativeModule {
-        if (this._interop === undefined) this._interop = initInterop()
+        if (this._interop === undefined) {
+            this._interop = initInterop()
+        }
         return this._interop
     }
 
diff --git a/koala-wrapper/src/generated/Es2pandaEnums.ts b/koala-wrapper/src/generated/Es2pandaEnums.ts
index 1e5ee0d2c482bbc7844c58134580b5f277e611cc..c69ad468ea67c9df733091e5769d7894063e4ee2 100644
--- a/koala-wrapper/src/generated/Es2pandaEnums.ts
+++ b/koala-wrapper/src/generated/Es2pandaEnums.ts
@@ -24,174 +24,7 @@ export enum Es2pandaContextState {
     ES2PANDA_STATE_BIN_GENERATED = 6,
     ES2PANDA_STATE_ERROR = 7
 }
-// export enum Es2pandaAstNodeType {
-//     AST_NODE_TYPE_ARROW_FUNCTION_EXPRESSION = 0,
-//     AST_NODE_TYPE_ANNOTATION_DECLARATION = 1,
-//     AST_NODE_TYPE_ANNOTATION_USAGE = 2,
-//     AST_NODE_TYPE_ASSERT_STATEMENT = 3,
-//     AST_NODE_TYPE_AWAIT_EXPRESSION = 4,
-//     AST_NODE_TYPE_BIGINT_LITERAL = 5,
-//     AST_NODE_TYPE_BINARY_EXPRESSION = 6,
-//     AST_NODE_TYPE_BLOCK_STATEMENT = 7,
-//     AST_NODE_TYPE_BOOLEAN_LITERAL = 8,
-//     AST_NODE_TYPE_BREAK_STATEMENT = 9,
-//     AST_NODE_TYPE_CALL_EXPRESSION = 10,
-//     AST_NODE_TYPE_CATCH_CLAUSE = 11,
-//     AST_NODE_TYPE_CHAIN_EXPRESSION = 12,
-//     AST_NODE_TYPE_CHAR_LITERAL = 13,
-//     AST_NODE_TYPE_CLASS_DEFINITION = 14,
-//     AST_NODE_TYPE_CLASS_DECLARATION = 15,
-//     AST_NODE_TYPE_CLASS_EXPRESSION = 16,
-//     AST_NODE_TYPE_CLASS_PROPERTY = 17,
-//     AST_NODE_TYPE_CLASS_STATIC_BLOCK = 18,
-//     AST_NODE_TYPE_CONDITIONAL_EXPRESSION = 19,
-//     AST_NODE_TYPE_CONTINUE_STATEMENT = 20,
-//     AST_NODE_TYPE_DEBUGGER_STATEMENT = 21,
-//     AST_NODE_TYPE_DECORATOR = 22,
-//     AST_NODE_TYPE_DIRECT_EVAL = 23,
-//     AST_NODE_TYPE_DO_WHILE_STATEMENT = 24,
-//     AST_NODE_TYPE_EMPTY_STATEMENT = 25,
-//     AST_NODE_TYPE_EXPORT_ALL_DECLARATION = 26,
-//     AST_NODE_TYPE_EXPORT_DEFAULT_DECLARATION = 27,
-//     AST_NODE_TYPE_EXPORT_NAMED_DECLARATION = 28,
-//     AST_NODE_TYPE_EXPORT_SPECIFIER = 29,
-//     AST_NODE_TYPE_EXPRESSION_STATEMENT = 30,
-//     AST_NODE_TYPE_FOR_IN_STATEMENT = 31,
-//     AST_NODE_TYPE_FOR_OF_STATEMENT = 32,
-//     AST_NODE_TYPE_FOR_UPDATE_STATEMENT = 33,
-//     AST_NODE_TYPE_FUNCTION_DECLARATION = 34,
-//     AST_NODE_TYPE_FUNCTION_EXPRESSION = 35,
-//     AST_NODE_TYPE_IDENTIFIER = 36,
-//     AST_NODE_TYPE_DUMMYNODE = 37,
-//     AST_NODE_TYPE_IF_STATEMENT = 38,
-//     AST_NODE_TYPE_IMPORT_DECLARATION = 39,
-//     AST_NODE_TYPE_IMPORT_EXPRESSION = 40,
-//     AST_NODE_TYPE_IMPORT_DEFAULT_SPECIFIER = 41,
-//     AST_NODE_TYPE_IMPORT_NAMESPACE_SPECIFIER = 42,
-//     AST_NODE_TYPE_IMPORT_SPECIFIER = 43,
-//     AST_NODE_TYPE_LABELLED_STATEMENT = 44,
-//     AST_NODE_TYPE_MEMBER_EXPRESSION = 45,
-//     AST_NODE_TYPE_META_PROPERTY_EXPRESSION = 46,
-//     AST_NODE_TYPE_METHOD_DEFINITION = 47,
-//     AST_NODE_TYPE_NAMED_TYPE = 48,
-//     AST_NODE_TYPE_NAMESPACE_DECLARATION = 49,
-//     AST_NODE_TYPE_NAMESPACE_DEFINITION = 50,
-//     AST_NODE_TYPE_NEW_EXPRESSION = 51,
-//     AST_NODE_TYPE_NULL_LITERAL = 52,
-//     AST_NODE_TYPE_UNDEFINED_LITERAL = 53,
-//     AST_NODE_TYPE_NUMBER_LITERAL = 54,
-//     AST_NODE_TYPE_OMITTED_EXPRESSION = 55,
-//     AST_NODE_TYPE_PREFIX_ASSERTION_EXPRESSION = 56,
-//     AST_NODE_TYPE_PROPERTY = 57,
-//     AST_NODE_TYPE_REGEXP_LITERAL = 58,
-//     AST_NODE_TYPE_REEXPORT_STATEMENT = 59,
-//     AST_NODE_TYPE_RETURN_STATEMENT = 60,
-//     AST_NODE_TYPE_SCRIPT_FUNCTION = 61,
-//     AST_NODE_TYPE_SEQUENCE_EXPRESSION = 62,
-//     AST_NODE_TYPE_STRING_LITERAL = 63,
-//     AST_NODE_TYPE_ETS_NULL_TYPE = 64,
-//     AST_NODE_TYPE_ETS_UNDEFINED_TYPE = 65,
-//     AST_NODE_TYPE_ETS_NEVER_TYPE = 66,
-//     AST_NODE_TYPE_ETS_STRING_LITERAL_TYPE = 67,
-//     AST_NODE_TYPE_ETS_FUNCTION_TYPE = 68,
-//     AST_NODE_TYPE_ETS_WILDCARD_TYPE = 69,
-//     AST_NODE_TYPE_ETS_PRIMITIVE_TYPE = 70,
-//     AST_NODE_TYPE_ETS_PACKAGE_DECLARATION = 71,
-//     AST_NODE_TYPE_ETS_CLASS_LITERAL = 72,
-//     AST_NODE_TYPE_ETS_TYPE_REFERENCE = 73,
-//     AST_NODE_TYPE_ETS_TYPE_REFERENCE_PART = 74,
-//     AST_NODE_TYPE_ETS_UNION_TYPE = 75,
-//     AST_NODE_TYPE_ETS_LAUNCH_EXPRESSION = 76,
-//     AST_NODE_TYPE_ETS_NEW_ARRAY_INSTANCE_EXPRESSION = 77,
-//     AST_NODE_TYPE_ETS_NEW_MULTI_DIM_ARRAY_INSTANCE_EXPRESSION = 78,
-//     AST_NODE_TYPE_ETS_NEW_CLASS_INSTANCE_EXPRESSION = 79,
-//     AST_NODE_TYPE_ETS_IMPORT_DECLARATION = 80,
-//     AST_NODE_TYPE_ETS_PARAMETER_EXPRESSION = 81,
-//     AST_NODE_TYPE_ETS_TUPLE = 82,
-//     AST_NODE_TYPE_ETS_SCRIPT = 83,
-//     AST_NODE_TYPE_SUPER_EXPRESSION = 84,
-//     AST_NODE_TYPE_STRUCT_DECLARATION = 85,
-//     AST_NODE_TYPE_SWITCH_CASE_STATEMENT = 86,
-//     AST_NODE_TYPE_SWITCH_STATEMENT = 87,
-//     AST_NODE_TYPE_TS_ENUM_DECLARATION = 88,
-//     AST_NODE_TYPE_TS_ENUM_MEMBER = 89,
-//     AST_NODE_TYPE_TS_EXTERNAL_MODULE_REFERENCE = 90,
-//     AST_NODE_TYPE_TS_NUMBER_KEYWORD = 91,
-//     AST_NODE_TYPE_TS_ANY_KEYWORD = 92,
-//     AST_NODE_TYPE_TS_STRING_KEYWORD = 93,
-//     AST_NODE_TYPE_TS_BOOLEAN_KEYWORD = 94,
-//     AST_NODE_TYPE_TS_VOID_KEYWORD = 95,
-//     AST_NODE_TYPE_TS_UNDEFINED_KEYWORD = 96,
-//     AST_NODE_TYPE_TS_UNKNOWN_KEYWORD = 97,
-//     AST_NODE_TYPE_TS_OBJECT_KEYWORD = 98,
-//     AST_NODE_TYPE_TS_BIGINT_KEYWORD = 99,
-//     AST_NODE_TYPE_TS_NEVER_KEYWORD = 100,
-//     AST_NODE_TYPE_TS_NON_NULL_EXPRESSION = 101,
-//     AST_NODE_TYPE_TS_NULL_KEYWORD = 102,
-//     AST_NODE_TYPE_TS_ARRAY_TYPE = 103,
-//     AST_NODE_TYPE_TS_UNION_TYPE = 104,
-//     AST_NODE_TYPE_TS_TYPE_LITERAL = 105,
-//     AST_NODE_TYPE_TS_PROPERTY_SIGNATURE = 106,
-//     AST_NODE_TYPE_TS_METHOD_SIGNATURE = 107,
-//     AST_NODE_TYPE_TS_SIGNATURE_DECLARATION = 108,
-//     AST_NODE_TYPE_TS_PARENT_TYPE = 109,
-//     AST_NODE_TYPE_TS_LITERAL_TYPE = 110,
-//     AST_NODE_TYPE_TS_INFER_TYPE = 111,
-//     AST_NODE_TYPE_TS_CONDITIONAL_TYPE = 112,
-//     AST_NODE_TYPE_TS_IMPORT_TYPE = 113,
-//     AST_NODE_TYPE_TS_INTERSECTION_TYPE = 114,
-//     AST_NODE_TYPE_TS_MAPPED_TYPE = 115,
-//     AST_NODE_TYPE_TS_MODULE_BLOCK = 116,
-//     AST_NODE_TYPE_TS_THIS_TYPE = 117,
-//     AST_NODE_TYPE_TS_TYPE_OPERATOR = 118,
-//     AST_NODE_TYPE_TS_TYPE_PARAMETER = 119,
-//     AST_NODE_TYPE_TS_TYPE_PARAMETER_DECLARATION = 120,
-//     AST_NODE_TYPE_TS_TYPE_PARAMETER_INSTANTIATION = 121,
-//     AST_NODE_TYPE_TS_TYPE_PREDICATE = 122,
-//     AST_NODE_TYPE_TS_PARAMETER_PROPERTY = 123,
-//     AST_NODE_TYPE_TS_MODULE_DECLARATION = 124,
-//     AST_NODE_TYPE_TS_IMPORT_EQUALS_DECLARATION = 125,
-//     AST_NODE_TYPE_TS_FUNCTION_TYPE = 126,
-//     AST_NODE_TYPE_TS_CONSTRUCTOR_TYPE = 127,
-//     AST_NODE_TYPE_TS_TYPE_ALIAS_DECLARATION = 128,
-//     AST_NODE_TYPE_TS_TYPE_REFERENCE = 129,
-//     AST_NODE_TYPE_TS_QUALIFIED_NAME = 130,
-//     AST_NODE_TYPE_TS_INDEXED_ACCESS_TYPE = 131,
-//     AST_NODE_TYPE_TS_INTERFACE_DECLARATION = 132,
-//     AST_NODE_TYPE_TS_INTERFACE_BODY = 133,
-//     AST_NODE_TYPE_TS_INTERFACE_HERITAGE = 134,
-//     AST_NODE_TYPE_TS_TUPLE_TYPE = 135,
-//     AST_NODE_TYPE_TS_NAMED_TUPLE_MEMBER = 136,
-//     AST_NODE_TYPE_TS_INDEX_SIGNATURE = 137,
-//     AST_NODE_TYPE_TS_TYPE_QUERY = 138,
-//     AST_NODE_TYPE_TS_AS_EXPRESSION = 139,
-//     AST_NODE_TYPE_TS_CLASS_IMPLEMENTS = 140,
-//     AST_NODE_TYPE_TS_TYPE_ASSERTION = 141,
-//     AST_NODE_TYPE_TAGGED_TEMPLATE_EXPRESSION = 142,
-//     AST_NODE_TYPE_TEMPLATE_ELEMENT = 143,
-//     AST_NODE_TYPE_TEMPLATE_LITERAL = 144,
-//     AST_NODE_TYPE_THIS_EXPRESSION = 145,
-//     AST_NODE_TYPE_TYPEOF_EXPRESSION = 146,
-//     AST_NODE_TYPE_THROW_STATEMENT = 147,
-//     AST_NODE_TYPE_TRY_STATEMENT = 148,
-//     AST_NODE_TYPE_UNARY_EXPRESSION = 149,
-//     AST_NODE_TYPE_UPDATE_EXPRESSION = 150,
-//     AST_NODE_TYPE_VARIABLE_DECLARATION = 151,
-//     AST_NODE_TYPE_VARIABLE_DECLARATOR = 152,
-//     AST_NODE_TYPE_WHILE_STATEMENT = 153,
-//     AST_NODE_TYPE_YIELD_EXPRESSION = 154,
-//     AST_NODE_TYPE_OPAQUE_TYPE_NODE = 155,
-//     AST_NODE_TYPE_BLOCK_EXPRESSION = 156,
-//     AST_NODE_TYPE_ERROR_TYPE_NODE = 157,
-//     AST_NODE_TYPE_ARRAY_EXPRESSION = 158,
-//     AST_NODE_TYPE_ARRAY_PATTERN = 159,
-//     AST_NODE_TYPE_ASSIGNMENT_EXPRESSION = 160,
-//     AST_NODE_TYPE_ASSIGNMENT_PATTERN = 161,
-//     AST_NODE_TYPE_OBJECT_EXPRESSION = 162,
-//     AST_NODE_TYPE_OBJECT_PATTERN = 163,
-//     AST_NODE_TYPE_SPREAD_ELEMENT = 164,
-//     AST_NODE_TYPE_REST_ELEMENT = 165
-// }
+
 export enum Es2pandaScopeType {
     SCOPE_TYPE_PARAM = 0,
     SCOPE_TYPE_CATCH_PARAM = 1,
diff --git a/koala-wrapper/src/generated/peers/AnnotatedAstNode.ts b/koala-wrapper/src/generated/peers/AnnotatedAstNode.ts
index f1199de4dbd806158f2e28a5a37e42498d2160a1..13274b55fa6c70832985d56a06a345c62f91f238 100644
--- a/koala-wrapper/src/generated/peers/AnnotatedAstNode.ts
+++ b/koala-wrapper/src/generated/peers/AnnotatedAstNode.ts
@@ -14,19 +14,8 @@
  */
 
 import {
-    global,
-    passNode,
-    passNodeArray,
-    unpackNonNullableNode,
-    unpackNode,
-    unpackNodeArray,
-    assertValidPeer,
     AstNode,
-    Es2pandaAstNodeType,
-    KNativePointer,
-    nodeByType,
-    ArktsObject,
-    unpackString
+    KNativePointer
 } from "../../reexport-for-generated"
 
 export class AnnotatedAstNode extends AstNode {
diff --git a/koala-wrapper/src/generated/peers/AnnotatedExpression.ts b/koala-wrapper/src/generated/peers/AnnotatedExpression.ts
index 2a5924eb9e87c8e69b6ab45a59b686f48f808a28..66718209b1cb434d9a8aed52541fd93c1a6d1ece 100644
--- a/koala-wrapper/src/generated/peers/AnnotatedExpression.ts
+++ b/koala-wrapper/src/generated/peers/AnnotatedExpression.ts
@@ -16,17 +16,9 @@
 import {
     global,
     passNode,
-    passNodeArray,
-    unpackNonNullableNode,
     unpackNode,
-    unpackNodeArray,
-    assertValidPeer,
     AstNode,
-    Es2pandaAstNodeType,
-    KNativePointer,
-    nodeByType,
-    ArktsObject,
-    unpackString
+    KNativePointer
 } from "../../reexport-for-generated"
 
 import { Expression } from "./Expression"