astro-accelerator-utils 0.1.11 → 0.1.13

package/index.d.mts

@@ -1,13 +1,14 @@
+import { Cache } from "./lib/v1/cache.mjs";
 import { DateFormatter } from "./lib/v1/dates.mjs";
 import { Markdown } from "./lib/v1/markdown.mjs";
+import { Navigation } from "./lib/v1/navigation.mjs";
 import { Posts } from "./lib/v1/posts.mjs";
 import { UrlFormatter } from "./lib/v1/urls.mjs";
-import { Cache } from "./lib/v1/cache.mjs";
 import * as PostQueries from "./lib/postQueries.mjs";
 import * as PostFiltering from "./lib/postFiltering.mjs";
 import * as PostOrdering from "./lib/postOrdering.mjs";
 import * as PostPaging from "./lib/postPaging.mjs";
 import * as FooterMenu from "./lib/footerMenu.mjs";
-import * as Navigation from "./lib/navigation.mjs";
+import * as NavigationX from "./lib/navigation.mjs";
 import * as Taxonomy from "./lib/taxonomy.mjs";
-export { DateFormatter, Markdown, Posts, UrlFormatter, Cache, PostQueries, PostFiltering, PostOrdering, PostPaging, FooterMenu, Navigation, Taxonomy };
+export { Cache, DateFormatter, Markdown, Navigation, Posts, UrlFormatter, PostQueries, PostFiltering, PostOrdering, PostPaging, FooterMenu, NavigationX, Taxonomy };

package/index.mjs

@@ -1,6 +1,7 @@
 import { Cache } from './lib/v1/cache.mjs';
 import { DateFormatter } from './lib/v1/dates.mjs';
 import { Markdown } from './lib/v1/markdown.mjs';
+import { Navigation } from './lib/v1/navigation.mjs';
 import { Posts } from './lib/v1/posts.mjs';
 import { UrlFormatter } from './lib/v1/urls.mjs';
 
@@ -9,20 +10,21 @@ import * as PostFiltering from './lib/postFiltering.mjs';
 import * as PostOrdering from './lib/postOrdering.mjs';
 import * as PostPaging from './lib/postPaging.mjs';
 import * as FooterMenu from './lib/footerMenu.mjs';
-import * as Navigation from './lib/navigation.mjs';
+import * as NavigationX from './lib/navigation.mjs';
 import * as Taxonomy from './lib/taxonomy.mjs';
 
 export {
+    Cache,
     DateFormatter,
     Markdown,
+    Navigation,
     Posts,
     UrlFormatter,
-    Cache,
     PostQueries,
     PostFiltering,
     PostOrdering,
     PostPaging,
     FooterMenu,
-    Navigation,
+    NavigationX,
     Taxonomy
 };

package/lib/navigation.d.mts

@@ -1,5 +1,5 @@
 /**
- *
+ * @deprecated Use Navigation.menu()
  * @param {URL} currentUrl
  * @param {Site} site
  * @param {NavPage | 'auto'} menu
@@ -7,13 +7,13 @@
  */
 export function getMenu(currentUrl: URL, site: Site, menu: NavPage | 'auto'): Promise<NavPage[]>;
 /**
- *
+ * @deprecated Use Navigation.isNavPage
  * @param {NavPage | 'auto' | 'tags' | 'toptags' | 'categories'} item
  * @returns {item is NavPage}
  */
 export function isNavPage(item: NavPage | 'auto' | 'tags' | 'toptags' | 'categories'): item is import("../types/NavPage").NavPage;
 /**
- *
+ * @deprecated Use Navigation.autoMenu()
  * @param {URL} currentUrl
  * @param {Site} site
  * @returns {Promise<NavPage[]}

package/lib/navigation.mjs

@@ -11,7 +11,7 @@ import * as PostFiltering from './postFiltering.mjs';
 const cache = new Cache(200);
 
 /**
- * 
+ * @deprecated Use Navigation.menu()
  * @param {URL} currentUrl 
  * @param {Site} site 
  * @param {NavPage | 'auto'} menu
@@ -47,7 +47,7 @@ export async function getMenu (currentUrl, site, menu) {
 }
 
 /**
- * 
+ * @deprecated Use Navigation.isNavPage
  * @param {NavPage | 'auto' | 'tags' | 'toptags' | 'categories'} item 
  * @returns {item is NavPage}
  */
