Use Python package for tree-sitter-zeek

tree-sitter-zeek now provides a Python package we can directly depend
on. With this we can avoid building and shipping the generated
tree-sitter bindings. By using the "official upstream API" we can also
simplify the way we parse input.

.gitignore

@@ -1,8 +1,5 @@
 build
 dist
 *.egg-info
-zeekscript/zeek-language.so
-zeekscript/zeek-language.exp
-zeekscript/zeek-language.lib
 __pycache__
 .idea/

.pre-commit-config.yaml

@@ -14,7 +14,9 @@ repos:
   hooks:
   - id: pylint
     additional_dependencies:
-      - setuptools
+      - "setuptools"
+      - "tree-sitter>=0.21.3"
+      - "tree-sitter-zeek"
 
 - repo: https://github.com/psf/black
   rev: 23.10.1

pyproject.toml

@@ -25,10 +25,11 @@ keywords = [
     "parsing",
 ]
 
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 
 dependencies = [
     "tree-sitter>=0.21.3",
+    "tree-sitter-zeek",
 ]
 
 [project.optional-dependencies]

zeekscript/__init__.py

@@ -1,11 +1,10 @@
 """Wrapper around more low-level tests."""
 __version__ = "1.2.9"
-__all__ = ["cli", "error", "formatter", "node", "output", "parser", "script"]
+__all__ = ["cli", "error", "formatter", "node", "output", "script"]
 
 from .cli import *
 from .error import *
 from .formatter import *
 from .node import *
 from .output import *
-from .parser import *
 from .script import *

zeekscript/script.py

@@ -5,11 +5,13 @@
 import pathlib
 import sys
 
+import tree_sitter
+import tree_sitter_zeek
+
 from .error import FileError, ParserError
 from .formatter import Formatter
 from .node import Node
 from .output import OutputStream
-from .parser import Parser
 
 
 class Script:
@@ -55,7 +57,8 @@ def parse(self):
         except OSError as err:
             raise FileError(str(err)) from err
 
-        self.ts_tree = Parser().parse(self.source)
+        parser = tree_sitter.Parser(tree_sitter.Language(tree_sitter_zeek.language()))
+        self.ts_tree = parser.parse(self.source)
 
         if self.ts_tree is None or self.ts_tree.root_node is None:
             # This is a hard parse error and we need to bail. Smaller errors get