traxys/tree-sitter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(bindings)!: convert node bindings to NAPI

Browse source 
Co-authored-by: Boris Verkhovskiy <boris.verk@gmail.com>
Co-authored-by: Amaan Qureshi <amaanq12@gmail.com>
Co-authored-by: ObserverOfTime <chronobserver@disroot.org>
This commit is contained in:
Segev Finer 2024-02-28 00:06:25 +02:00 • committed by GitHub
parent 3d65ffa5af
commit e87cf7ef15
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 35 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

27
cli/src/generate/grammar_files.rs
View file

@ -193,23 +193,30 @@ pub fn generate_grammar_files(
generate_file(path, INDEX_JS_TEMPLATE, language_name)
})?;
missing_path(path.join("binding.cc"), |path| {
generate_file(path, JS_BINDING_CC_TEMPLATE, language_name)
})?;
missing_path_else(
path.join("binding.cc"),
|path| generate_file(path, JS_BINDING_CC_TEMPLATE, language_name),
|path| {
let binding_cc =
fs::read_to_string(path).with_context(|| "Failed to read binding.cc")?;
if binding_cc.contains("NAN_METHOD(New) {}") {
eprintln!("Replacing binding.cc with new binding API");
write_file(path, JS_BINDING_CC_TEMPLATE)?;
}
Ok(())
},
)?;
// Create binding.gyp, or update it with new binding path.
// Create binding.gyp, or update it with new binding API.
missing_path_else(
repo_path.join("binding.gyp"),
|path| generate_file(path, BINDING_GYP_TEMPLATE, language_name),
|path| {
let binding_gyp =
fs::read_to_string(path).with_context(|| "Failed to read binding.gyp")?;
let old_path = "\"src/binding.cc\"";
if binding_gyp.contains(old_path) {
eprintln!("Updating binding.gyp with new binding path");
let binding_gyp =
binding_gyp.replace(old_path, "\"bindings/node/binding.cc\"");
write_file(path, binding_gyp)?;
if binding_gyp.contains("require('nan')") {
eprintln!("Replacing binding.gyp with new binding API");
write_file(path, BINDING_GYP_TEMPLATE)?;
}
Ok(())
},

12
cli/src/generate/templates/binding.gyp
View file

@ -2,8 +2,8 @@
"targets": [
{
"target_name": "tree_sitter_PARSER_NAME_binding",
"dependencies": ["<!(node -p \"require('node-addon-api').targets\"):node_addon_api_except"],
"include_dirs": [
"<!(node -e \"require('nan')\")",
"src",
],
"sources": [
@ -16,7 +16,15 @@
],
"cflags_cc": [
"-Wno-cast-function-type",
]
],
"conditions": [
["OS=='mac'", {
"cflags+": ["-fvisibility=hidden"],
"xcode_settings": {
"GCC_SYMBOLS_PRIVATE_EXTERN": "YES", # -fvisibility=hidden
}
}]
],
}
]
}

30
cli/src/generate/templates/js-binding.cc
View file

@ -1,29 +1,13 @@
#include "nan.h"
#include <node.h>
using namespace v8;
#include <napi.h>
typedef struct TSLanguage TSLanguage;
extern "C" const TSLanguage *tree_sitter_PARSER_NAME(void);
extern "C" TSLanguage *tree_sitter_PARSER_NAME();
namespace {
NAN_METHOD(New) {}
void Init(Local<Object> exports, Local<Object> module) {
Local<FunctionTemplate> tpl = Nan::New<FunctionTemplate>(New);
tpl->SetClassName(Nan::New("Language").ToLocalChecked());
tpl->InstanceTemplate()->SetInternalFieldCount(1);
Local<Function> constructor = Nan::GetFunction(tpl).ToLocalChecked();
Local<Object> instance = constructor->NewInstance(Nan::GetCurrentContext()).ToLocalChecked();
Nan::SetInternalFieldPointer(instance, 0, (void *)tree_sitter_PARSER_NAME());
Nan::Set(instance, Nan::New("name").ToLocalChecked(), Nan::New("PARSER_NAME").ToLocalChecked());
Nan::Set(module, Nan::New("exports").ToLocalChecked(), instance);
Napi::Object Init(Napi::Env env, Napi::Object exports) {
exports["name"] = Napi::String::New(env, "PARSER_NAME");
exports["language"] = Napi::External<TSLanguage>::New(env, tree_sitter_PARSER_NAME());
return exports;
}
NODE_MODULE_CONTEXT_AWARE(tree_sitter_PARSER_NAME_binding, Init)
} // namespace
NODE_API_MODULE(tree_sitter_PARSER_NAME_binding, Init)

2
cli/src/generate/templates/package.json
View file

@ -20,7 +20,7 @@
"LOWER_PARSER_NAME"
],
"dependencies": {
"nan": "^2.18.0"
"node-addon-api": "^7.1.0"
},
"devDependencies": {
"tree-sitter-cli": "^CLI_VERSION"