@@ -61,7 +61,7 @@ export function isNavPage (item) {
   
 
 /**
- * 
+ * @deprecated Use Navigation.autoMenu()
  * @param {URL} currentUrl 
  * @param {Site} site 
  * @returns {Promise<NavPage[]}

package/lib/postQueries.d.mts

@@ -27,6 +27,7 @@ export function getAuthors(frontmatter: Frontmatter): Promise<AuthorList>;
 export function getAuthorInfo(slug: string): Promise<AuthorInfo>;
 /**
  * Returns a list of breadcrumbs
+ * @deprecated Use Navigation.breadcrumbs
  * @param {URL} currentUrl
  * @param {Site} site
  * @returns {Promise<NavPage[]>}
@@ -34,6 +35,7 @@ export function getAuthorInfo(slug: string): Promise<AuthorInfo>;
 export function getBreadcrumbs(currentUrl: URL, site: Site): Promise<NavPage[]>;
 /**
  * Converts a MarkdownInstance into a NavPage
+ * @deprecated Use Navigation.mapNavPage()
  * @param {MarkdownInstance} page
  * @param {Site}
  * @returns {NavPage}
@@ -41,12 +43,14 @@ export function getBreadcrumbs(currentUrl: URL, site: Site): Promise<NavPage[]>;
 export function mapNavPage(page: MarkdownInstance, site: any): NavPage;
 /**
  * Walks the tree to set current page
+ * @deprecated Use Navigation.setCurrentPage()
  * @param {NavPage[]} pages
  * @param {URL} currentUrl
  */
 export function setCurrentPage(pages: NavPage[], currentUrl: URL): void;
 /**
  * Pops matching page from array
+ * @deprecated Use Navigation.popMatchingPage()
  * @param {MarkdownInstance[]} allPages
  * @param {string} search
  * @returns

package/lib/postQueries.mjs

@@ -148,6 +148,7 @@ export async function getAuthorInfo (slug) {
 
 /**
  * Returns a list of breadcrumbs
+ * @deprecated Use Navigation.breadcrumbs
  * @param {URL} currentUrl 
  * @param {Site} site
  * @returns {Promise<NavPage[]>}
@@ -181,6 +182,7 @@ export async function getBreadcrumbs (currentUrl, site) {
 
 /**
  * Converts a MarkdownInstance into a NavPage
+ * @deprecated Use Navigation.mapNavPage()
  * @param {MarkdownInstance} page 
  * @param {Site}
  * @returns {NavPage}
@@ -222,6 +224,7 @@ export function mapNavPage (page, site) {
 
 /**
  * Walks the tree to set current page
+ * @deprecated Use Navigation.setCurrentPage()
  * @param {NavPage[]} pages 
  * @param {URL} currentUrl 
  */
@@ -235,6 +238,7 @@ export function setCurrentPage (pages, currentUrl) {
 
 /**
  * Pops matching page from array
+ * @deprecated Use Navigation.popMatchingPage()
  * @param {MarkdownInstance[]} allPages 
  * @param {string} search 
  * @returns 

package/lib/v1/navigation.d.mts

@@ -0,0 +1,62 @@
+/**
+ * @typedef { import("../../types/Astro").MarkdownInstance } MarkdownInstance
+ * @typedef { import("../../types/NavPage").NavPage } NavPage
+ */
+export class Navigation {
+    /**
+     * Constructor
+     * @param {Posts} posts
+     * @param {UrlFormatter} urlFormatter
+     */
+    constructor(posts: Posts, urlFormatter: UrlFormatter);
+    posts: Posts;
+    urlFormatter: UrlFormatter;
+    /**
+     * Returns a list of breadcrumbs
+     * @param {URL} currentUrl
+     * @param {string} subfolder
+     * @returns {NavPage[]}
+     */
+    breadcrumbs(currentUrl: URL, subfolder: string): NavPage[];
+    /**
+     *
+     * @param {URL} currentUrl
+     * @param {string} subfolder
+     * @param {(NavPage | 'auto')[]} menu
+     * @returns {NavPage[]}
+     */
+    menu(currentUrl: URL, subfolder: string, menu: (NavPage | 'auto')[]): NavPage[];
+    /**
+     *
+     * @param {string} subfolder
+     * @returns {NavPage[]}
+     */
+    autoMenu(subfolder: string): NavPage[];
+    /**
+     * Walks a NavPage tree to set current page
+     * @param {NavPage[]} pages
+     * @param {URL} currentUrl
+     */
+    setCurrentPage(pages: NavPage[], currentUrl: URL): void;
+    /**
+     * Converts a MarkdownInstance into a NavPage
+     * @param {MarkdownInstance} page
+     * @returns {NavPage}
+     */
+    mapNavPage(page: MarkdownInstance): NavPage;
+    /**
+     * Checks whether the item is a NavPage
+     * @param {NavPage | 'auto' | 'tags' | 'toptags' | 'categories'} item
+     * @returns {item is NavPage}
+     */
+    isNavPage(item: NavPage | 'auto' | 'tags' | 'toptags' | 'categories'): item is import("../../types/NavPage").NavPage;
+    /**
+     * Pops matching page from array
+     * @param {MarkdownInstance[]} allPages
+     * @param {string} search
+     * @returns
+     */
+    popMatchingPage(allPages: MarkdownInstance[], search: string): import("../../types/Astro").MarkdownInstance;
+}
+export type MarkdownInstance = import("../../types/Astro").MarkdownInstance;
+export type NavPage = import("../../types/NavPage").NavPage;

package/lib/v1/navigation.mjs

@@ -0,0 +1,220 @@
+import * as PostFiltering from '../postFiltering.mjs';
+
+/**
+ * @typedef { import("../../types/Astro").MarkdownInstance } MarkdownInstance
+ * @typedef { import("../../types/NavPage").NavPage } NavPage
+ */
+
+export class Navigation {
+    /**
+     * Constructor
+     * @param {Posts} posts
+     * @param {UrlFormatter} urlFormatter
+     */
+    constructor(posts, urlFormatter) {
+        /* istanbul ignore next */
+        this.posts = posts;
+        this.urlFormatter = urlFormatter;
+    }
+
+    /**
+     * Returns a list of breadcrumbs
+     * @param {URL} currentUrl 
+     * @param {string} subfolder
+     * @returns {NavPage[]}
+     */
+    breadcrumbs (currentUrl, subfolder) {
+        const allPages = this.posts.all();
+
+        const pathParts = currentUrl.pathname.split('/');
+    
+        if (subfolder.length > 0) {
+            // Running in a subfolder
+            pathParts.shift();
+        }
+        
+        /** @type {NavPage[]} */
+        const navPages = [];
+        let path = '';
+    
+        pathParts.forEach((part) => {
+            path += part.length > 0 ? '/' + part : '';
+            const match = this.popMatchingPage(allPages, path);
+    
+            if (match) {
+                navPages.push(this.mapNavPage(match));
+            }
+        });
+    
+        this.setCurrentPage(navPages, currentUrl);
+    
+        return navPages;
+    }
+
+    /**
+     * 
+     * @param {URL} currentUrl 
+     * @param {string} subfolder
+     * @param {(NavPage | 'auto')[]} menu
+     * @returns {NavPage[]}
+     */
+    menu (currentUrl, subfolder, menu) {
+            const pages = [];
+            for (let i = 0; i < menu.length; i++) {
+                const item = menu[i];
+                if (this.isNavPage(item)) {
+                    pages.push(item);
+                } else {
+                    const p = this.autoMenu(subfolder);
+                    for (let j = 0; j < p.length; j++) {
+                        pages.push(p[j]);
+                    }
+                }
+            }
+
+        this.setCurrentPage(pages, currentUrl);
+
+        return pages;
+    }
+
+    /**
+     * 
+     * @param {string} subfolder 
+     * @returns {NavPage[]}
+     */
+    autoMenu (subfolder) {
+        const allPages = this.posts
+            .all()
+            .filter(PostFiltering.showInMenu);
+
+        const topLevelPages = this.posts
+            .root(subfolder)
+            .filter(PostFiltering.showInMenu);
+
+        const pageHierarchy = topLevelPages
+            .map(p => this.mapNavPage(p))
+            .sort((a, b) => a.order - b.order);
+            
+        /** @type {NavPage[]} */
+        const pageList = allPages.map(p => this.mapNavPage(p));
+
+        for (let i = 0; i < pageHierarchy.length; i++) {
+            const page = pageHierarchy[i];
+
+            if (i > 0) {
+                // Don't add children to first link (Home)
+                page.children = pageList
+                    .filter((mp) =>
+                        page.url != '/'
+                        && mp.url != page.url
+                        && mp.url.startsWith(page.url)
+                    )
+                    .sort((mp) => mp.order);
+            }
+
+            if (page.children.length > 0) {
+                const ownChild = structuredClone(page);
+                ownChild.order = -1;
+                ownChild.children = [];
+                page.children.push(ownChild);
+            }
+        }
+
+        return pageHierarchy;
+    }
+
+
+    /**
+     * Walks a NavPage tree to set current page
+     * @param {NavPage[]} pages 
+     * @param {URL} currentUrl 
+     */
+    setCurrentPage (pages, currentUrl) {
+        pages.forEach(p => {
+            p.isOpen = currentUrl.pathname.startsWith(p.url);
+            p.ariaCurrent = p.url == currentUrl.pathname
+                ? 'page'
+                : false;
+            
+            if (p.children) {
+                this.setCurrentPage(p.children, currentUrl);
+            }
+        });
+    }
+
+    /**
+     * Converts a MarkdownInstance into a NavPage
+     * @param {MarkdownInstance} page 
+     * @returns {NavPage}
+     */
+    mapNavPage (page) {
+        let url = page.url == null || (page.url ?? '').length == 0 
+            ? '/'
+            : page.url;
+    
+        // Send visitors straight to the first page
+        if (page.frontmatter.paged) {
+            url += '/1/';
+        }
+    
+        url = this.urlFormatter.addSlashToAddress(url);
+    
+        if (page.frontmatter.layout == 'src/layouts/Redirect.astro') {
+            // Skips past the redirect
+            url = page.frontmatter.redirect;
+        }
+    
+        /** @type {NavPage} */
+        const entry = {
+            section: page.frontmatter.navSection ?? page.frontmatter.navTitle ?? page.frontmatter.title,
+            title: page.frontmatter.navTitle ?? page.frontmatter.title,
+            url: url,
+            order: page.frontmatter.navOrder,
+            children: [],
+            // These are later set to the correct value, but not now as we want to cache
+            isOpen: false,
+            ariaCurrent: false
+        }
+    
+        return entry;
+    }
+
+
+    /**
+     * Checks whether the item is a NavPage
+     * @param {NavPage | 'auto' | 'tags' | 'toptags' | 'categories'} item 
+     * @returns {item is NavPage}
+     */
+    isNavPage (item) {
+        if (typeof item === 'string' && ['auto', 'tags', 'toptags', 'categories'].includes(item)) {
+            return false;
+        }
+    
+        return true;
+    }
+
+    /**
+     * Pops matching page from array
+     * @param {MarkdownInstance[]} allPages 
+     * @param {string} search 
+     * @returns 
+     */
+    popMatchingPage (allPages, search) {
+        const numberToRemove = 1;
+        let indexToRemove = -1;
+        let match = null;
+    
+        for (let i = 0; i < allPages.length; i++) {
+            if (allPages[i].url == search) {
+                indexToRemove = i;
+                match = allPages[i];
+            }
+        }
+    
+        if (match) {
+            allPages.splice(indexToRemove, numberToRemove);
+        }
+    
+        return match;
+  }
+}

package/lib/v1/posts.mjs

@@ -35,6 +35,7 @@ export class Posts {
      * @returns {MarkdownInstance[]}
      */
     root (subfolder) {
+        console.log('SUBFOLDER IS', subfolder)
         const isRoot = subfolder.length == 0;
         const expectedDepth = isRoot ? 1 : 2;
 

package/package.json

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