@idlizer/arktscgen 2.1.9-arktscgen-6 → 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: [
         {
@@ -261,13 +270,166 @@
             methods: [
                 {
                     name: "setChildrenParentPtr",
-                    definition: "methodDefinitionSetChildrenParentPtr",
+                    definition: "extension_MethodDefinitionSetChildrenParentPtr",
                 },
                 {
                     name: "onUpdate",
-                    definition: "methodDefinitionOnUpdate",
+                    definition: "extension_MethodDefinitionOnUpdate",
                 },
             ]
         },
+        {
+            interface: "ETSModule",
+            methods: [
+                {
+                    name: "getNamespaceFlag",
+                    definition: "extension_ETSModuleGetNamespaceFlag",
+                }
+            ]
+        },
+        {
+            interface: "ScriptFunction",
+            methods: [
+                {
+                    name: "getSignaturePointer",
+                    definition: "extension_ScriptFunctionGetSignaturePointer",
+                },
+                {
+                    name: "setSignaturePointer",
+                    definition: "extension_ScriptFunctionSetSignaturePointer",
+                },
+                {
+                    name: "getPreferredReturnTypePointer",
+                    definition: "extension_ScriptFunctionGetPreferredReturnTypePointer",
+                },
+                {
+                    name: "setPreferredReturnTypePointer",
+                    definition: "extension_ScriptFunctionSetPreferredReturnTypePointer",
+                },
+            ]
+        },
+        {
+            interface: "Program",
+            methods: [
+                {
+                    name: "getExternalSources",
+                    definition: "extension_ProgramGetExternalSources",
+                },
+            ],
+        }
+    ],
+    parameters: [
+        {
+            interface: "ArrowFunctionExpression",
+            parameters: [
+                {
+                    name: "annotations",
+                },
+            ],
+        },
+        {
+            interface: "CallExpression",
+            parameters: [
+                {
+                    name: "trailingBlock",
+                },
+            ],
+        },
+        {
+            interface: "ClassDeclaration",
+            parameters: [
+                {
+                    name: "modifierFlags",
+                },
+            ],
+        },
+        {
+            interface: "ClassDefinition",
+            parameters: [
+                {
+                    name: "annotations",
+                },
+            ],
+        },
+        {
+            interface: "ClassProperty",
+            parameters: [
+                {
+                    name: "annotations",
+                },
+            ],
+        },
+        {
+            interface: "ETSFunctionType",
+            parameters: [
+                {
+                    name: "annotations",
+                },
+            ],
+        },
+        {
+            interface: "ETSParameterExpression",
+            parameters: [
+                {
+                    name: "annotations",
+                },
+            ],
+        },
+        {
+            interface: "ETSUnionType",
+            parameters: [
+                {
+                    name: "annotations",
+                },
+            ],
+        },
+        {
+            interface: "MethodDefinition",
+            parameters: [
+                {
+                    name: "overloads",
+                },
+            ],
+        },
+        {
+            interface: "ScriptFunction",
+            parameters: [
+                {
+                    name: "ident",
+                    setter: "setIdent",
+                    getter: "id",
+                },
+                {
+                    name: "annotations",
+                },
+            ],
+        },
+        {
+            interface: "TSInterfaceDeclaration",
+            parameters: [
+                {
+                    name: "modifierFlags",
+                },
+            ],
+        },
+        {
+            interface: "TSTypeAliasDeclaration",
+            parameters: [
+                {
+                    name: "annotations",
+                },
+                {
+                    name: "modifierFlags",
+                },
+            ],
+        },
+        {
+            interface: "VariableDeclaration",
+            parameters: [
+                {
+                    name: "annotations",
+                },
+            ],
+        },
     ],
 }

package/build/libarkts-copy/native/meson.build

@@ -20,6 +20,7 @@ project(
         'buildtype=release',
     ],
 )
