feat: bump tree-sitter to 0.25.3

Author: HerringtonDarkholme

crates/tree-sitter-facade/src/node.rs

@@ -329,7 +329,7 @@ mod wasm {
 
         #[inline]
         pub fn child_with_descendant(&self, descendant: Self) -> Option<Self> {
-            self.inner.child_with_descendant(descendant.inner).map(Into::into)
+            self.inner.child_with_descendant(&descendant.inner).map(Into::into)
         }
 
         #[inline]

crates/tree-sitter-facade/src/parser.rs

@@ -202,7 +202,7 @@ mod wasm {
 
         #[inline]
         pub fn language(&self) -> Option<Language> {
-            self.inner.get_language().map(Into::into)
+            self.inner.language().map(Into::into)
         }
 
         #[inline]
@@ -322,20 +322,10 @@ mod wasm {
             }
         }
 
-        #[inline]
-        pub fn set_timeout_micros(&mut self, timeout_micros: f64) {
-            self.inner.set_timeout_micros(timeout_micros)
-        }
-
         // #[inline]
         // pub fn stop_printing_dot_graphs(&mut self) {
         //     unimplemented!()
         // }
-
-        #[inline]
-        pub fn timeout_micros(&self) -> f64 {
-            self.inner.get_timeout_micros()
-        }
     }
 
     impl Drop for Parser {

crates/tree-sitter-facade/src/tree.rs

@@ -101,7 +101,7 @@ mod wasm {
         }
 
         pub fn language(&self) -> Language {
-            self.inner.get_language().into()
+            self.inner.language().into()
         }
 
         pub fn root_node(&self) -> Node<'_> {

crates/web-tree-sitter-sg/Cargo.toml

@@ -25,7 +25,7 @@ web = ["web-sys"]
 
 [dependencies]
 js-sys = "0.3"
-wasm-bindgen = { version = "0.2.83", features = ["strict-macro"] }
+wasm-bindgen = { version = "0.2", features = ["strict-macro"] }
 wasm-bindgen-futures = "0.4"
 
 [dependencies.web-sys]

crates/web-tree-sitter-sg/package.json

@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "web-tree-sitter-sg": "0.22.2"
+    "web-tree-sitter": "0.25.3"
   }
 }

crates/web-tree-sitter-sg/src/lib.rs

@@ -33,13 +33,6 @@ extern {
     static GLOBAL: Object;
 }
 
