feat: add natural sorting for basename and path fields (#662)

* feat: add natural sorting for basename and path fields

* Introduced `PathNatural` and `BasenameNatural` sort fields.
* Implemented natural comparison logic for sorting edges based on path and basename.
* Updated `EdgeSorter` to handle new sorting criteria.

* chore: update version to 4.6.1 in manifest and package files

* Increment version number from 4.6.0 to 4.6.1 in manifest-beta.json, manifest.json, and package.json.
* Add new version entry for 4.6.1 in versions.json.

Author: michaelpporter

CHANGELOG.md

@@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file. See [standa
 
 ## 4.X
 
+### [4.6.1](https://github.com/SkepticMystic/breadcrumbs/compare/4.6.0...4.6.1) (2026-04-29)
+
 ### [4.6.0](https://github.com/SkepticMystic/breadcrumbs/compare/4.5.0...4.6.0) (2026-04-28)
 
 ### [4.5.0](https://github.com/SkepticMystic/breadcrumbs/compare/4.4.4...4.5.0) (2026-04-21)

Makefile

@@ -34,5 +34,10 @@ build:
 		bun run build || exit 1
 		npm i
 
-beta:
- 		npm run version:beta
+version_beta:
+		bun run version-bump-beta.mjs
+		git add manifest-beta.json versions.json package.json
+
+version_prod:
+		bun run version-bump.mjs
+		git add manifest.json versions.json package.json

manifest-beta.json

@@ -1,12 +1,12 @@
 {
 	"id": "breadcrumbs",
 	"name": "Breadcrumbs",
-	"version": "4.6.0",
+	"version": "4.6.1",
 	"minAppVersion": "1.11.0",
 	"description": "Add structured hierarchies to your notes",
 	"author": "SkepticMystic",
 	"authorUrl": "https://github.com/SkepticMystic/breadcrumbs",
 	"fundingUrl": "https://github.com/SkepticMystic/breadcrumbs#donations",
 	"helpUrl": "https://publish.obsidian.md/breadcrumbs-docs",
 	"isDesktopOnly": false
-}
+}

manifest.json

@@ -1,12 +1,12 @@
 {
 	"id": "breadcrumbs",
 	"name": "Breadcrumbs",
-	"version": "4.6.0",
+	"version": "4.6.1",
 	"minAppVersion": "1.11.0",
 	"description": "Add structured hierarchies to your notes",
 	"author": "SkepticMystic",
 	"authorUrl": "https://github.com/SkepticMystic/breadcrumbs",
 	"fundingUrl": "https://github.com/SkepticMystic/breadcrumbs#donations",
 	"helpUrl": "https://publish.obsidian.md/breadcrumbs-docs",
 	"isDesktopOnly": false
-}
+}

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "breadcrumbs",
-	"version": "4.6.0",
+	"version": "4.6.1",
 	"description": "Add typed-links to your Obsidian notes",
 	"main": "main.js",
 	"scripts": {

src/const/graph.ts

@@ -18,7 +18,9 @@ export const SIMPLE_EDGE_SORT_FIELDS = [
 	// Hidden because I don't think anyone really cares about that order
 	// "graph",
 	"basename",
+	"basename_natural",
 	"path",
+	"path_natural",
 	"field",
 	// Whether the edge is explicit or not
 	// Uses source and implied_kind as tie-breakers for explicit == true and false, respectively

versions.json

@@ -253,5 +253,6 @@
 	"4.4.4": "1.0.0",
 	"4.5.0": "1.0.0",
 	"4.6.0-beta.0": "1.0.0",
-	"4.6.0": "1.11.0"
-}
+	"4.6.0": "1.11.0",
+	"4.6.1": "1.11.0"
+}

wasm/src/edge_sorting.rs

