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

package/build/libarkts-copy/generator/options.json5

@@ -253,7 +253,16 @@
                     types: ["returnType"]
                 }
             ]
-        }
+        },
+        {
+            name: "ClassDeclaration",
+            methods: [
+                {
+                    name: "Definition",
+                    types: ["returnType"]
+                }
+            ]
+        },
     ],
     fragments: [
         {
@@ -281,6 +290,14 @@
         {
             interface: "ScriptFunction",
             methods: [
+                {
+                    name: "getSignaturePointer",
+                    definition: "extension_ScriptFunctionGetSignaturePointer",
+                },
+                {
+                    name: "setSignaturePointer",
+                    definition: "extension_ScriptFunctionSetSignaturePointer",
+                },
                 {
                     name: "getPreferredReturnTypePointer",
                     definition: "extension_ScriptFunctionGetPreferredReturnTypePointer",
@@ -291,6 +308,15 @@
                 },
             ]
         },
+        {
+            interface: "Program",
+            methods: [
+                {
+                    name: "getExternalSources",
+                    definition: "extension_ProgramGetExternalSources",
+                },
+            ],
+        }
     ],
     parameters: [
         {

package/build/libarkts-copy/native/src/bridges.cc

@@ -405,6 +405,32 @@ KOALA_INTEROP_V1(DestroyGlobalContext, KNativePointer)
 // All these "Checker_" bridges are related to checker namespace in es2panda, so work with them carefully
 // Checker.Type does reset on recheck, so modifying them makes no sence
 // It seems that compiler does not provide API to convert Checker.Type to ir.Type
+KNativePointer impl_Checker_ScriptFunctionSignature(KNativePointer context, KNativePointer node)
+{
+    auto _context = reinterpret_cast<es2panda_Context*>(context);
+    auto _node = reinterpret_cast<es2panda_AstNode*>(node);
+    return GetImpl()->ScriptFunctionSignature(_context, _node);
+}
+KOALA_INTEROP_2(Checker_ScriptFunctionSignature, KNativePointer, KNativePointer, KNativePointer)
+
+void impl_Checker_ScriptFunctionSetSignature(KNativePointer context, KNativePointer node, KNativePointer signature)
+{
+    auto _context = reinterpret_cast<es2panda_Context*>(context);
+    auto _node = reinterpret_cast<es2panda_AstNode*>(node);
+    auto _signature = reinterpret_cast<es2panda_Signature*>(signature);
+    GetImpl()->ScriptFunctionSetSignature(_context, _node, _signature);
+    return;
+}
+KOALA_INTEROP_V3(Checker_ScriptFunctionSetSignature, KNativePointer, KNativePointer, KNativePointer)
+
+KNativePointer impl_Checker_SignatureReturnType(KNativePointer context, KNativePointer signature)
+{
+    auto _context = reinterpret_cast<es2panda_Context*>(context);
+    auto _signature = reinterpret_cast<es2panda_Signature*>(signature);
+    return GetImpl()->SignatureReturnType(_context, _signature);
+}
+KOALA_INTEROP_2(Checker_SignatureReturnType, KNativePointer, KNativePointer, KNativePointer)
+
 KNativePointer impl_Checker_ScriptFunctionGetPreferredReturnType(KNativePointer context, KNativePointer node)
 {
     auto _context = reinterpret_cast<es2panda_Context*>(context);
@@ -553,10 +579,12 @@ KNativePointer impl_CreateDiagnosticKind(KNativePointer context, KStringPtr& mes
 }
 KOALA_INTEROP_3(CreateDiagnosticKind, KNativePointer, KNativePointer, KStringPtr, KInt)
 
-KNativePointer impl_CreateDiagnosticInfo(KNativePointer context, KNativePointer kind, KStringArray argsPtr, KInt argc)
+KNativePointer impl_CreateDiagnosticInfo(KNativePointer context, KNativePointer kind, KStringArray argsPtr,
+                                         KInt argc, KNativePointer pos)
 {
     const auto _context = reinterpret_cast<es2panda_Context*>(context);
     const auto _kind = reinterpret_cast<es2panda_DiagnosticKind*>(kind);
+    const auto _pos = reinterpret_cast<es2panda_SourcePosition *>(pos);
     const std::size_t headerLen = 4;
     const char** _args = new const char*[argc];
     std::size_t position = headerLen;
@@ -567,15 +595,17 @@ KNativePointer impl_CreateDiagnosticInfo(KNativePointer context, KNativePointer
         _args[i] = strdup(std::string(reinterpret_cast<const char*>(argsPtr + position), strLen).c_str());
         position += strLen;
     }
-    return GetImpl()->CreateDiagnosticInfo(_context, _kind, _args, argc);
+    return GetImpl()->CreateDiagnosticInfo(_context, _kind, _args, argc, _pos);
 }
-KOALA_INTEROP_4(CreateDiagnosticInfo, KNativePointer, KNativePointer, KNativePointer, KStringArray, KInt)
+KOALA_INTEROP_5(CreateDiagnosticInfo, KNativePointer, KNativePointer, KNativePointer,
+                KStringArray, KInt, KNativePointer)
 
 KNativePointer impl_CreateSuggestionInfo(KNativePointer context, KNativePointer kind, KStringArray argsPtr,
-                                         KInt argc, KStringPtr& substitutionCode)
+                                         KInt argc, KStringPtr& substitutionCode, KNativePointer range)
 {
     const auto _context = reinterpret_cast<es2panda_Context*>(context);
     const auto _kind = reinterpret_cast<es2panda_DiagnosticKind *>(kind);
+    const auto _range = reinterpret_cast<es2panda_SourceRange *>(range);
     const std::size_t headerLen = 4;
     const char** _args = new const char*[argc];
     std::size_t position = headerLen;
@@ -587,9 +617,9 @@ KNativePointer impl_CreateSuggestionInfo(KNativePointer context, KNativePointer
         position += strLen;
     }
     const auto _substitutionCode = getStringCopy(substitutionCode);
-    return GetImpl()->CreateSuggestionInfo(_context, _kind, _args, argc, _substitutionCode);
+    return GetImpl()->CreateSuggestionInfo(_context, _kind, _args, argc, _substitutionCode, _range);
 }
-KOALA_INTEROP_5(CreateSuggestionInfo, KNativePointer, KNativePointer, KNativePointer, KStringArray, KInt, KStringPtr)
+KOALA_INTEROP_6(CreateSuggestionInfo, KNativePointer, KNativePointer, KNativePointer, KStringArray, KInt, KStringPtr, KNativePointer)
 
 void impl_LogDiagnostic(KNativePointer context, KNativePointer kind, KStringArray argvPtr,
                         KInt argc, KNativePointer pos)
@@ -612,15 +642,14 @@ void impl_LogDiagnostic(KNativePointer context, KNativePointer kind, KStringArra
 KOALA_INTEROP_V5(LogDiagnostic, KNativePointer, KNativePointer, KStringArray, KInt, KNativePointer)
 
 void impl_LogDiagnosticWithSuggestion(KNativePointer context, KNativePointer diagnosticInfo,
-                                      KNativePointer suggestionInfo, KNativePointer range)
+                                      KNativePointer suggestionInfo)
 {
     const auto _context = reinterpret_cast<es2panda_Context*>(context);
     const auto _diagnosticInfo = reinterpret_cast<es2panda_DiagnosticInfo*>(diagnosticInfo);
     const auto _suggestionInfo = reinterpret_cast<es2panda_SuggestionInfo*>(suggestionInfo);
-    const auto _range = reinterpret_cast<es2panda_SourceRange*>(range);
-    GetImpl()->LogDiagnosticWithSuggestion(_context, _diagnosticInfo, _suggestionInfo, _range);
+    GetImpl()->LogDiagnosticWithSuggestion(_context, _diagnosticInfo, _suggestionInfo);
 }
-KOALA_INTEROP_V4(LogDiagnosticWithSuggestion, KNativePointer, KNativePointer, KNativePointer, KNativePointer)
+KOALA_INTEROP_V3(LogDiagnosticWithSuggestion, KNativePointer, KNativePointer, KNativePointer)
 
 KInt impl_GenerateStaticDeclarationsFromContext(KNativePointer contextPtr, KStringPtr &outputPath)
 {
@@ -640,12 +669,12 @@ KNativePointer impl_AnnotationUsageIrPropertiesPtrConst(KNativePointer context,
 KOALA_INTEROP_2(AnnotationUsageIrPropertiesPtrConst, KNativePointer, KNativePointer, KNativePointer);
 
 KInt impl_GenerateTsDeclarationsFromContext(KNativePointer contextPtr, KStringPtr &outputDeclEts, KStringPtr &outputEts,
-                                            KBoolean exportAll, KBoolean isolated)
+                                            KBoolean exportAll, KBoolean isolated, KStringPtr &recordFile)
 {
     auto context = reinterpret_cast<es2panda_Context *>(contextPtr);
-    return GetImpl()->GenerateTsDeclarationsFromContext(context, outputDeclEts.data(), outputEts.data(), exportAll, isolated );
+    return GetImpl()->GenerateTsDeclarationsFromContext(context, outputDeclEts.data(), outputEts.data(), exportAll, isolated, recordFile.data() );
 }
-KOALA_INTEROP_5(GenerateTsDeclarationsFromContext, KInt, KNativePointer, KStringPtr, KStringPtr, KBoolean, KBoolean)
+KOALA_INTEROP_6(GenerateTsDeclarationsFromContext, KInt, KNativePointer, KStringPtr, KStringPtr, KBoolean, KBoolean, KStringPtr)
 
 // Improve: simplify
 KNativePointer impl_CreateContextGenerateAbcForExternalSourceFiles(
@@ -670,3 +699,12 @@ KNativePointer impl_CreateContextGenerateAbcForExternalSourceFiles(
         config, fileNamesCount, argv);
 }
 KOALA_INTEROP_3(CreateContextGenerateAbcForExternalSourceFiles, KNativePointer, KNativePointer, KInt, KStringArray)
+
+KNativePointer impl_JsdocStringFromDeclaration(KNativePointer contextPtr, KNativePointer nodePtr)
+{
+    auto context = reinterpret_cast<es2panda_Context*>(contextPtr);
+    auto node = reinterpret_cast<es2panda_AstNode*>(nodePtr);
+    return StageArena::strdup(GetImpl()->JsdocStringFromDeclaration(context, node));
+}
+KOALA_INTEROP_2(JsdocStringFromDeclaration, KNativePointer, KNativePointer, KNativePointer)
+

package/build/libarkts-copy/native/src/common.cc

@@ -15,6 +15,7 @@
 
 #include <common.h>
 #include <utility>
+#include "interop-types.h"
 
 using std::string, std::cout, std::endl, std::vector;
 
@@ -58,13 +59,16 @@ char* StageArena::strdup(const char* string)
     auto* arena = StageArena::instance();
     auto size = strlen(string) + 1;
     char* memory = (char*)arena->alloc(size);
-    memcpy(memory, string, size);
+    interop_memcpy(memory, size, string, size);
     return memory;
 }
 
 void* StageArena::alloc(size_t size)
 {
     void* result = malloc(size);
+    if (!result) {
+        INTEROP_FATAL("Cannot allocate memory");
+    }
     totalSize += size;
     add(result);
     return result;
@@ -131,7 +135,7 @@ KOALA_INTEROP_V1(SetUpSoPath, KStringPtr);
 void* FindLibrary() {
     void *res = nullptr;
     std::vector<std::string> pathArray;
-    
+
     // find by SetUpSoPath
     if (!ES2PANDA_LIB_PATH.empty()) {
         pathArray = {ES2PANDA_LIB_PATH, LIB_DIR, LIB_ES2PANDA_PUBLIC};

package/build/libarkts-copy/native/src/common.h

@@ -35,6 +35,7 @@
 #include "es2panda_lib.h"
 #include "common-interop.h"
 #include "stdexcept"
+#include "interop-utils.h"
 #include <string>
 #include <iostream>
 #include <vector>

package/build/libarkts-copy/native/src/generated/bridges.cc

@@ -16,8 +16,8 @@
 #include <common.h>
 
 /*
- * THIS FILE IS AUTOGENERATED BY arktscgen v2.1.9+devel. DO NOT EDIT MANUALLY!
- * es2panda c962477266722fec18ce4851b5efccddada11561(2025-07-22) sdk v1.5.0-dev.38458
+ * THIS FILE IS AUTOGENERATED BY arktscgen v2.1.9-arktscgen-8. DO NOT EDIT MANUALLY!
+ * es2panda 2d77536b9b49352e16827106a4f4311e221008c5(2025-07-30) sdk v1.5.0-dev.39323
  */
 
 KNativePointer impl_CreateNumberLiteral(KNativePointer context, KInt value)
@@ -4281,6 +4281,34 @@ KUInt impl_ScriptFunctionFormalParamsLengthConst(KNativePointer context, KNative
 }
 KOALA_INTEROP_2(ScriptFunctionFormalParamsLengthConst, KUInt, KNativePointer, KNativePointer);
 
+void impl_ScriptFunctionSetAsyncPairMethod(KNativePointer context, KNativePointer receiver, KNativePointer asyncPairFunction)
+{
+    const auto _context = reinterpret_cast<es2panda_Context*>(context);
+    const auto _receiver = reinterpret_cast<es2panda_AstNode*>(receiver);
+    const auto _asyncPairFunction = reinterpret_cast<es2panda_AstNode*>(asyncPairFunction);
+    GetImpl()->ScriptFunctionSetAsyncPairMethod(_context, _receiver, _asyncPairFunction);
+    return ;
+}
+KOALA_INTEROP_V3(ScriptFunctionSetAsyncPairMethod, KNativePointer, KNativePointer, KNativePointer);
+
+KNativePointer impl_ScriptFunctionAsyncPairMethodConst(KNativePointer context, KNativePointer receiver)
+{
+    const auto _context = reinterpret_cast<es2panda_Context*>(context);
+    const auto _receiver = reinterpret_cast<es2panda_AstNode*>(receiver);
+    auto result = GetImpl()->ScriptFunctionAsyncPairMethodConst(_context, _receiver);
+    return (void*)result;
+}
+KOALA_INTEROP_2(ScriptFunctionAsyncPairMethodConst, KNativePointer, KNativePointer, KNativePointer);
+
+KNativePointer impl_ScriptFunctionAsyncPairMethod(KNativePointer context, KNativePointer receiver)
+{
+    const auto _context = reinterpret_cast<es2panda_Context*>(context);
+    const auto _receiver = reinterpret_cast<es2panda_AstNode*>(receiver);
+    auto result = GetImpl()->ScriptFunctionAsyncPairMethod(_context, _receiver);
+    return result;
+}
+KOALA_INTEROP_2(ScriptFunctionAsyncPairMethod, KNativePointer, KNativePointer, KNativePointer);
+
 void impl_ScriptFunctionEmplaceReturnStatements(KNativePointer context, KNativePointer receiver, KNativePointer returnStatements)
 {
     const auto _context = reinterpret_cast<es2panda_Context*>(context);

package/build/libarkts-copy/package.json

@@ -5,10 +5,10 @@
     "typesVersions": {
         "*": {
             "./compat/*": [
-                "./build/wrapper-compat/index.d.ts"
+                "./lib/types/wrapper-compat/index.d.ts"
             ],
             "*": [
-                "./lib/build/index.d.ts"
+                "./lib/types/index.d.ts"
             ]
         }
     },
@@ -23,7 +23,7 @@
         "./plugins/build/src/**/*"
     ],
     "config": {
-        "gen_version": "2.1.9-arktscgen-7",
+        "gen_version": "2.1.9-arktscgen-8",
         "panda_sdk_path": "../../incremental/tools/panda/node_modules/@panda/sdk",
         "ohos_panda_sdk_path": "../build/sdk",
         "panda_sdk_version": "next"
@@ -65,7 +65,7 @@
         "compile:js": "rm -rf lib/ && rollup -c rollup.lib.mjs && rollup -c rollup.es2panda.mjs",
         "compile:plugins": "rollup -c ./rollup.printer-plugin.mjs",
         "direct": "fast-arktsc --config arktsconfig.json --compiler ../../incremental/tools/panda/arkts/ui2abc --link-name ./build/abc/main.abc && ninja -f build/abc/build.ninja",
-        "simultaneous": "../../incremental/tools/panda/arkts/ui2abc --arktsconfig arktsconfig.json --output ./build/abc/main.abc:./build/abc/library.abc plugins/input/main.ets:plugins/input/library.ets",
+        "simultaneous": "mkdir -p build/abc && bash ../../incremental/tools/panda/arkts/ui2abc --simultaneous --arktsconfig arktsconfig.json --output ./build/abc/main.abc:./build/abc/library.abc plugins/input/main.ets:plugins/input/library.ets",
         "run": "npm run compile && npm run compile:plugins && npm run simultaneous",
         "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",

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

@@ -162,6 +162,15 @@ export class Es2pandaNativeModule {
     _OptionsArkTsConfig(context: KNativePointer, options: KNativePointer): KNativePointer {
         throw new Error("Not implemented");
     }
+    _Checker_ScriptFunctionSignature(context: KNativePointer, node: KNativePointer): KNativePointer {
+        throw new Error("Not implemented");
+    }
+    _Checker_ScriptFunctionSetSignature(context: KNativePointer, node: KNativePointer, signature: KNativePointer): void {
+        throw new Error("Not implemented");
+    }
+    _Checker_SignatureReturnType(context: KNativePointer, signature: KNativePointer): KNativePointer {
+        throw new Error("Not implemented");
+    }
     _Checker_ScriptFunctionGetPreferredReturnType(context: KNativePointer, node: KNativePointer): KNativePointer {
         throw new Error("Not implemented");
     }
@@ -174,6 +183,9 @@ export class Es2pandaNativeModule {
     _Checker_TypeNodeGetType(context: KNativePointer, node: KNativePointer): KNativePointer {
         throw new Error("Not implemented");
     }
+    _JsdocStringFromDeclaration(context: KPtr, node: KPtr): KPtr {
+        throw new Error("Not implemented")
+    }
 
     // From koala-wrapper
     _ClassVariableDeclaration(context: KNativePointer, classInstance: KNativePointer): KNativePointer {
@@ -200,18 +212,18 @@ export class Es2pandaNativeModule {
     _CreateDiagnosticKind(context: KNativePointer, message: string, type: Es2pandaPluginDiagnosticType): KNativePointer {
         throw new Error("Not implemented")
     }
-    _CreateDiagnosticInfo(context: KNativePointer, kind: KNativePointer, args: string[], argc: number): KNativePointer {
+    _CreateDiagnosticInfo(context: KNativePointer, kind: KNativePointer, args: string[], argc: number, pos: KNativePointer): KNativePointer {
         throw new Error("Not implemented")
     }
     _CreateSuggestionInfo(context: KNativePointer, kind: KNativePointer, args: string[],
-        argc: number, substitutionCode: string): KNativePointer {
+        argc: number, substitutionCode: string, range: KNativePointer): 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 {
+        suggestionInfo?: KNativePointer): void {
         throw new Error("Not implemented")
     }
     _SetUpSoPath(soPath: string): void {
@@ -226,7 +238,7 @@ export class Es2pandaNativeModule {
     _ProgramCanSkipPhases(context: KNativePointer, program: KNativePointer): boolean {
         throw new Error("Not implemented")
     }
-    _GenerateTsDeclarationsFromContext(config: KPtr, outputDeclEts: String, outputEts: String, exportAll: KBoolean, isolated: KBoolean): KPtr {
+    _GenerateTsDeclarationsFromContext(config: KPtr, outputDeclEts: String, outputEts: String, exportAll: KBoolean, isolated: KBoolean, recordFile: String): KPtr {
         throw new Error("Not implemented")
     }
     _GenerateStaticDeclarationsFromContext(config: KPtr, outputPath: String): KPtr {
@@ -270,4 +282,4 @@ export function initGeneratedEs2panda(): GeneratedEs2pandaNativeModule {
     // registerNativeModule("InteropNativeModule", NativeModule)
     loadNativeModuleLibrary("NativeModule", instance)
     return instance
-}
+}

package/build/libarkts-copy/src/arkts-api/node-utilities/Program.ts

@@ -13,19 +13,8 @@
  * limitations under the License.
  */
 
-import { ExternalSource } from "../peers/ExternalSource"
-import { acceptNativeObjectArrayResult } from "../utilities/private"
-import { KNativePointer } from "@koalaui/interop"
-import { global } from "../static/global"
 import { Program } from "../../generated"
 
-export function programGetExternalSources(program: Program, context: KNativePointer = global.context): ExternalSource[] {
-    return acceptNativeObjectArrayResult<ExternalSource>(
-        global.es2panda._ProgramExternalSources(context, program.peer),
-        (instance: KNativePointer) => new ExternalSource(instance)
-    )
-}
-
 export function dumpProgramInfo(program: Program) {
     console.log(`Program info:`)
     console.log(`\tAbsoluteName:          ${program.absoluteName}`)

package/build/libarkts-copy/src/arkts-api/node-utilities/ScriptFunction.ts

@@ -38,6 +38,7 @@ export function createScriptFunction(
     dataflags: Es2pandaModifierFlags,
     ident: Identifier | undefined,
     annotations: readonly AnnotationUsage[] | undefined,
+    signaturePointer?: KNativePointer,
     preferredReturnTypePointer?: KNativePointer,
 ) {
     const res = ScriptFunction.createScriptFunction(
@@ -53,6 +54,9 @@ export function createScriptFunction(
         ident,
         annotations,
     )
+    if (signaturePointer) {
+        res.setSignaturePointer(signaturePointer)
+    }
     if (preferredReturnTypePointer) {
         res.setPreferredReturnTypePointer(preferredReturnTypePointer)
     }
@@ -70,6 +74,7 @@ export function updateScriptFunction(
     dataflags: Es2pandaModifierFlags,
     ident: Identifier | undefined,
     annotations: readonly AnnotationUsage[] | undefined,
+    signaturePointer?: KNativePointer,
     preferredReturnTypePointer?: KNativePointer,
 ) {
     if (isSameNativeObject(databody, original.body)
@@ -81,6 +86,7 @@ export function updateScriptFunction(
         && isSameNativeObject(dataflags, original.modifierFlags)
         && isSameNativeObject(ident, original.id)
         && isSameNativeObject(annotations, original.annotations)
+        && signaturePointer == original.getSignaturePointer()
         && preferredReturnTypePointer == original.getPreferredReturnTypePointer()
     ) {
         return original
@@ -96,6 +102,7 @@ export function updateScriptFunction(
             dataflags,
             ident,
             annotations,
+            signaturePointer,
             preferredReturnTypePointer,
         ),
         original

package/build/libarkts-copy/src/arkts-api/peers/AstNode.ts

@@ -15,7 +15,7 @@
 
 import { isNullPtr, KInt, KNativePointer, nullptr } from "@koalaui/interop"
 import { global } from "../static/global"
-import { allFlags, unpackNodeArray, unpackNonNullableNode, unpackString } from "../utilities/private"
+import { allFlags, unpackNode, unpackNodeArray, unpackNonNullableNode, unpackString } from "../utilities/private"
 import { throwError } from "../../utils"
 import { Es2pandaModifierFlags } from "../../generated/Es2pandaEnums"
 import { ArktsObject } from "./ArktsObject"
@@ -117,7 +117,7 @@ export abstract class AstNode extends ArktsObject {
     
     public get parent(): AstNode | undefined {
         const parent = global.generatedEs2panda._AstNodeParent(global.context, this.peer);
-        return unpackNonNullableNode(parent);
+        return unpackNode(parent);
     }
 
     public set parent(node: AstNode | undefined) {

package/build/libarkts-copy/src/arkts-api/peers/ExternalSource.ts

@@ -34,4 +34,8 @@ export class ExternalSource extends ArktsObject {
             (instance: KNativePointer) => new Program(instance)
         )
     }
+
+    static instantiate(peer: KNativePointer) {
+        return new ExternalSource(peer)
+    }
 }

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

@@ -16,13 +16,12 @@
 import { Es2pandaContextState } from "../generated/Es2pandaEnums"
 import { Program } from "../generated"
 import { ExternalSource } from "./peers/ExternalSource"
-import { programGetExternalSources } from "./node-utilities/Program"
 import { KNativePointer } from "@koalaui/interop"
 import { global } from "./static/global"
 import { RunTransformerHooks } from "../plugin-utils"
 
 export interface CompilationOptions {
-    readonly isMainProgram: boolean,
+    readonly isProgramForCodegeneration: boolean,
     readonly state: Es2pandaContextState,
 }
 
@@ -49,10 +48,10 @@ export function defaultFilter(name: string) {
     return true
 }
 
-export function listPrograms(program: Program, filter: (name: string) => boolean = defaultFilter, context: KNativePointer = global.context): Program[] {
+export function listPrograms(program: Program, filter: (name: string) => boolean = defaultFilter): Program[] {
     return [
         program,
-        ...programGetExternalSources(program, context).flatMap((it: ExternalSource) => {
+        ...program.getExternalSources().flatMap((it: ExternalSource) => {
             if (filter(it.getName())) {
                 return it.programs
             }

package/build/libarkts-copy/src/arkts-api/static/global.ts

@@ -48,6 +48,7 @@ export class global {
 
     // Improve: rename to context when the pointer valued one is eliminated
     public static compilerContext: Context
+    public static isContextGenerateAbcForExternalSourceFiles: boolean = false
 
     private static _es2panda: Es2pandaNativeModule | undefined = undefined
     public static get es2panda(): Es2pandaNativeModule {

package/build/libarkts-copy/src/arkts-api/utilities/extensions.ts

@@ -13,13 +13,17 @@
  * limitations under the License.
  */
 
+import { KNativePointer } from "@koalaui/interop"
 import type {
     ETSModule,
     MethodDefinition,
+    Program,
     ScriptFunction,
 } from "../../generated"
+import { ExternalSource } from "../peers/ExternalSource"
 import { Es2pandaModuleFlag } from "../../generated/Es2pandaEnums"
-import { global, KNativePointer } from "../../reexport-for-generated"
+import { global } from "../static/global"
+import { acceptNativeObjectArrayResult } from "./private"
 
 export function extension_ETSModuleGetNamespaceFlag(this: ETSModule): Es2pandaModuleFlag {
     return (this.isETSScript ? Es2pandaModuleFlag.MODULE_FLAG_ETSSCRIPT : 0)
@@ -27,6 +31,7 @@ export function extension_ETSModuleGetNamespaceFlag(this: ETSModule): Es2pandaMo
         + (this.isNamespaceChainLastNode ? Es2pandaModuleFlag.MODULE_FLAG_NAMESPACE_CHAIN_LAST_NODE : 0)
 }
 
+// this is a workaround for overloads not included in children list
 export function extension_MethodDefinitionSetChildrenParentPtr(this: MethodDefinition) {
     global.es2panda._AstNodeSetChildrenParentPtr(global.context, this.peer)
     const overloads = this.overloads
@@ -48,6 +53,16 @@ export function extension_MethodDefinitionOnUpdate(this: MethodDefinition, origi
     }
 }
 
+// Improve: generate checker related stuff
+export function extension_ScriptFunctionGetSignaturePointer(this: ScriptFunction): KNativePointer {
+    return global.es2panda._Checker_ScriptFunctionSignature(global.context, this.peer)
+}
+
+export function extension_ScriptFunctionSetSignaturePointer(this: ScriptFunction, signaturePointer: KNativePointer): void {
+    global.es2panda._Checker_ScriptFunctionSetSignature(global.context, this.peer, signaturePointer)
+}
+
+// Improve: perhaps "preferredReturnType" stuff can be removed later if "signature" is always enough
 export function extension_ScriptFunctionGetPreferredReturnTypePointer(this: ScriptFunction): KNativePointer {
     return global.es2panda._Checker_ScriptFunctionGetPreferredReturnType(global.context, this.peer)
 }
@@ -55,3 +70,11 @@ export function extension_ScriptFunctionGetPreferredReturnTypePointer(this: Scri
 export function extension_ScriptFunctionSetPreferredReturnTypePointer(this: ScriptFunction, typePointer: KNativePointer): void {
     global.es2panda._Checker_ScriptFunctionSetPreferredReturnType(global.context, this.peer, typePointer)
 }
+
+// Improve: generate methods with string[] args or return type
+export function extension_ProgramGetExternalSources(this: Program): ExternalSource[] {
+    return acceptNativeObjectArrayResult<ExternalSource>(
+        global.es2panda._ProgramExternalSources(global.context, this.peer),
+        ExternalSource.instantiate,
+    )
+}

package/build/libarkts-copy/src/arkts-api/utilities/public.ts

@@ -17,7 +17,7 @@ import { global } from "../static/global"
 import { isNumber, throwError, withWarning } from "../../utils"
 import { KNativePointer, nullptr, KInt} from "@koalaui/interop"
 import { passNode, passNodeArray, unpackNodeArray, unpackNonNullableNode, passString, unpackString } from "./private"
-import { Es2pandaContextState, Es2pandaModifierFlags, Es2pandaMethodDefinitionKind, Es2pandaPrimitiveType } from "../../generated/Es2pandaEnums"
+import { Es2pandaContextState, Es2pandaModifierFlags, Es2pandaMethodDefinitionKind, Es2pandaPrimitiveType, Es2pandaScriptFunctionFlags } from "../../generated/Es2pandaEnums"
 import type { AstNode } from "../peers/AstNode"
 import { isSameNativeObject } from "../peers/ArktsObject"
 import {
@@ -245,6 +245,12 @@ export function getFileName(): string {
     return global.filePath
 }
 
+export function getJsDoc(node: AstNode): string | undefined {
+    const result = unpackString(global.es2panda._JsdocStringFromDeclaration(global.context, node.peer))
+    return result === 'Empty Jsdoc' ? undefined : result
+}
+
+
 // Improve: It seems like Definition overrides AstNode  modifiers
 // with it's own modifiers which is completely unrelated set of flags.
 // Use this function if you need
@@ -323,14 +329,16 @@ export function generateTsDeclarationsFromContext(
   outputDeclEts: string,
   outputEts: string,
   exportAll: boolean,
-  isolated: boolean
+  isolated: boolean,
+  recordFile: string
 ): KInt {
   return global.es2panda._GenerateTsDeclarationsFromContext(
     global.context,
     passString(outputDeclEts),
     passString(outputEts),
     exportAll,
-    isolated
+    isolated,
+    recordFile
   );
 }
 
@@ -346,15 +354,71 @@ export function importDeclarationInsert(node: ETSImportDeclaration, program: Pro
     global.es2panda._InsertETSImportDeclarationAndParse(global.context, program.peer, node.peer)
 }
 
+export function signatureReturnType(signature: KNativePointer): KNativePointer {
+    if (!signature) {
+        return nullptr
+    }
+    return global.es2panda._Checker_SignatureReturnType(global.context, signature)
+}
+
 export function tryConvertCheckerTypeToTypeNode(typePeer: KNativePointer | undefined): TypeNode | undefined {
     if (!typePeer) {
         return undefined
     }
     const str = unpackString(global.es2panda._Checker_TypeToString(global.context, typePeer))
+    // Primitive types
     if (str == "void") {
         return factory.createETSPrimitiveType(Es2pandaPrimitiveType.PRIMITIVE_TYPE_VOID)
     }
-    if (str == "String" || str == "StringerNode") {
+    if (str == "Byte") {
+        return factory.createETSPrimitiveType(Es2pandaPrimitiveType.PRIMITIVE_TYPE_BYTE)
+    }
+    if (str == "Int") {
+        return factory.createETSPrimitiveType(Es2pandaPrimitiveType.PRIMITIVE_TYPE_INT)
+    }
+    if (str == "Long") {
+        return factory.createETSPrimitiveType(Es2pandaPrimitiveType.PRIMITIVE_TYPE_LONG)
+    }
+    if (str == "Short") {
+        return factory.createETSPrimitiveType(Es2pandaPrimitiveType.PRIMITIVE_TYPE_SHORT)
+    }
+    if (str == "Float") {
+        return factory.createETSPrimitiveType(Es2pandaPrimitiveType.PRIMITIVE_TYPE_FLOAT)
+    }
+    if (str == "Double") {
+        return factory.createETSPrimitiveType(Es2pandaPrimitiveType.PRIMITIVE_TYPE_DOUBLE)
+    }
+    if (str == "Boolean") {
+        return factory.createETSPrimitiveType(Es2pandaPrimitiveType.PRIMITIVE_TYPE_BOOLEAN)
+    }
+    if (str == "Char") {
+        return factory.createETSPrimitiveType(Es2pandaPrimitiveType.PRIMITIVE_TYPE_CHAR)
+    }
+    // Special types
+    if (str == "undefined") {
+        return factory.createETSUndefinedType()
+    }
+    // Stdlib types
+    if (str == "String" || str == "Object" || str == "Any") {
+        return factory.createETSTypeReference(
+            factory.createETSTypeReferencePart(
+                factory.createIdentifier(str)
+            )
+        )
+    }
+    // Basic arrow type
+    if (str == "() => void") {
+        return factory.createETSFunctionType(
+            undefined,
+            [],
+            factory.createETSPrimitiveType(Es2pandaPrimitiveType.PRIMITIVE_TYPE_VOID),
+            false,
+            Es2pandaScriptFunctionFlags.SCRIPT_FUNCTION_FLAGS_NONE,
+            undefined,
+        )
+    }
+    // Only used in samples code
+    if (str == "StringerNode") {
         return factory.createETSTypeReference(
             factory.createETSTypeReferencePart(
                 factory.createIdentifier(str)