-#[cfg(feature = "node")]
-#[wasm_bindgen(module = "web-tree-sitter-sg")]
-extern {
-    #[wasm_bindgen(js_name = "init")]
-    fn initialize_tree_sitter() -> Promise;
-}
-
 thread_local! {
     // Ensure `web-tree-sitter` is only initialized once
     static TREE_SITTER_INITIALIZED: RefCell<bool> = RefCell::new(false);
@@ -56,7 +49,7 @@ impl TreeSitter {
             return Ok(());
         }
 
-        JsFuture::from(initialize_tree_sitter()).await.lift_error()?;
+        JsFuture::from(Parser::init()).await.lift_error()?;
 
         // Set `web-tree-sitter` to initialized
         TREE_SITTER_INITIALIZED.with(|cell| cell.replace(true));
@@ -161,7 +154,7 @@ extern {
     fn delete(this: &LoggerParams, val: &JsString);
 }
 
-#[wasm_bindgen]
+#[wasm_bindgen(module="web-tree-sitter")]
 extern {
     #[derive(Clone, Debug, PartialEq)]
     pub type Language;
@@ -768,6 +761,8 @@ extern {
 
     #[wasm_bindgen(method, getter, js_name = rootNode)]
     pub fn root_node(this: &Tree) -> SyntaxNode;
+    #[wasm_bindgen(method, getter)]
+    pub fn language(this: &Tree) -> Language;
 
     // Instance Methods
 
@@ -786,9 +781,6 @@ extern {
     // -> Range[]
     #[wasm_bindgen(method, js_name = getChangedRanges)]
     pub fn get_changed_ranges(this: &Tree, other: &Tree) -> Box<[JsValue]>;
-
-    #[wasm_bindgen(method, js_name = getLanguage)]
-    pub fn get_language(this: &Tree) -> Language;
 }
 
 impl Clone for Tree {
@@ -858,32 +850,33 @@ extern {
     pub fn reset(this: &TreeCursor, node: &SyntaxNode);
 }
 
-#[wasm_bindgen(module="web-tree-sitter-sg")]
+#[wasm_bindgen(module="web-tree-sitter")]
 extern {
     #[derive(Clone, Debug)]
     pub type Parser;
 
     // Static Methods
+    #[wasm_bindgen(static_method_of = Parser)]
+    pub fn init() -> Promise;
 
     // Constructor
 
     #[wasm_bindgen(catch, constructor)]
     fn __new() -> Result<Parser, ParserError>;
 
+    // Instance Properties
+
+    #[wasm_bindgen(method, getter)]
+    pub fn language(this: &Parser) -> Option<Language>;
+
     // Instance Methods
 
     #[wasm_bindgen(method)]
     pub fn delete(this: &Parser);
 
-    #[wasm_bindgen(method, js_name = getLanguage)]
-    pub fn get_language(this: &Parser) -> Option<Language>;
-
     #[wasm_bindgen(method, js_name = getLogger)]
     pub fn get_logger(this: &Parser) -> Option<Logger>;
 
-    #[wasm_bindgen(method, js_name = getTimeoutMicros)]
-    pub fn get_timeout_micros(this: &Parser) -> f64;
-
     #[wasm_bindgen(catch, method, js_name = parse)]
     pub fn parse_with_function(
         this: &Parser,
@@ -908,9 +901,6 @@ extern {
 
     #[wasm_bindgen(method, js_name = setLogger)]
     pub fn set_logger(this: &Parser, logger: Option<&Logger>);
-
-    #[wasm_bindgen(method, js_name = setTimeoutMicros)]
-    pub fn set_timeout_micros(this: &Parser, timeout_micros: f64);
 }
 
 impl Parser {

crates/web-tree-sitter-sg/tests/node/parser.rs

@@ -83,10 +83,10 @@ async fn set_get_language() {
         let language = crate::util::language::load().await?;
 
         parser.set_language(Some(&language))?;
-        assert_eq!(Some(language), parser.get_language());
+        assert_eq!(Some(language), parser.language());
 
         parser.set_language(None)?;
-        assert_eq!(None, parser.get_language());
+        assert_eq!(None, parser.language());
 
         Ok(())
     }
@@ -113,15 +113,3 @@ async fn set_get_logger() {
     }
     assert!(inner().await.is_ok());
 }
-
-#[wasm_bindgen_test]
-async fn set_get_timeout_micros() {
-    async fn inner() -> Result<(), JsValue> {
-        TreeSitter::init().await?;
-        let parser = Parser::new()?;
-        parser.set_timeout_micros(1000f64);
-        assert!((1000f64 - parser.get_timeout_micros()).abs() < std::f64::EPSILON);
-        Ok(())
-    }
-    assert!(inner().await.is_ok());
-}

crates/web-tree-sitter-sg/tests/node/tree.rs

@@ -64,7 +64,7 @@ async fn get_language() {
     async fn inner() -> Result<(), JsValue> {
         TreeSitter::init().await?;
         let tree = crate::util::tree::make().await?.unwrap();
-        let _language = tree.get_language();
+        let _language = tree.language();
         Ok(())
     }
     assert!(inner().await.is_ok());

package.json

@@ -3,6 +3,6 @@
   "description": "this is only for wasm-pack test, not actually used",
   "scripts": {},
   "dependencies": {
-    "web-tree-sitter-sg": "file:./web-tree-sitter-sg/"
+    "web-tree-sitter": "0.25.3"
   }
 }