@@ -13,7 +13,9 @@ use crate::{
 #[derive(Clone, Debug)]
 pub enum SortField {
     Path,
+    PathNatural,
     Basename,
+    BasenameNatural,
     EdgeType,
     Implied,
     Neighbour(String),
@@ -25,7 +27,9 @@ impl FromStr for SortField {
     fn from_str(s: &str) -> Result<Self> {
         match s {
             "path" => Ok(SortField::Path),
+            "path_natural" => Ok(SortField::PathNatural),
             "basename" => Ok(SortField::Basename),
+            "basename_natural" => Ok(SortField::BasenameNatural),
             "field" => Ok(SortField::EdgeType),
             "explicit" => Ok(SortField::Implied),
             s if s.starts_with("neighbour-field:") => Ok(SortField::Neighbour(
@@ -122,7 +126,9 @@ impl EdgeSorter {
     fn get_edge_comparer<'a>(&self, graph: &'a NoteGraph) -> Comparer<'a> {
         match self.field.clone() {
             SortField::Path => PathComparer.into(),
+            SortField::PathNatural => PathNaturalComparer.into(),
             SortField::Basename => BasenameComparer.into(),
+            SortField::BasenameNatural => BasenameNaturalComparer.into(),
             SortField::EdgeType => EdgeTypeComparer.into(),
             SortField::Implied => ImpliedComparer.into(),
             SortField::Neighbour(neighbour_field) => {
@@ -165,12 +171,56 @@ pub trait EdgeComparer {
 #[enum_dispatch(EdgeComparer)]
 pub enum Comparer<'a> {
     PathComparer,
+    PathNaturalComparer,
     BasenameComparer,
+    BasenameNaturalComparer,
     EdgeTypeComparer,
     ImpliedComparer,
     NeighbourOrdering(NeighbourComparer<'a>),
 }
 
+/// Compare two strings using natural sort order: numeric segments are compared
+/// numerically so that "note 2" < "note 10" rather than "note 10" < "note 2".
+fn natural_cmp(a: &str, b: &str) -> std::cmp::Ordering {
+    let mut a_chars = a.chars().peekable();
+    let mut b_chars = b.chars().peekable();
+
+    loop {
+        let a_peek = a_chars.peek().copied();
+        let b_peek = b_chars.peek().copied();
+
+        match (a_peek, b_peek) {
+            (None, None) => return std::cmp::Ordering::Equal,
+            (None, _) => return std::cmp::Ordering::Less,
+            (_, None) => return std::cmp::Ordering::Greater,
+            (Some(a_ch), Some(b_ch)) if a_ch.is_ascii_digit() && b_ch.is_ascii_digit() => {
+                let mut a_num = 0u64;
+                while a_chars.peek().map_or(false, |c| c.is_ascii_digit()) {
+                    a_num = a_num * 10 + (a_chars.next().unwrap() as u64 - '0' as u64);
+                }
+                let mut b_num = 0u64;
+                while b_chars.peek().map_or(false, |c| c.is_ascii_digit()) {
+                    b_num = b_num * 10 + (b_chars.next().unwrap() as u64 - '0' as u64);
+                }
+                match a_num.cmp(&b_num) {
+                    std::cmp::Ordering::Equal => continue,
+                    other => return other,
+                }
+            }
+            (Some(a_ch), Some(b_ch)) => {
+                match a_ch.cmp(&b_ch) {
+                    std::cmp::Ordering::Equal => {
+                        a_chars.next();
+                        b_chars.next();
+                        continue;
+                    }
+                    other => return other,
+                }
+            }
+        }
+    }
+}
+
 #[derive(Default)]
 pub struct PathComparer;
 
@@ -196,6 +246,32 @@ impl EdgeComparer for BasenameComparer {
     }
 }
 
+#[derive(Default)]
+pub struct PathNaturalComparer;
+
+impl EdgeComparer for PathNaturalComparer {
+    fn compare(&self, graph: &NoteGraph, a: &EdgeStruct, b: &EdgeStruct) -> std::cmp::Ordering {
+        natural_cmp(
+            a.target_path_ref(graph).unwrap(),
+            b.target_path_ref(graph).unwrap(),
+        )
+    }
+}
+
+#[derive(Default)]
+pub struct BasenameNaturalComparer;
+
+impl EdgeComparer for BasenameNaturalComparer {
+    fn compare(&self, graph: &NoteGraph, a: &EdgeStruct, b: &EdgeStruct) -> std::cmp::Ordering {
+        let a_target = a.target_path_ref(graph).unwrap();
+        let b_target = b.target_path_ref(graph).unwrap();
+        let a_basename = a_target.split('/').next_back().unwrap();
+        let b_basename = b_target.split('/').next_back().unwrap();
+
+        natural_cmp(a_basename, b_basename)
+    }
+}
+
 #[derive(Default)]
 pub struct EdgeTypeComparer;