updates

Author: TimWhiting

.gitignore

@@ -14,5 +14,7 @@ package-lock.json
 .packages
 pubspec.lock
 .antlr
-libdart.dylib
+*.so
+*.dll
+*.dylib
 doc

.vscode/settings.json

@@ -0,0 +1,14 @@
+{
+  "[dart]": {
+    "editor.formatOnPaste": true,
+    "editor.formatOnSave": true,
+    "editor.formatOnType": true,
+    "editor.rulers": [
+      80
+    ],
+    "editor.codeActionsOnSave": {
+      "source.organizeImports": true,
+      "source.fixAll": true
+    }
+  }
+}

tree_sitter/Makefile

@@ -1,5 +1,14 @@
+ifeq ($(shell uname),Darwin)
+	SOEXT = dylib
+else
+	SOEXT = so
+endif
+
 dart: tree-sitter
-	clang -I src ../src/parser.c ../src/scanner.c tree-sitter/libtree-sitter.a --shared -o libdart.dylib
+	clang -Isrc -Itree-sitter/lib/include ../src/parser.c ../src/scanner.c tree-sitter/libtree-sitter.a --shared -o libdart.$(SOEXT)
+	cp tree-sitter/libtree-sitter.so .
+	cp tree-sitter/libtree-sitter.dylib .
+	cp tree-sitter/tree-sitter.dll .
 
 tree-sitter:
 	cd tree-sitter && make

tree_sitter/example/tree_sitter.dart

@@ -1,8 +1,12 @@
+import 'dart:io';
+
+import 'package:dylib/dylib.dart';
 import 'package:tree_sitter/tree_sitter.dart';
 
 void main() {
-  final parser =
-      Parser(sharedLibrary: 'libdart.dylib', entryPoint: 'tree_sitter_dart');
+  final parser = Parser(
+      sharedLibrary: resolveDylibPath('dart', path: Directory.current.path),
+      entryPoint: 'tree_sitter_dart');
   final program = "class A {}";
   final tree = parser.parse(program);
   print(tree.root.child(0).namedChild(0).string);

tree_sitter/lib/tree_sitter.dart

@@ -6,7 +6,9 @@ library;
 import 'dart:convert';
 import 'dart:ffi';
 import 'dart:ffi' as ffi;
+import 'dart:io';
 
+import 'package:dylib/dylib.dart';
 import 'package:ffi/ffi.dart';
 import 'package:tree_sitter/tree_sitter.dart';
 
@@ -20,7 +22,8 @@ final treeSitterApi = TreeSitterConfig.instance.ffiApi;
 
 /// Configuration of the package to find the correct shared libraries
 final class TreeSitterConfig {
-  static String _dylibLocation = 'tree-sitter/libtree-sitter.dylib';
+  static String _dylibLocation =
+      resolveDylibPath('tree-sitter', path: Directory.current.path);
   late final ffiApi = TreeSitter(DynamicLibrary.open(_dylibLocation));
 
   /// Sets the path to find the tree sitter shared libraries

tree_sitter/pubspec.yaml

@@ -7,6 +7,7 @@ environment:
   sdk: ">=3.0.0 <3.2.0"
 
 dependencies:
+  dylib: ^0.3.3
   ffi: ^2.0.1
   path: ^1.8.3
 

tree_sitter/test/tree_sitter_test.dart

@@ -1,10 +1,14 @@
+import 'dart:io';
+
+import 'package:dylib/dylib.dart';
 import 'package:test/test.dart';
 import 'package:tree_sitter/tree_sitter.dart';
 
 void main() {
   test('calculate', () {
-    final parser =
-        Parser(sharedLibrary: 'libdart.dylib', entryPoint: 'tree_sitter_dart');
+    final parser = Parser(
+        sharedLibrary: resolveDylibPath('dart', path: Directory.current.path),
+        entryPoint: 'tree_sitter_dart');
     final program = "class A {}";
     final tree = parser.parse(program);
     print(tree.root.string);