@idlizer/arktscgen 2.1.5 → 2.1.9-arktscgen-4

package/build/libarkts-copy/package.json

@@ -1,63 +1,83 @@
 {
-  "name": "@koalaui/libarkts",
-  "version": "1.5.15+devel",
-  "bin": "./lib/es2panda",
-  "types": "./build/index.d.ts",
-  "exports": {
-    ".": "./lib/libarkts.js",
-    "./plugins/*": "./lib/plugins/*.js"
-  },
-  "files": [
-    "./lib/**/*",
-    "./build/**/*",
-    "./plugins/build/src/**/*"
-  ],
-  "config": {
-    "gen_version": "3.8.0",
-    "panda_sdk_path": "../../incremental/tools/panda/node_modules/@panda/sdk"
-  },
-  "dependencies": {
-    "@koalaui/ets-tsc": "4.9.5-r5",
-    "@koalaui/build-common": "1.5.15+devel",
-    "@koalaui/compat": "1.5.15+devel",
-    "@koalaui/common": "1.5.15+devel",
-    "@koalaui/interop": "1.5.15+devel",
-    "node-addon-api": "8.0.0",
-    "node-api-headers": "0.0.5",
-    "commander": "10.0.1"
-  },
-  "devDependencies": {
-    "rollup": "^4.13.0",
-    "@rollup/plugin-commonjs": "^26.0.1",
-    "@rollup/plugin-node-resolve": "^15.3.0",
-    "@rollup/plugin-terser": "^0.4.4",
-    "@rollup/plugin-typescript": "^11.1.6"
-  },
-  "scripts": {
-    "clean": "rimraf build native/build* ./.rollup.cache tsconfig.tsbuildinfo lib",
-    "clean:plugins": "rimraf plugins/build",
-    "compile:koala:interop": "npm run --prefix ../../interop compile",
-    "compile:meson": "cd native && meson setup build && meson compile -C build",
-    "copy:.node": "mkdir -p ./build/native/build && cp ./native/build/es2panda.node ./build/native/build",
-    "compile:native": "npm run compile:koala:interop && npm run compile:meson && npm run copy:.node",
-    "compile:src": "npx ets-tsc -p ./tsconfig.json",
-    "compile": "npm run compile:native && npm run compile:src && rollup -c rollup.lib.mjs && rollup -c rollup.es2panda.mjs",
-    "compile:plugins": "npx rollup -c ./rollup.printer-plugin.mjs && npx rollup -c ./rollup.no-visitor-plugin.mjs ",
-    "restart": "npx fast-arktsc --config arktsconfig.json --compiler ../../incremental/tools/panda/arkts/ui2abc --link-name ./build/abc/main.abc --file-option --restart-stages && ninja -f build/abc/build.ninja",
-    "direct": "PANDA_SDK_PATH=../../incremental/tools/panda/node_modules/@panda/sdk node . --file ./plugins/input/direct.ets --output ./build/abc/direct.abc --dump-plugin-ast --arktsconfig ./arktsconfig-direct.json && file build/abc/direct.abc",
-    "memo": "PANDA_SDK_PATH=../../incremental/tools/panda/node_modules/@panda/sdk node . --file ./plugins/input/memo.ets --output ./build/abc/memo.abc --dump-plugin-ast --arktsconfig ./arktsconfig-memo.json --restart-stages",
-    "run": "npm run compile && npm run compile:plugins && npm run compile --prefix ../memo-plugin && npm run restart",
-    "run:memo": "npm run compile && npm run compile:plugins && npm run compile --prefix ../memo-plugin && npm run memo",
-    "run:abc": "../../incremental/tools/panda/node_modules/@panda/sdk/linux_host_tools/bin/ark --load-runtimes=ets --boot-panda-files=../../incremental/tools/panda/node_modules/@panda/sdk/ets/etsstdlib.abc ./main.abc main.ETSGLOBAL::main",
-    "mocha": "PANDA_SDK_PATH=../../incremental/tools/panda/node_modules/@panda/sdk TS_NODE_PROJECT=./test/tsconfig.json mocha -r tsconfig-paths/register --reporter-option maxDiffSize=0",
-    "test": "npm run compile:native && npm run mocha",
-    "compile:playground": "cd playground && meson setup build && meson compile -C build",
-    "run:playground": "npm run compile:playground && ./playground/build/playground.out",
-    "panda:sdk:clean": "cd ../../incremental/tools/panda && rimraf node_modules",
-    "panda:sdk:install": "cd ../../incremental/tools/panda && npm run panda:sdk:install",
-    "panda:sdk:reinstall": "npm run panda:sdk:clean && npm run panda:sdk:install",
-    "regenerate:current": "npm run compile -C ../../../arktscgen && node ../../../arktscgen --panda-sdk-path $npm_package_config_panda_sdk_path --output-dir ../ --options-file ./generator/options.json5 --no-initialize --debug",
-    "regenerate": "npx --yes @idlizer/arktscgen@$npm_package_config_gen_version --panda-sdk-path $npm_package_config_panda_sdk_path --output-dir ../ --options-file ./generator/options.json5 --no-initialize",
-    "reinstall:regenerate": "npm run panda:sdk:reinstall && npm run regenerate"
-  }
-}
+    "name": "@koalaui/libarkts",
+    "version": "1.7.5+devel",
+    "bin": "./lib/es2panda",
+    "typesVersions": {
+        "*": {
+            "./compat/*": [
+                "./build/wrapper-compat/index.d.ts"
+            ],
+            "*": [
+                "./build/index.d.ts"
+            ]
+        }
+    },
+    "exports": {
+        ".": "./lib/libarkts.js",
+        "./compat": "./lib/libarkts-compat.js",
+        "./plugins/*": "./lib/plugins/*.js"
+    },
+    "files": [
+        "./lib/**/*",
+        "./build/**/*",
+        "./plugins/build/src/**/*"
+    ],
+    "config": {
+        "gen_version": "2.1.9-arktscgen-3",
+        "panda_sdk_path": "../../incremental/tools/panda/node_modules/@panda/sdk",
+        "ohos_panda_sdk_path": "../build/sdk",
+        "panda_sdk_version": "next"
+    },
+    "dependencies": {
+        "@koalaui/ets-tsc": "4.9.5-r5",
+        "@koalaui/build-common": "1.7.5+devel",
+        "@koalaui/compat": "1.7.5+devel",
+        "@koalaui/common": "1.7.5+devel",
+        "@koalaui/interop": "1.7.5+devel",
+        "node-addon-api": "8.0.0",
+        "node-api-headers": "0.0.5",
+        "commander": "10.0.1"
+    },
+    "devDependencies": {
+        "rollup": "^4.13.0",
+        "@rollup/plugin-commonjs": "^26.0.1",
+        "@rollup/plugin-node-resolve": "^15.3.0",
+        "@rollup/plugin-terser": "^0.4.4",
+        "@rollup/plugin-typescript": "^11.1.6"
+    },
+    "scripts": {
+        "clean": "rimraf build native/build* ./.rollup.cache tsconfig.tsbuildinfo lib",
+        "clean:plugins": "rimraf plugins/build",
+        "compile:koala:interop": "npm run --prefix ../../interop compile",
+        "compile:meson": "cd native && meson setup build && meson compile -C build",
+        "crosscompile:meson": "cd native && CXX=clang++ meson setup -D cross_compile=true build && CXX=clang++ meson compile -C build",
+        "copy:.node": "mkdir -p ./build/native/build && cp ./native/build/es2panda_*.node ./build/native/build",
+        "compile:native": "npm run compile:koala:interop && npm run compile:meson && npm run copy:.node",
+        "crosscompile:native": "npm run compile:koala:interop && npm run crosscompile:meson && npm run copy:.node",
+        "compile:src": "npx ets-tsc -p ./tsconfig.json",
+        "compile": "npm run compile:native && npm run compile:js",
+        "compile:release": "npm run crosscompile:native && npm run compile:js",
+        "compile:js": "npm run compile:src && rollup -c rollup.lib.mjs && rollup -c rollup.es2panda.mjs",
+        "compile:gn": "npm run compile:koala:interop && npm run compile:js",
+        "compile:plugins": "npx rollup -c ./rollup.printer-plugin.mjs && npx rollup -c ./rollup.no-visitor-plugin.mjs ",
+        "restart": "node ../fast-arktsc --config arktsconfig.json --compiler ../../incremental/tools/panda/arkts/ui2abc --link-name ./build/abc/main.abc --restart-stages && ninja -f build/abc/build.ninja",
+        "direct": "node ../fast-arktsc --config arktsconfig.json --compiler ../../incremental/tools/panda/arkts/ui2abc --link-name ./build/abc/main.abc && ninja -f build/abc/build.ninja",
+        "run": "npm run compile && npm run compile:plugins && npm run direct",
+        "run:memo": "npm run compile && npm run compile:plugins && npm run compile --prefix ../memo-plugin && npm run memo",
+        "run:abc": "$npm_package_config_panda_sdk_path/linux_host_tools/bin/ark --load-runtimes=ets --boot-panda-files=$npm_package_config_panda_sdk_path/ets/etsstdlib.abc ./main.abc main.ETSGLOBAL::main",
+        "mocha": "PANDA_SDK_PATH=${PANDA_SDK_PATH:=$npm_package_config_panda_sdk_path} TS_NODE_PROJECT=./test/tsconfig.json mocha -r tsconfig-paths/register --reporter-option maxDiffSize=0",
+        "mocha:ohos": "PANDA_SDK_PATH=${PANDA_SDK_PATH:=$npm_package_config_ohos_panda_sdk_path} TS_NODE_PROJECT=./test/tsconfig.json mocha -r tsconfig-paths/register --reporter-option maxDiffSize=0",
+        "test:light": "npm run mocha",
+        "test": "npm run compile:native && npm run test:light",
+        "test:golden": "npm run compile:native && TEST_GOLDEN=1 npm run test:light",
+        "compile:playground": "cd playground && meson setup build && meson compile -C build",
+        "run:playground": "npm run compile:playground && ./playground/build/playground.out",
+        "panda:sdk:clean": "cd ../../incremental/tools/panda && rimraf node_modules",
+        "panda:sdk:install": "cd ../../incremental/tools/panda && echo \"Installing panda sdk $npm_package_config_panda_sdk_version\" && PANDA_SDK_VERSION=$npm_package_config_panda_sdk_version npm run panda:sdk:install",
+        "panda:sdk:reinstall": "npm run panda:sdk:clean && npm run panda:sdk:install",
+        "regenerate:current": "npm run compile -C ../../../arktscgen && node ../../../arktscgen --panda-sdk-path $npm_package_config_panda_sdk_path --output-dir ../ --options-file ./generator/options.json5 --no-initialize --debug",
+        "regenerate": "npx --yes @idlizer/arktscgen@$npm_package_config_gen_version --panda-sdk-path $npm_package_config_panda_sdk_path --output-dir ../ --options-file ./generator/options.json5 --no-initialize",
+        "regenerate:ohos": "npx --yes @idlizer/arktscgen@$npm_package_config_gen_version --panda-sdk-path ${PANDA_SDK_PATH:=$npm_package_config_ohos_panda_sdk_path} --output-dir ../ --options-file ./generator/options.json5 --no-initialize",
+        "reinstall:regenerate": "npm run panda:sdk:reinstall && npm run regenerate"
+    }
+}

