From a6d7704a16732ddf14fa2201f6cdde0235007d36 Mon Sep 17 00:00:00 2001
From: Oscar Otero <oom@oscarotero.com>
Date: Sat, 29 Jun 2024 13:00:48 +0200
Subject: [PATCH] changes

---
 plugins/nav.ts                      | 8 ++++----
 tests/assets/nav/_includes/main.vto | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/nav.ts b/plugins/nav.ts
index a84f5b14..dce97cc1 100644
--- a/plugins/nav.ts
+++ b/plugins/nav.ts
@@ -110,8 +110,8 @@ export class Nav {
         part = parts.shift();
       }
     }
-    const sortfn = buildSort(sort || "basename");
-    return convert(nav, undefined, sortfn);
+
+    return convert(nav, buildSort(sort || "basename"));
   }
 }
 
@@ -148,8 +148,8 @@ function searchData(parts: string[], menu: NavData): NavData | undefined {
 // Convert TempNavData to NavData
 function convert(
   temp: TempNavData,
+  order: (a: Data, b: Data) => number,
   parent?: NavData,
-  order?: (a: Data, b: Data) => number,
 ): NavData {
   const data: NavData = {
     slug: temp.slug,
@@ -159,7 +159,7 @@ function convert(
 
   data.children = temp.children
     ? Object.values(temp.children)
-      .map((child) => convert(child, data, order))
+      .map((child) => convert(child, order, data))
       .sort((a, b) => {
         if (a.data && b.data && order) {
           return order(a.data, b.data);
diff --git a/tests/assets/nav/_includes/main.vto b/tests/assets/nav/_includes/main.vto
index ca548f59..beed68bf 100644
--- a/tests/assets/nav/_includes/main.vto
+++ b/tests/assets/nav/_includes/main.vto
@@ -16,7 +16,7 @@
 
     <nav>
       <ul>
-      {{ for item of nav.menu("/", "", "order").children }}
+      {{ for item of nav.menu("/", "", "order basename").children }}
         <li>
           {{ include "./step.vto" { item } }}
         </li>