astro-accelerator 0.0.24 → 0.0.25

package/package.json

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

package/src/config.ts

@@ -1,4 +1,6 @@
-export const SITE = {
+import type { Site } from 'astro-accelerator-utils';
+
+export const SITE: Site = {
 	url: 'https://astro.stevefenton.co.uk',
 	subfolder: '',
 	feedUrl: '/articles/feed.xml',
@@ -62,8 +64,6 @@ type Mapped<T> = {
     [P in keyof T]?: any
 }
 
-export type Site = Mapped<typeof SITE>;
-
 export type Frontmatter = {
 	layout: string;
 	title: string;

package/src/layouts/Default.astro

@@ -10,7 +10,6 @@ type Props = {
     headings: { depth: number; slug: string; text: string; }[];
 }
 const { frontmatter, headings } = Astro.props as Props;
-
 ---
 <Default frontmatter={ frontmatter } headings={ headings }>
     <slot />

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

@@ -6,8 +6,7 @@ import { Translations, Lang } from '@util/Languages';
 import type { Page, MarkdownInstance } from 'astro';
 import { Frontmatter, SITE } from '@config';
 import { getPageLinks } from '@util/PageLinks';
-import { isListable, sortByPubDateDesc } from '@util/PageTypeFilters';
-import { getItem, setItem } from '@util/Cache';
+import { isListable, sortByPubDateDesc, getItem, setItem } from 'astro-accelerator-utils';
 import Default from 'src/layouts/Default.astro';
 import ArticleList from '@components/ArticleList.astro';
 import Paging from '@components/Paging.astro';

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

@@ -2,8 +2,8 @@
 
 // Generates an ATOM feed of recent posts
 import { SITE } from '@config';
-import { addSlashToAddress } from '@util/Url';
-import { isListable } from '@util/PageTypeFilters';
+import { addSlashToAddress, isListable } from 'astro-accelerator-utils';
+import { getTextFrom } from '@util/Markdown';
 
 async function getData() {
   //@ts-ignore
@@ -15,6 +15,8 @@ async function getData() {
     const article: any = await allArticles[path]();
 
     if (isListable(article)) {
+      article.frontmatter.title = await getTextFrom(article.frontmatter.title ?? '');
+
       articles.push({
         url: article.url,
         frontmatter: article.frontmatter
@@ -31,7 +33,7 @@ async function getData() {
     <entry>
       <title>${a.frontmatter.title ?? ''}</title>
       <link href="${ SITE.url + a.url }" />
-      <id>${ SITE.url + addSlashToAddress(a.url) }</id>
+      <id>${ SITE.url + addSlashToAddress(a.url, SITE) }</id>
       <published>${ a.frontmatter.pubDate }</published>
       <updated>${ a.frontmatter.pubDate ?? a.frontmatter.pubDate }</updated>
       <summary>${ a.frontmatter.description ?? '' }</summary>

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

@@ -4,10 +4,9 @@
 // For listing all articles in this folder
 import { Translations, Lang } from '@util/Languages';
 import type { Page, MarkdownInstance } from 'astro';
-import { Frontmatter, SITE } from '@config';
+import { SITE, Frontmatter } from '@config';
 import { getPageLinks } from '@util/PageLinks';
-import { isListable, sortByPubDateDesc } from '@util/PageTypeFilters';
-import { getItem, setItem } from '@util/Cache';
+import { isListable, sortByPubDateDesc, getItem, setItem } from 'astro-accelerator-utils';
 import { getAuthorInfo } from '@util/PageQueries';
 import Default from '@layouts/Default.astro';
 import ArticleList from '@components/ArticleList.astro';

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

@@ -4,10 +4,9 @@
 // For listing by frontmatter.categories
 import { Translations, Lang } from '@util/Languages';
 import type { Page, MarkdownInstance } from 'astro';
-import { Frontmatter, SITE } from '@config';
+import { SITE, Frontmatter } from '@config';
 import { getPageLinks } from '@util/PageLinks';
-import { isListable, sortByPubDateDesc } from '@util/PageTypeFilters';
-import { getItem, setItem } from '@util/Cache';
+import { isListable, sortByPubDateDesc, getItem, setItem } from 'astro-accelerator-utils';
 import Default from 'src/layouts/Default.astro';
 import ArticleList from '@components/ArticleList.astro';
 import Paging from '@components/Paging.astro';

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

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

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

@@ -1,9 +1,9 @@
 ---
-import { sortByPubDateDesc } from '@util/PageTypeFilters';
-import { getPages } from '@util/PageQueries';
+import { sortByPubDateDesc, getPages } from 'astro-accelerator-utils';
+import { fetchPages } from '@util/PageQueries';
 
 // Logic
-const allPages = await getPages();
+const allPages = await getPages(fetchPages);
 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(sortByPubDateDesc).slice(0, Math.min(50, pageCount));

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

@@ -1,8 +1,9 @@
 ---
-import { getPages } from '@util/PageQueries';
+import { getPages } from 'astro-accelerator-utils';
+import { fetchPages } from '@util/PageQueries';
 
 // Logic
-const allPages = await getPages();
+const allPages = await getPages(fetchPages);
 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,9 @@
 ---
-import { sortByModDate } from '@util/PageTypeFilters';
-import { getPages } from '@util/PageQueries';
+import { sortByModDate, getPages } from 'astro-accelerator-utils';
+import { fetchPages } from '@util/PageQueries';
 
 // Logic
-const allPages = await getPages();
+const allPages = await getPages(fetchPages);
 const pageCount = allPages.length;
 const pages = allPages.sort(sortByModDate).slice(0, Math.min(50, pageCount));
 ---

package/src/pages/search.json.ts

@@ -2,8 +2,8 @@
 
 import type { MarkdownInstance } from 'astro';
 import { SITE } from '@config';
-import { showInSearch } from '@util/PageTypeFilters';
-import { addSlashToAddress } from '@util/Url';
+import { addSlashToAddress, showInSearch } from 'astro-accelerator-utils';
+import { getTextFrom } from '@util/Markdown';
 
 const getData = async () => {
     //@ts-ignore
@@ -24,15 +24,16 @@ const getData = async () => {
         }
 
         const headings = await page.getHeadings();
+        const title = await getTextFrom(page.frontmatter.title ?? '');
               
         items.push({
-            title: page.frontmatter.title ?? '',
+            title: title,
             headings: headings.map(h => {
                 return {text: h.text, slug: h.slug }
             }),
             description: page.frontmatter.description ?? '',
             tags: page.frontmatter.tags ?? [],
-            url: SITE.url + addSlashToAddress(url),
+            url: SITE.url + addSlashToAddress(url, SITE),
             date: page.frontmatter.pubDate ?? ''
         });
     }

package/src/pages/sitemap.xml.ts

@@ -2,8 +2,7 @@
 
 // Generates an ATOM feed of recent posts
 import { SITE } from '@config';
-import { showInSitemap } from '@util/PageTypeFilters';
-import { addSlashToAddress } from '@util/Url';
+import { addSlashToAddress, showInSitemap } from 'astro-accelerator-utils';
 
 async function getData() {
   //@ts-ignore
@@ -18,7 +17,7 @@ async function getData() {
     if (addToSitemap) {
       pages.push(`
         <url>
-          <loc>${ SITE.url + addSlashToAddress(article.url) }</loc>
+          <loc>${ SITE.url + addSlashToAddress(article.url, SITE) }</loc>
           <lastmod>${ article.frontmatter.pubDate }</lastmod>
         </url>`);
     }

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

@@ -4,10 +4,9 @@
 // For listing by frontmatter.tags
 import { Translations, Lang } from '@util/Languages';
 import type { Page, MarkdownInstance } from 'astro';
-import { Frontmatter, SITE } from '@config';
+import { SITE, Frontmatter } from '@config';
 import { getPageLinks } from '@util/PageLinks';
-import { isListable, sortByPubDateDesc } from '@util/PageTypeFilters';
-import { getItem, setItem } from '@util/Cache';
+import { isListable, sortByPubDateDesc, getItem, setItem } from 'astro-accelerator-utils';
 import Default from 'src/layouts/Default.astro';
 import ArticleList from '@components/ArticleList.astro';
 import Paging from '@components/Paging.astro';

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

@@ -1,8 +1,9 @@
 ---
 import type { MarkdownInstance } from 'astro';
 import { SITE, Frontmatter } from '@config';
-import { addSlashToAddress } from '@util/Url';
+import { addSlashToAddress } from 'astro-accelerator-utils';
 import { getImageInfo } from '@util/custom-markdown.mjs';
+import { getTextFrom } from '@util/Markdown';
 import AuthorsMini from '@components/AuthorsMini.astro';
 
 
@@ -14,15 +15,35 @@ type Props = {
 const { lang, posts } = Astro.props as Props;
 
 // Logic
-const articles = posts.map(p => {
-  return {
-    url: p.url,
+type ImageInfo = {
+  src: string;
+  srcset: string;
+  sizes: string;
+  class: string;
+};
+
+type Article = {
+  url: string;
+  frontmatter: Record<string, any>;
+  img: ImageInfo | null;
+};
+
+
+const articles: Article[] = [];
+
+for (let p of posts) {
+  const item = {
+    url: p.url ?? '',
     frontmatter: p.frontmatter,
     img: p.frontmatter.bannerImage
-      ? getImageInfo(p.frontmatter.bannerImage.src, '', SITE.images.listerSize)
-      : null
+    ? getImageInfo(p.frontmatter.bannerImage.src, '', SITE.images.listerSize)
+    : null
   };
-});
+  
+  item.frontmatter.title = await getTextFrom(p.frontmatter.title);
+
+  articles.push(item)
+}
 
 let articleIndex = 0;
 function getLoadingAttribute() {
@@ -34,7 +55,7 @@ function getLoadingAttribute() {
 ---
 <ul class="post-list anim-show-parent">
   {articles.map((post) => (
-  <li class="list-item" data-destination={ addSlashToAddress(post.url) } data-image={ (post.frontmatter.bannerImage?.src.length > 0).toString() }>
+  <li class="list-item" data-destination={ addSlashToAddress(post.url, SITE) } data-image={ (post.frontmatter.bannerImage?.src.length > 0).toString() }>
     <article>
       <div class="list-item-image">
       {post.img && (
@@ -49,7 +70,7 @@ function getLoadingAttribute() {
       </div>
       <div class="list-item-content">
         <h3>
-          <a href={ addSlashToAddress(post.url) }>{ post.frontmatter.title }</a>
+          <a href={ addSlashToAddress(post.url, SITE) }>{ post.frontmatter.title }</a>
         </h3>
         <AuthorsMini lang={ lang } frontmatter={ post.frontmatter as Frontmatter } />
       </div>

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

@@ -1,9 +1,8 @@
 ---
 import { SITE, Frontmatter } from '@config';
 import { Translations, Lang } from '@util/Languages';
-import { formatDate, formatModifiedDate } from '@util/DateFormat';
+import { formatDate, formatModifiedDate, addSlashToAddress } from 'astro-accelerator-utils';
 import { getAuthorList } from '@util/Authors';
-import { addSlashToAddress } from '@util/Url';
 import { getImageInfo } from '@util/custom-markdown.mjs';
 
 // Properties
@@ -36,9 +35,9 @@ const contributors = authorList.writers.slice(1);
   <div class="author-info">
     <span>{ _(Translations.post.written_by) }
       {author &&
-        <a href={ addSlashToAddress(author.url) + '1/' } itemprop="author">{ author.frontmatter.title }</a>
+        <a href={ addSlashToAddress(author.url, SITE) + '1/' } itemprop="author">{ author.frontmatter.title }</a>
       }{contributors.map((writer) => (
-        <a href={ addSlashToAddress(writer.url) + '1/' } itemprop="contributor">{ writer.frontmatter.title }</a>
+        <a href={ addSlashToAddress(writer.url, SITE) + '1/' } itemprop="contributor">{ writer.frontmatter.title }</a>
       ))}.
       <br /><time datetime={ frontmatter.pubDate.toString() } itemprop="datePublished">
       { formatDate(frontmatter, lang, SITE) }

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

@@ -1,7 +1,7 @@
 ---
 import { SITE, Frontmatter } from '@config';
 import { Translations, Lang } from '@util/Languages';;
-import { formatDate } from '@util/DateFormat';
+import { formatDate } from 'astro-accelerator-utils';
 import { getAuthorList } from '@util/Authors';
 
 // Properties

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

@@ -1,8 +1,8 @@
 ---
-import type { Frontmatter } from '@config';
+import { SITE, Frontmatter } from '@config';
 import { Translations, Lang } from '@util/Languages';
 import { getBreadcrumbs } from '@util/Breadcrumbs';
-import { addSlashToAddress } from '@util/Url';
+import { addSlashToAddress } from 'astro-accelerator-utils';
 
 // Properties
 type Props = {
@@ -24,7 +24,7 @@ const navPages = await getBreadcrumbs(currentUrl);
     {navPages.map((page, index) => (
     <li property="itemListElement" typeof="ListItem">
       <meta property="position" content={ index.toString() } />
-      <a property="item" typeof="WebPage" href={ addSlashToAddress(page.url) } aria-current={ page.ariaCurrent } rel={ page.rel }><span property="name">{ page.title }</span></a>
+      <a property="item" typeof="WebPage" href={ addSlashToAddress(page.url, SITE) } aria-current={ page.ariaCurrent } rel={ page.rel }><span property="name">{ page.title }</span></a>
     </li>
     ))}
   </ol>

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

@@ -1,9 +1,8 @@
 ---
 import { SITE, Frontmatter } from '@config';
 import { Translations, Lang } from '@util/Languages';
-import { getPages } from '@util/PageQueries';
-import { addSlashToAddress } from '@util/Url';
-import { isSearch } from '@util/PageTypeFilters';
+import { fetchPages } from '@util/PageQueries';
+import { addSlashToAddress, isSearch, getPages } from 'astro-accelerator-utils';
 
 // Properties
 type Props = {
@@ -17,7 +16,7 @@ const { lang } = Astro.props as Props;
 const _ = Lang(lang);
 
 // Logic
-const search = (await getPages(isSearch))[0] ?? null;
+const search = (await getPages(fetchPages, isSearch))[0] ?? null;
 
 ---
 <header class="site-header">
@@ -31,7 +30,7 @@ const search = (await getPages(isSearch))[0] ?? null;
   </svg></a>
   <a href={ (SITE.subfolder ?? '') + '/' } class="site-title" translate="no">{ SITE.title }</a>
   {search != null &&
-  <a href={ addSlashToAddress(search.url) } class="search-icon" title={ _(Translations.header.open_search) }><svg xmlns="http://www.w3.org/2000/svg" 
+  <a href={ addSlashToAddress(search.url, SITE) } class="search-icon" title={ _(Translations.header.open_search) }><svg xmlns="http://www.w3.org/2000/svg" 
     width="40" height="40" viewBox="0 0 24 24" stroke-width="1" 
     fill="none" stroke-linecap="round" stroke-linejoin="round">
     <path stroke="none" d="M0 0h24v24H0z" fill="none"/>

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

@@ -1,6 +1,6 @@
 ---
 import { SITE, OPEN_GRAPH, HEADER_SCRIPTS, Frontmatter } from '@config';
-import { addSlashToUrl } from '@util/Url';
+import { addSlashToUrl } from 'astro-accelerator-utils';
 import { getTextFrom } from '@util/Markdown';
 
 // Properties

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

@@ -1,6 +1,7 @@
 ---
+import { SITE } from '@config';
 import type { NavPage } from '@util/NavigationTypes';
-import { addSlashToAddress } from '@util/Url';
+import { addSlashToAddress } from 'astro-accelerator-utils';
 
 // Properties
 type Props = {
@@ -11,7 +12,7 @@ const { lang, page } = Astro.props as Props;
 ---
 {(page.children.length == 0) && (
 <li>
-  <a href={ addSlashToAddress(page.url) } aria-current={ page.ariaCurrent } rel={ page.rel }>{ page.title }</a>
+  <a href={ addSlashToAddress(page.url, SITE) } aria-current={ page.ariaCurrent } rel={ page.rel }>{ page.title }</a>
 </li>
 )}
 {(page.children.length > 0) && (

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

@@ -1,8 +1,9 @@
 ---
+import { SITE } from '@config';
 import type { Link } from '@util/PageLinks';
 import type { MarkdownInstance, Page } from 'astro';
 import { Translations, Lang } from '@util/Languages';
-import { addSlashToAddress } from '@util/Url';
+import { addSlashToAddress } from 'astro-accelerator-utils';
 
 // Properties
 type Props = {
@@ -20,12 +21,12 @@ const _ = Lang(lang);
 ---
 <nav class="post-paging" aria-label={ _(Translations.aria.paging) }>
   {page.url.prev
-    ? <a href={ addSlashToAddress(page.url.prev) }>{ _(Translations.articles.previous) }</a>
+    ? <a href={ addSlashToAddress(page.url.prev, SITE) }>{ _(Translations.articles.previous) }</a>
     : <span>{ _(Translations.articles.previous) }</span>}
   {pageLinks.map((link) => (
-      <a href={ addSlashToAddress(link.url) } aria-current={ link.ariaCurrent } class={ link.class }>{ link.title }</a>
+      <a href={ addSlashToAddress(link.url, SITE) } aria-current={ link.ariaCurrent } class={ link.class }>{ link.title }</a>
   ))}
   {page.url.next
-    ? <a href={ addSlashToAddress(page.url.next) }>{ _(Translations.articles.next) }</a>
+    ? <a href={ addSlashToAddress(page.url.next, SITE) }>{ _(Translations.articles.next) }</a>
     : <span>{ _(Translations.articles.next) }</span>}
   </nav>

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

@@ -1,15 +1,12 @@
 ---
-import type { Frontmatter } from '@config';
+import { SITE, Frontmatter } from '@config';
 import type { MarkdownInstance } from 'astro';
-import { addSlashToAddress } from '@util/Url';
+import { addSlashToAddress, isListable, sortByPubDateDesc, getPages } from 'astro-accelerator-utils';
 import { getImageInfo } from '@util/custom-markdown.mjs'
-import { getPages } from '@util/PageQueries';
-import { isListable, sortByPubDateDesc } from '@util/PageTypeFilters';
+import { fetchPages } from '@util/PageQueries';
 
 import AuthorsMini from '@components/AuthorsMini.astro';
 
-import { SITE } from '@config';
-
 // Properties
 type Props = {
   lang: string;
@@ -23,7 +20,7 @@ let posts: MarkdownInstance<Record<string, any>>[] = [];
 const parentCagory = (frontmatter.categories ?? [null])[0];
 
 if (parentCagory != null) {
-  const allPages = await getPages(isListable)
+  const allPages = await getPages(fetchPages, isListable)
   const allPosts = allPages
     .filter(p => p.frontmatter.title != frontmatter.title && p.frontmatter.categories && p.frontmatter.categories.includes(parentCagory))
     .sort(sortByPubDateDesc)
@@ -56,7 +53,7 @@ const articles = posts.map(p => {
 {articles.length > 0 &&
 <ul class="post-list anim-show-parent">
   {articles.map((post) => (
-  <li class="list-item" data-destination={ addSlashToAddress(post.url) } data-image={ (post.frontmatter.bannerImage?.src.length > 0).toString() }>
+  <li class="list-item" data-destination={ addSlashToAddress(post.url, SITE) } data-image={ (post.frontmatter.bannerImage?.src.length > 0).toString() }>
     <article>
       <div class="list-item-image">
       {post.img && (
@@ -71,7 +68,7 @@ const articles = posts.map(p => {
       </div>
       <div class="list-item-content">
         <h3>
-          <a href={ addSlashToAddress(post.url) }>{ post.frontmatter.title }</a>
+          <a href={ addSlashToAddress(post.url, SITE) }>{ post.frontmatter.title }</a>
         </h3>
         <AuthorsMini lang={ lang } frontmatter={ post.frontmatter as Frontmatter } />
       </div>

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

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

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

@@ -27,7 +27,8 @@ const subtitle = frontmatter.subtitle
     ? await getInlineHtmlFrom(frontmatter.subtitle)
     : null;
 
-const features = "<script>const site_url = '" + SITE.url + "'; const site_features = '" + JSON.stringify(SITE.featureFlags) + "';</script>";
+const site_url = SITE.url;
+const site_features = SITE.featureFlags;
 ---
 <html dir={ textDirection } lang={ lang } class="initial">
     <Head frontmatter={ frontmatter } headings={ headings } lang={ lang } />
@@ -56,7 +57,10 @@ const features = "<script>const site_url = '" + SITE.url + "'; const site_featur
             </main>
         </div>
         <Footer frontmatter={ frontmatter } headings={ headings } lang={ lang } />
-        <Fragment is:html="true" set:html={ features } />
+        <script define:vars={{ site_url, site_features }}>
+            window.site_url = site_url;
+            window.site_features = site_features;
+        </script>
         <script src={ SITE.subfolder + '/js/main.js' } type="module" async></script>
     </body>
 </html>

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

@@ -1,8 +1,8 @@
 import type { Frontmatter } from '@config';
 import type { MarkdownInstance } from 'astro';
 
-import { getPages } from "@util/PageQueries";
-import { isAuthor } from "@util/PageTypeFilters";
+import { fetchPages } from "@util/PageQueries";
+import { isAuthor, getPages } from "astro-accelerator-utils";
 
 type BannerImage = { src: string; alt: string } | null;
 type AuthorList = {
@@ -11,7 +11,7 @@ type AuthorList = {
 };
 
 export async function getAuthors () {
-    const authors = await getPages(isAuthor);
+    const authors = await getPages(fetchPages, isAuthor);
     return authors;
 }
 

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

@@ -1,10 +1,11 @@
-import { getPages } from '@util/PageQueries';
+import { getPages } 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 getPages();
+    const allPages = await getPages(fetchPages);
 
     const pathParts = currentUrl.pathname.split('/');
     const navPages: NavPage[] = [];

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

@@ -2,7 +2,7 @@
 import { menu } from 'src/data/footer';
 import { Translations, Lang } from '@util/Languages';
 import { SITE } from '@config';
-import { getItem, setItem } from '@util/Cache';
+import { getItem, setItem } from 'astro-accelerator-utils';
 import { setCurrentPage } from '@util/NavPage';
 import { NavPage, isNavPage } from '@util/NavigationTypes';
 import { getTaxonomy, taxonomyLinks } from '@util/Taxonomy';

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

@@ -1,7 +1,8 @@
+import { SITE } from '@config';
 import type { MarkdownInstance } from 'astro';
 import type { NavPage } from './NavigationTypes';
 
-import { addSlashToAddress } from './Url';
+import { addSlashToAddress } from 'astro-accelerator-utils';
 
 export function mapNavPage (page: MarkdownInstance<Record<string, any>>) {
 
@@ -14,7 +15,7 @@ export function mapNavPage (page: MarkdownInstance<Record<string, any>>) {
     url += '/1/';
   }
 
-  url = addSlashToAddress(url);
+  url = addSlashToAddress(url, SITE);
 
   if (page.frontmatter.layout == 'src/layouts/Redirect.astro') {
     // Skips past the redirect

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

@@ -1,11 +1,10 @@
 // Data file `navigation.ts`
 import { menu } from 'src/data/navigation';
 
-import { getItem, setItem } from '@util/Cache';
-import { showInMenu } from '@util/PageTypeFilters';
+import { showInMenu, getItem, setItem, getPages } from 'astro-accelerator-utils';
 import { mapNavPage, setCurrentPage } from '@util/NavPage';
 import { NavPage, isNavPage } from '@util/NavigationTypes';
-import { getTopLevelPages, getPages } from '@util/PageQueries';
+import { getTopLevelPages, fetchPages } from '@util/PageQueries';
 
 export async function getMenu (currentUrl: URL) {
     const key = 'Navigation__getMenu';
@@ -41,7 +40,7 @@ export async function getNavigation (currentUrl: URL) {
 
     if (pageHierarchy == null) {
         const topLevelPages = await getTopLevelPages(showInMenu);
-        const allPages = await getPages(showInMenu);
+        const allPages = await getPages(fetchPages, showInMenu);
 
         pageHierarchy = topLevelPages
             .map(mapNavPage)

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

@@ -1,33 +1,36 @@
 import type { MarkdownInstance } from "astro";
 import { SITE } from '@config';
-import { getItem, setItem } from '@util/Cache';
-import { isAuthor } from '@util/PageTypeFilters';
+import { isAuthor, getItem, setItem, PagePredicate, getPages } from 'astro-accelerator-utils';
 
-export type PagePredicate = (value: MarkdownInstance<Record<string, any>>, index: number, array: MarkdownInstance<Record<string, any>>[]) => boolean;
+export function fetchPages(): Record<string, any> {
+    return import.meta.glob("../../../pages/**/*.md", { eager: true });
+}
 
-export async function getPages (filter?: PagePredicate | null): Promise<MarkdownInstance<Record<string,any>>[]> {
-    const key = 'PageQueries__getPages';
-    let allPages: MarkdownInstance<Record<string,any>>[] = await getItem(key);
+// export type PagePredicate = (value: MarkdownInstance<Record<string, any>>, index: number, array: MarkdownInstance<Record<string, any>>[]) => boolean;
 
-    if (allPages == null) {
-        const pageImportResult = import.meta.glob("../../../pages/**/*.md", { eager: true });
-        allPages = Object.values(pageImportResult) as MarkdownInstance<Record<string,any>>[];
-        await setItem(key, allPages);
-    }
+// export async function getPages (fetchPages: () => Record<string, any>, filter?: PagePredicate | null): Promise<MarkdownInstance<Record<string,any>>[]> {
+//     const key = 'PageQueries__getPages';
+//     let allPages: MarkdownInstance<Record<string,any>>[] = await getItem(key);
 
-    if (filter == null) {
-        return allPages;
-    }
+//     if (allPages == null) {
+//         const pageImportResult = fetchPages();
+//         allPages = Object.values(pageImportResult) as MarkdownInstance<Record<string,any>>[];
+//         await setItem(key, allPages);
+//     }
 
-    return allPages.filter(filter);
-}
+//     if (filter == null) {
+//         return allPages;
+//     }
+
+//     return allPages.filter(filter);
+// }
 
 export async function getTopLevelPages (filter?: PagePredicate | null): Promise<MarkdownInstance<Record<string,any>>[]> {
     const key = 'PageQueries__getTopLevelPages';
     let allPages = await getItem(key);
 
     if (allPages == null) {
-        allPages = await getPages();
+        allPages = await getPages(fetchPages);
 
         const isRoot = SITE.subfolder.length == 0;
         const expectedDepth = isRoot ? 1 : 2;
@@ -53,7 +56,7 @@ export async function getAuthorInfo (slug: string) {
     let authorInfo = await getItem(cacheKey);
 
     if (authorInfo == null) {
-        const allPages = await getPages();
+        const allPages = await getPages(fetchPages);
 
         const author = allPages
             .filter(isAuthor)

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

@@ -1,9 +1,8 @@
 import type { Entry } from '@util/Languages';
 import { Translations } from '@util/Languages';
 import { SITE } from '@config';
-import { getPages } from '@util/PageQueries';
-import { getItem, setItem } from '@util/Cache';
-import { addSlashToAddress } from '@util/Url';
+import { fetchPages } from '@util/PageQueries';
+import { addSlashToAddress, getItem, setItem, getPages } from 'astro-accelerator-utils';
 
 type TaxonomyEntry = {
     title: string;
@@ -39,10 +38,10 @@ export function taxonomyLinks(lang: (entry: Entry) => string) {
         tag: tag,
         category: category,
         getCategoryLink: (category: string) => {
-            return addSlashToAddress(categoryLink + category.toLowerCase().replace(/ /g, '-') + '/1/');
+            return addSlashToAddress(categoryLink + category.toLowerCase().replace(/ /g, '-') + '/1/', SITE);
         },
         getTagLink: (tag: string) => {
-            return addSlashToAddress(tagLink + tag.toLowerCase().replace(/ /g, '-') + '/1/');
+            return addSlashToAddress(tagLink + tag.toLowerCase().replace(/ /g, '-') + '/1/', SITE);
         }
     };
 
@@ -54,7 +53,7 @@ export async function getTaxonomy (): Promise<Taxonomy> {
     let taxonomy: Taxonomy = await getItem(cacheKey);
 
     if (taxonomy == null) {
-        const allPages = await getPages();
+        const allPages = await getPages(fetchPages);
         const tags: { [key: string]: number } = {};
         const cats: { [key: string]: number } = {};
 

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

@@ -1,40 +0,0 @@
-import fs from 'fs';
-import path from 'path';
-import process from 'process';
-
-export const maxAge = 200; //seconds
-
-export async function getCachePath () {
-    const cachePath = path.join(process.cwd(), '.cache/');
-    await fs.promises.mkdir(cachePath, { recursive: true })
-    return cachePath;
-}
-
-export async function getItemPath (key: string) {
-    const cachePath = await getCachePath();
-    return path.join(cachePath, key + '.cache');
-}
-
-export async function getItem (key: string) {
-    const itemPath = await getItemPath(key);
-    try {
-
-        const { mtime } = await fs.promises.stat(itemPath);
-
-        var date_time = new Date();
-        let timeDifference = Math.abs((date_time.getTime() - mtime.getTime()) / 1000);
-        if (timeDifference < maxAge) {
-            console.log('Cache hit', key);
-            const content = fs.readFileSync(itemPath).toString();
-            return JSON.parse(content);
-        }
-    } catch{}
-
-    console.warn('Cache miss', key);
-    return null;
-}
-
-export async function setItem (key: string, value: object) {
-    const itemPath = await getItemPath(key);
-    await fs.promises.writeFile(itemPath, JSON.stringify(value));
-}

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

@@ -1,23 +0,0 @@
-import type { Site } from '@config';
-
-type FrontMatter = Record<string, any>;
-
-export function formatDate (frontmatter: FrontMatter, lang: string, site: Site) {
-  const date = frontmatter.pubDate ?? '';
-
-  if (date) {
-    return new Date(date).toLocaleDateString(lang, site.dateOptions);
-  }
-  
-  return '';
-}
-
-export function formatModifiedDate (frontmatter: FrontMatter, lang: string, site: Site) {
-  const date = frontmatter.modDate ?? '';
-
-  if (date) {
-    return new Date(date).toLocaleDateString(lang, site.dateOptions);
-  }
-  
-  return '';
-}

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

@@ -1,67 +0,0 @@
-import type { MarkdownInstance } from 'astro';
-
-export function showInSitemap (p: MarkdownInstance<Record<string, any>>) {
-  // User setting to remove from sitemap
-  if (typeof p.frontmatter.navSitemap !== 'undefined'
-    && p.frontmatter.navSitemap == false) {
-    return false;
-  }
-
-  return isListable(p);
-}
-
-export function showInSearch (p: MarkdownInstance<Record<string, any>>) {
-  // User setting to remove from search
-  if (typeof p.frontmatter.navSearch !== 'undefined'
-    && p.frontmatter.navSearch == false) {
-    return false;
-  }
-
-  return isListable(p);
-}
-
-export function showInMenu (p: MarkdownInstance<Record<string, any>>) {
-  if (typeof p.frontmatter.navMenu !== 'undefined'
-    && p.frontmatter.navMenu == false) {
-    return false;
-  }
-
-  return true;
-}
-
-export function isAuthor (p: MarkdownInstance<Record<string, any>>) {
-  if (p?.frontmatter?.layout?.indexOf('/Author.astro') > -1) {
-    return true;
-  }
-
-  return false;
-}
-
-export function isSearch (p: MarkdownInstance<Record<string, any>>) {
-  if (p?.frontmatter?.layout?.indexOf('/Search.astro') > -1) {
-    return true;
-  }
-
-  return false;
-}
-
-export function isListable (p: MarkdownInstance<Record<string, any>>) {
-  return p.url != null 
-    && p.url != '' 
-    && p.frontmatter.layout.includes('/Redirect.astro') !== true
-    && Date.parse(p.frontmatter.pubDate) < Date.now()
-}
-
-export function sortByPubDate (a: MarkdownInstance<Record<string, any>>, b: MarkdownInstance<Record<string, any>>) {
-  return b.frontmatter.pubDate.localeCompare(a.frontmatter.pubDate);
-}
-
-export function sortByPubDateDesc (a: MarkdownInstance<Record<string, any>>, b: MarkdownInstance<Record<string, any>>) {
-  return b.frontmatter.pubDate.localeCompare(a.frontmatter.pubDate);
-}
-
-export function sortByModDate (a: MarkdownInstance<Record<string, any>>, b: MarkdownInstance<Record<string, any>>) {
-  const dateA = a.frontmatter.modDate || a.frontmatter.pubDate || '1970-01-01';
-  const dateB = b.frontmatter.modDate || b.frontmatter.pubDate || '1970-01-01';
-  return dateA.localeCompare(dateB);
-}

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

@@ -1,19 +0,0 @@
-import { SITE } from '@config';
-
-export function addSlashToUrl (url: URL) {
-    url.pathname += url.pathname.endsWith('/') ? '' : '/';
-    return url;
-}
-
-export function addSlashToAddress (address: string | undefined) {
-    if (!address) {
-        address = '/';
-    }
-
-    if (address.indexOf('://') > -1) {
-        return address;
-    }
-
-    const url = addSlashToUrl(new URL(address, SITE.url));
-    return url.pathname + url.search;
-}