astro-accelerator-utils 0.0.33 → 0.0.34

package/index.d.mts

@@ -5,5 +5,6 @@ import * as PostPaging from "./lib/postPaging.mjs";
 import * as Cache from "./lib/cache.mjs";
 import * as Dates from "./lib/dates.mjs";
 import * as Markdown from "./lib/markdown.mjs";
+import * as Navigation from "./lib/navigation.mjs";
 import * as Urls from "./lib/urls.mjs";
-export { PostQueries, PostFiltering, PostOrdering, PostPaging, Cache, Dates, Markdown, Urls };
+export { PostQueries, PostFiltering, PostOrdering, PostPaging, Cache, Dates, Markdown, Navigation, Urls };

package/index.mjs

@@ -5,6 +5,7 @@ import * as PostPaging from './lib/postPaging.mjs';
 import * as Cache from './lib/cache.mjs';
 import * as Dates from './lib/dates.mjs';
 import * as Markdown from './lib/markdown.mjs';
+import * as Navigation from './lib/navigation.mjs';
 import * as Urls from './lib/urls.mjs';
 
 export {
@@ -15,5 +16,6 @@ export {
     Cache,
     Dates,
     Markdown,
+    Navigation,
     Urls
 };

package/lib/navigation.d.mts

@@ -0,0 +1,20 @@
+/**
+ * @typedef { import("../types/Site").Site } Site
+ * @typedef { import("../types/NavPage").NavPage } NavPage
+ */
+/**
+ *
+ * @param {URL} currentUrl
+ * @param {Site} site
+ * @returns {Promise<NavPage[]}
+ */
+export function getMenu(currentUrl: URL, site: Site): Promise<NavPage[]>;
+/**
+ *
+ * @param {URL} currentUrl
+ * @param {Site} site
+ * @returns {Promise<NavPage[]}
+ */
+export function getNavigation(currentUrl: URL, site: Site): Promise<NavPage[]>;
+export type Site = import("../types/Site").Site;
+export type NavPage = import("../types/NavPage").NavPage;

package/lib/navigation.mjs

@@ -0,0 +1,97 @@
+import * as PostQueries from './postQueries.mjs';
+import * as PostFiltering from './postFiltering.mjs';
+import * as Cache from './cache.mjs';
+import { menu } from '/src/data/navigation';
+
+/**
+ * @typedef { import("../types/Site").Site } Site
+ * @typedef { import("../types/NavPage").NavPage } NavPage
+ */
+
+/**
+ * 
+ * @param {URL} currentUrl 
+ * @param {Site} site 
+ * @returns {Promise<NavPage[]}
+ */
+export async function getMenu (currentUrl, site) {
+    const key = 'Navigation__getMenu';
+
+    /** @type {NavPage[]} */
+    let pages = await Cache.getItem(key);
+
+    if (pages == null) {
+        pages = [];
+        for (let i = 0; i < menu.length; i++) {
+            const item = menu[i];
+            if (isNavPage(item)) {
+                pages.push(item);
+            } else {
+                const p = await getNavigation(currentUrl, site);
+                for (let j = 0; j < p.length; j++) {
+                    pages.push(p[j]);
+                }
+            }
+        }
+
+        // Cache the result
+        await Cache.setItem(key, pages);
+    }
+
+    PostQueries.setCurrentPage(pages, currentUrl);
+
+    return pages;
+}
+
+/**
+ * 
+ * @param {URL} currentUrl 
+ * @param {Site} site 
+ * @returns {Promise<NavPage[]}
+ */
+export async function getNavigation (currentUrl, site) {
+
+    const key = 'Navigation__getNavigation';
+
+    /** @type {NavPage[]} */
+    let pageHierarchy = await Cache.getItem(key);
+
+    if (pageHierarchy == null) {
+        const topLevelPages = await PostQueries.getTopLevelPages(site, PostFiltering.showInMenu);
+        const allPages = await PostQueries.getPages(PostFiltering.showInMenu);
+
+        pageHierarchy = topLevelPages
+            .map(p => PostQueries.mapNavPage(p, site))
+            .sort((a, b) => a.order - b.order);
+            
+        /** @type {NavPage[]} */
+        const pageList = allPages.map(p => PostQueries.mapNavPage(p, site));
+
+        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);
+            }
+        }
+
+        // Cache the result
+        await Cache.setItem(key, pageHierarchy);
+    }
+
+    return pageHierarchy;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro-accelerator-utils",
-  "version": "0.0.33",
+  "version": "0.0.34",
   "description": "Astro utilities for Astro Accelerator.",
   "main": "index.mjs",
   "files": [