@idlizer/arktscgen 2.1.10-arktscgen-9 → 2.1.10-arktscgen-10

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

@@ -107,8 +107,7 @@
                     // Handwritten bridges
                     "ConfigGetOptions", // handwritten class
                     "SourcePositionCol", // not in idl
-                    "LogDiagnostic", // not in idl
-                    "CreateDiagnosticKind",
+                    "CreateDiagnosticKind", // no const suffix in idl
                     "GetSemanticErrors",
                     "GetSyntaxErrors",
                     "GetPluginErrors",
@@ -172,12 +171,22 @@
             {
                 interface: "ClassDefinition",
                 methods: [
-                    "SetBody", // handwritten, no such method in idl.
-                               // probably, an optimized version.
+                    "SetBody", // TODO: implement in compiler some time
                 ]
             },
         ]
     },
+    globalAliases: {
+        classes: [
+            "parser.Program",
+            "es2panda.ArkTsConfig",
+        ],
+        functions: [
+            "compiler.*",
+            "compiler.ProceedToState!",
+            "compiler.Is*!",
+        ]
+    },
     nonNullable: [
         {
            name: "es2panda_Impl",
@@ -210,6 +219,14 @@
                     name: "CreateGlobalContext",
                     types: ["returnType"],
                 },
+                {
+                    name: "CreateDiagnosticInfo",
+                    types: ["returnType"],
+                },
+                {
+                    name: "CreateSuggestionInfo",
+                    types: ["returnType"],
+                },
             ],
         },
         {

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

@@ -28,7 +28,6 @@ sources = [
     './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',
 ]
@@ -42,77 +41,32 @@ cflags = [
 
 ldflags = []
 
-if (host_machine.system() == 'windows')
+arch = target_machine.cpu()
+
+oses = { 'darwin': 'macos', 'windows': 'win32' }  # rename meson default names to convenient ones
+archs = { 'x86_64': 'x64', 'aarch64': 'arm64', 'armv7-a': 'arm32', 'wasm32': 'wasm' }
+
+os = target_machine.system()
+os = oses.get(os, os)
+arch = target_machine.cpu()
+arch = archs.get(arch, arch)
+
+if os == 'win32'
     cflags += ['-DKOALA_WINDOWS']
     # apply node.exe symbol loading hook
     sources += [
         get_option('interop_src_dir') / 'napi/win-dynamic-node.cpp'
     ]
+    ldflags += ['-static']
+endif
 
-    cflags += [
-        '-nostdinc++',
-        '-I/home/huawei/Projects/idlize/external/arkoala-arkts/tools/compiler/llvm-toolchain/include/c++/v1',
-        '-I/home/huawei/Projects/idlize/external/arkoala-arkts/tools/compiler/llvm-toolchain/include/x86_64-unknown-linux-gnu/c++/v1',
-        '-std=c++17',
-        '-Wall',
-        '-Werror',
-        '-Wno-unused-variable',
-        '-Wno-unused-command-line-argument',
-        '-fPIC',
-        '-Wno-error=deprecated-copy',
-        '-enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang',
-        '-ftrivial-auto-var-init=zero',
-        '-fcolor-diagnostics',
-        '-fmerge-all-constants',
-        '-Xclang',
-        '-mllvm',
-        '-Xclang',
-        '-instcombine-lower-dbg-declare=0',
-        '-no-canonical-prefixes',
-        '-fuse-ld=lld',
-        '-fno-stack-protector',
-        '-fno-strict-aliasing',
-        '-Wno-builtin-macro-redefined',
-        '-fms-extensions',
-        '-static',
-        '-rtlib=compiler-rt',
-        '-stdlib=libc++',
-        '-lunwind',
-        '-lpthread',
-        '-Qunused-arguments',
-        '-D__CUSTOM_SECURITY_LIBRARY',
-        '-fno-exceptions',
-        '-fno-rtti',
-    ]
-
-    ldflags += [
-        '-Wl,--fatal-warnings',
-        '-fPIC',
-        '-Wl,--as-needed',
-        '-fuse-ld=lld',
-        '-Wl,--icf=all',
-        '-m64',
-        '-static',
-        '-rtlib=compiler-rt',
-        '-stdlib=libc++',
-        '-std=c++17',
-        '-lunwind',
-        '-lpthread',
-        '-Qunused-arguments',
-    ]
-else
+if os == 'linux'
     cflags += ['-DKOALA_LINUX']
 endif
 
-arch = target_machine.cpu()
-
-oses = { 'darwin': 'macos' }  # rename meson default names to convenient ones
-archs = { 'x86_64': 'x64', 'aarch64': 'arm64', 'armv7-a': 'arm32', 'wasm32': 'wasm' }
-
-os = target_machine.system()
-os = oses.get(os, os)
-arch = target_machine.cpu()
-arch = archs.get(arch, arch)
+if os == 'macos'
+    cflags += ['-DKOALA_MACOS']
+endif
 
 cflags_cross = []
 suffix_host = '_' + os + '_' + arch
@@ -152,6 +106,7 @@ shared_library(
         'b_lundef=false',
     ],
     install: true,
+    install_dir: meson.current_source_dir() + '/../build/native/build',
     name_prefix: '',
     name_suffix: 'node',
     include_directories: [

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

@@ -12,8 +12,8 @@
 # limitations under the License.
 
 [binaries]
-c = ['/home/huawei/Projects/idlize/external/arkoala-arkts/tools/compiler/llvm-toolchain/bin/clang', '-target', 'x86_64-pc-windows-gnu']
-cpp = ['/home/huawei/Projects/idlize/external/arkoala-arkts/tools/compiler/llvm-toolchain/bin/clang++', '-target', 'x86_64-pc-windows-gnu', '-fuse-ld=lld', '-Wl,--icf=all']
+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'
@@ -24,3 +24,6 @@ system = 'windows'
 cpu_family = 'x86_64'
 cpu = 'x86_64'
 endian = 'little'
+
+[built-in options]
+cpp_link_args = ['-lpsapi']

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

@@ -118,25 +118,6 @@ KBoolean impl_HasGlobalStructInfo(KNativePointer contextPtr, KStringPtr& instanc
 }
 KOALA_INTEROP_2(HasGlobalStructInfo, KBoolean, KNativePointer, KStringPtr);
 
-KNativePointer impl_ClassVariableDeclaration(KNativePointer context, KNativePointer classInstance)
-{
-    const auto _context = reinterpret_cast<es2panda_Context*>(context);
-    const auto _classInstance = reinterpret_cast<es2panda_AstNode*>(classInstance);
-    auto _typedTsType = GetImpl()->TypedTsType(_context, _classInstance);
-    if (_typedTsType == nullptr) {
-        return nullptr;
-    }
-    const auto _instanceType = reinterpret_cast<es2panda_Type*>(_typedTsType);
-    auto _typeVar = GetImpl()->TypeVariable(_context, _instanceType);
-    if (_typeVar == nullptr) {
-        return nullptr;
-    }
-    const auto result = reinterpret_cast<es2panda_Declaration*>(GetImpl()->VariableDeclaration(_context, _typeVar));
-    const auto declNode = GetImpl()->DeclNode(_context, result);
-    return declNode;
-}
-KOALA_INTEROP_2(ClassVariableDeclaration, KNativePointer, KNativePointer, KNativePointer)
-
 KNativePointer impl_ETSParserGetGlobalProgramAbsName(KNativePointer contextPtr)
 {
     auto context = reinterpret_cast<es2panda_Context*>(contextPtr);
@@ -154,16 +135,6 @@ KNativePointer impl_CreateDiagnosticKind(KNativePointer context, KStringPtr& mes
 }
 KOALA_INTEROP_3(CreateDiagnosticKind, KNativePointer, KNativePointer, KStringPtr, KInt)
 
-void impl_LogDiagnostic(
-    KNativePointer context, KNativePointer kind, KStringArray& argvPtr, KInt argc, KNativePointer pos)
-{
-    auto&& _context_ = reinterpret_cast<es2panda_Context*>(context);
-    auto&& _kind_ = reinterpret_cast<es2panda_DiagnosticKind*>(kind);
-    auto&& _pos_ = reinterpret_cast<es2panda_SourcePosition*>(pos);
-    GetImpl()->LogDiagnostic(_context_, _kind_, getStringArray(argvPtr), argc, _pos_);
-}
-KOALA_INTEROP_V5(LogDiagnostic, KNativePointer, KNativePointer, KStringArray, KInt, KNativePointer)
-
 KNativePointer impl_AnnotationUsageIrPropertiesPtrConst(KNativePointer context, KNativePointer receiver)
 {
     const auto _context = reinterpret_cast<es2panda_Context*>(context);

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

@@ -26,13 +26,14 @@
 
 using std::string, std::cout, std::endl, std::vector;
 constexpr int AST_NODE_TYPE_LIMIT = 256;
+constexpr int MAX_ALLOC_SIZE = 1 << 25;
 
 es2panda_Impl* es2pandaImplementation = nullptr;
-static thread_local StageArena currentArena;
+static thread_local StageArena g_currentArena;
 
 StageArena* StageArena::Instance()
 {
-    return &currentArena;
+    return &g_currentArena;
 }
 
 void StageArena::Add(void* pointer)
@@ -73,6 +74,9 @@ char* StageArena::Strdup(const char* string)
 
 void* StageArena::Alloc(size_t size)
 {
+    if (size > MAX_ALLOC_SIZE) {
+        INTEROP_FATAL("Cannot allocate memory");
+    }
     void* result = malloc(size);
     if (!result) {
         INTEROP_FATAL("Cannot allocate memory");
@@ -99,8 +103,12 @@ void* StageArena::Alloc(size_t size)
 #endif
 
 #define LIB_PREFIX "lib"
+#ifdef KOALA_MACOS
+#define LIB_SUFFIX ".dylib"
+#else
 #define LIB_SUFFIX ".so"
 #endif
+#endif
 
 const char* DEFAULT_SDK_PATH = "../../../incremental/tools/panda/node_modules/@panda/sdk";
 
@@ -204,13 +212,11 @@ es2panda_Impl* GetImplSlow()
     }
     auto library = FindLibrary();
     if (!library) {
-        printf("No library (es2panda_lib.cc)");
-        abort();
+        INTEROP_FATAL("No library (common.cpp): %s and %s", LIB_ES2PANDA_PUBLIC, LIB_ES2PANDA_PUBLIC_ALT);
     }
     auto symbol = findSymbol(library, "es2panda_GetImpl");
     if (!symbol) {
-        printf("no entry point");
-        abort();
+        INTEROP_FATAL("no entry point: es2panda_GetImpl");
     }
     es2pandaImplementation = reinterpret_cast<es2panda_Impl* (*)(int)>(symbol)(ES2PANDA_LIB_VERSION);
     return es2pandaImplementation;
@@ -258,7 +264,7 @@ KOALA_INTEROP_V4(ClassDefinitionSetBody, KNativePointer, KNativePointer, KNative
 
 /*
 Improve: NOT FROM API (shouldn't be there)
------------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
 */
 
 es2panda_AstNode* cachedParentNode;
@@ -322,6 +328,23 @@ void impl_AstNodeOnUpdate(KNativePointer context, KNativePointer newNode, KNativ
 }
 KOALA_INTEROP_V3(AstNodeOnUpdate, KNativePointer, KNativePointer, KNativePointer)
 
+KNativePointer impl_JumpFromETSTypeReferenceToTSTypeAliasDeclarationTypeAnnotation(
+    KNativePointer context, KNativePointer etsTypeReference
+) {
+    auto _context = reinterpret_cast<es2panda_Context*>(context);
+    auto _node = reinterpret_cast<es2panda_AstNode*>(etsTypeReference);
+    auto _name = GetImpl()->ETSTypeReferencePartName(_context,
+        GetImpl()->ETSTypeReferencePart(_context, _node)
+    );
+    auto _decl = GetImpl()->DeclarationFromIdentifier(_context, _name);
+    if (_decl && GetImpl()->IsTSTypeAliasDeclaration(_decl)) {
+        return GetImpl()->TSTypeAliasDeclarationTypeAnnotationConst(_context, _decl);
+    }
+    return nullptr;
+}
+KOALA_INTEROP_2(JumpFromETSTypeReferenceToTSTypeAliasDeclarationTypeAnnotation,
+    KNativePointer, KNativePointer, KNativePointer)
+
 static thread_local std::vector<es2panda_AstNode*> cachedChildren;
 
 static void visitChild(es2panda_AstNode* node)
@@ -587,7 +610,7 @@ KNativePointer impl_FilterNodes3(KNativePointer context, KNativePointer node, KI
 KOALA_INTEROP_4(FilterNodes3, KNativePointer, KNativePointer, KNativePointer, KInt*, KInt)
 
 /*
------------------------------------------------------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------
 */
 
 // From koala-wrapper
@@ -638,7 +661,11 @@ KNativePointer impl_AstNodeProgram(KNativePointer contextPtr, KNativePointer ins
     if (GetImpl()->AstNodeIsProgramConst(_context, _receiver)) {
         return GetImpl()->ETSModuleProgram(_context, _receiver);
     }
-    return impl_AstNodeProgram(_context, GetImpl()->AstNodeParent(_context, _receiver));
+    auto parent = GetImpl()->AstNodeParent(_context, _receiver);
+    if (parent == nullptr) {
+        return nullptr;
+    }
+    return impl_AstNodeProgram(_context, parent);
 }
 KOALA_INTEROP_2(AstNodeProgram, KNativePointer, KNativePointer, KNativePointer)
 
@@ -687,3 +714,204 @@ void impl_MemoryTrackerPrintCurrent(KNativePointer context)
 }
 KOALA_INTEROP_V1(MemoryTrackerPrintCurrent, KNativePointer);
 
+static KNativePointer findPropertyInClassDefinition(KNativePointer context, KNativePointer classInstance, char *keyName)
+{
+    const auto _context = reinterpret_cast<es2panda_Context*>(context);
+    const auto _instance = reinterpret_cast<es2panda_AstNode*>(classInstance);
+    std::size_t bodySize = 0;
+    const auto _body = GetImpl()->ClassDefinitionBody(_context, _instance, &bodySize);
+    if (_body == nullptr) {
+        return nullptr;
+    }
+    const auto _bodyInstance = reinterpret_cast<es2panda_AstNode**>(_body);
+    for (std::size_t i = 0; i < bodySize; i++) {
+        const auto _member = reinterpret_cast<es2panda_AstNode*>(_bodyInstance[i]);
+        const auto _key = reinterpret_cast<es2panda_AstNode*>(GetImpl()->ClassElementKey(_context, _member));
+        if (strcmp(GetImpl()->IdentifierName(_context, _key), keyName) == 0) {
+            return _member;
+        }
+    }
+    return nullptr;
+}
+
+static KNativePointer findPropertyInTSInterfaceDeclaration(
+    KNativePointer context, KNativePointer classInstance, char *keyName)
+{
+    const auto _context = reinterpret_cast<es2panda_Context*>(context);
+    const auto _instance = reinterpret_cast<es2panda_AstNode*>(classInstance);
+    const auto _body = GetImpl()->TSInterfaceDeclarationBody(_context, _instance);
+    if (_body == nullptr) {
+        return nullptr;
+    }
+    const auto _bodyInstance = reinterpret_cast<es2panda_AstNode*>(_body);
+    std::size_t bodySize = 0;
+    const auto _bodyBody = GetImpl()->TSInterfaceBodyBodyConst(_context, _bodyInstance, &bodySize);
+    if (_bodyBody == nullptr) {
+        return nullptr;
+    }
+    const auto _bodyBodyInstance = reinterpret_cast<es2panda_AstNode**>(_bodyBody);
+    for (std::size_t i = 0; i < bodySize; i++) {
+        const auto _member = reinterpret_cast<es2panda_AstNode*>(_bodyBodyInstance[i]);
+        const auto _key = reinterpret_cast<es2panda_AstNode*>(GetImpl()->ClassElementKey(_context, _member));
+        if (strcmp(GetImpl()->IdentifierName(_context, _key), keyName) == 0) {
+            return _member;
+        }
+    }
+    return nullptr;
+}
+
+KNativePointer impl_ClassVariableDeclaration(KNativePointer context, KNativePointer classInstance);
+
+KNativePointer impl_DeclarationFromProperty(KNativePointer context, KNativePointer property)
+{
+    const auto _context = reinterpret_cast<es2panda_Context*>(context);
+    const auto _property = reinterpret_cast<es2panda_AstNode*>(property);
+    auto _key = GetImpl()->PropertyKey(_context, _property);
+    if (_key == nullptr) {
+        return nullptr;
+    }
+    auto _parent = GetImpl()->AstNodeParent(_context, _property);
+    if (_parent == nullptr) {
+        return nullptr;
+    }
+    const auto _parentInstance = reinterpret_cast<es2panda_AstNode*>(_parent);
+    auto _decl = impl_ClassVariableDeclaration(_context, _parentInstance);
+    if (_decl == nullptr) {
+        return nullptr;
+    }
+    const auto _declInstance = reinterpret_cast<es2panda_AstNode*>(_decl);
+    const auto _keyInstance = reinterpret_cast<es2panda_AstNode*>(_key);
+    auto _keyName = GetImpl()->IdentifierName(_context, _keyInstance);
+    if (GetImpl()->IsClassDefinition(_declInstance)) {
+        return findPropertyInClassDefinition(_context, _declInstance, _keyName);
+    }
+    if (GetImpl()->IsTSInterfaceDeclaration(_declInstance)) {
+        return findPropertyInTSInterfaceDeclaration(_context, _declInstance, _keyName);
+    }
+    return nullptr;
+}
+KOALA_INTEROP_2(DeclarationFromProperty, KNativePointer, KNativePointer, KNativePointer);
+
+KNativePointer impl_DeclarationFromMemberExpression(KNativePointer context, KNativePointer nodePtr)
+{
+    const auto _context = reinterpret_cast<es2panda_Context*>(context);
+    const auto _node = reinterpret_cast<es2panda_AstNode*>(nodePtr);
+    auto _object = GetImpl()->MemberExpressionObject(_context, _node);
+    auto _property = GetImpl()->MemberExpressionProperty(_context, _node);
+    if (_property == nullptr) {
+        return nullptr;
+    }
+    const auto _propertyInstance = reinterpret_cast<es2panda_AstNode*>(_property);
+    if (GetImpl()->IsNumberLiteral(_propertyInstance) && _object != nullptr) {
+        const auto _objectInstance = reinterpret_cast<es2panda_AstNode*>(_object);
+        if (GetImpl()->IsMemberExpression(_objectInstance)) {
+        return impl_DeclarationFromMemberExpression(_context, _objectInstance);
+        }
+        return GetImpl()->DeclarationFromIdentifier(_context, _objectInstance);
+    }
+    if (GetImpl()->IsMemberExpression(_propertyInstance)) {
+        return impl_DeclarationFromMemberExpression(_context, _propertyInstance);
+    }
+    return GetImpl()->DeclarationFromIdentifier(_context, _propertyInstance);
+}
+KOALA_INTEROP_2(DeclarationFromMemberExpression, KNativePointer, KNativePointer, KNativePointer);
+
+KNativePointer impl_DeclarationFromAstNode(KNativePointer context, KNativePointer nodePtr)
+{
+    const auto _context = reinterpret_cast<es2panda_Context*>(context);
+    const auto _node = reinterpret_cast<es2panda_AstNode*>(nodePtr);
+    if (GetImpl()->IsMemberExpression(_node)) {
+        return impl_DeclarationFromMemberExpression(_context, _node);
+    }
+    if (GetImpl()->IsObjectExpression(_node)) {
+        return impl_ClassVariableDeclaration(_context, _node);
+    }
+    if (GetImpl()->IsProperty(_node)) {
+        return impl_DeclarationFromProperty(_context, _node);
+    }
+    return GetImpl()->DeclarationFromIdentifier(_context, _node);
+}
+KOALA_INTEROP_2(DeclarationFromAstNode, KNativePointer, KNativePointer, KNativePointer);
+
+KNativePointer impl_ClassVariableDeclaration(KNativePointer context, KNativePointer classInstance)
+{
+    const auto _context = reinterpret_cast<es2panda_Context*>(context);
+    const auto _classInstance = reinterpret_cast<es2panda_AstNode*>(classInstance);
+    auto _typedTsType = GetImpl()->TypedTsType(_context, _classInstance);
+    if (_typedTsType == nullptr) {
+        return nullptr;
+    }
+    const auto _instanceType = reinterpret_cast<es2panda_Type*>(_typedTsType);
+    auto _typeVar = GetImpl()->TypeVariable(_context, _instanceType);
+    if (_typeVar == nullptr) {
+        return nullptr;
+    }
+    const auto result = reinterpret_cast<es2panda_Declaration*>(GetImpl()->VariableDeclaration(_context, _typeVar));
+    const auto declNode = GetImpl()->DeclNode(_context, result);
+    return declNode;
+}
+KOALA_INTEROP_2(ClassVariableDeclaration, KNativePointer, KNativePointer, KNativePointer)
+
+thread_local KBoolean targetChildFound = false;
+thread_local es2panda_AstNode *targetInnerChild = nullptr;
+thread_local KInt targetAstNodeType = -1;
+
+static void findNodeInnerChild(es2panda_AstNode *node)
+{
+    if (targetInnerChild == node) {
+        targetChildFound = true;
+    }
+}
+
+KBoolean impl_AstNodeFindNodeInInnerChild(
+    KNativePointer contextPtr, KNativePointer instancePtr, KNativePointer tartgetPtr)
+{
+    if (tartgetPtr == nullptr) {
+        return false;
+    }
+    auto _context = reinterpret_cast<es2panda_Context*>(contextPtr);
+    auto _receiver = reinterpret_cast<es2panda_AstNode*>(instancePtr);
+    auto _target = reinterpret_cast<es2panda_AstNode*>(tartgetPtr);
+    targetChildFound = false;
+    targetInnerChild = _target;
+    GetImpl()->AstNodeIterateConst(_context, _receiver, findNodeInnerChild);
+    return targetChildFound;
+}
+KOALA_INTEROP_3(AstNodeFindNodeInInnerChild, KBoolean, KNativePointer, KNativePointer, KNativePointer);
+
+static void findInnerChild(es2panda_AstNode *node, void *arg)
+{
+    auto *context = static_cast<es2panda_Context *>(arg);
+    if (targetAstNodeType == GetImpl()->AstNodeTypeConst(context, node)) {
+        targetInnerChild = node;
+    }
+}
+
+KNativePointer impl_AstNodeFindInnerChild(KNativePointer contextPtr, KNativePointer instancePtr, KInt AstNodeType)
+{
+    auto _context = reinterpret_cast<es2panda_Context*>(contextPtr);
+    auto _receiver = reinterpret_cast<es2panda_AstNode*>(instancePtr);
+    targetAstNodeType = AstNodeType;
+
+    GetImpl()->AstNodeForEach(_receiver, findInnerChild, _context);
+    return targetInnerChild;
+}
+KOALA_INTEROP_3(AstNodeFindInnerChild, KNativePointer, KNativePointer, KNativePointer, KInt);
+
+KNativePointer impl_AstNodeFindOuterParent(KNativePointer contextPtr, KNativePointer instancePtr, KInt AstNodeType)
+{
+    auto _context = reinterpret_cast<es2panda_Context*>(contextPtr);
+    auto _receiver = reinterpret_cast<es2panda_AstNode*>(instancePtr);
+    if (GetImpl()->AstNodeIsProgramConst(_context, _receiver)) {
+        return nullptr;
+    }
+    if (AstNodeType == GetImpl()->AstNodeTypeConst(_context, _receiver)) {
+        return _receiver;
+    }
+    auto parent = GetImpl()->AstNodeParent(_context, _receiver);
+    if (parent == nullptr) {
+        return nullptr;
+    }
+    return impl_AstNodeFindOuterParent(_context, parent, AstNodeType);
+}
+KOALA_INTEROP_3(AstNodeFindOuterParent, KNativePointer, KNativePointer, KNativePointer, KInt);

package/build/libarkts-copy/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@koalaui/libarkts",
-    "version": "1.7.10+devel",
+    "version": "1.7.13+devel",
     "main": "./lib/libarkts.js",
     "typesVersions": {
         "*": {
@@ -20,12 +20,12 @@
     ],
     "config": {
         "panda_sdk_path": "../incremental/tools/panda/node_modules/@panda/sdk",
-        "panda_sdk_version": "1.5.0-dev.53118"
+        "panda_sdk_version": "next"
     },
     "dependencies": {
-        "@koalaui/compat": "1.7.10+devel",
-        "@koalaui/common": "1.7.10+devel",
-        "@koalaui/interop": "1.7.10+devel",
+        "@koalaui/compat": "1.7.13+devel",
+        "@koalaui/common": "1.7.13+devel",
+        "@koalaui/interop": "1.7.13+devel",
         "commander": "10.0.1"
     },
     "devDependencies": {
@@ -37,12 +37,12 @@
         "@rollup/plugin-typescript": "^11.1.6",
         "tsconfig-paths": "^4.2.0",
         "rimraf": "^6.0.1",
-        "@koalaui/fast-arktsc": "1.7.10+devel",
-        "@idlizer/arktscgen": "2.1.10-arktscgen-8",
+        "@koalaui/fast-arktsc": "1.7.13+devel",
+        "@idlizer/arktscgen": "2.1.10-arktscgen-9",
         "mocha": "^9.2.2",
-        "@koalaui/harness": "1.7.10+devel",
+        "@koalaui/harness": "1.7.13+devel",
         "@koalaui/ets-tsc": "4.9.5-r6",
-        "@koalaui/build-common": "1.7.10+devel",
+        "@koalaui/build-common": "1.7.13+devel",
         "node-addon-api": "8.0.0",
         "node-api-headers": "0.0.5"
     },
@@ -51,7 +51,7 @@
         "clean:plugins": "rimraf plugins/build",
         "compile:koala:interop": "npm run --prefix ../interop compile",
         "compile:meson": "cd native && meson setup build && meson compile -C build",
-        "compile:meson:mingw": "cd native && meson setup --cross-file ./mingw.cross mingw_build && meson compile -C mingw_build",
+        "compile:meson:mingw": "cd native && meson setup --strip --cross-file ./mingw.cross mingw_build && meson install -C mingw_build",
         "crosscompile:meson": "cd native && CXX=clang++ meson setup -D cross_compile=true build && CXX=clang++ meson compile -C build",
         "copy:.node": "mkdir -p ./build/native/build && cp ./native/build/es2panda_*.node ./build/native/build",
         "compile:native": "npm run compile:koala:interop && npm run compile:meson && npm run copy:.node",
@@ -83,4 +83,4 @@
         "format:generated:ts": "npx prettier --config .prettierrc --write \"./generated/**/*.ts\"",
         "format:ts": "npm run format:src:ts && npm run format:generated:ts"
     }
-}
+}

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

@@ -132,13 +132,11 @@ export class Es2pandaNativeModule {
     _OptionsArkTsConfig(context: KNativePointer, options: KNativePointer): KNativePointer {
         throw new Error('Not implemented');
     }
-    _ScriptFunctionSetParams(
+    _JumpFromETSTypeReferenceToTSTypeAliasDeclarationTypeAnnotation(
         context: KNativePointer,
-        receiver: KNativePointer,
-        paramsList: BigUint64Array,
-        paramsListLength: KUInt
-    ): void {
-        throw new Error('Not implemented');
+        etsTypeReference: KNativePointer,
+    ): KNativePointer {
+        throw new Error('Not implemented')
     }
     _ClassDefinitionSetBody(
         context: KNativePointer,
@@ -162,6 +160,15 @@ export class Es2pandaNativeModule {
     _ClassVariableDeclaration(context: KNativePointer, classInstance: KNativePointer): KNativePointer {
         throw new Error('Not implemented');
     }
+    _DeclarationFromProperty(context: KPtr, property: KPtr): KPtr {
+        throw new Error('Not implemented');
+    }
+    _DeclarationFromMemberExpression(context: KPtr, expression: KPtr): KPtr {
+        throw new Error('Not implemented');
+    }
+    _DeclarationFromAstNode(context: KPtr, node: KPtr): KPtr {
+        throw new Error('Not implemented');
+    }
     _ETSParserGetGlobalProgramAbsName(context: KNativePointer): KNativePointer {
         throw new Error('Not implemented');
     }
@@ -191,6 +198,18 @@ export class Es2pandaNativeModule {
         throw new Error('Not implemented');
     }
 
+    _AstNodeFindNodeInInnerChild(context: KNativePointer, node: KNativePointer, target: KNativePointer): boolean {
+        throw new Error('Not implemented');
+    }
+
+    _AstNodeFindInnerChild(context: KNativePointer, node: KNativePointer, nodeType: KInt): KNativePointer {
+        throw new Error('Not implemented');
+    }
+
+    _AstNodeFindOuterParent(context: KNativePointer, node: KNativePointer, nodeType: KInt): KNativePointer {
+        throw new Error('Not implemented');
+    }
+
     _GetCompilationMode(config: KNativePointer): KInt {
         throw new Error('Not implemented');
     }
@@ -213,7 +232,11 @@ export class Es2pandaNativeModule {
 }
 
 export function findNativeModule(): string {
-    const candidates = [path.resolve(__dirname, '../native/build'), path.resolve(__dirname, '../build/native/build')];
+    const candidates = [
+        path.resolve(__dirname, '../native/build'),
+        path.resolve(__dirname, '../build/native'),
+        path.resolve(__dirname, '../build/native/build')
+    ];
     let result = undefined;
     candidates.forEach((path) => {
         if (fs.existsSync(path)) {

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

@@ -105,6 +105,20 @@ export abstract class AstNode extends ArktsObject {
         return clonedNode as this;
     }
 
+    public findNodeInInnerChild(node: AstNode): boolean {
+        return global.es2panda._AstNodeFindNodeInInnerChild(global.context, this.peer, node.peer);
+    }
+
+    public findInnerChild<T extends AstNode>(nodeType: Es2pandaAstNodeType): T | undefined {
+        const childNodePeer = global.es2panda._AstNodeFindInnerChild(global.context, this.peer, nodeType);
+        return unpackNode(childNodePeer, nodeType);
+    }
+
+    public findOuterParent<T extends AstNode>(nodeType: Es2pandaAstNodeType): T | undefined {
+        const parentNodePeer = global.es2panda._AstNodeFindOuterParent(global.context, this.peer, nodeType);
+        return unpackNode(parentNodePeer, nodeType);
+    }
+
     public get parent(): AstNode | undefined {
         const parent = global.generatedEs2panda._AstNodeParent(global.context, this.peer);
         return unpackNode(parent);