+is_cross = get_option('cross_compile')
 
 sources = [
     './src/common.cc',
@@ -28,7 +29,7 @@ sources = [
     get_option('interop_src_dir') / 'common-interop.cc',
     get_option('interop_src_dir') / 'callback-resource.cc',
     get_option('interop_src_dir') / 'interop-logging.cc',
-    get_option('interop_src_dir') / 'napi/convertors-napi.cc',
+    get_option('interop_src_dir') / 'napi' / 'convertors-napi.cc',
 ]
 
 cflags = [
@@ -38,14 +39,12 @@ cflags = [
     '-DKOALA_NAPI',
 ]
 
-if (target_machine.system() == 'windows')
+if (host_machine.system() == 'windows')
     cflags += ['-DKOALA_WINDOWS']
-    if (meson.get_compiler('cpp').get_id() == 'msvc')
-        # apply node.exe symbol loading hook
-        sources += [
-            get_option('interop_src_dir') / 'napi/win-dynamic-node.cc'
-        ]
-    endif
+    # apply node.exe symbol loading hook
+    sources += [
+        get_option('interop_src_dir') / 'napi/win-dynamic-node.cc'
+    ]
 else
     cflags += ['-DKOALA_LINUX']
 endif
@@ -62,17 +61,17 @@ arch = archs.get(arch, arch)
 
 cflags_cross = []
 cflags_host = []
-suffix_host = '_' + arch
+suffix_host = '_' + os + '_' + arch
 suffix_cross = ''
 
 if get_option('cross_compile')
 if arch == 'arm64'
 cflags_cross = ['--target=x86_64-linux-gnu']
-suffix_cross = '_x64'
+suffix_cross = '_' + os + '_x64'
 endif
 if arch == 'x64'
 cflags_cross = ['--target=aarch64-linux-gnu']
-suffix_cross = '_arm64'
+suffix_cross = '_' + os + '_arm64'
 endif
 endif
 
@@ -100,7 +99,7 @@ shared_library(
     dependencies: []
 )
 
-if get_option('cross_compile')
+if is_cross
     # sudo apt install g++-aarch64-linux-gnu binutils-aarch64-linux-gnu
     shared_library(
         get_option('lib_name') + suffix_cross,

package/build/libarkts-copy/native/meson_options.txt

@@ -40,4 +40,4 @@ option(
     type : 'boolean',
     value : false,
     description : 'whether to build binaries for all architectures or just for current'
-)
+)

package/build/libarkts-copy/native/mingw.cross

@@ -0,0 +1,14 @@
+[binaries]
+c = 'x86_64-w64-mingw32-gcc'
+cpp = 'x86_64-w64-mingw32-g++'
+ar = 'x86_64-w64-mingw32-ar'
+windres = 'x86_64-w64-mingw32-windres'
+strip = 'x86_64-w64-mingw32-strip'
+exe_wrapper = 'wine64'
+
+[host_machine]
+system = 'windows'
+cpu_family = 'x86_64'
+cpu = 'x86_64'
+endian = 'little'
+

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

@@ -190,6 +190,14 @@ KNativePointer impl_ContextErrorMessage(KNativePointer contextPtr)
 }
 KOALA_INTEROP_1(ContextErrorMessage, KNativePointer, KNativePointer)
 
+KNativePointer impl_GetAllErrorMessages(KNativePointer contextPtr)
+{
+    auto context = reinterpret_cast<es2panda_Context*>(contextPtr);
+
+    return StageArena::strdup(GetImpl()->GetAllErrorMessages(context));
+}
+KOALA_INTEROP_1(GetAllErrorMessages, KNativePointer, KNativePointer)
+
 /*
 KNativePointer impl_CallExpressionSignature(KNativePointer context, KNativePointer classInstance)
 {
@@ -394,15 +402,83 @@ void impl_DestroyGlobalContext(KNativePointer globalContextPtr) {
 }
 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);
+    auto _node = reinterpret_cast<es2panda_AstNode*>(node);
+    return GetImpl()->ScriptFunctionGetPreferredReturnType(_context, _node);
+}
+KOALA_INTEROP_2(Checker_ScriptFunctionGetPreferredReturnType, KNativePointer, KNativePointer, KNativePointer)
+
+void impl_Checker_ScriptFunctionSetPreferredReturnType(KNativePointer context, KNativePointer node, KNativePointer type)
+{
+    auto _context = reinterpret_cast<es2panda_Context*>(context);
+    auto _node = reinterpret_cast<es2panda_AstNode*>(node);
+    auto _type = reinterpret_cast<es2panda_Type*>(type);
+    GetImpl()->ScriptFunctionSetPreferredReturnType(_context, _node, _type);
+    return;
+}
+KOALA_INTEROP_V3(Checker_ScriptFunctionSetPreferredReturnType, KNativePointer, KNativePointer, KNativePointer)
+
+KNativePointer impl_Checker_TypeToString(KNativePointer context, KNativePointer type)
+{
+    auto _context = reinterpret_cast<es2panda_Context*>(context);
+    auto _type = reinterpret_cast<es2panda_Type*>(type);
+    auto result = GetImpl()->TypeToStringConst(_context, _type);
+    return StageArena::strdup(result);
+}
+KOALA_INTEROP_2(Checker_TypeToString, KNativePointer, KNativePointer, KNativePointer)
+
+KNativePointer impl_Checker_TypeNodeGetType(KNativePointer context, KNativePointer astNode)
+{
+    auto _context = reinterpret_cast<es2panda_Context*>(context);
+    auto _astNode = reinterpret_cast<es2panda_AstNode*>(astNode);
+    return GetImpl()->TypeNodeGetType(_context, _astNode);
+}
+KOALA_INTEROP_2(Checker_TypeNodeGetType, KNativePointer, KNativePointer, KNativePointer)
+
 // From koala-wrapper
-// TODO check if some code should be generated
+// Improve: check if some code should be generated
 
 std::set<std::string> globalStructInfo;
+#ifdef _GLIBCXX_HAS_GTHREADS
 std::mutex g_structMutex;
+#endif
 
 void impl_InsertGlobalStructInfo(KNativePointer contextPtr, KStringPtr& instancePtr)
 {
+#ifdef _GLIBCXX_HAS_GTHREADS
     std::lock_guard<std::mutex> lock(g_structMutex);
+#endif
     globalStructInfo.insert(getStringCopy(instancePtr));
     return;
 }
@@ -410,7 +486,9 @@ KOALA_INTEROP_V2(InsertGlobalStructInfo, KNativePointer, KStringPtr);
 
 KBoolean impl_HasGlobalStructInfo(KNativePointer contextPtr, KStringPtr& instancePtr)
 {
+#ifdef _GLIBCXX_HAS_GTHREADS
     std::lock_guard<std::mutex> lock(g_structMutex);
+#endif
     return globalStructInfo.count(getStringCopy(instancePtr));
 }
 KOALA_INTEROP_2(HasGlobalStructInfo, KBoolean, KNativePointer, KStringPtr);
@@ -501,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;
@@ -515,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;
@@ -535,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)
@@ -560,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)
 {
@@ -588,14 +669,14 @@ 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)
 
-// TODO: simplify
+// Improve: simplify
 KNativePointer impl_CreateContextGenerateAbcForExternalSourceFiles(
     KNativePointer configPtr, KInt fileNamesCount, KStringArray fileNames)
 {
@@ -618,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;
@@ -127,11 +131,11 @@ void impl_SetUpSoPath(KStringPtr &soPath)
 }
 KOALA_INTEROP_V1(SetUpSoPath, KStringPtr);
 
-// todo: simplify this
+// Improve: simplify this
 void* FindLibrary() {
-    void *res = NULL;
+    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};
@@ -165,7 +169,7 @@ void* FindLibrary() {
         return res;
     }
 
-    return NULL;
+    return nullptr;
 }
 
 es2panda_Impl *GetImplSlow()
@@ -270,7 +274,7 @@ KInt impl_IdentifierIdentifierFlags(KNativePointer contextPtr, KNativePointer no
 KOALA_INTEROP_2(IdentifierIdentifierFlags, KInt, KNativePointer, KNativePointer)
 
 /*
-TODO: NOT FROM API (shouldn't be there)
+Improve: NOT FROM API (shouldn't be there)
 -----------------------------------------------------------------------------------------------------------------------------
 */
 
@@ -336,7 +340,7 @@ KOALA_INTEROP_2(AstNodeChildren, KNativePointer, KNativePointer, KNativePointer)
 */
 
 // From koala-wrapper
-// TODO check if some code should be generated
+// Improve: check if some code should be generated
 
 void impl_MemInitialize()
 {

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>