astro-accelerator 0.0.28 → 0.0.30

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.28",
+  "version": "0.0.30",
   "author": "Steve Fenton",
   "name": "astro-accelerator",
   "description": "A super-lightweight, accessible, SEO-friendly starter project for Astro",
@@ -26,7 +26,7 @@
   "dependencies": {
     "@squoosh/lib": "^0.4.0",
     "astro": "^1.6.6",
-    "astro-accelerator-utils": "^0.0.26",
+    "astro-accelerator-utils": "^0.0.43",
     "hast-util-from-selector": "^2.0.0",
     "remark-directive": "^2.0.1"
   },

package/src/config.ts

@@ -1,65 +1,30 @@
-import type { Site } from 'astro-accelerator-utils';
+import { Config } from 'astro-accelerator-utils';
 
-export const SITE: Site = {
-	url: 'https://astro.stevefenton.co.uk',
-	subfolder: '',
-	feedUrl: '/articles/feed.xml',
-	title: 'Astro Accelerator',
-	description: 'An Astro quick start project.',
-	defaultLanguage: 'en',
-	themeColor: '#222255',
-	owner: 'Steve Fenton',
-	default: {
-		lang: 'en',
-		locale: 'en-GB',
-		dir: 'ltr'
-	},
-	search: {
-		fallbackUrl: 'https://www.google.com/search',
-		fallbackSite: 'q',
-		fallbackQuery: 'q',
-	},
-	pageSize: 2,
-	/*
-	Refers to "pages in the middle" of the automatically generated links:
-	- Prev
-	- First Page
-	- (A number of links, defined below)
-	- Last Page
-	- Next
-	*/
-	pageLinks: 3,
-	rssLimit: 20,
-	dateOptions: {
-		weekday: 'long',
-		year: 'numeric',
-		month: 'long',
-		day: 'numeric',
-	},
-	featureFlags: {
-		codeBlocks: ['copy'],
-		figures: ['enlarge'],
-		youTubeLinks: ['embed'],
-	},
-	images: {
-		contentSize: '(max-width: 860px) 100vw, 620px',
-		listerSize: '(max-width: 860px) 90vw, 350px',
-		authorSize: '50px',
-	}
-};
+const SITE = Config.getDefault();
+SITE.owner = 'Steve Fenton';
+SITE.url = 'https://astro.stevefenton.co.uk';
+SITE.feedUrl = '/articles/feed.xml';
+SITE.title= 'Astro Accelerator';
+SITE.description = 'An Astro quick start project.';
+SITE.themeColor = '#222255';
+SITE.defaultLanguage = 'en';
+SITE.default.locale = 'en-GB';
+SITE.pageSize = 2; // Allows testing of paging
 
 // Default image for OG: Tags
