@idlizer/arktscgen 2.1.10-arktscgen-5 → 2.1.10-arktscgen-7

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

@@ -22,31 +22,14 @@
         "ETSUndefinedType",
     ],
     "ignore": {
-        "full": [
+        "peers": [
             "es2panda_Config",
+            "es2panda_Context",
+            "es2panda_GlobalContext",
+        ],
+        "full": [
             "es2panda_ExternalSource",
             "es2panda_OverloadInfo",
-            "es2panda_GlobalContext",
-
-            // Duplicates of types in ir namespace
-            // They will be removed in the fututre.
-            'es2panda_Signature',
-            'es2panda_CheckerContext',
-            'es2panda_Type',
-            'es2panda_TypeRelation',
-            'es2panda_GlobalTypesHolder',
-            'es2panda_Variable',
-            'es2panda_Scope',
-            'es2panda_Path',
-            'es2panda_ResolveResult',
-            'es2panda_RecordTable',
-            'es2panda_BoundContext',
-            'es2panda_ImportPathManager',
-            'es2panda_Options',
-            'es2panda_AstNode',
-            'es2panda_Program',
-            'es2panda_ArkTsConfig',
-            'es2panda_FunctionSignature',
 
             'NodeTransformer',
             'NodeTraverser',
@@ -87,25 +70,22 @@
                 interface: "es2panda_Impl",
                 methods: [
                     "LogSyntaxError", "LogWarning", "LogTypeError", // wrong idl
-                    "DestroyContext", // cleanup arena (Improve: move this cleanup to another method)
+                    "DestroyConfig", // cleanup arena
 
                     // Handwritten bridges
-                    "AstNodeRebind",
-                    "ConfigGetOptions",
-                    "CreateCacheContextFromFile",
-                    "CreateContextFromFile",
-                    "CreateContextFromString",
-                    "CreateContextGenerateAbcForExternalSourceFiles",
-                    "CreateDiagnosticInfo",
+                    "ConfigGetOptions", // handwritten class
+                    "ExternalSourceName", // handwritten class and used in panda API
+                    "SourcePositionCol", // not in idl
+                    "ExternalSourcePrograms", // Wrong args
+                    "LogDiagnostic", // not in idl
                     "CreateDiagnosticKind",
-                    "CreateGlobalContext",
-                    "CreateSuggestionInfo",
-                    "DestroyGlobalContext",
-                    "SourcePositionCol",
-                    "ExternalSourceName",
-                    "ExternalSourcePrograms",
-                    "GenerateTsDeclarationsFromContext",
-                    "LogDiagnostic",
+                    "GetSemanticErrors",
+                    "GetSyntaxErrors",
+                    "GetPluginErrors",
+                    "GetWarnings",
+                    "NumberLiteralStrConst",
+                    "MemInitialize",
+                    "MemFinalize",
                 ],
             },
             {
@@ -235,18 +215,15 @@
                     "Parse",
                 ]
             },
+            {
+                interface: "ClassDefinition",
+                methods: [
+                    "SetBody", // handwritten
+                ]
+            },
         ]
     },
     nonNullable: [
-        {
-            name: "ScriptFunction",
-            methods: [
-                {
-                    name: "SetIdent",
-                    types: ["id"]
-                }
-            ]
-        },
         {
             name: "ArrowFunctionExpression",
             methods: [

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

@@ -23,14 +23,14 @@ project(
 is_cross = get_option('cross_compile')
 
 sources = [
-    './src/common.cc',
-    './src/memoryTracker.cc',
-    './src/bridges.cc',
-    '../generated/native/bridges.cc',
-    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',
+    './src/common.cpp',
+    './src/memoryTracker.cpp',
+    './src/bridges.cpp',
+    '../generated/native/bridges.cpp',
+    get_option('interop_src_dir') / 'common-interop.cpp',
+    get_option('interop_src_dir') / 'callback-resource.cpp',
+    get_option('interop_src_dir') / 'interop-logging.cpp',
+    get_option('interop_src_dir') / 'napi' / 'convertors-napi.cpp',
 ]
 
 cflags = [
@@ -44,7 +44,7 @@ if (host_machine.system() == 'windows')
     cflags += ['-DKOALA_WINDOWS']
     # apply node.exe symbol loading hook
     sources += [
-        get_option('interop_src_dir') / 'napi/win-dynamic-node.cc'
+        get_option('interop_src_dir') / 'napi/win-dynamic-node.cpp'
     ]
 else
     cflags += ['-DKOALA_LINUX']
@@ -76,6 +76,22 @@ suffix_cross = '_' + os + '_arm64'
 endif
 endif
 
+fs = import('fs')
+if fs.is_dir(get_option('node_modules_dir_1') + '/node-api-headers')
+    node_api_headers_dir = get_option('node_modules_dir_1')
+elif fs.is_dir(get_option('node_modules_dir_2') + '/node-api-headers')
+    node_api_headers_dir = get_option('node_modules_dir_2')
+else
+    error('node-api-headers not found')
+endif
+if fs.is_dir(get_option('node_modules_dir_1') + '/node-addon-api')
+    node_addon_api_dir = get_option('node_modules_dir_1')
+elif fs.is_dir(get_option('node_modules_dir_2') + '/node-addon-api')
+    node_addon_api_dir = get_option('node_modules_dir_2')
+else
+    error('node-addon-api not found')
+endif
+
 shared_library(
     get_option('lib_name') + suffix_host,
     sources,
@@ -92,8 +108,8 @@ shared_library(
         get_option('interop_src_dir'),
         get_option('interop_src_dir') / 'types',
         get_option('interop_src_dir') / 'napi',
-        get_option('node_modules_dir') / 'node-api-headers/include',
-        get_option('node_modules_dir') / 'node-addon-api',
+        node_api_headers_dir / 'node-api-headers/include',
+        node_addon_api_dir / 'node-addon-api',
     ],
     cpp_args: cflags + cflags_host,
     link_args: [cflags_host],
@@ -118,8 +134,8 @@ if is_cross
             get_option('interop_src_dir'),
             get_option('interop_src_dir') / 'types',
             get_option('interop_src_dir') / 'napi',
-            get_option('node_modules_dir') / 'node-api-headers/include',
-            get_option('node_modules_dir') / 'node-addon-api',
+            node_api_headers_dir / 'node-api-headers/include',
+            node_addon_api_dir / 'node-addon-api',
         ],
         cpp_args: cflags  + cflags_cross,
         link_args: [cflags_cross],

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

@@ -12,7 +12,13 @@
 # limitations under the License.
 
 option(
-    'node_modules_dir',
+    'node_modules_dir_1',
+    type : 'string',
+    value : '../node_modules/',
+    description : 'path to node_modules'
+)
+option(
+    'node_modules_dir_2',
     type : 'string',
     value : '../../node_modules/',
     description : 'path to node_modules'
@@ -20,13 +26,13 @@ option(
 option(
     'interop_src_dir',
     type : 'string',
-    value : '../../../interop/src/cpp/',
+    value : '../../interop/src/cpp/',
     description : 'path to koala interop cpp files'
 )
 option(
     'panda_sdk_dir',
     type : 'string',
-    value : '../../../incremental/tools/panda/node_modules/@panda/sdk/',
+    value : '../../incremental/tools/panda/node_modules/@panda/sdk/',
     description : 'path to panda sdk'
 )
 option(

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

@@ -25,3 +25,5 @@ cpu_family = 'x86_64'
 cpu = 'x86_64'
 endian = 'little'
 
+[properties]
+cpp_link_args = ['-lpsapi']

package/build/libarkts-copy/native/src/{bridges.cc → bridges.cpp}

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Huawei Device Co., Ltd.
+ * Copyright (c) 2024-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
@@ -18,6 +18,7 @@
 #include <string>
 
 #include "common.h"
+#include "memoryTracker.h"
 
 /** XXX: If you add or remove methods that exist in C API,
  * please change generator/options.json5 accordingly.
@@ -39,7 +40,7 @@ KNativePointer impl_AnnotationAllowedAnnotations(
     auto node = reinterpret_cast<es2panda_AstNode*>(nodePtr);
     std::size_t params_len = 0;
     auto annotations = GetImpl()->AnnotationAllowedAnnotations(context, node, &params_len);
-    return StageArena::cloneVector(annotations, params_len);
+    return StageArena::CloneVector(annotations, params_len);
 }
 KOALA_INTEROP_3(AnnotationAllowedAnnotations, KNativePointer, KNativePointer, KNativePointer, KNativePointer)
 
@@ -50,7 +51,7 @@ KNativePointer impl_AnnotationAllowedAnnotationsConst(
     auto node = reinterpret_cast<es2panda_AstNode*>(nodePtr);
     std::size_t params_len = 0;
     auto annotations = GetImpl()->AnnotationAllowedAnnotationsConst(context, node, &params_len);
-    return StageArena::cloneVector(annotations, params_len);
+    return StageArena::CloneVector(annotations, params_len);
 }
 KOALA_INTEROP_3(AnnotationAllowedAnnotationsConst, KNativePointer, KNativePointer, KNativePointer, KNativePointer)
 
@@ -91,20 +92,6 @@ KNativePointer impl_ETSParserCreateExpression(KNativePointer contextPtr, KString
 }
 KOALA_INTEROP_3(ETSParserCreateExpression, KNativePointer, KNativePointer, KStringPtr, KInt)
 
-KNativePointer impl_CreateContextFromString(KNativePointer configPtr, KStringPtr& sourcePtr, KStringPtr& filenamePtr)
-{
-    auto config = reinterpret_cast<es2panda_Config*>(configPtr);
-    return GetImpl()->CreateContextFromString(config, sourcePtr.data(), filenamePtr.data());
-}
-KOALA_INTEROP_3(CreateContextFromString, KNativePointer, KNativePointer, KStringPtr, KStringPtr)
-
-KNativePointer impl_CreateContextFromFile(KNativePointer configPtr, KStringPtr& filenamePtr)
-{
-    auto config = reinterpret_cast<es2panda_Config*>(configPtr);
-    return GetImpl()->CreateContextFromFile(config, getStringCopy(filenamePtr));
-}
-KOALA_INTEROP_2(CreateContextFromFile, KNativePointer, KNativePointer, KStringPtr)
-
 KNativePointer impl_SignatureFunction(KNativePointer context, KNativePointer classInstance)
 {
     const auto _context = reinterpret_cast<es2panda_Context*>(context);
@@ -120,7 +107,7 @@ static KNativePointer impl_ProgramExternalSources(KNativePointer contextPtr, KNa
     auto&& instance = reinterpret_cast<es2panda_Program*>(instancePtr);
     std::size_t source_len = 0;
     auto external_sources = GetImpl()->ProgramExternalSources(context, instance, &source_len);
-    return StageArena::cloneVector(external_sources, source_len);
+    return StageArena::CloneVector(external_sources, source_len);
 }
 KOALA_INTEROP_2(ProgramExternalSources, KNativePointer, KNativePointer, KNativePointer);
 
@@ -139,7 +126,7 @@ static KNativePointer impl_ProgramSourceFilePath(KNativePointer contextPtr, KNat
     auto context = reinterpret_cast<es2panda_Context*>(contextPtr);
     auto&& instance = reinterpret_cast<es2panda_Program*>(instancePtr);
     auto&& result = GetImpl()->ProgramSourceFilePathConst(context, instance);
-    return StageArena::strdup(result);
+    return StageArena::Strdup(result);
 }
 KOALA_INTEROP_2(ProgramSourceFilePath, KNativePointer, KNativePointer, KNativePointer);
 
@@ -147,7 +134,7 @@ static KNativePointer impl_ExternalSourceName(KNativePointer instance)
 {
     auto&& _instance_ = reinterpret_cast<es2panda_ExternalSource*>(instance);
     auto&& result = GetImpl()->ExternalSourceName(_instance_);
-    return StageArena::strdup(result);
+    return StageArena::Strdup(result);
 }
 KOALA_INTEROP_1(ExternalSourceName, KNativePointer, KNativePointer);
 
@@ -156,7 +143,7 @@ static KNativePointer impl_ExternalSourcePrograms(KNativePointer instance)
     auto&& _instance_ = reinterpret_cast<es2panda_ExternalSource*>(instance);
     std::size_t program_len = 0;
     auto programs = GetImpl()->ExternalSourcePrograms(_instance_, &program_len);
-    return StageArena::cloneVector(programs, program_len);
+    return StageArena::CloneVector(programs, program_len);
 }
 KOALA_INTEROP_1(ExternalSourcePrograms, KNativePointer, KNativePointer);
 
@@ -210,30 +197,6 @@ KNativePointer impl_OptionsArkTsConfig(KNativePointer context, KNativePointer op
 }
 KOALA_INTEROP_2(OptionsArkTsConfig, KNativePointer, KNativePointer, KNativePointer)
 
-KNativePointer impl_CreateCacheContextFromFile(
-    KNativePointer configPtr, KStringPtr& source_file_namePtr, KNativePointer globalContextPtr, KBoolean isExternal)
-{
-    auto config = reinterpret_cast<es2panda_Config*>(configPtr);
-    auto globalContext = reinterpret_cast<es2panda_GlobalContext*>(globalContextPtr);
-    return GetImpl()->CreateCacheContextFromFile(config, getStringCopy(source_file_namePtr), globalContext, isExternal);
-}
-KOALA_INTEROP_4(CreateCacheContextFromFile, KNativePointer, KNativePointer, KStringPtr, KNativePointer, KBoolean)
-
-KNativePointer impl_CreateGlobalContext(
-    KNativePointer configPtr, KStringArray& externalFileListPtr, KUInt fileNum, KBoolean LspUsage)
-{
-    auto config = reinterpret_cast<es2panda_Config*>(configPtr);
-    return GetImpl()->CreateGlobalContext(config, getStringArray(externalFileListPtr), fileNum, LspUsage);
-}
-KOALA_INTEROP_4(CreateGlobalContext, KNativePointer, KNativePointer, KStringArray, KUInt, KBoolean)
-
-void impl_DestroyGlobalContext(KNativePointer globalContextPtr)
-{
-    auto globalContext = reinterpret_cast<es2panda_GlobalContext*>(globalContextPtr);
-    GetImpl()->DestroyGlobalContext(globalContext);
-}
-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
@@ -312,7 +275,7 @@ KNativePointer impl_Checker_TypeToString(KNativePointer context, KNativePointer
     auto _context = reinterpret_cast<es2panda_Context*>(context);
     auto _type = reinterpret_cast<es2panda_Type*>(type);
     auto result = GetImpl()->TypeToStringConst(_context, _type);
-    return StageArena::strdup(result);
+    return StageArena::Strdup(result);
 }
 KOALA_INTEROP_2(Checker_TypeToString, KNativePointer, KNativePointer, KNativePointer)
 
@@ -384,7 +347,7 @@ KNativePointer impl_TSInterfaceBodyBodyPtr(KNativePointer context, KNativePointe
     const auto _receiver = reinterpret_cast<es2panda_AstNode*>(receiver);
     std::size_t length;
     auto result = GetImpl()->TSInterfaceBodyBodyPtr(_context, _receiver, &length);
-    return StageArena::cloneVector(result, length);
+    return StageArena::CloneVector(result, length);
 }
 KOALA_INTEROP_2(TSInterfaceBodyBodyPtr, KNativePointer, KNativePointer, KNativePointer);
 
@@ -394,7 +357,7 @@ KNativePointer impl_AnnotationDeclarationPropertiesPtrConst(KNativePointer conte
     const auto _receiver = reinterpret_cast<es2panda_AstNode*>(receiver);
     std::size_t length;
     auto result = GetImpl()->AnnotationDeclarationPropertiesPtrConst(_context, _receiver, &length);
-    return StageArena::cloneVector(result, length);
+    return StageArena::CloneVector(result, length);
 }
 KOALA_INTEROP_2(AnnotationDeclarationPropertiesPtrConst, KNativePointer, KNativePointer, KNativePointer);
 
@@ -415,31 +378,6 @@ 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 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);
-    return GetImpl()->CreateDiagnosticInfo(_context, _kind, getStringArray(argsPtr), argc, _pos);
-}
-KOALA_INTEROP_5(
-    CreateDiagnosticInfo, KNativePointer, KNativePointer, KNativePointer, KStringArray, KInt, KNativePointer)
-
-KNativePointer impl_CreateSuggestionInfo(KNativePointer context, KNativePointer kind, KStringArray& argsPtr, KInt argc,
-    KStringPtr& substitutionCode, KStringPtr& title, KNativePointer range)
-{
-    const auto _context = reinterpret_cast<es2panda_Context*>(context);
-    const auto _kind = reinterpret_cast<es2panda_DiagnosticKind*>(kind);
-    const auto _title = getStringCopy(title);
-    const auto _range = reinterpret_cast<es2panda_SourceRange*>(range);
-    const auto _substitutionCode = getStringCopy(substitutionCode);
-    return GetImpl()->CreateSuggestionInfo(
-        _context, _kind, getStringArray(argsPtr), argc, _substitutionCode, _title, _range);
-}
-KOALA_INTEROP_7(CreateSuggestionInfo, KNativePointer, KNativePointer, KNativePointer, KStringArray, KInt, KStringPtr,
-    KStringPtr, KNativePointer)
-
 void impl_LogDiagnostic(
     KNativePointer context, KNativePointer kind, KStringArray& argvPtr, KInt argc, KNativePointer pos)
 {
@@ -456,28 +394,10 @@ KNativePointer impl_AnnotationUsageIrPropertiesPtrConst(KNativePointer context,
     const auto _receiver = reinterpret_cast<es2panda_AstNode*>(receiver);
     std::size_t length;
     auto result = GetImpl()->AnnotationUsageIrPropertiesPtrConst(_context, _receiver, &length);
-    return StageArena::cloneVector(result, length);
+    return StageArena::CloneVector(result, length);
 }
 KOALA_INTEROP_2(AnnotationUsageIrPropertiesPtrConst, KNativePointer, KNativePointer, KNativePointer);
 
-KInt impl_GenerateTsDeclarationsFromContext(KNativePointer contextPtr, KStringPtr& outputDeclEts, KStringPtr& outputEts,
-    KBoolean exportAll, KBoolean isolated, KStringPtr& recordFile, KBoolean genAnnotations)
-{
-    auto context = reinterpret_cast<es2panda_Context*>(contextPtr);
-    return GetImpl()->GenerateTsDeclarationsFromContext(
-        context, outputDeclEts.data(), outputEts.data(), exportAll, isolated, recordFile.data(), genAnnotations);
-}
-KOALA_INTEROP_7(GenerateTsDeclarationsFromContext, KInt, KNativePointer, KStringPtr, KStringPtr, KBoolean, KBoolean,
-    KStringPtr, KBoolean)
-
-KNativePointer impl_CreateContextGenerateAbcForExternalSourceFiles(
-    KNativePointer configPtr, KInt fileNamesCount, KStringArray& fileNames)
-{
-    auto config = reinterpret_cast<es2panda_Config*>(configPtr);
-    return GetImpl()->CreateContextGenerateAbcForExternalSourceFiles(config, fileNamesCount, getStringArray(fileNames));
-}
-KOALA_INTEROP_3(CreateContextGenerateAbcForExternalSourceFiles, KNativePointer, KNativePointer, KInt, KStringArray)
-
 KInt impl_GetCompilationMode(KNativePointer configPtr)
 {
     auto _config = reinterpret_cast<es2panda_Config*>(configPtr);
@@ -502,3 +422,22 @@ KNativePointer impl_CreateTypeNodeFromTsType(KNativePointer context, KNativePoin
     return _typeAnnotation;
 }
 KOALA_INTEROP_2(CreateTypeNodeFromTsType, KNativePointer, KNativePointer, KNativePointer)
+
+MemoryTracker tracker;
+void impl_MemoryTrackerReset(KNativePointer context)
+{
+    tracker.Reset();
+}
+KOALA_INTEROP_V1(MemoryTrackerReset, KNativePointer);
+
+void impl_MemoryTrackerGetDelta(KNativePointer context)
+{
+    tracker.Report(tracker.GetDelta());
+}
+KOALA_INTEROP_V1(MemoryTrackerGetDelta, KNativePointer);
+
+void impl_MemoryTrackerPrintCurrent(KNativePointer context)
+{
+    tracker.Report(GetMemoryStats());
+}
+KOALA_INTEROP_V1(MemoryTrackerPrintCurrent, KNativePointer);