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

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

@@ -27,10 +27,10 @@ sources = [
     './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',
+    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

@@ -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.
@@ -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);
@@ -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
@@ -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)
 {
@@ -460,24 +398,6 @@ 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, 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);

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

@@ -15,10 +15,11 @@
 
 #include <common.h>
 #include <iterator>
-#include <regex.h>
+#include <regex>
 #include <sstream>
 #include <utility>
 #include <vector>
+#include <bitset>
 
 #include "interop-types.h"
 
@@ -136,14 +137,14 @@ void impl_SetUpSoPath(KStringPtr& soPath)
 }
 KOALA_INTEROP_V1(SetUpSoPath, KStringPtr);
 
-void* TryLibrary(const char* name) 
+void* TryLibrary(const char* name)
 {
     void* res = nullptr;
     std::vector<std::string> pathArray;
 
     // find by SetUpSoPath
     if (!ES2PANDA_LIB_PATH.empty()) {
-        pathArray = {ES2PANDA_LIB_PATH, LIB_DIR, name};
+        pathArray = { ES2PANDA_LIB_PATH, LIB_DIR, name };
         res = loadLibrary(joinPath(pathArray));
         if (res) {
             return res;
@@ -153,7 +154,7 @@ void* TryLibrary(const char* name)
     // find by set PANDA_SDK_PATH
     char* envValue = getenv("PANDA_SDK_PATH");
     if (envValue) {
-        pathArray = {envValue, PLUGIN_DIR, LIB_DIR, name};
+        pathArray = { envValue, PLUGIN_DIR, LIB_DIR, name };
         res = loadLibrary(joinPath(pathArray));
         if (res) {
             return res;
@@ -161,14 +162,14 @@ void* TryLibrary(const char* name)
     }
 
     // find by set LD_LIBRARY_PATH
-    pathArray = {name};
+    pathArray = { name };
     res = loadLibrary(joinPath(pathArray));
     if (res) {
         return res;
     }
 
     // find by DEFAULT_SDK_PATH
-    pathArray = {DEFAULT_SDK_PATH, PLUGIN_DIR, LIB_DIR, name};
+    pathArray = { DEFAULT_SDK_PATH, PLUGIN_DIR, LIB_DIR, name };
     res = loadLibrary(joinPath(pathArray));
     if (res) {
         return res;
@@ -178,8 +179,9 @@ void* TryLibrary(const char* name)
 }
 
 // TODO: @panda/sdk will be changed to match ohos-sdk
-void* FindLibrary() {
-    void *res = nullptr;
+void* FindLibrary()
+{
+    void* res = nullptr;
 
     res = TryLibrary(LIB_ES2PANDA_PUBLIC);
     if (res) {
@@ -228,27 +230,16 @@ char* getStringCopy(KStringPtr& ptr)
     return StageArena::strdup(ptr.c_str() ? ptr.c_str() : "");
 }
 
-KNativePointer impl_CreateConfig(KInt argc, KStringArray& argvPtr)
-{
-    return GetImpl()->CreateConfig(argc, getStringArray(argvPtr));
-}
-KOALA_INTEROP_2(CreateConfig, KNativePointer, KInt, KStringArray)
-
-KNativePointer impl_DestroyConfig(KNativePointer configPtr)
-{
-    auto config = reinterpret_cast<es2panda_Config*>(configPtr);
-    GetImpl()->DestroyConfig(config);
-    return nullptr;
-}
-KOALA_INTEROP_1(DestroyConfig, KNativePointer, KNativePointer)
-
-void impl_DestroyContext(KNativePointer contextPtr)
+void impl_DestroyConfig(KNativePointer config)
 {
-    auto context = reinterpret_cast<es2panda_Context*>(contextPtr);
-    GetImpl()->DestroyContext(context);
+    const auto _config = reinterpret_cast<es2panda_Config*>(config);
+    // panda prints diagnostics here and do not clone our strings
+    // so keep arena alive until this moment.
+    GetImpl()->DestroyConfig(_config);
     StageArena::instance()->cleanup();
+    printf("[libarkts native] Arena cleaned up!\n");
 }
-KOALA_INTEROP_V1(DestroyContext, KNativePointer)
+KOALA_INTEROP_V1(DestroyConfig, KNativePointer);
 
 KNativePointer impl_UpdateCallExpression(KNativePointer contextPtr, KNativePointer nodePtr, KNativePointer calleePtr,
     KNativePointerArray argumentsPtr, KInt argumentsLen, KNativePointer typeParamsPtr, KBoolean optionalT,
@@ -385,24 +376,45 @@ struct Pattern {
     std::string key;
     std::string value;
     es2panda_Impl* impl;
+    bool isWildcard = false;
+    std::regex regex;
+
+    Pattern(const Pattern&) = delete;
+
+    Pattern(Pattern&& other) noexcept :
+        context(other.context), key(std::move(other.key)), value(std::move(other.value)), impl(other.impl), isWildcard(other.isWildcard), regex(other.regex) {
+        other.isWildcard = false;
+    }
 
     Pattern(es2panda_Context* context, const std::string& part) : context(context), impl(GetImpl())
     {
         std::istringstream stream(part);
         std::getline(stream, key, '=');
         std::getline(stream, value, '=');
+        isWildcard = value.find('*') != std::string::npos;
+
+        if (isWildcard) {
+            this->regex = std::regex(value);
+        }
     }
-    bool match(es2panda_AstNode* node)
+    
+    ~Pattern() = default;
+
+    bool match(es2panda_AstNode* node) const
     {
         if (key == "type") {
             auto type = impl->AstNodeTypeConst(context, node);
             switch (type) {
                 case Es2pandaAstNodeType::AST_NODE_TYPE_METHOD_DEFINITION:
-                case Es2pandaAstNodeType::AST_NODE_TYPE_SCRIPT_FUNCTION:
-
                     return value == "method";
+                case Es2pandaAstNodeType::AST_NODE_TYPE_SCRIPT_FUNCTION:
+                    return value == "function";
                 case Es2pandaAstNodeType::AST_NODE_TYPE_STRUCT_DECLARATION:
                     return value == "struct";
+                case Es2pandaAstNodeType::AST_NODE_TYPE_CALL_EXPRESSION:
+                    return value == "call";
+                case Es2pandaAstNodeType::AST_NODE_TYPE_ASSIGNMENT_EXPRESSION:
+                    return value == "assignment";
                 default:
                     return false;
             }
@@ -412,22 +424,42 @@ struct Pattern {
             Es2pandaAstNodeType type = impl->AstNodeTypeConst(context, node);
             es2panda_AstNode** result = nullptr;
             switch (type) {
-                case Es2pandaAstNodeType::AST_NODE_TYPE_METHOD_DEFINITION: {
-                    auto function = impl->MethodDefinitionFunction(context, node);
-                    result = impl->FunctionDeclarationAnnotations(context, function, &length);
+                case Es2pandaAstNodeType::AST_NODE_TYPE_SCRIPT_FUNCTION: {
+                    result = impl->ScriptFunctionAnnotations(context, node, &length);
                     break;
                 }
-                case Es2pandaAstNodeType::AST_NODE_TYPE_FUNCTION_DECLARATION:
+                case Es2pandaAstNodeType::AST_NODE_TYPE_FUNCTION_DECLARATION: {
                     result = impl->FunctionDeclarationAnnotations(context, node, &length);
                     break;
-                case AST_NODE_TYPE_ARROW_FUNCTION_EXPRESSION: {
-                    auto function = impl->ArrowFunctionExpressionFunction(context, node);
-                    result = impl->FunctionDeclarationAnnotations(context, function, &length);
+                }
+                case Es2pandaAstNodeType::AST_NODE_TYPE_ARROW_FUNCTION_EXPRESSION: {
+                    result = impl->ArrowFunctionExpressionAnnotations(context, node, &length);
+                    break;
+                }
+                case Es2pandaAstNodeType::AST_NODE_TYPE_ETS_FUNCTION_TYPE: {
+                    result = impl->TypeNodeAnnotations(context, node, &length);
+                    break;
+                }
+                case Es2pandaAstNodeType::AST_NODE_TYPE_TS_TYPE_ALIAS_DECLARATION: {
+                    result = impl->TSTypeAliasDeclarationAnnotations(context, node, &length);
                     break;
                 }
-                case Es2pandaAstNodeType::AST_NODE_TYPE_CLASS_PROPERTY:
+                case Es2pandaAstNodeType::AST_NODE_TYPE_VARIABLE_DECLARATION: {
+                    result = impl->VariableDeclarationAnnotations(context, node, &length);
+                    break;
+                }
+                case Es2pandaAstNodeType::AST_NODE_TYPE_ETS_UNION_TYPE: {
+                    result = impl->TypeNodeAnnotations(context, node, &length);
+                    break;
+                }
+                case Es2pandaAstNodeType::AST_NODE_TYPE_CLASS_PROPERTY: {
                     result = impl->ClassPropertyAnnotations(context, node, &length);
                     break;
+                }
+                case Es2pandaAstNodeType::AST_NODE_TYPE_ETS_PARAMETER_EXPRESSION: {
+                    result = impl->ETSParameterExpressionAnnotations(context, node, &length);
+                    break;
+                }
                 default:
                     return false;
             }
@@ -442,15 +474,13 @@ struct Pattern {
         return false;
     }
 
-    bool matchWildcard(const std::string& pattern, const char* value)
+    bool matchWildcard(const std::string& pattern, const char* value) const
     {
-        if (pattern.find('*') == std::string::npos) {
+        if (!isWildcard) {
             return pattern == value;
         }
-        regex_t regex;
-        regmatch_t match[1];
-        regcomp(&regex, pattern.c_str(), REG_NEWLINE);
-        return regexec(&regex, value, 1, match, 0) != REG_NOMATCH;
+
+        return std::regex_search(value, this->regex);
     }
 };
 
@@ -464,20 +494,20 @@ struct Matcher {
         std::istringstream stream(query);
         std::string item;
         while (std::getline(stream, item, ';')) {
-            patterns.emplace_back(Pattern(context, item));
+            patterns.emplace_back(std::forward<Pattern>(Pattern(context, item)));
         }
     }
     bool match(es2panda_AstNode* node)
     {
         bool result = true;
-        for (auto pattern : patterns) {
+        for (const auto& pattern : patterns) {
             result &= pattern.match(node);
         }
         return result;
     }
 };
 
-KNativePointer impl_FilterNodes(KNativePointer context, KNativePointer node, const KStringPtr& filters)
+KNativePointer impl_FilterNodes(KNativePointer context, KNativePointer node, const KStringPtr& filters, KBoolean deeperAfterMatch)
 {
     auto _node = reinterpret_cast<es2panda_AstNode*>(node);
     auto _context = reinterpret_cast<es2panda_Context*>(context);
@@ -490,9 +520,11 @@ KNativePointer impl_FilterNodes(KNativePointer context, KNativePointer node, con
     while (queue.size() > 0) {
         auto* current = queue.back();
         queue.pop_back();
-        if (matcher.match(current)) {
+        bool isMatch = matcher.match(current);
+        if (isMatch) {
             result.push_back(current);
-        } else {
+        }
+        if (!isMatch || deeperAfterMatch) {
             impl->AstNodeIterateConst(_context, current, visitChild);
             // We want to retain match order, so add children in reverse order.
             for (auto it = cachedChildren.rbegin(); it != cachedChildren.rend(); ++it) {
@@ -503,7 +535,53 @@ KNativePointer impl_FilterNodes(KNativePointer context, KNativePointer node, con
     }
     return StageArena::cloneVector(result.data(), result.size());
 }
-KOALA_INTEROP_3(FilterNodes, KNativePointer, KNativePointer, KNativePointer, KStringPtr)
+KOALA_INTEROP_4(FilterNodes, KNativePointer, KNativePointer, KNativePointer, KStringPtr, KBoolean)
+
+constexpr int AST_NODE_TYPE_LIMIT = 256;
+
+struct FilterArgs {
+    es2panda_Impl *impl;
+    es2panda_Context *context;
+    std::bitset<AST_NODE_TYPE_LIMIT> *typesMask;
+    std::vector<es2panda_AstNode *> *result;
+};
+
+void filterByType(es2panda_AstNode *node, void *argsPointer)
+{
+    FilterArgs *args = reinterpret_cast<FilterArgs *>(argsPointer);
+    auto type = args->impl->AstNodeTypeConst(args->context, node);
+    if ((*args->typesMask)[type]) {
+        args->result->push_back(node);
+    }
+}
+
+KNativePointer impl_FilterNodes2(KNativePointer context, KNativePointer node, KInt type)
+{
+    auto _node = reinterpret_cast<es2panda_AstNode*>(node);
+    auto _context = reinterpret_cast<es2panda_Context*>(context);
+    std::bitset<AST_NODE_TYPE_LIMIT> typesMask;
+    typesMask.set(type);
+    std::vector<es2panda_AstNode *> result;
+    FilterArgs args = { GetImpl(), _context, &typesMask, &result };
+    GetImpl()->AstNodeForEach(_node, filterByType, &args);
+    return StageArena::cloneVector(result.data(), result.size());
+}
+KOALA_INTEROP_3(FilterNodes2, KNativePointer, KNativePointer, KNativePointer, KInt)
+
+KNativePointer impl_FilterNodes3(KNativePointer context, KNativePointer node, KInt* types, KInt typesSize)
+{
+    auto _node = reinterpret_cast<es2panda_AstNode*>(node);
+    auto _context = reinterpret_cast<es2panda_Context*>(context);
+    std::bitset<AST_NODE_TYPE_LIMIT> typesMask;
+    for (int i = 0; i < typesSize; i++) {
+        typesMask.set(types[i]);
+    }
+    std::vector<es2panda_AstNode *> result;
+    FilterArgs args = { GetImpl(), _context, &typesMask, &result };
+    GetImpl()->AstNodeForEach(_node, filterByType, &args);
+    return StageArena::cloneVector(result.data(), result.size());
+}
+KOALA_INTEROP_4(FilterNodes3, KNativePointer, KNativePointer, KNativePointer, KInt*, KInt)
 
 /*
 -----------------------------------------------------------------------------------------------------------------------------