-export const OPEN_GRAPH = {
+const OPEN_GRAPH = {
 	image: {
 		src: '/img/surface-accessories.png',
 		alt: 'Alt text for image goes here',
 	}
 };
 
-export const HEADER_SCRIPTS = `
+const HEADER_SCRIPTS = `
 <!-- HEADER SCRIPTS -->
 `.trim();
 
+export { SITE, OPEN_GRAPH, HEADER_SCRIPTS }
+
 export type Frontmatter = {
 	layout: string;
 	title: string;

package/src/data/footer.ts

@@ -1,4 +1,4 @@
-import type { NavPage } from '@util/NavigationTypes';
+import type { NavPage } from '@util/TempNavPage';
 
 export const menu: (NavPage | 'categories' | 'tags' | 'toptags')[] = [
 	'categories',

package/src/data/navigation.ts

@@ -1,4 +1,4 @@
-import type { NavPage } from '@util/NavigationTypes';
+import type { NavPage } from '@util/TempNavPage';
 
 export const menu: (NavPage | 'auto')[] = [
 	'auto'

package/src/pages/articles/[page].astro

@@ -2,11 +2,10 @@
 // warning: This file is overwritten by Astro Accelerator
 
 // For listing all articles in this folder
+import { Cache, PostFiltering, PostOrdering, PostPaging } from 'astro-accelerator-utils';
 import { Translations, Lang } from '@util/Languages';
 import type { Page, MarkdownInstance } from 'astro';
 import { Frontmatter, SITE } from '@config';
-import { getPageLinks } from '@util/PageLinks';
-import { Cache, PostFiltering, PostOrdering } from 'astro-accelerator-utils';
 import Default from 'src/layouts/Default.astro';
 import ArticleList from '@components/ArticleList.astro';
 import Paging from '@components/Paging.astro';
@@ -68,7 +67,7 @@ export async function getStaticPaths({ paginate }: any) {
 }
 
 // Page Links
-const pageLinks = getPageLinks(SITE.pageLinks, page.lastPage, page.currentPage, page.url.current);
+const pageLinks = PostPaging.getPageLinks(SITE.pageLinks, page.lastPage, page.currentPage, page.url.current);
 ---
 <Default frontmatter={ frontmatter } headings={ headings }>
   <h2>{ _(Translations.articles.page_title).replace('{n}', page.currentPage.toString())}</h2>

package/src/pages/articles/feed.xml.ts

@@ -2,8 +2,7 @@
 
 // Generates an ATOM feed of recent posts
 import { SITE } from '@config';
-import { PostFiltering, Urls } from 'astro-accelerator-utils';
-import { getTextFrom } from '@util/Markdown';
+import { Markdown, PostFiltering, Urls } from 'astro-accelerator-utils';
 
 async function getData() {
   //@ts-ignore
@@ -15,7 +14,7 @@ async function getData() {
     const article: any = await allArticles[path]();
 
     if (PostFiltering.isListable(article)) {
-      article.frontmatter.title = await getTextFrom(article.frontmatter.title ?? '');
+      article.frontmatter.title = await Markdown.getTextFrom(article.frontmatter.title ?? '');
 
       articles.push({
         url: article.url,

package/src/pages/authors/[author]/[page].astro

@@ -2,12 +2,10 @@
 // warning: This file is overwritten by Astro Accelerator
 
 // For listing all articles in this folder
+import { Cache, PostFiltering, PostOrdering, PostQueries, PostPaging } from 'astro-accelerator-utils';
 import { Translations, Lang } from '@util/Languages';
 import type { Page, MarkdownInstance } from 'astro';
 import { SITE, Frontmatter } from '@config';
-import { getPageLinks } from '@util/PageLinks';
-import { Cache, PostFiltering, PostOrdering } from 'astro-accelerator-utils';
-import { getAuthorInfo } from '@util/PageQueries';
 import Default from '@layouts/Default.astro';
 import ArticleList from '@components/ArticleList.astro';
 import Paging from '@components/Paging.astro';
@@ -16,7 +14,7 @@ const lang = SITE.default.lang;
 const currentUrl = new URL(Astro.request.url);
 const slug = currentUrl.pathname.split('/')[2];
 
-let authorInfo = await getAuthorInfo(slug);
+let authorInfo = await PostQueries.getAuthorInfo(slug);
 
 const frontmatter = authorInfo.frontmatter as Frontmatter;
 
@@ -88,7 +86,7 @@ export async function getStaticPaths({ paginate }: any) {
 }
 
 // Page Links
-const pageLinks = getPageLinks(SITE.pageLinks, page.lastPage, page.currentPage, page.url.current);
+const pageLinks = PostPaging.getPageLinks(SITE.pageLinks, page.lastPage, page.currentPage, page.url.current);
 ---
 <Default frontmatter={ frontmatter } headings={ headings }>
   <h2>{ _(Translations.articles.page_title).replace('{n}', page.currentPage.toString())}</h2>

package/src/pages/category/[category]/[page].astro

@@ -2,11 +2,10 @@
 // warning: This file is overwritten by Astro Accelerator
 
 // For listing by frontmatter.categories
+import { Cache, PostFiltering, PostOrdering, PostPaging } from 'astro-accelerator-utils';
 import { Translations, Lang } from '@util/Languages';
 import type { Page, MarkdownInstance } from 'astro';
 import { SITE, Frontmatter } from '@config';
-import { getPageLinks } from '@util/PageLinks';
-import { Cache, PostFiltering, PostOrdering } from 'astro-accelerator-utils';
 import Default from 'src/layouts/Default.astro';
 import ArticleList from '@components/ArticleList.astro';
 import Paging from '@components/Paging.astro';
@@ -92,7 +91,7 @@ export async function getStaticPaths({ paginate }: any) {
 }
 
 // Page Links
-const pageLinks = getPageLinks(SITE.pageLinks, page.lastPage, page.currentPage, page.url.current);
+const pageLinks = PostPaging.getPageLinks(SITE.pageLinks, page.lastPage, page.currentPage, page.url.current);
 ---
 <Default frontmatter={ frontmatter } headings={ headings }>
   <h2>{ _(Translations.articles.page_title).replace('{n}', page.currentPage.toString())}</h2>

package/src/pages/report/missing-banner.astro

@@ -1,9 +1,8 @@
 ---
 import { PostQueries, PostOrdering } from 'astro-accelerator-utils';
-import { fetchPages } from '@util/PageQueries';
 
 // Logic
-const allPages = await PostQueries.getPages(fetchPages);
+const allPages = await PostQueries.getPages();
 const missingBanner = allPages.filter(p => p.frontmatter.bannerImage == null && p.frontmatter.layout != 'src/layouts/Redirect.astro');
 const pageCount = missingBanner.length;
 const pages = missingBanner.sort(PostOrdering.sortByPubDateDesc).slice(0, Math.min(50, pageCount));

package/src/pages/report/missing-meta.astro

@@ -1,9 +1,8 @@
 ---
 import { PostQueries, PostOrdering } from 'astro-accelerator-utils';
-import { fetchPages } from '@util/PageQueries';
 
 // Logic
-const allPages = await PostQueries.getPages(fetchPages);
+const allPages = await PostQueries.getPages();
 const missingMeta = allPages.filter(p => (p.frontmatter.keywords == null || p.frontmatter.description == null) && p.frontmatter.layout != 'src/layouts/Redirect.astro');
 const pageCount = missingMeta.length;
 const pages = missingMeta.sort(PostOrdering.sortByPubDateDesc).slice(0, Math.min(50, pageCount));

package/src/pages/report/missing-pubdate.astro

@@ -1,9 +1,8 @@
 ---
 import { PostQueries } from 'astro-accelerator-utils';
-import { fetchPages } from '@util/PageQueries';
 
 // Logic
-const allPages = await PostQueries.getPages(fetchPages);
+const allPages = await PostQueries.getPages();
 const missingMeta = allPages.filter(p => (p.frontmatter.pubDate == null && p.frontmatter.layout != 'src/layouts/Redirect.astro'));
 const pageCount = missingMeta.length;
 const pages = missingMeta.slice(0, Math.min(50, pageCount));

package/src/pages/report/oldest-content.astro

@@ -1,9 +1,8 @@
 ---
 import { PostQueries, PostOrdering } from 'astro-accelerator-utils';
-import { fetchPages } from '@util/PageQueries';
 
 // Logic
-const allPages = await PostQueries.getPages(fetchPages);
+const allPages = await PostQueries.getPages();
 const pageCount = allPages.length;
 const pages = allPages.sort(PostOrdering.sortByModDate).slice(0, Math.min(50, pageCount));
 ---

package/src/pages/report/taxonomy.astro

@@ -1,15 +1,16 @@
 ---
+import { Taxonomy } from 'astro-accelerator-utils';
 import { Lang } from '@util/Languages';
-
-import { getTaxonomy, taxonomyLinks, sortByTitle } from '@util/Taxonomy';
+import { Translations } from '@util/Languages';
+import { SITE } from '@config';
 
 // Lang
 const _ = Lang('en');
 
 // Logic
 
-const links = taxonomyLinks(_);
-const taxonomy = await getTaxonomy();
+const links = Taxonomy.taxonomyLinks(Translations, _, SITE);
+const taxonomy = await Taxonomy.getTaxonomy();
 ---
 <!doctype html>
 <html>
@@ -27,14 +28,14 @@ const taxonomy = await getTaxonomy();
                     <th>Count</th>
                 </tr>
             </thead>
-        {taxonomy.categories.sort(sortByTitle).map(t => 
+        {taxonomy.categories.sort(Taxonomy.sortByTitle).map(t => 
         <tr>
             <td>{ links.category }</td>
             <td><a href={ links.getCategoryLink(t.title) }>{ t.title }</a></td>
             <td>{ t.count }</td>
         </tr>
         )}
-        {taxonomy.tags.sort(sortByTitle).map(t => 
+        {taxonomy.tags.sort(Taxonomy.sortByTitle).map(t => 
         <tr>
             <td>{ links.tag }</td>
             <td><a href={ links.getTagLink(t.title) }>{ t.title }</a></td>

package/src/pages/search.json.ts

@@ -2,8 +2,7 @@
 
 import type { MarkdownInstance } from 'astro';
 import { SITE } from '@config';
-import { PostFiltering, Urls } from 'astro-accelerator-utils';
-import { getTextFrom } from '@util/Markdown';
+import { Markdown, PostFiltering, Urls } from 'astro-accelerator-utils';
 
 const getData = async () => {
     //@ts-ignore
@@ -24,7 +23,7 @@ const getData = async () => {
         }
 
         const headings = await page.getHeadings();
-        const title = await getTextFrom(page.frontmatter.title ?? '');
+        const title = await Markdown.getTextFrom(page.frontmatter.title ?? '');
               
         items.push({
             title: title,

package/src/pages/tag/[tag]/[page].astro

@@ -2,11 +2,10 @@
 // warning: This file is overwritten by Astro Accelerator
 
 // For listing by frontmatter.tags
+import {Cache, PostFiltering, PostOrdering, PostPaging } from 'astro-accelerator-utils';
 import { Translations, Lang } from '@util/Languages';
 import type { Page, MarkdownInstance } from 'astro';
 import { SITE, Frontmatter } from '@config';
-import { getPageLinks } from '@util/PageLinks';
-import {Cache, PostFiltering, PostOrdering } from 'astro-accelerator-utils';
 import Default from 'src/layouts/Default.astro';
 import ArticleList from '@components/ArticleList.astro';
 import Paging from '@components/Paging.astro';
@@ -92,7 +91,7 @@ export async function getStaticPaths({ paginate }: any) {
 }
 
 // Page Links
-const pageLinks = getPageLinks(SITE.pageLinks, page.lastPage, page.currentPage, page.url.current);
+const pageLinks = PostPaging.getPageLinks(SITE.pageLinks, page.lastPage, page.currentPage, page.url.current);
 ---
 <Default frontmatter={ frontmatter } headings={ headings }>
   <h2>{ _(Translations.articles.page_title).replace('{n}', page.currentPage.toString())}</h2>

package/src/themes/accelerator/components/ArticleList.astro

@@ -1,9 +1,8 @@
 ---
+import { Markdown, Urls } from 'astro-accelerator-utils';
 import type { MarkdownInstance } from 'astro';
-import { Urls } from 'astro-accelerator-utils';
 import { SITE, Frontmatter } from '@config';
 import { getImageInfo } from '@util/custom-markdown.mjs';
-import { getTextFrom } from '@util/Markdown';
 import AuthorsMini from '@components/AuthorsMini.astro';
 
 
@@ -40,7 +39,7 @@ for (let p of posts) {
     : null
   };
   
-  item.frontmatter.title = await getTextFrom(p.frontmatter.title);
+  item.frontmatter.title = await Markdown.getTextFrom(p.frontmatter.title);
 
   articles.push(item)
 }

package/src/themes/accelerator/components/Authors.astro

@@ -3,7 +3,6 @@ import { Dates, Urls, PostQueries } from 'astro-accelerator-utils';
 import { SITE, Frontmatter } from '@config';
 import { Translations, Lang } from '@util/Languages';
 import { getImageInfo } from '@util/custom-markdown.mjs';
-import { fetchPages } from '@util/PageQueries';
 
 // Properties
 type Props = {
@@ -16,7 +15,7 @@ const { lang, frontmatter } = Astro.props as Props;
 const _ = Lang(lang);
 
 // Logic
-const authorList = await PostQueries.getAuthors(fetchPages, frontmatter);
+const authorList = await PostQueries.getAuthors(frontmatter);
 
 // Get image info
 const authorImage = authorList?.image?.src 

package/src/themes/accelerator/components/AuthorsMini.astro

@@ -2,7 +2,6 @@
 import { Dates, PostQueries } from 'astro-accelerator-utils';
 import { SITE, Frontmatter } from '@config';
 import { Translations, Lang } from '@util/Languages';;
-import { fetchPages } from '@util/PageQueries';
 
 // Properties
 type Props = {
@@ -15,7 +14,7 @@ const { lang, frontmatter } = Astro.props as Props;
 const _ = Lang(lang);
 
 // Logic
-const authorList = await PostQueries.getAuthors(fetchPages, frontmatter);
+const authorList = await PostQueries.getAuthors(frontmatter);
 ---
 {authorList.writers.length > 0 && 
 <div class="post-meta">

package/src/themes/accelerator/components/Breadcrumbs.astro

@@ -1,8 +1,7 @@
 ---
-import { Urls } from 'astro-accelerator-utils';
+import { Urls, PostQueries } from 'astro-accelerator-utils';
 import { SITE, Frontmatter } from '@config';
 import { Translations, Lang } from '@util/Languages';
-import { getBreadcrumbs } from '@util/Breadcrumbs';
 
 // Properties
 type Props = {
@@ -17,7 +16,7 @@ const _ = Lang(lang);
 
 // Logic
 const currentUrl = new URL(Astro.request.url);
-const navPages = await getBreadcrumbs(currentUrl);
+const navPages = await PostQueries.getBreadcrumbs(currentUrl, SITE);
 ---
 <nav class="site-breadcrumbs" aria-label={ _(Translations.aria.breadcrumbs) }>
   <ol vocab="http://schema.org/" typeof="BreadcrumbList">

package/src/themes/accelerator/components/Footer.astro

@@ -1,7 +1,8 @@
 ---
+import { FooterMenu } from 'astro-accelerator-utils';
 import { SITE, Frontmatter } from '@config';
 import { Translations, Lang } from '@util/Languages';
-import { getMenu } from '@util/Footer';
+import { menu } from 'src/data/footer';
 import FooterItem from '@components/FooterItem.astro';
 
 // Properties
@@ -17,7 +18,7 @@ const _ = Lang(lang);
 
 // Logic
 const currentUrl = new URL(Astro.request.url);
-const pages = await getMenu(currentUrl, lang);
+const pages = await FooterMenu.getMenu(currentUrl, _, Translations, SITE, menu);
 ---
 <footer class="site-footer" id="site-footer">
   <div class="footer-columns">

package/src/themes/accelerator/components/FooterItem.astro

@@ -1,5 +1,5 @@
 ---
-import type { NavPage } from '@util/NavigationTypes';
+import type { NavPage } from '@util/TempNavPage';
 
 // Properties
 type Props = {

package/src/themes/accelerator/components/Header.astro

@@ -2,7 +2,6 @@
 import { Urls, PostQueries, PostFiltering } from 'astro-accelerator-utils';
 import { SITE, Frontmatter } from '@config';
 import { Translations, Lang } from '@util/Languages';
-import { fetchPages } from '@util/PageQueries';
 
 // Properties
 type Props = {
@@ -16,7 +15,7 @@ const { lang } = Astro.props as Props;
 const _ = Lang(lang);
 
 // Logic
-const search = (await PostQueries.getPages(fetchPages, PostFiltering.isSearch))[0] ?? null;
+const search = (await PostQueries.getPages(PostFiltering.isSearch))[0] ?? null;
 
 ---
 <header class="site-header">

package/src/themes/accelerator/components/HtmlHead.astro

@@ -1,7 +1,6 @@
 ---
-import { Urls } from 'astro-accelerator-utils';
+import { Markdown, Urls } from 'astro-accelerator-utils';
 import { SITE, OPEN_GRAPH, HEADER_SCRIPTS, Frontmatter } from '@config';
-import { getTextFrom } from '@util/Markdown';
 
 // Properties
 type Props = {
@@ -17,7 +16,7 @@ const imageAlt = frontmatter.bannerImage?.alt ?? OPEN_GRAPH.image.alt;
 const robots = frontmatter.robots ?? 'index, follow';
 const canonicalImageSrc = new URL(imageSrc, Astro.site);
 const canonicalURL =  Urls.addSlashToUrl(new URL(Astro.url.pathname, Astro.site + SITE.subfolder));
-const socialTitle = await getTextFrom(frontmatter.title);
+const socialTitle = await Markdown.getTextFrom(frontmatter.title);
 const title = `${ socialTitle } | ${ SITE.title }`;
 ---
 <head>

package/src/themes/accelerator/components/Navigation.astro

@@ -1,7 +1,9 @@
 ---
+import { Navigation } from 'astro-accelerator-utils';
 import { Translations, Lang } from '@util/Languages';
-import { getMenu } from '@util/Navigation';
 import NavigationItem from '@components/NavigationItem.astro';
+import { SITE } from '@config';
+import { menu } from '@data/navigation';
 
 // Properties
 type Props = {
@@ -14,7 +16,7 @@ const _ = Lang(lang);
 
 // Logic
 const currentUrl = new URL(Astro.request.url);
-const pages = await getMenu(currentUrl);
+const pages = await Navigation.getMenu(currentUrl, SITE, menu);
 ---
 <nav class="site-nav" id="site-nav" aria-label={ _(Translations.aria.site_navigation) }>
   <h2 class="site-nav-title">{ _(Translations.navigation.title) }</h2>

package/src/themes/accelerator/components/NavigationBar.astro

@@ -1,6 +1,8 @@
 ---
+import { Navigation } from 'astro-accelerator-utils';
 import { Translations, Lang } from '@util/Languages';
-import { getMenu } from '@util/Navigation';
+import { SITE } from '@config';
+import { menu } from '@data/navigation';
 
 // Properties
 type Props = {
@@ -13,7 +15,7 @@ const _ = Lang(lang);
 
 // Logic
 const currentUrl = new URL(Astro.request.url);
-const pages = await getMenu(currentUrl);
+const pages = await Navigation.getMenu(currentUrl, SITE, menu);
 ---
 <nav class="site-nav-bar" id="site-nav" aria-label={ _(Translations.aria.site_navigation) }>
   <h2 class="site-nav-title">{ _(Translations.navigation.title) }</h2>

package/src/themes/accelerator/components/NavigationItem.astro

@@ -1,6 +1,6 @@
 ---
 import { SITE } from '@config';
-import type { NavPage } from '@util/NavigationTypes';
+import type { NavPage } from '@util/TempNavPage';
 import { Urls } from 'astro-accelerator-utils';
 
 // Properties

package/src/themes/accelerator/components/Related.astro

@@ -3,7 +3,6 @@ import { SITE, Frontmatter } from '@config';
 import type { MarkdownInstance } from 'astro';
 import { Urls, PostQueries, PostFiltering, PostOrdering } from 'astro-accelerator-utils';
 import { getImageInfo } from '@util/custom-markdown.mjs'
-import { fetchPages } from '@util/PageQueries';
 
 import AuthorsMini from '@components/AuthorsMini.astro';
 
@@ -20,7 +19,7 @@ let posts: MarkdownInstance<Record<string, any>>[] = [];
 const parentCagory = (frontmatter.categories ?? [null])[0];
 
 if (parentCagory != null) {
-  const allPages = await PostQueries.getPages(fetchPages, PostFiltering.isListable)
+  const allPages = await PostQueries.getPages(PostFiltering.isListable)
   const allPosts = allPages
     .filter(p => p.frontmatter.title != frontmatter.title && p.frontmatter.categories && p.frontmatter.categories.includes(parentCagory))
     .sort(PostOrdering.sortByPubDateDesc)

package/src/themes/accelerator/components/Taxonomy.astro

@@ -1,7 +1,8 @@
 ---
+import { Taxonomy } from 'astro-accelerator-utils';
 import type { Frontmatter } from '@config';
 import { Translations, Lang } from '@util/Languages';
-import { taxonomyLinks } from '@util/Taxonomy';
+import { SITE } from '@config';
 
 // Properties
 type Props = {
@@ -17,7 +18,7 @@ const _ = Lang(lang);
 const categories = frontmatter.categories ?? [];
 const tags = frontmatter.tags ?? [];
 
-const links = taxonomyLinks(_);
+const links = Taxonomy.taxonomyLinks(Translations, _, SITE);
 const hasTaxonomy = (categories.length + tags.length) > 0;
 ---
 {hasTaxonomy && (

package/src/themes/accelerator/layouts/Author.astro

@@ -2,7 +2,6 @@
 import { PostQueries } from 'astro-accelerator-utils';
 import { SITE, Frontmatter } from '@config';
 import { Translations, Lang } from '@util/Languages';
-import { fetchPages } from '@util/PageQueries';
 import Default from './Default.astro';
 import ArticleList from '@components/ArticleList.astro';
 
@@ -18,7 +17,7 @@ const lang = frontmatter.lang ?? SITE.default.lang;
 const _ = Lang(lang);
 
 // Logic
-const authorPages = await PostQueries.getPages(fetchPages, p => p.frontmatter.authors?.indexOf(frontmatter.id) > -1)
+const authorPages = await PostQueries.getPages(p => p.frontmatter.authors?.indexOf(frontmatter.id) > -1)
 ---
 <Default frontmatter={ frontmatter } headings={ headings }>
     <slot />

package/src/themes/accelerator/layouts/Default.astro

@@ -1,7 +1,7 @@
 ---
-import { SITE, Frontmatter } from '@config';
-import { getInlineHtmlFrom } from '@util/Markdown';
+import { Markdown } from 'astro-accelerator-utils';
 
+import { SITE, Frontmatter } from '@config';
 import Head from '@components/HtmlHead.astro';
 import Header from '@components/Header.astro';
 import Footer from '@components/Footer.astro';
@@ -22,9 +22,9 @@ const { frontmatter, headings } = Astro.props as Props;
 const lang = frontmatter.lang ?? SITE.default.lang;
 const textDirection = frontmatter.dir ?? SITE.default.dir;
 
-const title = await getInlineHtmlFrom(frontmatter.title ?? SITE.title);
+const title = await Markdown.getInlineHtmlFrom(frontmatter.title ?? SITE.title);
 const subtitle = frontmatter.subtitle
-    ? await getInlineHtmlFrom(frontmatter.subtitle)
+    ? await Markdown.getInlineHtmlFrom(frontmatter.subtitle)
     : null;
 
 const site_url = SITE.url;

package/src/themes/accelerator/utilities/TempNavPage.ts

@@ -0,0 +1,10 @@
+export interface NavPage {
+    section?: string;
+    title: string;
+    url: string;
+    order: number;
+    isOpen: boolean;
+    ariaCurrent: 'page' | false;
+    children: NavPage[];
+    rel?: string;
+}

package/src/themes/accelerator/utilities/Breadcrumbs.ts

@@ -1,26 +0,0 @@
-import { PostQueries } from 'astro-accelerator-utils';
-import { fetchPages } from '@util/PageQueries';
-import { mapNavPage, setCurrentPage, popMatchingPage } from '@util/NavPage';
-
-import type { NavPage } from '@util/NavigationTypes';
-
-export async function getBreadcrumbs (currentUrl: URL) {
-    const allPages = await PostQueries.getPages(fetchPages);
-
-    const pathParts = currentUrl.pathname.split('/');
-    const navPages: NavPage[] = [];
-    let path = '';
-
-    pathParts.forEach((part) => {
-        path += part.length > 0 ? '/' + part : '';
-        const match = popMatchingPage(allPages, path);
-
-        if (match) {
-            navPages.push(mapNavPage(match));
-        }
-    });
-
-    setCurrentPage(navPages, currentUrl);
-
-    return navPages;
-}

package/src/themes/accelerator/utilities/Footer.ts

@@ -1,172 +0,0 @@
-// Data file `navigation.ts`
-import { Cache } from 'astro-accelerator-utils';
-import { menu } from 'src/data/footer';
-import { Translations, Lang, TranslationProvider } from '@util/Languages';
-import { SITE } from '@config';
-import { setCurrentPage } from '@util/NavPage';
-import { NavPage, isNavPage } from '@util/NavigationTypes';
-import { getTaxonomy, taxonomyLinks, TaxonomyLinks } from '@util/Taxonomy';
-
-export async function getMenu (currentUrl: URL, lang: string) {
-    const key = 'Footer__getMenu_' + lang;
-    const _ = Lang(lang);
-    const links = taxonomyLinks(_);
-    let pages: NavPage[] = 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 {
-                switch (item) {
-                    case 'tags':
-                        const tags = await getTags(links, _, lang);
-                        for (let j = 0; j < tags.length; j++) {
-                            pages.push(tags[j]);
-                        }
-                        break;
-                    case 'toptags':
-                        const toptags = await getTopTags(links, _, lang);
-                        for (let j = 0; j < toptags.length; j++) {
-                            pages.push(toptags[j]);
-                        }
-                        break;
-                    case 'categories':
-                        const categories = await getCategories(links, _, lang);
-                        for (let j = 0; j < categories.length; j++) {
-                            pages.push(categories[j]);
-                        }
-                        break;
-                }
-            }
-        }
-
-        // Cache the result
-        await Cache.setItem(key, pages);
-    }
-
-    setCurrentPage(pages, currentUrl);
-
-    return pages;
-}
-
-export async function getCategories (links: TaxonomyLinks, _: TranslationProvider, lang: string) {
-
-    const key = 'Footer__getCategories_' + lang;
-    let pageHierarchy: NavPage[] = await Cache.getItem(key);
-
-    if (pageHierarchy == null) {
-        const category = _(Translations.articles.category) ?? 'category';
-        const categoryTitle = _(Translations.articles.category_title) ?? 'Categories';
-        const categoryLink = `${SITE.subfolder}/${category}/`;
-
-        let order = 0;
-
-        const taxonomy = await getTaxonomy();
-
-        pageHierarchy = [{
-            title: categoryTitle,
-            url: categoryLink,
-            ariaCurrent: false,
-            isOpen: false,
-            order: 1,
-            children: taxonomy.categories.map(item => {
-                return {
-                    title: item.title,
-                    url: links.getCategoryLink(item.title),
-                    ariaCurrent: false,
-                    isOpen: false,
-                    order: ++order,
-                    children: []
-                };
-            })
-        }];
-       
-        // Cache the result
-        await Cache.setItem(key, pageHierarchy);
-    }
-
-    return pageHierarchy;
-}
-
-export async function getTags (links: TaxonomyLinks, _: TranslationProvider, lang: string) {
-
-    const key = 'Footer__getTags_' + lang;
-    let pageHierarchy: NavPage[] = await Cache.getItem(key);
-
-    if (pageHierarchy == null) {
-        const _ = Lang(lang);
-        const tag = _(Translations.articles.tag) ?? 'tag';
-        const tagTitle = _(Translations.articles.tag_title) ?? 'Tags';
-        const tagLink = `${SITE.subfolder}/${tag}/`;
-
-        let order = 0;
-
-        const taxonomy = await getTaxonomy();
-
-        pageHierarchy = [{
-            title: tagTitle,
-            url: tagLink,
-            ariaCurrent: false,
-            isOpen: false,
-            order: 1,
-            children: taxonomy.tags.map(item => {
-                return {
-                    title: item.title,
-                    url: links.getTagLink(item.title),
-                    ariaCurrent: false,
-                    isOpen: false,
-                    order: ++order,
-                    children: []
-                };
-            })
-        }];
-    
-        // Cache the result
-        await Cache.setItem(key, pageHierarchy);
-    }
-
-    return pageHierarchy;
-}
-
-export async function getTopTags (links: TaxonomyLinks, _: TranslationProvider, lang: string) {
-
-const key = 'Footer__getTopTags_' + lang;
-let pageHierarchy: NavPage[] = await Cache.getItem(key);
-
-if (pageHierarchy == null) {
-    const _ = Lang(lang);
-    const tag = _(Translations.articles.tag) ?? 'tag';
-    const tagTitle = _(Translations.articles.tag_title) ?? 'Tags';
-    const tagLink = `${SITE.subfolder}/${tag}/`;
-
-    let order = 0;
-
-    const taxonomy = await getTaxonomy();
-
-    pageHierarchy = [{
-        title: tagTitle,
-        url: tagLink,
-        ariaCurrent: false,
-        isOpen: false,
-        order: 1,
-        children: taxonomy.topTags.map(item => {
-            return {
-                title: item.title,
-                url: links.getTagLink(item.title),
-                ariaCurrent: false,
-                isOpen: false,
-                order: ++order,
-                children: []
-            };
-        })
-    }];
-
-    // Cache the result
-    await Cache.setItem(key, pageHierarchy);
-}
-
-return pageHierarchy;
-}

package/src/themes/accelerator/utilities/Markdown.ts

@@ -1,30 +0,0 @@
-import { unified } from 'unified';
-import remarkParse from 'remark-parse';
-import remarkRehype from 'remark-rehype'
-import rehypeStringify from 'rehype-stringify';
-
-export async function getInlineHtmlFrom(markdown: string): Promise<string> {
-    let html = await getHtmlFrom(markdown);
-
-    // There may be a better way to unwrap this... maybe a visitor
-    if (html.substring(0, 3) == '<p>' && html.substring(html.length - 4) == '</p>') {
-        html = html.substring(3, html.length - 4);
-    }
-
-    return html;
-}
-
-export async function getHtmlFrom(markdown: string): Promise<string> {
-    const vfile = await unified()
-    .use(remarkParse)
-    .use(remarkRehype)
-    .use(rehypeStringify)
-    .process(markdown)
-
-    return String(vfile);
-}
-
-export async function getTextFrom(markdown: string): Promise<string> {
-    const html = await getInlineHtmlFrom(markdown);
-    return html.replace(/<.*?>/g, '');
-}

package/src/themes/accelerator/utilities/NavPage.ts

@@ -1,64 +0,0 @@
-import { SITE } from '@config';
-import type { MarkdownInstance } from 'astro';
-import type { NavPage } from './NavigationTypes';
-
-import { Urls } from 'astro-accelerator-utils';
-
-export function mapNavPage (page: MarkdownInstance<Record<string, any>>) {
-
-  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 = Urls.addSlashToAddress(url, SITE);
-
-  if (page.frontmatter.layout == 'src/layouts/Redirect.astro') {
-    // Skips past the redirect
-    url = page.frontmatter.redirect;
-  }
-
-  const entry: NavPage = {
-    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;
-};
-
-export function setCurrentPage (pages: NavPage[], currentUrl: URL) {
-  pages.forEach(p => {
-    p.isOpen = currentUrl.pathname.startsWith(p.url);
-    p.ariaCurrent = p.url == currentUrl.pathname ? 'page': false;
-    if (p.children) setCurrentPage(p.children, currentUrl);
-  });
-}
-
-export function popMatchingPage (allPages: MarkdownInstance<Record<string, any>>[], search: string) {
-  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/src/themes/accelerator/utilities/Navigation.ts

@@ -1,78 +0,0 @@
-// Data file `navigation.ts`
-import { menu } from 'src/data/navigation';
-
-import { PostQueries, PostFiltering, Cache } from 'astro-accelerator-utils';
-import { mapNavPage, setCurrentPage } from '@util/NavPage';
-import { NavPage, isNavPage } from '@util/NavigationTypes';
-import { getTopLevelPages, fetchPages } from '@util/PageQueries';
-
-export async function getMenu (currentUrl: URL) {
-    const key = 'Navigation__getMenu';
-    let pages: NavPage[] = 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);
-                for (let j = 0; j < p.length; j++) {
-                    pages.push(p[j]);
-                }
-            }
-        }
-
-        // Cache the result
-        await Cache.setItem(key, pages);
-    }
-
-    setCurrentPage(pages, currentUrl);
-
-    return pages;
-}
-
-export async function getNavigation (currentUrl: URL) {
-
-    const key = 'Navigation__getNavigation';
-    let pageHierarchy: NavPage[] = await Cache.getItem(key);
-
-    if (pageHierarchy == null) {
-        const topLevelPages = await getTopLevelPages(PostFiltering.showInMenu);
-        const allPages = await PostQueries.getPages(fetchPages, PostFiltering.showInMenu);
-
-        pageHierarchy = topLevelPages
-            .map(mapNavPage)
-            .sort((a, b) => a.order - b.order);
-            
-        const pageList: NavPage[] = allPages.map(mapNavPage);
-
-        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/src/themes/accelerator/utilities/NavigationTypes.ts

@@ -1,18 +0,0 @@
-export type NavPage = {
-  section?: string;
-  title: string;
-  url: string;
-  order: number;
-  isOpen: boolean;
-  ariaCurrent: 'page' | false;
-  children: NavPage[];
-  rel?: string;
-}
-
-export function isNavPage (item: NavPage | 'auto' | 'tags' | 'toptags' | 'categories') : item is NavPage {
-  if (typeof item === 'string' && ['auto', 'tags', 'toptags', 'categories'].includes(item)) {
-    return false;
-  }
-
-  return true;
-}

package/src/themes/accelerator/utilities/PageLinks.ts

@@ -1,70 +0,0 @@
-export type Link = {
-  title: string;
-  url: string;
-  ariaCurrent: 'page' | false;
-  class: string;
-}
-
-export function getPageLinks(limit: number, numberOfPages: number, currentPage: number, url: string) {
-  const pageLinks: Link[] = [];
-
-  let start = 0;
-  let end = numberOfPages;
-
-  if (numberOfPages > limit) {
-    start = (currentPage - (limit - 1) / 2) - 1;
-    if (start < 0) {
-      start = 0;
-    }
-
-    end = (start + limit);
-    if (end > numberOfPages) {
-      end = numberOfPages;
-      start = numberOfPages - limit;
-    }
-  }
-
-  if (start == 1) {
-    pageLinks.push({
-      title: '1',
-      url: url.replace('/' + currentPage, '/' + 1),
-      ariaCurrent: false,
-      class: ''
-    });
-  } else if (start > 1) {
-    pageLinks.push({
-      title: '1',
-      url: url.replace('/' + currentPage, '/' + 1),
-      ariaCurrent: false,
-      class: 'paging-collapse-after'
-    });
-  }
-
-  for (let i = start; i < end; i++) {
-    const userPage = i + 1;
-    pageLinks.push({
-      title: userPage.toString(),
-      url: url.replace('/' + currentPage, '/' + userPage),
-      ariaCurrent: userPage == currentPage ? 'page' : false,
-      class: ''
-    });
-  }
-
-  if (end < (numberOfPages - 1)) {
-    pageLinks.push({
-      title: numberOfPages.toString(),
-      url: url.replace('/' + currentPage, '/' + numberOfPages),
-      ariaCurrent: false,
-      class: 'paging-collapse-before'
-    });
-  } else if (end < numberOfPages) {
-    pageLinks.push({
-      title: numberOfPages.toString(),
-      url: url.replace('/' + currentPage, '/' + numberOfPages),
-      ariaCurrent: false,
-      class: ''
-    });
-  }
-
-  return pageLinks;
-}

package/src/themes/accelerator/utilities/PageQueries.ts

@@ -1,56 +0,0 @@
-import type { MarkdownInstance } from "astro";
-import { SITE } from '@config';
-import { Cache, PostQueries, PostFiltering } from 'astro-accelerator-utils';
-
-export function fetchPages(): MarkdownInstance<Record<string, any>>[] {
-    return import.meta.glob<any>("../../../pages/**/*.md", { eager: true }) as MarkdownInstance<Record<string, any>>[];
-}
-
-export type PagePredicate = (value: MarkdownInstance<Record<string, any>>, index: number, array: MarkdownInstance<Record<string, any>>[]) => boolean;
-
-export async function getTopLevelPages (filter?: PagePredicate | null): Promise<MarkdownInstance<Record<string,any>>[]> {
-    const key = 'PageQueries__getTopLevelPages';
-    let allPages: MarkdownInstance<Record<string, any>>[] = await Cache.getItem(key);
-
-    if (allPages == null) {
-        allPages = await PostQueries.getPages(fetchPages);
-
-        const isRoot = SITE.subfolder.length == 0;
-        const expectedDepth = isRoot ? 1 : 2;
-        allPages = allPages.filter(p => {
-            const depth = (p.url ?? '/').split('/').length - 1;
-            return depth == expectedDepth
-                || (depth == (expectedDepth - 1) && p.file.includes(SITE.subfolder.toLowerCase() + '.md'));
-        });
-
-        await Cache.setItem(key, allPages);
-    }
-
-    if (filter == null) {
-        return allPages;
-    }
-
-    return allPages.filter(filter);
-}
-
-export async function getAuthorInfo (slug: string) {
-    const cacheKey = 'Global__author_info';
-    
-    let authorInfo = await Cache.getItem(cacheKey);
-
-    if (authorInfo == null) {
-        const allPages = await PostQueries.getPages(fetchPages);
-
-        const author = allPages
-            .filter(PostFiltering.isAuthor)
-            .filter(x => x.url?.split('/')[2] == slug)[0];
-
-        authorInfo = {
-            frontmatter: author.frontmatter
-        };
-  
-      await Cache.setItem(cacheKey, authorInfo);
-    }
-
-    return authorInfo;
-}

package/src/themes/accelerator/utilities/Taxonomy.ts

@@ -1,115 +0,0 @@
-import { Cache, Urls, PostQueries } from 'astro-accelerator-utils';
-import type { Entry } from '@util/Languages';
-import { Translations } from '@util/Languages';
-import { SITE } from '@config';
-import { fetchPages } from '@util/PageQueries';
-import type { MarkdownInstance } from 'astro-accelerator-utils/types/Astro';
-
-type TaxonomyEntry = {
-    title: string;
-    count: number;
-};
-
-type Taxonomy = { 
-    tags: TaxonomyEntry[];
-    topTags: TaxonomyEntry[];
-    categories: TaxonomyEntry[];
-};
-
-export function sortByTitle (a: TaxonomyEntry, b: TaxonomyEntry) {
-  if ( a.title < b.title ){
-    return -1;
-  }
-
-  if ( a.title > b.title ){
-    return 1;
-  }
-  
-  return 0;
-}
-
-export type TaxonomyLinks = {
-    tag: string;
-    category: string;
-    getCategoryLink: (category: string) => string;
-    getTagLink: (tag: string) => string;
-}
-
-export function taxonomyLinks(lang: (entry: Entry) => string): TaxonomyLinks {
-    const category = lang(Translations.articles.category) ?? 'category';
-    const categoryLink = `${SITE.subfolder}/${category}/`;
-
-    const tag = lang(Translations.articles.tag) ?? 'category';
-    const tagLink = `${SITE.subfolder}/${tag}/`;
-
-    return {
-        tag: tag,
-        category: category,
-        getCategoryLink: (category: string) => {
-            return Urls.addSlashToAddress(categoryLink + category.toLowerCase().replace(/ /g, '-') + '/1/', SITE);
-        },
-        getTagLink: (tag: string) => {
-            return Urls.addSlashToAddress(tagLink + tag.toLowerCase().replace(/ /g, '-') + '/1/', SITE);
-        }
-    };
-
-}
-
-export async function getTaxonomy (): Promise<Taxonomy> {
-    const cacheKey = 'Global__taxonomy';
-
-    let taxonomy: Taxonomy = await Cache.getItem(cacheKey);
-
-    if (taxonomy == null) {
-        const allPages: MarkdownInstance<Record<string, any>>[] = await PostQueries.getPages(fetchPages);
-        const tags: { [key: string]: number } = {};
-        const cats: { [key: string]: number } = {};
-
-        // Get taxonomy and counts
-        allPages.forEach((p) => {
-            p.frontmatter.tags && (p.frontmatter.tags as string[]).forEach(t => {
-                tags[t] = (tags[t] ?? 0) + 1;
-            });
-
-            p.frontmatter.categories && (p.frontmatter.categories as string[]).forEach(c => {
-                cats[c] = (cats[c] ?? 0) + 1;
-            });
-        });
-
-        // Map into the taxonomy
-        taxonomy = {
-            tags: Object.keys(tags).sort().map(x => {
-                return {
-                    title: x,
-                    count: tags[x]
-                };
-            }),
-            topTags: [],
-            categories: Object.keys(cats).sort().map(x => {
-                return {
-                    title: x,
-                    count: cats[x]
-                };
-            })
-        };
-
-        // Get a list of "top tags" by usage count
-        const length = Math.min(taxonomy.categories.length, taxonomy.tags.length);
-        taxonomy.topTags = taxonomy.tags
-            .sort((a, b) => b.count - a.count)
-            .slice(0, length)
-            .sort((a, b) => {
-                if ( a.title < b.title ){
-                    return -1;
-                }
-                if ( a.title > b.title ){
-                    return 1;
-                }
-                return 0;
-             });
-
-        await Cache.setItem(cacheKey, taxonomy);
-    }
-
-    return taxonomy;
-}