From 9416f975d3f405d1addfefbc4737c48f519bae77 Mon Sep 17 00:00:00 2001 From: Andrew Hlynskyi Date: Fri, 16 Apr 2021 09:44:53 +0300 Subject: [PATCH 1/2] fix(cli): set actual cli version in generated package.json --- cli/src/generate/binding_files.rs | 6 +++++- cli/src/generate/templates/package.json | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cli/src/generate/binding_files.rs b/cli/src/generate/binding_files.rs index 8ce7e4a4..8414b65d 100644 --- a/cli/src/generate/binding_files.rs +++ b/cli/src/generate/binding_files.rs @@ -11,6 +11,8 @@ const BUILD_RS_TEMPLATE: &'static str = include_str!("./templates/build.rs"); const CARGO_TOML_TEMPLATE: &'static str = include_str!("./templates/cargo.toml"); const PACKAGE_JSON_TEMPLATE: &'static str = include_str!("./templates/package.json"); const PARSER_NAME_PLACEHOLDER: &'static str = "PARSER_NAME"; +const CLI_VERSION_PLACEHOLDER: &'static str = "CLI_VERSION"; +const CLI_VERSION: &'static str = env!("CARGO_PKG_VERSION"); pub fn generate_binding_files(repo_path: &Path, language_name: &str) -> Result<()> { let bindings_dir = repo_path.join("bindings"); @@ -110,7 +112,9 @@ pub fn generate_binding_files(repo_path: &Path, language_name: &str) -> Result<( fn generate_file(path: &Path, template: &str, language_name: &str) -> Result<()> { write_file( path, - template.replace(PARSER_NAME_PLACEHOLDER, language_name), + template + .replace(PARSER_NAME_PLACEHOLDER, language_name) + .replace(CLI_VERSION_PLACEHOLDER, CLI_VERSION), ) } diff --git a/cli/src/generate/templates/package.json b/cli/src/generate/templates/package.json index bba22b82..18598797 100644 --- a/cli/src/generate/templates/package.json +++ b/cli/src/generate/templates/package.json @@ -11,7 +11,7 @@ "nan": "^2.12.1" }, "devDependencies": { - "tree-sitter-cli": "^0.17.3" + "tree-sitter-cli": "^CLI_VERSION" }, "scripts": { "test": "tree-sitter test" From 7aa538dd9783720912f0e9602826b7ca9926719a Mon Sep 17 00:00:00 2001 From: Andrew Hlynskyi Date: Fri, 16 Apr 2021 09:55:44 +0300 Subject: [PATCH 2/2] fix(cli): use dashed language name in generated package.json and Cargo.toml files --- cli/src/generate/binding_files.rs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cli/src/generate/binding_files.rs b/cli/src/generate/binding_files.rs index 8414b65d..ed56fcde 100644 --- a/cli/src/generate/binding_files.rs +++ b/cli/src/generate/binding_files.rs @@ -17,6 +17,9 @@ const CLI_VERSION: &'static str = env!("CARGO_PKG_VERSION"); pub fn generate_binding_files(repo_path: &Path, language_name: &str) -> Result<()> { let bindings_dir = repo_path.join("bindings"); + let dashed_language_name = language_name.replace("_", "-"); + let dashed_language_name = dashed_language_name.as_str(); + // Generate rust bindings if needed. let rust_binding_dir = bindings_dir.join("rust"); if !rust_binding_dir.exists() { @@ -33,7 +36,7 @@ pub fn generate_binding_files(repo_path: &Path, language_name: &str) -> Result<( )?; let cargo_toml_path = repo_path.join("Cargo.toml"); if !cargo_toml_path.exists() { - generate_file(&cargo_toml_path, CARGO_TOML_TEMPLATE, language_name)?; + generate_file(&cargo_toml_path, CARGO_TOML_TEMPLATE, dashed_language_name)?; } } @@ -92,7 +95,7 @@ pub fn generate_binding_files(repo_path: &Path, language_name: &str) -> Result<( write_file(&package_json_path, package_json_str)?; } } else { - generate_file(&package_json_path, PACKAGE_JSON_TEMPLATE, language_name)?; + generate_file(&package_json_path, PACKAGE_JSON_TEMPLATE, dashed_language_name)?; } // Remove files from old node binding paths.