bump to 0.25

Cargo.lock

···
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "ahash"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0453232ace82dee0dd0b4c87a59bd90f7b53b314f3e0f61fe2ee7c8a16482289"
+version = 4
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "cc"
-version = "1.0.83"
+version = "1.2.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+checksum = "5c1599538de2394445747c8cf7935946e3cc27e9625f889d979bfb2aaf569362"
 dependencies = [
- "libc",
+ "shlex",
 ]
 
 [[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
 name = "darling"
-version = "0.20.6"
+version = "0.20.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c376d08ea6aa96aafe61237c7200d1241cb177b7d3a542d791f2d118e9cbb955"
+checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee"
 dependencies = [
  "darling_core",
  "darling_macro",
···
 
 [[package]]
 name = "darling_core"
-version = "0.20.6"
+version = "0.20.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33043dcd19068b8192064c704b3f83eb464f91f1ff527b44a4e2b08d9cdb8855"
+checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e"
 dependencies = [
  "fnv",
  "ident_case",
···
 
 [[package]]
 name = "darling_macro"
-version = "0.20.6"
+version = "0.20.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5a91391accf613803c2a9bf9abccdbaa07c54b4244a5b64883f9c3c137c86be"
+checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
 dependencies = [
  "darling_core",
  "quote",
···
 
 [[package]]
 name = "derive_builder"
-version = "0.20.0"
+version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7"
+checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947"
 dependencies = [
  "derive_builder_macro",
 ]
 
 [[package]]
 name = "derive_builder_core"
-version = "0.20.0"
+version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d"
+checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8"
 dependencies = [
  "darling",
  "proc-macro2",
···
 
 [[package]]
 name = "derive_builder_macro"
-version = "0.20.0"
+version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b"
+checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c"
 dependencies = [
  "derive_builder_core",
  "syn",
···
 
 [[package]]
 name = "dissimilar"
-version = "1.0.7"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86e3bdc80eee6e16b2b6b0f87fbc98c04bee3455e35174c0de1a125d0688c632"
+checksum = "8975ffdaa0ef3661bfe02dbdcc06c9f829dfafe6a3c474de366a8d5e44276921"
 
 [[package]]
 name = "equivalent"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
 [[package]]
 name = "expect-test"
-version = "1.4.1"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30d9eafeadd538e68fb28016364c9732d78e420b9ff8853fa5e4058861e9f8d3"
+checksum = "63af43ff4431e848fb47472a920f14fa71c24de13255a5692e93d4e90302acb0"
 dependencies = [
  "dissimilar",
  "once_cell",
···
 
 [[package]]
 name = "hashbrown"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
-dependencies = [
- "ahash",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.14.3"
+version = "0.15.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
+checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5"
 
 [[package]]
 name = "html"
···
 
 [[package]]
 name = "indexmap"
-version = "2.2.3"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177"
+checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.3",
+ "hashbrown",
 ]
 
 [[package]]
 name = "itoa"
-version = "1.0.10"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
-
-[[package]]
-name = "libc"
-version = "0.2.153"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "log"
-version = "0.4.20"
+version = "0.4.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
 
 [[package]]
 name = "memchr"
-version = "2.7.1"
+version = "2.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
+checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
 name = "petgraph"
-version = "0.6.4"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
+checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
 dependencies = [
  "fixedbitset",
  "indexmap",
···
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.3"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
···
 
 [[package]]
 name = "regex-automata"
-version = "0.4.5"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
···
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.2"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "ryu"
-version = "1.0.16"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c"
+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 
 [[package]]
 name = "serde"
-version = "1.0.196"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32"
+checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.196"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
+checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
 dependencies = [
  "proc-macro2",
  "quote",
···
 
 [[package]]
 name = "serde_json"
-version = "1.0.113"
+version = "1.0.140"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79"
+checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
 dependencies = [
+ "indexmap",
  "itoa",
+ "memchr",
  "ryu",
  "serde",
 ]
 
 [[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 
 [[package]]
 name = "stag"
···
 ]
 
 [[package]]
-name = "string-interner"
-version = "0.12.2"
+name = "streaming-iterator"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "383196d1876517ee6f9f0864d1fc1070331b803335d3c6daaa04bbcccd823c08"
-dependencies = [
- "cfg-if",
- "hashbrown 0.9.1",
-]
+checksum = "2b2231b7c3057d5e4ad0156fb3dc807d900806020c5ffa3ee6ff2c8c76fb8520"
 
 [[package]]
 name = "strsim"
-version = "0.10.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
 dependencies = [
  "proc-macro2",
  "quote",
···
 
 [[package]]
 name = "thiserror"
-version = "1.0.57"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.57"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
···
 
 [[package]]
 name = "tree-sitter"
-version = "0.20.10"
+version = "0.25.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e747b1f9b7b931ed39a548c1fae149101497de3c1fc8d9e18c62c1a66c683d3d"
+checksum = "a7cf18d43cbf0bfca51f657132cc616a5097edc4424d538bae6fa60142eaf9f0"
 dependencies = [
  "cc",
  "regex",
+ "regex-syntax",
+ "serde_json",
+ "streaming-iterator",
+ "tree-sitter-language",
 ]
 
 [[package]]
 name = "tree-sitter-graph"
-version = "0.11.3"
+version = "0.12.0"
+source = "git+https://tangled.sh/@oppi.li/tree-sitter-graph#36785dff28c7a6e496d46ffa70f5d0f98d61bbf0"
 dependencies = [
  "log",
  "regex",
  "serde",
  "serde_json",
  "smallvec",
- "string-interner",
+ "streaming-iterator",
  "thiserror",
  "tree-sitter",
 ]
 
 [[package]]
+name = "tree-sitter-language"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4013970217383f67b18aef68f6fb2e8d409bc5755227092d32efb0422ba24b8"
+
+[[package]]
 name = "tree-sitter-rust"
-version = "0.20.4"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0832309b0b2b6d33760ce5c0e818cb47e1d72b468516bfe4134408926fa7594"
+checksum = "4b9b18034c684a2420722be8b2a91c9c44f2546b631c039edf575ccba8c61be1"
 dependencies = [
  "cc",
- "tree-sitter",
+ "tree-sitter-language",
 ]
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"

Cargo.toml

···
 version = "0.1.0"
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [lib]
 
 [dependencies]
···
 serde = {version = "1.0.188", features = ["derive"]}
 once_cell = "1.19.0"
 thiserror = "1.0.56"
-tree-sitter-graph = { path = "../tree-sitter-graph/"}
-tree-sitter-rust = "0.20.4"
-tree-sitter = "0.20"
+tree-sitter-graph = { git = "https://tangled.sh/@oppi.li/tree-sitter-graph"}
+# tree-sitter-graph = { path = "../tree-sitter-graph"}
+tree-sitter-rust = "0.24"
+tree-sitter = "0.25"
 derive_builder = "0.20.0"
 expect-test = "1.4.1"
 html = "0.6.3"

src/bin/html.rs

···
 fn main() {
     let src = include_str!("html.rs");
 
+    let language = tree_sitter_rust::LANGUAGE;
+
     let sg = StagBuilder::default()
         .with_source(src)
         .with_stag_file(stag::RUST)
-        .with_language(tree_sitter_rust::language())
+        .with_language(language.into())
         .execute()
         .unwrap();
 
     let mut parser = Parser::new();
-    let _ = parser.set_language(tree_sitter_rust::language());
+    let _ = parser.set_language(&language.into());
 
     let tree = parser.parse(&src, None).unwrap();
     let root = tree.root_node();

src/debug.rs

···
 use std::fmt;
 
-use crate::stag::{EdgeKind, NodeKind};
+use crate::stag::{EdgeKind, Node};
 use crate::text_range::TextRange;
 
 use petgraph::{
···
         }
     }
 
-    fn build(&mut self, graph: &Graph<NodeKind, EdgeKind>, start: NodeIndex<u32>, src: &[u8]) {
+    fn build(&mut self, graph: &Graph<Node, EdgeKind>, start: NodeIndex<u32>, src: &[u8]) {
         let mut defs = graph
             .edges_directed(start, Direction::Incoming)
             .filter(|edge| *edge.weight() == EdgeKind::DefToScope)
···
         self.scopes = scopes;
     }
 
-    pub fn new(graph: &Graph<NodeKind, EdgeKind>, start: NodeIndex<u32>, src: &[u8]) -> Self {
+    pub fn new(graph: &Graph<Node, EdgeKind>, start: NodeIndex<u32>, src: &[u8]) -> Self {
         let mut scope_debug = Self::empty(graph[start].range());
         scope_debug.build(graph, start, src);
         scope_debug

src/stag.rs

···
 
     pub fn execute(&self) -> Result<ScopeGraph, StagError> {
         let mut parser = tree_sitter::Parser::new();
-        let language = self.language.ok_or(ConfigError::MissingLanguage)?;
-        parser.set_language(language)?;
+        let language = self.language.clone().ok_or(ConfigError::MissingLanguage)?;
+        parser.set_language(&language)?;
 
         let file = File::from_str(
             language,
···
     }
 }
 
-/// The type of a node in the ScopeGraph
+/// A node in the ScopeGraph
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct Node {
+    kind: NodeKind,
+    metadata: Metadata,
+}
+
+impl Node {
+    pub fn new(kind: NodeKind) -> Self {
+        Self {
+            kind,
+            metadata: Default::default(),
+        }
+    }
+
+    pub fn scope(s: LocalScope) -> Self {
+        Self::new(NodeKind::Scope(s))
+    }
+
+    pub fn local_def(d: LocalDef) -> Self {
+        Self::new(NodeKind::Def(d))
+    }
+
+    pub fn reference(r: Reference) -> Self {
+        Self::new(NodeKind::Ref(r))
+    }
+
+    pub fn import(i: LocalImport) -> Self {
+        Self::new(NodeKind::Import(i))
+    }
+
+    /// Produce the range spanned by this node
+    pub fn range(&self) -> TextRange {
+        match &self.kind {
+            NodeKind::Scope(l) => l.range,
+            NodeKind::Def(d) => d.range,
+            NodeKind::Ref(r) => r.range,
+            NodeKind::Import(i) => i.range,
+        }
+    }
+}
+
+#[derive(Serialize, Deserialize, Default, Debug, Clone)]
+struct Metadata {}
+
+/// The kind of a lexical node in the ScopeGraph
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub enum NodeKind {
     /// A scope node
···
     Ref(Reference),
 }
 
-impl NodeKind {
-    /// Construct a scope node from a range
-    pub fn scope(range: TextRange) -> Self {
-        Self::Scope(LocalScope::new(range))
-    }
-
-    /// Produce the range spanned by this node
-    pub fn range(&self) -> TextRange {
-        match self {
-            Self::Scope(l) => l.range,
-            Self::Def(d) => d.range,
-            Self::Ref(r) => r.range,
-            Self::Import(i) => i.range,
-        }
-    }
-}
-
 /// Describes the relation between two nodes in the ScopeGraph
 #[derive(Serialize, Deserialize, PartialEq, Eq, Copy, Clone, Debug)]
 pub enum EdgeKind {
···
 #[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct ScopeGraph {
     /// The raw graph
-    pub graph: Graph<NodeKind, EdgeKind>,
+    pub graph: Graph<Node, EdgeKind>,
 
     // Graphs do not have the concept of a `root`, but lexical scopes follow the syntax
     // tree, and as a result, have a "root" node. The root_idx points to a scope node that
···
 impl ScopeGraph {
     pub fn new(range: TextRange) -> Self {
         let mut graph = Graph::new();
-        let root_idx = graph.add_node(NodeKind::scope(range));
+        let root_idx = graph.add_node(Node::scope(LocalScope::new(range)));
         Self { graph, root_idx }
     }
 
-    pub fn get_node(&self, node_idx: NodeIndex) -> Option<&NodeKind> {
+    pub fn get_node(&self, node_idx: NodeIndex) -> Option<&Node> {
         self.graph.node_weight(node_idx)
     }
 
     /// Insert a local scope into the scope-graph
-    fn insert_local_scope(&mut self, new: LocalScope) {
+    fn insert_local_scope(&mut self, new: LocalScope) -> Option<NodeIndex> {
         if let Some(parent_scope) = self.scope_by_range(new.range, self.root_idx) {
-            let new_scope = NodeKind::Scope(new);
+            let new_scope = Node::scope(new);
             let new_idx = self.graph.add_node(new_scope);
             self.graph
                 .add_edge(new_idx, parent_scope, EdgeKind::ScopeToScope);
+            Some(new_idx)
+        } else {
+            None
         }
     }
 
     /// Insert a def into the scope-graph
     fn insert_local_def(&mut self, new: LocalDef) {
         if let Some(defining_scope) = self.scope_by_range(new.range, self.root_idx) {
-            let new_def = NodeKind::Def(new);
+            let new_def = Node::local_def(new);
             let new_idx = self.graph.add_node(new_def);
             self.graph
                 .add_edge(new_idx, defining_scope, EdgeKind::DefToScope);
···
     /// Insert a def into the scope-graph, at the root scope
     #[allow(unused)]
     fn insert_global_def(&mut self, new: LocalDef) {
-        let new_def = NodeKind::Def(new);
+        let new_def = Node::local_def(new);
         let new_idx = self.graph.add_node(new_def);
         self.graph
             .add_edge(new_idx, self.root_idx, EdgeKind::DefToScope);
···
     /// Insert an import into the scope-graph
     fn insert_local_import(&mut self, new: LocalImport) {
         if let Some(defining_scope) = self.scope_by_range(new.range, self.root_idx) {
-            let new_imp = NodeKind::Import(new);
+            let new_imp = Node::import(new);
             let new_idx = self.graph.add_node(new_imp);
             self.graph
                 .add_edge(new_idx, defining_scope, EdgeKind::ImportToScope);
···
                     .filter(|edge| *edge.weight() == EdgeKind::DefToScope)
                     .map(|edge| edge.source())
                 {
-                    if let NodeKind::Def(def) = &self.graph[local_def] {
+                    if let NodeKind::Def(def) = &self.graph[local_def].kind {
                         if new.text == def.text {
                             match (def.symbol.as_ref(), new.symbol.as_ref()) {
                                 // both contain symbols, but they don't belong to the same namepspace
···
                     .filter(|edge| *edge.weight() == EdgeKind::ImportToScope)
                     .map(|edge| edge.source())
                 {
-                    if let NodeKind::Import(import) = &self.graph[local_import] {
+                    if let NodeKind::Import(import) = &self.graph[local_import].kind {
                         if new.text == import.text {
                             possible_imports.push(local_import);
                         }
···
         }
 
         if !possible_defs.is_empty() || !possible_imports.is_empty() {
-            let new_ref = NodeKind::Ref(new);
+            let new_ref = Node::reference(new);
             let ref_idx = self.graph.add_node(new_ref);
             for def_idx in possible_defs {
                 self.graph.add_edge(ref_idx, def_idx, EdgeKind::RefToDef);
···
         let iterator =
             self.graph
                 .node_indices()
-                .filter_map(|node_idx| match &self.graph[node_idx] {
+                .filter_map(|node_idx| match &self.graph[node_idx].kind {
                     NodeKind::Scope(_) => None,
                     NodeKind::Def(d) => Some(d.range),
                     NodeKind::Ref(r) => Some(r.range),
···
     }
 
     pub fn is_definition(&self, node_idx: NodeIndex) -> bool {
-        matches!(self.graph[node_idx], NodeKind::Def(_))
+        matches!(self.graph[node_idx].kind, NodeKind::Def(_))
     }
 
     pub fn is_reference(&self, node_idx: NodeIndex) -> bool {
-        matches!(self.graph[node_idx], NodeKind::Ref(_))
+        matches!(self.graph[node_idx].kind, NodeKind::Ref(_))
     }
 
     pub fn is_scope(&self, node_idx: NodeIndex) -> bool {
-        matches!(self.graph[node_idx], NodeKind::Scope(_))
+        matches!(self.graph[node_idx].kind, NodeKind::Scope(_))
     }
 
     pub fn is_import(&self, node_idx: NodeIndex) -> bool {
-        matches!(self.graph[node_idx], NodeKind::Import(_))
+        matches!(self.graph[node_idx].kind, NodeKind::Import(_))
     }
 }