build: update bindings and manifests

.editorconfig

@@ -0,0 +1,39 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.{json,toml,yml,gyp}]
+indent_style = space
+indent_size = 2
+
+[*.js]
+indent_style = space
+indent_size = 2
+
+[*.rs]
+indent_style = space
+indent_size = 4
+
+[*.{c,cc,h}]
+indent_style = space
+indent_size = 4
+
+[*.{py,pyi}]
+indent_style = space
+indent_size = 4
+
+[*.swift]
+indent_style = space
+indent_size = 4
+
+[*.go]
+indent_style = tab
+indent_size = 8
+
+[Makefile]
+indent_style = tab
+indent_size = 8

.gitattributes

@@ -1,20 +1,11 @@
-typescript/src/** linguist-vendored
-tsx/src/** linguist-vendored
+* text eol=lf
 
-/examples/* linguist-vendored
+src/*.json linguist-generated
+src/parser.c linguist-generated
+src/tree_sitter/* linguist-generated
 
-typescript/src/grammar.json linguist-generated
-typescript/src/node-types.json linguist-generated
-typescript/src/parser.c linguist-generated
-
-tsx/src/grammar.json linguist-generated
-tsx/src/node-types.json linguist-generated
-tsx/src/parser.c linguist-generated
-
-typescript/src/grammar.json -diff
-typescript/src/node-types.json -diff
-typescript/src/parser.c -diff
-
-tsx/src/grammar.json -diff
-tsx/src/node-types.json -diff
-tsx/src/parser.c -diff
+bindings/** linguist-generated
+binding.gyp linguist-generated
+setup.py linguist-generated
+Makefile linguist-generated
+Package.swift linguist-generated

.gitignore

@@ -1,24 +1,38 @@
+# Rust artifacts
 Cargo.lock
-node_modules
-.node-version
-target
-build
-/.build
-*.log
-Cargo.lock
-package-lock.json
-/test.ts
-examples/desktop
-examples/redux
-examples/vscode
-log.html
-yarn.lock
+target/
+
+# Node artifacts
+build/
+prebuilds/
+node_modules/
+*.tgz
+
+# Swift artifacts
+.build/
+
+# Go artifacts
+go.sum
+_obj/
+
+# Python artifacts
+.venv/
+dist/
+*.egg-info
+*.whl
+
+# C artifacts
+*.a
+*.so
+*.so.*
+*.dylib
+*.dll
+*.pc
+
+# Example dirs
+/examples/*/
 
-# These files would be generated by 'tree-sitter generate' with the default
-# settings. We don't want them because there's already a copy at the root.
-/tsx/Cargo.toml
-/tsx/binding.gyp
-/tsx/bindings
-/typescript/Cargo.toml
-/typescript/binding.gyp
-/typescript/bindings
+# Grammar volatiles
+*.wasm
+*.obj
+*.o

Cargo.toml

@@ -1,32 +1,34 @@
 [package]
 name = "tree-sitter-typescript"
-description = "Typescript grammar for tree-sitter"
+description = "TypeScript and TSX grammars for tree-sitter"
 version = "0.20.6"
-authors = ["Max Brunsfeld <[email protected]>"]
+authors = [
+  "Max Brunsfeld <[email protected]>",
+  "Amaan Qureshi <[email protected]>",
+]
 license = "MIT"
-readme = "bindings/rust/README.md"
-keywords = ["incremental", "parsing", "typescript", "tsx"]
+keywords = ["incremental", "parsing", "tree-sitter", "typescript", "tsx"]
 categories = ["parsing", "text-editors"]
 repository = "https://github.com/tree-sitter/tree-sitter-typescript"
 edition = "2021"
 autoexamples = false
 
 build = "bindings/rust/build.rs"
 include = [
-	"common",
-	"bindings/rust",
-	"typescript/grammar.js",
-	"typescript/src",
-	"tsx/grammar.js",
-	"tsx/src",
-	"queries",
+  "common",
+  "bindings/rust",
+  "typescript/grammar.js",
+  "typescript/src",
+  "tsx/grammar.js",
+  "tsx/src",
+  "queries",
 ]
 
 [lib]
 path = "bindings/rust/lib.rs"
 
 [dependencies]
-tree-sitter = "~0.20.10"
+tree-sitter = ">=0.21.0"
 
 [build-dependencies]
-cc = "~1.0.90"
+cc = "1.0.96"

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017 GitHub
+Copyright (c) 2017 Max Brunsfeld
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -5,6 +5,7 @@
 [![matrix][matrix]](https://matrix.to/#/#tree-sitter-chat:matrix.org)
 [![crates][crates]](https://crates.io/crates/tree-sitter-typescript)
 [![npm][npm]](https://www.npmjs.com/package/tree-sitter-typescript)
+[![pypi][pypi]](https://pypi.org/project/tree-sitter-typescript)
 
 TypeScript and TSX grammars for [tree-sitter][].
 
@@ -15,7 +16,7 @@ require("tree-sitter-typescript").typescript; // TypeScript grammar
 require("tree-sitter-typescript").tsx; // TSX grammar
 ```
 
-For Javascript files with [flow] type annotations you can use the the `tsx` parser.
+For Javascript files with [flow] type annotations you can use the `tsx` parser.
 
 [tree-sitter]: https://github.com/tree-sitter/tree-sitter
 [flow]: https://flow.org/en/
@@ -29,3 +30,4 @@ References
 [matrix]: https://img.shields.io/matrix/tree-sitter-chat%3Amatrix.org?logo=matrix&label=matrix
 [npm]: https://img.shields.io/npm/v/tree-sitter-typescript?logo=npm
 [crates]: https://img.shields.io/crates/v/tree-sitter-typescript?logo=rust
+[pypi]: https://img.shields.io/pypi/v/tree-sitter-typescript?logo=pypi&logoColor=ffd242