package/build/libarkts-copy/src/Es2pandaNativeModule.ts

@@ -22,10 +22,12 @@ import {
     loadNativeModuleLibrary,
     KDouble,
     KUInt,
+    KStringArrayPtr,
 } from "@koalaui/interop"
 import { Es2pandaNativeModule as GeneratedEs2pandaNativeModule, KNativePointerArray } from "./generated/Es2pandaNativeModule"
 import * as path from "path"
 import * as fs from "fs"
+import { Es2pandaPluginDiagnosticType } from "./generated/Es2pandaEnums"
 
 // TODO: this type should be in interop
 export type KPtrArray = BigUint64Array
@@ -61,6 +63,24 @@ export class Es2pandaNativeModule {
     _CreateContextFromString(config: KPtr, source: String, filename: String): KPtr {
         throw new Error("Not implemented")
     }
+    _CreateContextFromFile(config: KPtr, filename: String): KPtr {
+        throw new Error("Not implemented")
+    }
+    _CreateCacheContextFromFile(config: KNativePointer, sourceFileName: String, globalContext: KNativePointer, isExternal: KBoolean): KNativePointer {
+        throw new Error("Not implemented");
+    }
+    _InsertGlobalStructInfo(context: KNativePointer, str: String): void {
+        throw new Error("Not implemented");
+    }
+    _HasGlobalStructInfo(context: KNativePointer, str: String): KBoolean {
+        throw new Error("Not implemented");
+    }
+    _CreateGlobalContext(config: KNativePointer, externalFileList: KStringArrayPtr, fileNum: KUInt, lspUsage: KBoolean): KNativePointer {
+        throw new Error("Not implemented");
+    }
+    _DestroyGlobalContext(context: KNativePointer): void {
+        throw new Error("Not implemented");
+    }
     _DestroyContext(context: KPtr): void {
         throw new Error("Not implemented")
     }
@@ -97,9 +117,15 @@ export class Es2pandaNativeModule {
     _DeclarationFromIdentifier(context: KPtr, identifier: KPtr): KPtr {
         throw new Error("Not implemented")
     }
+    _ProgramSourceFilePath(context: KNativePointer, instance: KNativePointer): KNativePointer {
+        throw new Error("Not implemented");
+    }
     _ProgramExternalSources(context: KNativePointer, instance: KNativePointer): KNativePointer {
         throw new Error("Not implemented");
     }
+    _ProgramDirectExternalSources(context: KNativePointer, instance: KNativePointer): KNativePointer {
+        throw new Error("Not implemented")
+    }
     _ExternalSourceName(instance: KNativePointer): KNativePointer {
         throw new Error("Not implemented");
     }
@@ -127,12 +153,79 @@ export class Es2pandaNativeModule {
     _SourcePositionLine(context: KNativePointer, instance: KNativePointer): KInt {
         throw new Error("Not implemented");
     }
+    _ConfigGetOptions(config: KNativePointer): KNativePointer {
+        throw new Error("Not implemented");
+    }
+    _OptionsArkTsConfig(context: KNativePointer, options: KNativePointer): KNativePointer {
+        throw new Error("Not implemented");
+    }
+
+    // From koala-wrapper
+    _ClassVariableDeclaration(context: KNativePointer, classInstance: KNativePointer): KNativePointer {
+        throw new Error("Not implemented")
+    }
+    _IsMethodDefinition(node: KPtr): KBoolean {
+        throw new Error("Not implemented")
+    }
+    _SourceRangeStart(context: KNativePointer, range: KNativePointer): KNativePointer {
+        throw new Error("Not implemented")
+    }
+    _SourceRangeEnd(context: KNativePointer, range: KNativePointer): KNativePointer {
+        throw new Error("Not implemented")
+    }
+    _CreateSourceRange(context: KNativePointer, start: KNativePointer, end: KNativePointer): KNativePointer {
+        throw new Error("Not implemented")
+    }
+    _IsArrayExpression(node: KPtr): KBoolean {
+        throw new Error("Not implemented")
+    }
+    _ETSParserGetGlobalProgramAbsName(context: KNativePointer): KNativePointer {
+        throw new Error("Not implemented")
+    }
+    _CreateDiagnosticKind(context: KNativePointer, message: string, type: Es2pandaPluginDiagnosticType): KNativePointer {
+        throw new Error("Not implemented")
+    }
+    _CreateDiagnosticInfo(context: KNativePointer, kind: KNativePointer, args: string[], argc: number): KNativePointer {
+        throw new Error("Not implemented")
+    }
+    _CreateSuggestionInfo(context: KNativePointer, kind: KNativePointer, args: string[],
+        argc: number, substitutionCode: string): KNativePointer {
+        throw new Error("Not implemented")
+    }
+    _LogDiagnostic(context: KNativePointer, kind: KNativePointer, argv: string[], argc: number, pos: KNativePointer): void {
+        throw new Error("Not implemented")
+    }
+    _LogDiagnosticWithSuggestion(context: KNativePointer, diagnosticInfo: KNativePointer,
+        suggestionInfo?: KNativePointer, range?: KNativePointer): void {
+        throw new Error("Not implemented")
+    }
+    _SetUpSoPath(soPath: string): void {
+        throw new Error("Not implemented")
+    }
+    _MemInitialize(): void {
+        throw new Error("Not implemented")
+    }
+    _MemFinalize(): void {
+        throw new Error("Not implemented")
+    }
+    _ProgramCanSkipPhases(context: KNativePointer, program: KNativePointer): boolean {
+        throw new Error("Not implemented")
+    }
+    _GenerateTsDeclarationsFromContext(config: KPtr, outputDeclEts: String, outputEts: String, exportAll: KBoolean, isolated: KBoolean): KPtr {
+        throw new Error("Not implemented")
+    }
+    _GenerateStaticDeclarationsFromContext(config: KPtr, outputPath: String): KPtr {
+        throw new Error("Not implemented")
+    }
+    _AstNodeProgram(context: KNativePointer, instance: KNativePointer): KNativePointer {
+        throw new Error("Not implemented")
+    }
 }
 
 export function findNativeModule(): string {
     const candidates = [
-        path.resolve(__dirname, "../native/build/es2panda.node"),
-        path.resolve(__dirname, "../build/native/build/es2panda.node"),
+        path.resolve(__dirname, "../native/build"),
+        path.resolve(__dirname, "../build/native/build"),
     ]
     let result = undefined
     candidates.forEach(path => {
@@ -141,7 +234,8 @@ export function findNativeModule(): string {
             return
         }
     })
-    if (result) return result
+    if (result)
+        return path.join(result, "es2panda")
     throw new Error("Cannot find native module")
 }
 

package/build/libarkts-copy/src/InteropNativeModule.ts

@@ -19,7 +19,6 @@ import {
     registerNativeModuleLibraryName,
     loadNativeModuleLibrary
 } from "@koalaui/interop"
-import * as path from "path"
 import { findNativeModule } from "./Es2pandaNativeModule"
 
 export class InteropNativeModule {
@@ -32,6 +31,9 @@ export class InteropNativeModule {
     _GetStringFinalizer(): KPtr {
         throw new Error("Not implemented")
     }
+    _RawUtf8ToString(ptr: KPtr): string  {
+        throw new Error("Not implemented")
+    }
     _InvokeFinalizer(ptr: KPtr, finalizer: KPtr): void {
         throw new Error("Not implemented")
     }

package/build/libarkts-copy/src/arkts-api/AbstractVisitor.ts

@@ -14,8 +14,8 @@
  */
 
 import { AstNode } from "./peers/AstNode"
-import { Program } from "./peers/Program"
 import { visitEachChild } from "./visitor"
+import { Program } from "../generated"
 
 export interface VisitorOptions {
     program?: Program

package/build/libarkts-copy/src/arkts-api/ChainExpressionFilter.ts

@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2022-2025 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { ChainExpression, Expression, isChainExpression, isMemberExpression, MemberExpression } from "src/generated";
+import { AbstractVisitor } from "./AbstractVisitor";
+import { AstNode } from "./peers/AstNode"
+import { factory } from "./factory/nodeFactory";
+import { Es2pandaTokenType, Es2pandaVariableDeclarationKind, Es2pandaVariableDeclaratorFlag } from "src/generated/Es2pandaEnums";
+
+
+export class ChainExpressionFilter extends AbstractVisitor {
+    static counter = 0
+    transformChainExpression(node: ChainExpression): Expression {
+        const expression = node.expression
+        if (expression == undefined) return node
+        if (!isMemberExpression(expression)) return node
+        return this.transformMemberExpression(expression)
+    }
+    transformMemberExpression(expression: MemberExpression): Expression {
+        const temporaryVarName = `chaintmp%%_${ChainExpressionFilter.counter++}`
+        return factory.createBlockExpression(
+            [
+                factory.createVariableDeclaration(
+                    Es2pandaVariableDeclarationKind.VARIABLE_DECLARATION_KIND_LET,
+                    [
+                        factory.createVariableDeclarator(
+                            Es2pandaVariableDeclaratorFlag.VARIABLE_DECLARATOR_FLAG_LET,
+                            factory.createIdentifier(temporaryVarName),
+                            expression.object
+                        )
+                    ],
+                    undefined
+                ),
+                factory.createExpressionStatement(
+                    factory.createConditionalExpression(
+                        factory.createBinaryExpression(
+                            factory.createIdentifier(temporaryVarName, undefined),
+                            factory.createUndefinedLiteral(),
+                            Es2pandaTokenType.TOKEN_TYPE_PUNCTUATOR_STRICT_EQUAL
+                        ),
+                        factory.createUndefinedLiteral(),
+                        factory.createMemberExpression(
+                            factory.createIdentifier(temporaryVarName, undefined),
+                            expression.property,
+                            expression.kind,
+                            expression.isComputed,
+                            false
+                        )
+                    )
+                )
+            ]
+        )
+    }
+
+
+    visitor(beforeChildren: AstNode): AstNode {
+        const node = this.visitEachChild(beforeChildren)
+        if (isChainExpression(node)) {
+            return this.transformChainExpression(node)
+        }
+        if (isMemberExpression(node) && node.isOptional) {
+            return this.transformMemberExpression(node)
+        }
+        return node
+    }
+}

package/build/libarkts-copy/src/arkts-api/CheckedBackFilter.ts

@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2022-2025 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { AnnotationUsage, ClassDefinition, ClassElement, Expression, isArrowFunctionExpression, isClassDefinition, isClassProperty, isETSFunctionType, isETSModule, isETSNewClassInstanceExpression, isScriptFunction, isTSEnumDeclaration, TSEnumDeclaration, TSEnumMember } from "src/generated";
+import { AbstractVisitor } from "./AbstractVisitor";
+import { AstNode } from "./peers/AstNode"
+import { Es2pandaModifierFlags } from "src/generated/Es2pandaEnums";
+import { factory } from "src/generated/factory";
+import { arkts } from "src";
+import { TypeAliasDeclaration } from "@koalaui/ets-tsc";
+
+function filterAnnotations(annotations: AnnotationUsage[]): AnnotationUsage[] {
+    return annotations.filter(it => it.baseName?.name != "OptionalParametersAnnotation")
+}
+
+export abstract class ContextAwareVisitor extends AbstractVisitor {
+    private contextStack: ('global' | 'namespace')[] = ['global']
+    protected get context() {
+        return this.contextStack.at(-1)!
+    }
+    private enter(node:AstNode): () => void {
+        if (isETSModule(node) && node.ident?.name !== 'ETSGLOBAL') {
+            this.contextStack.push('namespace')
+            return () => this.contextStack.pop()
+        }
+        if (isClassDefinition(node) && node.isNamespaceTransformed && node.ident?.name !== 'ETSGLOBAL') {
+            this.contextStack.push('namespace')
+            return () => this.contextStack.pop()
+        }
+        return () => {}
+    }
+
+    visitEachChild(node: AstNode, options?: object): AstNode {
+        const leave = this.enter(node)
+        const r = super.visitEachChild(node, options)
+        leave()
+        return r
+    }
+}
+
+export class CheckedBackFilter extends ContextAwareVisitor {
+    transformInitializer(node: Expression|undefined): Expression|undefined {
+        if (node == undefined) return undefined
+        if (!isETSNewClassInstanceExpression(node)) return node
+        return node.arguments[1]
+    }
+    transformEnum(node: ClassDefinition): AstNode {
+        return TSEnumDeclaration.createTSEnumDeclaration(
+            node.ident,
+            node.body.map(it => {
+                const member: ClassElement = it as ClassElement
+                if (!isClassProperty(member)) return undefined
+                if (isClassProperty(member) && member.id?.name.startsWith("#")) return undefined
+                return factory.createTSEnumMember(
+                    member.key,
+                    this.transformInitializer(member.value),
+                    false
+                )
+            }).filter(it => it != undefined) as TSEnumMember[],
+            false,
+            false,
+            !!(node.modifierFlags & Es2pandaModifierFlags.MODIFIER_FLAGS_DECLARE) && this.context !== 'namespace'
+        )
+    }
+    transformScopedClass(node:ClassDefinition): ClassDefinition {
+        return ClassDefinition.createClassDefinition(
+            node.ident,
+            node.typeParams,
+            node.superTypeParams,
+            node.implements,
+            node.ctor,
+            node.super,
+            node.body,
+            node.modifiers,
+            this.context === 'namespace'
+                ? node.modifierFlags & (~Es2pandaModifierFlags.MODIFIER_FLAGS_DECLARE)
+                : node.modifierFlags
+        )
+    }
+    transformScopedEnum(node:TSEnumDeclaration): TSEnumDeclaration {
+        return TSEnumDeclaration.createTSEnumDeclaration(
+            node.key,
+            node.members,
+            node.isConst,
+            false,
+            !!(node.modifierFlags & Es2pandaModifierFlags.MODIFIER_FLAGS_DECLARE) && this.context !== 'namespace'
+        )
+    }
+    visitor(beforeChildren: AstNode): AstNode {
+        const node = this.visitEachChild(beforeChildren)
+        if (isTSEnumDeclaration(node)) {
+            return this.transformScopedEnum(node)
+        }
+        if (isClassDefinition(node)) {
+            if (node.isEnumTransformed) {
+                return this.transformEnum(node)
+            } else {
+                const transformed = this.context === 'namespace'
+                    ? this.transformScopedClass(node)
+                    : node
+                return transformed.setAnnotations(filterAnnotations([...node.annotations]))
+            }
+        }
+        if (isClassProperty(node)) {
+            return node.setAnnotations(filterAnnotations([...node.annotations]))
+        }
+        if (isArrowFunctionExpression(node)) {
+            return node.setAnnotations(filterAnnotations([...node.annotations]))
+        }
+        if (isETSFunctionType(node)) {
+            return node.setAnnotations(filterAnnotations([...node.annotations]))
+        }
+        if (isScriptFunction(node)) {
+            return node.setAnnotations(filterAnnotations([...node.annotations]))
+        }
+
+        return node
+    }
+}