Update

src/TreeSitterSharp.C/CLanguageProvider.cs

@@ -10,11 +10,11 @@ namespace TreeSitterSharp.C;
 internal class CLanguageProvider : ILanguageProvider
 {
     [DllImport("tree-sitter-c", EntryPoint = "tree_sitter_c", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
-    private static extern unsafe TsLanguage* tree_sitter_c();
+    private static extern unsafe Native.TsLanguage* tree_sitter_c();
 
-    public static unsafe Language GetLanguage()
+    public static unsafe TsLanguage GetLanguage()
     {
-        return new Language(tree_sitter_c());
+        return new TsLanguage(tree_sitter_c());
     }
 
 }

src/TreeSitterSharp.C/CParser.cs

@@ -5,7 +5,7 @@
 using System.Threading.Tasks;
 
 namespace TreeSitterSharp.C;
-public class CParser : Parser
+public class CParser : TsParser
 {
     public CParser() : base(CLanguageProvider.GetLanguage())
     {

src/TreeSitterSharp.Json/JsonLanguageProvider.cs

@@ -11,8 +11,8 @@ namespace TreeSitterSharp.Json
     internal unsafe class JsonLanguageProvider : ILanguageProvider
     {
         [DllImport("tree-sitter-json", EntryPoint = "tree_sitter_json", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
-        private static extern unsafe TsLanguage* tree_sitter_json();
+        private static extern unsafe Native.TsLanguage* tree_sitter_json();
 
-        public static Language GetLanguage() => new(tree_sitter_json());
+        public static TsLanguage GetLanguage() => new(tree_sitter_json());
     }
 }

src/TreeSitterSharp.Json/JsonParser.cs

@@ -6,7 +6,7 @@
 using System.Threading.Tasks;
 
 namespace TreeSitterSharp.Json;
-public class JsonParser : Parser
+public class JsonParser : TsParser
 {
     public JsonParser() : base(JsonLanguageProvider.GetLanguage())
     {

src/TreeSitterSharp/ILanguageProvider.cs

@@ -7,5 +7,5 @@
 namespace TreeSitterSharp;
 public interface ILanguageProvider
 {
-    static abstract Language GetLanguage();
+    static abstract TsLanguage GetLanguage();
 }

src/TreeSitterSharp/Native/Ts.cs

@@ -139,10 +139,8 @@ public static extern void
     [return: NativeTypeName("const TsLanguage *")]
     public static extern TsLanguage* node_language(TsNode self);
 
-    [DllImport("tree-sitter", CallingConvention = CallingConvention.Cdecl, EntryPoint = "ts_node_grammar_type",
-        ExactSpelling = true)]
-    [return: NativeTypeName("const char *")]
-    public static extern string node_grammar_type(TsNode self);
+    [LibraryImport("tree-sitter", EntryPoint = "ts_node_grammar_type", StringMarshalling = StringMarshalling.Custom, StringMarshallingCustomType = typeof(ConstantStringMarshaller))]
+    public static partial string node_grammar_type(TsNode self);
 
     [DllImport("tree-sitter", CallingConvention = CallingConvention.Cdecl, EntryPoint = "ts_node_grammar_symbol",
         ExactSpelling = true)]
@@ -171,21 +169,18 @@ public static extern void
         StringMarshallingCustomType = typeof(StringMarshaller))]
     public static partial string node_string(TsNode self);
 
-    [LibraryImport("tree-sitter", EntryPoint = "ts_node_is_null")]
-    [return: MarshalAs(UnmanagedType.Bool)]
-    public static partial bool node_is_null(TsNode self);
+    [DllImport("tree-sitter", EntryPoint = "ts_node_is_null")]
+    public static extern bool node_is_null(TsNode self);
 
-    [LibraryImport("tree-sitter", EntryPoint = "ts_node_is_named")]
-    [return: MarshalAs(UnmanagedType.Bool)]
-    public static partial bool node_is_named(TsNode self);
+    [DllImport("tree-sitter", EntryPoint = "ts_node_is_named")]
+    public static extern bool node_is_named(TsNode self);
 
-    [LibraryImport("tree-sitter", EntryPoint = "ts_node_is_missing")]
-    [return: MarshalAs(UnmanagedType.Bool)]
-    public static partial bool node_is_missing(TsNode self);
+    [DllImport("tree-sitter", EntryPoint = "ts_node_is_missing")]
+    public static extern bool node_is_missing(TsNode self);
 
-    [LibraryImport("tree-sitter", EntryPoint = "ts_node_is_extra")]
+    [DllImport("tree-sitter", EntryPoint = "ts_node_is_extra")]
     [return: MarshalAs(UnmanagedType.Bool)]
-    public static partial bool node_is_extra(TsNode self);
+    public static extern bool node_is_extra(TsNode self);
 
     [DllImport("tree-sitter", CallingConvention = CallingConvention.Cdecl, EntryPoint = "ts_node_has_changes",
         ExactSpelling = true)]
@@ -220,10 +215,9 @@ public static extern void
         ExactSpelling = true)]
     public static extern TsNode node_child(TsNode self, [NativeTypeName("uint32_t")] uint child_index);
 
-    [DllImport("tree-sitter", CallingConvention = CallingConvention.Cdecl,
-        EntryPoint = "ts_node_field_name_for_child", ExactSpelling = true)]
-    [return: NativeTypeName("const char *")]
-    public static extern string node_field_name_for_child(TsNode self, [NativeTypeName("uint32_t")] uint child_index);
+    [LibraryImport("tree-sitter", EntryPoint = "ts_node_field_name_for_child", StringMarshalling = StringMarshalling.Custom,
+        StringMarshallingCustomType = typeof(StringMarshaller))]
+    public static partial string node_field_name_for_child(TsNode self, [NativeTypeName("uint32_t")] uint child_index);
 
     [DllImport("tree-sitter", CallingConvention = CallingConvention.Cdecl, EntryPoint = "ts_node_child_count",
         ExactSpelling = true)]

src/TreeSitterSharp/Native/TsInput.cs

@@ -4,7 +4,7 @@ public unsafe partial struct TsInput
 {
     public void* payload;
 
-    [NativeTypeName("const char *(*)(void *, uint32_t, TsPoint, uint32_t *)")]
+    [NativeTypeName("const char *(*)(void *, uint32_t, TSPoint, uint32_t *)")]
     public delegate* unmanaged[Cdecl]<void*, uint, TsPoint, uint*, string> read;
 
     public TsInputEncoding encoding;

src/TreeSitterSharp/TSPoint.cs

@@ -0,0 +1,7 @@
+namespace TreeSitterSharp;
+public struct TsPoint
+{
+    public uint Row;
+
+    public uint Column;
+}

src/TreeSitterSharp/Language.cs → src/TreeSitterSharp/TsLanguage.cs

@@ -6,16 +6,16 @@
 using TreeSitterSharp.Native;
 
 namespace TreeSitterSharp;
-public unsafe class Language
+public unsafe class TsLanguage
 {
-    private TsLanguage* _language;
+    private Native.TsLanguage* _language;
 
-    public Language(TsLanguage* language)
+    public TsLanguage(Native.TsLanguage* language)
     {
         _language = language;
     }
 
-    public TsLanguage* ToUnmanaged()
+    public Native.TsLanguage* ToUnmanaged()
     {
         return _language;
     }