astro-accelerator-utils 0.3.96 → 0.3.98

package/lib/v1/navigation.d.mts

@@ -103,6 +103,18 @@ export class Navigation {
      * @returns {item is NavPage}
      */
     isNavPage(item: NavPage | "auto" | "tags" | "toptags" | "categories"): item is NavPage;
+    /**
+     * Counts non-empty path segments so trailing slashes do not affect depth
+     * @param {string | null | undefined} path
+     * @returns {number}
+     */
+    pathDepth(path: string | null | undefined): number;
+    /**
+     * Normalizes a path for comparison by joining non-empty segments
+     * @param {string | null | undefined} path
+     * @returns {string}
+     */
+    normalizePath(path: string | null | undefined): string;
     /**
      * Pops matching page from array
      * @param {MarkdownInstance[]} allPages

package/lib/v1/navigation.mjs

@@ -120,7 +120,7 @@ export class Navigation {
             page.url != '/'
             && mp.url != page.url
             && mp.url.startsWith(page.url)
-            && mp.url.split('/').length == (page.url.split('/').length + 1)
+            && this.pathDepth(mp.url) == (this.pathDepth(page.url) + 1)
         )
         .sort((mp) => mp.order);
 
@@ -458,6 +458,30 @@ export class Navigation {
         return true;
     }
 
+    /**
+     * Counts non-empty path segments so trailing slashes do not affect depth
+     * @param {string | null | undefined} path
+     * @returns {number}
+     */
+    pathDepth(path) {
+        const url = path ?? '/';
+        return url.split('/').filter((segment) => segment.length > 0).length;
+    }
+
+    /**
+     * Normalizes a path for comparison by joining non-empty segments
+     * @param {string | null | undefined} path
+     * @returns {string}
+     */
+    normalizePath(path) {
+        const depth = this.pathDepth(path);
+        if (depth === 0) {
+            return '/';
+        }
+
+        return '/' + (path ?? '/').split('/').filter((segment) => segment.length > 0).join('/');
+    }
+
     /**
      * Pops matching page from array
      * @param {MarkdownInstance[]} allPages 
@@ -468,9 +492,10 @@ export class Navigation {
         const numberToRemove = 1;
         let indexToRemove = -1;
         let match = null;
+        const normalizedSearch = this.normalizePath(search);
 
         for (let i = 0; i < allPages.length; i++) {
-            if (allPages[i].url == search) {
+            if (this.normalizePath(allPages[i].url) === normalizedSearch) {
                 indexToRemove = i;
                 match = allPages[i];
             }

package/lib/v1/posts.mjs

@@ -40,7 +40,7 @@ export class Posts {
 
         return this.all().filter(p => {
             const url = p.url ?? '/';
-            const depth = (url).split('/').length - 1;
+            const depth = url.split('/').filter((segment) => segment.length > 0).length;
             return depth == expectedDepth
                 || (depth == (expectedDepth - 1) && p.file.includes(subfolder.toLowerCase() + '.md'));
         })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro-accelerator-utils",
-  "version": "0.3.96",
+  "version": "0.3.98",
   "description": "Astro utilities for Astro Accelerator.",
   "main": "index.mjs",
   "type": "module",