astro-accelerator 0.0.25 → 0.0.26

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.25",
+  "version": "0.0.26",
   "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.18",
+    "astro-accelerator-utils": "^0.0.24",
     "hast-util-from-selector": "^2.0.0",
     "remark-directive": "^2.0.1"
   },

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

@@ -6,7 +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, getItem, setItem } from 'astro-accelerator-utils';
+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';
@@ -41,7 +41,7 @@ type CacheData = {
 export async function getCacheData() {
   const key = 'pages_articles_[page]';
 
-  let cacheData: CacheData = await getItem(key);
+  let cacheData: CacheData = await Cache.getItem(key);
 
   if (cacheData == null) {
     // This uses a relative glob, so we only look in the current collection
@@ -50,10 +50,10 @@ export async function getCacheData() {
     cacheData = { posts: []};
 
     cacheData.posts = sourcePosts
-      .filter(isListable)
-      .sort(sortByPubDateDesc);
+      .filter(PostFiltering.isListable)
+      .sort(PostOrdering.sortByPubDateDesc);
     
-    await setItem(key, cacheData);
+    await Cache.setItem(key, cacheData);
   }
 
   return cacheData;

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

@@ -2,7 +2,7 @@
 
 // Generates an ATOM feed of recent posts
 import { SITE } from '@config';
-import { addSlashToAddress, isListable } from 'astro-accelerator-utils';
+import { PostFiltering, Urls } from 'astro-accelerator-utils';
 import { getTextFrom } from '@util/Markdown';
 
 async function getData() {
@@ -14,7 +14,7 @@ async function getData() {
   for (const path in allArticles) {
     const article: any = await allArticles[path]();
 
-    if (isListable(article)) {
+    if (PostFiltering.isListable(article)) {
       article.frontmatter.title = await getTextFrom(article.frontmatter.title ?? '');
 
       articles.push({
@@ -33,7 +33,7 @@ async function getData() {
     <entry>
       <title>${a.frontmatter.title ?? ''}</title>
       <link href="${ SITE.url + a.url }" />
-      <id>${ SITE.url + addSlashToAddress(a.url, SITE) }</id>
+      <id>${ SITE.url + Urls.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

@@ -6,7 +6,7 @@ import { Translations, Lang } from '@util/Languages';
 import type { Page, MarkdownInstance } from 'astro';
 import { SITE, Frontmatter } from '@config';
 import { getPageLinks } from '@util/PageLinks';
-import { isListable, sortByPubDateDesc, getItem, setItem } from 'astro-accelerator-utils';
+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';
@@ -42,7 +42,7 @@ type CacheData = {
 export async function getCacheData() {
   const key = 'pages_authors_[author]_[page]';
 
-  let cacheData: CacheData = await getItem(key);
+  let cacheData: CacheData = await Cache.getItem(key);
 
   if (cacheData == null) {
     const sourcePosts = await Astro.glob('../../**/*.md');
@@ -50,8 +50,8 @@ export async function getCacheData() {
     cacheData = { posts: [], authors: []};
 
     cacheData.posts = sourcePosts
-      .filter(isListable)
-      .sort(sortByPubDateDesc);
+      .filter(PostFiltering.isListable)
+      .sort(PostOrdering.sortByPubDateDesc);
 
     cacheData.posts.forEach(p => {
       const auths: string[] = p.frontmatter.authors ?? [];
@@ -65,7 +65,7 @@ export async function getCacheData() {
       });
     });
     
-    await setItem(key, cacheData);
+    await Cache.setItem(key, cacheData);
   }
 
   return cacheData;

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

@@ -6,7 +6,7 @@ import { Translations, Lang } from '@util/Languages';
 import type { Page, MarkdownInstance } from 'astro';
 import { SITE, Frontmatter } from '@config';
 import { getPageLinks } from '@util/PageLinks';
-import { isListable, sortByPubDateDesc, getItem, setItem } from 'astro-accelerator-utils';
+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';
@@ -45,7 +45,7 @@ type CacheData = {
 export async function getCacheData() {
   const key = 'pages_articles_[category]_[page]';
 
-  let cacheData: CacheData = await getItem(key);
+  let cacheData: CacheData = await Cache.getItem(key);
 
   if (cacheData == null) {
     // This uses a relative glob, so we only look in the current collection
@@ -54,8 +54,8 @@ export async function getCacheData() {
     cacheData = { posts: [], categories: []};
 
     cacheData.posts = sourcePosts
-      .filter(isListable)
-      .sort(sortByPubDateDesc);
+      .filter(PostFiltering.isListable)
+      .sort(PostOrdering.sortByPubDateDesc);
 
     cacheData.posts.forEach(p => {
       const auths: string[] = p.frontmatter.categories ?? [];
@@ -69,7 +69,7 @@ export async function getCacheData() {
       });
     });
     
-    await setItem(key, cacheData);
+    await Cache.setItem(key, cacheData);
   }
 
   return cacheData;

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

@@ -1,12 +1,12 @@
 ---
-import { sortByPubDateDesc, getPages } from 'astro-accelerator-utils';
+import { PostQueries, PostOrdering } from 'astro-accelerator-utils';
 import { fetchPages } from '@util/PageQueries';
 
 // Logic
-const allPages = await getPages(fetchPages);
+const allPages = await PostQueries.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));
+const pages = missingBanner.sort(PostOrdering.sortByPubDateDesc).slice(0, Math.min(50, pageCount));
 ---
 <!doctype html>
 <html>

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

@@ -1,12 +1,12 @@
 ---
-import { sortByPubDateDesc, getPages } from 'astro-accelerator-utils';
+import { PostQueries, PostOrdering } from 'astro-accelerator-utils';
 import { fetchPages } from '@util/PageQueries';
 
 // Logic
-const allPages = await getPages(fetchPages);
+const allPages = await PostQueries.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));
+const pages = missingMeta.sort(PostOrdering.sortByPubDateDesc).slice(0, Math.min(50, pageCount));
 ---
 <!doctype html>
 <html>

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

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

package/src/pages/search.json.ts

@@ -2,7 +2,7 @@
 
 import type { MarkdownInstance } from 'astro';
 import { SITE } from '@config';
-import { addSlashToAddress, showInSearch } from 'astro-accelerator-utils';
+import { PostFiltering, Urls } from 'astro-accelerator-utils';
 import { getTextFrom } from '@util/Markdown';
 
 const getData = async () => {
@@ -13,7 +13,7 @@ const getData = async () => {
     for (const path in allPages) {
         const page = await allPages[path]() as  MarkdownInstance<Record<string, any>>;
 
-        if (!showInSearch(page)) {
+        if (!PostFiltering.showInSearch(page)) {
             continue;
         }
 
@@ -33,7 +33,7 @@ const getData = async () => {
             }),
             description: page.frontmatter.description ?? '',
             tags: page.frontmatter.tags ?? [],
-            url: SITE.url + addSlashToAddress(url, SITE),
+            url: SITE.url + Urls.addSlashToAddress(url, SITE),
             date: page.frontmatter.pubDate ?? ''
         });
     }

package/src/pages/sitemap.xml.ts

@@ -2,7 +2,7 @@
 
 // Generates an ATOM feed of recent posts
 import { SITE } from '@config';
-import { addSlashToAddress, showInSitemap } from 'astro-accelerator-utils';
+import { PostFiltering, Urls } from 'astro-accelerator-utils';
 
 async function getData() {
   //@ts-ignore
@@ -12,12 +12,12 @@ async function getData() {
   
   for (const path in allPages) {
     const article: any = await allPages[path]();
-    const addToSitemap = showInSitemap(article);
+    const addToSitemap = PostFiltering.showInSitemap(article);
 
     if (addToSitemap) {
       pages.push(`
         <url>
-          <loc>${ SITE.url + addSlashToAddress(article.url, SITE) }</loc>
+          <loc>${ SITE.url + Urls.addSlashToAddress(article.url, SITE) }</loc>
           <lastmod>${ article.frontmatter.pubDate }</lastmod>
         </url>`);
     }

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

@@ -6,7 +6,7 @@ import { Translations, Lang } from '@util/Languages';
 import type { Page, MarkdownInstance } from 'astro';
 import { SITE, Frontmatter } from '@config';
 import { getPageLinks } from '@util/PageLinks';
-import { isListable, sortByPubDateDesc, getItem, setItem } from 'astro-accelerator-utils';
+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';
@@ -45,7 +45,7 @@ type CacheData = {
 export async function getCacheData() {
   const key = 'pages_articles_[tag]_[page]';
 
-  let cacheData: CacheData = await getItem(key);
+  let cacheData: CacheData = await Cache.getItem(key);
 
   if (cacheData == null) {
     // This uses a relative glob, so we only look in the current collection
@@ -54,8 +54,8 @@ export async function getCacheData() {
     cacheData = { posts: [], tags: []};
 
     cacheData.posts = sourcePosts
-      .filter(isListable)
-      .sort(sortByPubDateDesc);
+      .filter(PostFiltering.isListable)
+      .sort(PostOrdering.sortByPubDateDesc);
 
     cacheData.posts.forEach(p => {
       const auths: string[] = p.frontmatter.tags ?? [];
@@ -69,7 +69,7 @@ export async function getCacheData() {
       });
     });
 
-    await setItem(key, cacheData);
+    await Cache.setItem(key, cacheData);
   }
 
   return cacheData;

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

@@ -1,7 +1,7 @@
 ---
 import type { MarkdownInstance } from 'astro';
+import { Urls } from 'astro-accelerator-utils';
 import { SITE, Frontmatter } from '@config';
-import { addSlashToAddress } from 'astro-accelerator-utils';
 import { getImageInfo } from '@util/custom-markdown.mjs';
 import { getTextFrom } from '@util/Markdown';
 import AuthorsMini from '@components/AuthorsMini.astro';
@@ -55,7 +55,7 @@ function getLoadingAttribute() {
 ---
 <ul class="post-list anim-show-parent">
   {articles.map((post) => (
-  <li class="list-item" data-destination={ addSlashToAddress(post.url, SITE) } data-image={ (post.frontmatter.bannerImage?.src.length > 0).toString() }>
+  <li class="list-item" data-destination={ Urls.addSlashToAddress(post.url, SITE) } data-image={ (post.frontmatter.bannerImage?.src.length > 0).toString() }>
     <article>
       <div class="list-item-image">
       {post.img && (
@@ -70,7 +70,7 @@ function getLoadingAttribute() {
       </div>
       <div class="list-item-content">
         <h3>
-          <a href={ addSlashToAddress(post.url, SITE) }>{ post.frontmatter.title }</a>
+          <a href={ Urls.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,7 +1,7 @@
 ---
+import { Dates, Urls } from 'astro-accelerator-utils';
 import { SITE, Frontmatter } from '@config';
 import { Translations, Lang } from '@util/Languages';
-import { formatDate, formatModifiedDate, addSlashToAddress } from 'astro-accelerator-utils';
 import { getAuthorList } from '@util/Authors';
 import { getImageInfo } from '@util/custom-markdown.mjs';
 
@@ -35,16 +35,16 @@ const contributors = authorList.writers.slice(1);
   <div class="author-info">
     <span>{ _(Translations.post.written_by) }
       {author &&
-        <a href={ addSlashToAddress(author.url, SITE) + '1/' } itemprop="author">{ author.frontmatter.title }</a>
+        <a href={ Urls.addSlashToAddress(author.url, SITE) + '1/' } itemprop="author">{ author.frontmatter.title }</a>
       }{contributors.map((writer) => (
-        <a href={ addSlashToAddress(writer.url, SITE) + '1/' } itemprop="contributor">{ writer.frontmatter.title }</a>
+        <a href={ Urls.addSlashToAddress(writer.url, SITE) + '1/' } itemprop="contributor">{ writer.frontmatter.title }</a>
       ))}.
       <br /><time datetime={ frontmatter.pubDate.toString() } itemprop="datePublished">
-      { formatDate(frontmatter, lang, SITE) }
+      { Dates.formatDate(frontmatter, lang, SITE) }
       </time>
       {frontmatter.modDate &&
       <br /><time datetime={ frontmatter.modDate.toString() } itemprop="dateModified">
-        { _(Translations.post.last_modified) } { formatModifiedDate(frontmatter, lang, SITE) }
+        { _(Translations.post.last_modified) } { Dates.formatModifiedDate(frontmatter, lang, SITE) }
       </time>
       }
     </span>

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 'astro-accelerator-utils';
+import { Dates } from 'astro-accelerator-utils';
 import { getAuthorList } from '@util/Authors';
 
 // Properties
@@ -25,9 +25,9 @@ const authorList = await getAuthorList(frontmatter);
         <span>{ writer.frontmatter.title }</span>
       ))}.<br />
       <time datetime={ frontmatter.pubDate.toString() }>
-      { formatDate(frontmatter, lang, SITE) }
+      { Dates.formatDate(frontmatter, lang, SITE) }
       </time>
     </span>
   </div>
 </div>
-}
+}

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

@@ -1,8 +1,8 @@
 ---
+import { Urls } from 'astro-accelerator-utils';
 import { SITE, Frontmatter } from '@config';
 import { Translations, Lang } from '@util/Languages';
 import { getBreadcrumbs } from '@util/Breadcrumbs';
-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, SITE) } aria-current={ page.ariaCurrent } rel={ page.rel }><span property="name">{ page.title }</span></a>
+      <a property="item" typeof="WebPage" href={ Urls.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,8 +1,8 @@
 ---
+import { Urls, PostQueries, PostFiltering } from 'astro-accelerator-utils';
 import { SITE, Frontmatter } from '@config';
 import { Translations, Lang } from '@util/Languages';
 import { fetchPages } from '@util/PageQueries';
-import { addSlashToAddress, isSearch, getPages } from 'astro-accelerator-utils';
 
 // Properties
 type Props = {
@@ -16,7 +16,7 @@ const { lang } = Astro.props as Props;
 const _ = Lang(lang);
 
 // Logic
-const search = (await getPages(fetchPages, isSearch))[0] ?? null;
+const search = (await PostQueries.getPages(fetchPages, PostFiltering.isSearch))[0] ?? null;
 
 ---
 <header class="site-header">
@@ -30,7 +30,7 @@ const search = (await getPages(fetchPages, isSearch))[0] ?? null;
   </svg></a>
   <a href={ (SITE.subfolder ?? '') + '/' } class="site-title" translate="no">{ SITE.title }</a>
   {search != null &&
-  <a href={ addSlashToAddress(search.url, SITE) } class="search-icon" title={ _(Translations.header.open_search) }><svg xmlns="http://www.w3.org/2000/svg" 
+  <a href={ Urls.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 { Urls } from 'astro-accelerator-utils';
 import { SITE, OPEN_GRAPH, HEADER_SCRIPTS, Frontmatter } from '@config';
-import { addSlashToUrl } from 'astro-accelerator-utils';
 import { getTextFrom } from '@util/Markdown';
 
 // Properties
@@ -16,7 +16,7 @@ const imageSrc = frontmatter.bannerImage?.src ?? OPEN_GRAPH.image.src;
 const imageAlt = frontmatter.bannerImage?.alt ?? OPEN_GRAPH.image.alt;
 const robots = frontmatter.robots ?? 'index, follow';
 const canonicalImageSrc = new URL(imageSrc, Astro.site);
-const canonicalURL =  addSlashToUrl(new URL(Astro.url.pathname, Astro.site + SITE.subfolder));
+const canonicalURL =  Urls.addSlashToUrl(new URL(Astro.url.pathname, Astro.site + SITE.subfolder));
 const title = await getTextFrom( frontmatter.title ? `${ frontmatter.title } | ${ SITE.title }` : SITE.title);
 ---
 <head>

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

@@ -1,7 +1,7 @@
 ---
 import { SITE } from '@config';
 import type { NavPage } from '@util/NavigationTypes';
-import { addSlashToAddress } from 'astro-accelerator-utils';
+import { Urls } from 'astro-accelerator-utils';
 
 // Properties
 type Props = {
@@ -12,7 +12,7 @@ const { lang, page } = Astro.props as Props;
 ---
 {(page.children.length == 0) && (
 <li>
-  <a href={ addSlashToAddress(page.url, SITE) } aria-current={ page.ariaCurrent } rel={ page.rel }>{ page.title }</a>
+  <a href={ Urls.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,9 +1,9 @@
 ---
+import { Urls } from 'astro-accelerator-utils';
 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 'astro-accelerator-utils';
 
 // Properties
 type Props = {
@@ -21,12 +21,12 @@ const _ = Lang(lang);
 ---
 <nav class="post-paging" aria-label={ _(Translations.aria.paging) }>
   {page.url.prev
-    ? <a href={ addSlashToAddress(page.url.prev, SITE) }>{ _(Translations.articles.previous) }</a>
+    ? <a href={ Urls.addSlashToAddress(page.url.prev, SITE) }>{ _(Translations.articles.previous) }</a>
     : <span>{ _(Translations.articles.previous) }</span>}
   {pageLinks.map((link) => (
-      <a href={ addSlashToAddress(link.url, SITE) } aria-current={ link.ariaCurrent } class={ link.class }>{ link.title }</a>
+      <a href={ Urls.addSlashToAddress(link.url, SITE) } aria-current={ link.ariaCurrent } class={ link.class }>{ link.title }</a>
   ))}
   {page.url.next
-    ? <a href={ addSlashToAddress(page.url.next, SITE) }>{ _(Translations.articles.next) }</a>
+    ? <a href={ Urls.addSlashToAddress(page.url.next, SITE) }>{ _(Translations.articles.next) }</a>
     : <span>{ _(Translations.articles.next) }</span>}
   </nav>

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

@@ -1,7 +1,7 @@
 ---
 import { SITE, Frontmatter } from '@config';
 import type { MarkdownInstance } from 'astro';
-import { addSlashToAddress, isListable, sortByPubDateDesc, getPages } from 'astro-accelerator-utils';
+import { Urls, PostQueries, PostFiltering, PostOrdering } from 'astro-accelerator-utils';
 import { getImageInfo } from '@util/custom-markdown.mjs'
 import { fetchPages } from '@util/PageQueries';
 
@@ -20,10 +20,10 @@ let posts: MarkdownInstance<Record<string, any>>[] = [];
 const parentCagory = (frontmatter.categories ?? [null])[0];
 
 if (parentCagory != null) {
-  const allPages = await getPages(fetchPages, isListable)
+  const allPages = await PostQueries.getPages(fetchPages, PostFiltering.isListable)
   const allPosts = allPages
     .filter(p => p.frontmatter.title != frontmatter.title && p.frontmatter.categories && p.frontmatter.categories.includes(parentCagory))
-    .sort(sortByPubDateDesc)
+    .sort(PostOrdering.sortByPubDateDesc)
   
   // One "Most Recent" Post
   if (allPosts.length > 0) {
@@ -53,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, SITE) } data-image={ (post.frontmatter.bannerImage?.src.length > 0).toString() }>
+  <li class="list-item" data-destination={ Urls.addSlashToAddress(post.url, SITE) } data-image={ (post.frontmatter.bannerImage?.src.length > 0).toString() }>
     <article>
       <div class="list-item-image">
       {post.img && (
@@ -68,7 +68,7 @@ const articles = posts.map(p => {
       </div>
       <div class="list-item-content">
         <h3>
-          <a href={ addSlashToAddress(post.url, SITE) }>{ post.frontmatter.title }</a>
+          <a href={ Urls.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,6 +1,6 @@
 ---
+import { PostQueries } from 'astro-accelerator-utils';
 import { SITE, Frontmatter } from '@config';
-import { getPages } from 'astro-accelerator-utils';
 import { Translations, Lang } from '@util/Languages';
 import { fetchPages } from '@util/PageQueries';
 import Default from './Default.astro';
@@ -18,7 +18,7 @@ const lang = frontmatter.lang ?? SITE.default.lang;
 const _ = Lang(lang);
 
 // Logic
-const authorPages = await getPages(fetchPages, p => p.frontmatter.authors?.indexOf(frontmatter.id) > -1)
+const authorPages = await PostQueries.getPages(fetchPages, p => p.frontmatter.authors?.indexOf(frontmatter.id) > -1)
 ---
 <Default frontmatter={ frontmatter } headings={ headings }>
     <slot />

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

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

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

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

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

@@ -1,18 +1,17 @@
 // Data file `navigation.ts`
+import { Cache } from 'astro-accelerator-utils';
 import { menu } from 'src/data/footer';
-import { Translations, Lang } from '@util/Languages';
+import { Translations, Lang, TranslationProvider } from '@util/Languages';
 import { SITE } from '@config';
-import { getItem, setItem } from 'astro-accelerator-utils';
 import { setCurrentPage } from '@util/NavPage';
 import { NavPage, isNavPage } from '@util/NavigationTypes';
-import { getTaxonomy, taxonomyLinks } from '@util/Taxonomy';
-
+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 getItem(key);
+    let pages: NavPage[] = await Cache.getItem(key);
 
     if (pages == null) {
         pages = [];
@@ -45,7 +44,7 @@ export async function getMenu (currentUrl: URL, lang: string) {
         }
 
         // Cache the result
-        await setItem(key, pages);
+        await Cache.setItem(key, pages);
     }
 
     setCurrentPage(pages, currentUrl);
@@ -53,10 +52,10 @@ export async function getMenu (currentUrl: URL, lang: string) {
     return pages;
 }
 
-export async function getCategories (links, _, lang: string) {
+export async function getCategories (links: TaxonomyLinks, _: TranslationProvider, lang: string) {
 
     const key = 'Footer__getCategories_' + lang;
-    let pageHierarchy: NavPage[] = await getItem(key);
+    let pageHierarchy: NavPage[] = await Cache.getItem(key);
 
     if (pageHierarchy == null) {
         const category = _(Translations.articles.category) ?? 'category';
@@ -86,16 +85,16 @@ export async function getCategories (links, _, lang: string) {
         }];
        
         // Cache the result
-        await setItem(key, pageHierarchy);
+        await Cache.setItem(key, pageHierarchy);
     }
 
     return pageHierarchy;
 }
 
-export async function getTags (links, _, lang: string) {
+export async function getTags (links: TaxonomyLinks, _: TranslationProvider, lang: string) {
 
     const key = 'Footer__getTags_' + lang;
-    let pageHierarchy: NavPage[] = await getItem(key);
+    let pageHierarchy: NavPage[] = await Cache.getItem(key);
 
     if (pageHierarchy == null) {
         const _ = Lang(lang);
@@ -126,16 +125,16 @@ export async function getTags (links, _, lang: string) {
         }];
     
         // Cache the result
-        await setItem(key, pageHierarchy);
+        await Cache.setItem(key, pageHierarchy);
     }
 
     return pageHierarchy;
 }
 
-export async function getTopTags (links, _, lang: string) {
+export async function getTopTags (links: TaxonomyLinks, _: TranslationProvider, lang: string) {
 
 const key = 'Footer__getTopTags_' + lang;
-let pageHierarchy: NavPage[] = await getItem(key);
+let pageHierarchy: NavPage[] = await Cache.getItem(key);
 
 if (pageHierarchy == null) {
     const _ = Lang(lang);
@@ -166,7 +165,7 @@ if (pageHierarchy == null) {
     }];
 
     // Cache the result
-    await setItem(key, pageHierarchy);
+    await Cache.setItem(key, pageHierarchy);
 }
 
 return pageHierarchy;

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

@@ -3,7 +3,11 @@ import user from '@data/language.json';
 
 export const Translations = {...bundled, ...user};
 
-export function Lang (lang: string): (entry: Entry) => string {
+export type TranslationProvider = {
+    (entry: Entry): string;
+}
+
+export function Lang (lang: string): TranslationProvider {
     const altLang = lang.indexOf('-') > -1
         ? lang.split('-')[0]
         : lang;

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

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

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

@@ -1,14 +1,14 @@
 // Data file `navigation.ts`
 import { menu } from 'src/data/navigation';
 
-import { showInMenu, getItem, setItem, getPages } from 'astro-accelerator-utils';
+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 getItem(key);
+    let pages: NavPage[] = await Cache.getItem(key);
 
     if (pages == null) {
         pages = [];
@@ -25,7 +25,7 @@ export async function getMenu (currentUrl: URL) {
         }
 
         // Cache the result
-        await setItem(key, pages);
+        await Cache.setItem(key, pages);
     }
 
     setCurrentPage(pages, currentUrl);
@@ -36,11 +36,11 @@ export async function getMenu (currentUrl: URL) {
 export async function getNavigation (currentUrl: URL) {
 
     const key = 'Navigation__getNavigation';
-    let pageHierarchy: NavPage[] = await getItem(key);
+    let pageHierarchy: NavPage[] = await Cache.getItem(key);
 
     if (pageHierarchy == null) {
-        const topLevelPages = await getTopLevelPages(showInMenu);
-        const allPages = await getPages(fetchPages, showInMenu);
+        const topLevelPages = await getTopLevelPages(PostFiltering.showInMenu);
+        const allPages = await PostQueries.getPages(fetchPages, PostFiltering.showInMenu);
 
         pageHierarchy = topLevelPages
             .map(mapNavPage)
@@ -71,7 +71,7 @@ export async function getNavigation (currentUrl: URL) {
         }
 
         // Cache the result
-        await setItem(key, pageHierarchy);
+        await Cache.setItem(key, pageHierarchy);
     }
 
     return pageHierarchy;

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

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

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

@@ -1,8 +1,9 @@
+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 { addSlashToAddress, getItem, setItem, getPages } from 'astro-accelerator-utils';
+import type { MarkdownInstance } from 'astro-accelerator-utils/types/Astro';
 
 type TaxonomyEntry = {
     title: string;
@@ -27,7 +28,14 @@ export function sortByTitle (a: TaxonomyEntry, b: TaxonomyEntry) {
   return 0;
 }
 
-export function taxonomyLinks(lang: (entry: Entry) => string) {
+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}/`;
 
@@ -38,10 +46,10 @@ export function taxonomyLinks(lang: (entry: Entry) => string) {
         tag: tag,
         category: category,
         getCategoryLink: (category: string) => {
-            return addSlashToAddress(categoryLink + category.toLowerCase().replace(/ /g, '-') + '/1/', SITE);
+            return Urls.addSlashToAddress(categoryLink + category.toLowerCase().replace(/ /g, '-') + '/1/', SITE);
         },
         getTagLink: (tag: string) => {
-            return addSlashToAddress(tagLink + tag.toLowerCase().replace(/ /g, '-') + '/1/', SITE);
+            return Urls.addSlashToAddress(tagLink + tag.toLowerCase().replace(/ /g, '-') + '/1/', SITE);
         }
     };
 
@@ -50,20 +58,20 @@ export function taxonomyLinks(lang: (entry: Entry) => string) {
 export async function getTaxonomy (): Promise<Taxonomy> {
     const cacheKey = 'Global__taxonomy';
 
-    let taxonomy: Taxonomy = await getItem(cacheKey);
+    let taxonomy: Taxonomy = await Cache.getItem(cacheKey);
 
     if (taxonomy == null) {
-        const allPages = await getPages(fetchPages);
+        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.forEach(t => {
+            p.frontmatter.tags && (p.frontmatter.tags as string[]).forEach(t => {
                 tags[t] = (tags[t] ?? 0) + 1;
             });
 
-            p.frontmatter.categories && p.frontmatter.categories.forEach(c => {
+            p.frontmatter.categories && (p.frontmatter.categories as string[]).forEach(c => {
                 cats[c] = (cats[c] ?? 0) + 1;
             });
         });
@@ -100,7 +108,7 @@ export async function getTaxonomy (): Promise<Taxonomy> {
                 return 0;
              });
 
-        await setItem(cacheKey, taxonomy);
+        await Cache.setItem(cacheKey, taxonomy);
     }
 
     return taxonomy;

package/src/themes/accelerator/utilities/custom-markdown.mjs

@@ -1,9 +1,10 @@
 import { SITE } from '/src/config';
-import { visit } from 'unist-util-visit';
-import { h } from 'hastscript';
 import { size } from '/src/data/image-size.mjs';
+import { h } from 'hastscript';
+import { visit } from 'unist-util-visit';
 import { fromSelector } from 'hast-util-from-selector'
-
+import path from 'path';
+import fs from 'fs';
 
 /* Based on https://github.com/remarkjs/remark-directive
 * Examples:
@@ -30,6 +31,8 @@ This is a custom div element with the class `note`
 
 */
 
+const workingDirectory = process.cwd();
+
 export function getDestination(uri, s) {
   const fromRegEx = new RegExp('^' + SITE.subfolder + '/img/');
   const replacement = SITE.subfolder + '/i/' + s.toString() + '/';
@@ -66,6 +69,13 @@ export function attributeMarkdown() {
         const hast = h(node.name, node.attributes);
 
         if (hast.properties.src) {
+          let metadata = null;
+          let metaAddress = path.join(workingDirectory, 'public', hast.properties.src + '.json');
+          
+          if (fs.existsSync(metaAddress)) {
+            metadata = JSON.parse(fs.readFileSync(metaAddress));
+          }
+
           // Process the image
           const info = getImageInfo(hast.properties.src, hast.properties.class, SITE.images.contentSize);
 
@@ -73,6 +83,11 @@ export function attributeMarkdown() {
           hast.properties.srcset = info.srcset;
           hast.properties.sizes = info.sizes;
           hast.properties.class = info.class;
+
+          if (metadata) {
+            hast.properties.width = metadata.width;
+            hast.properties.height = metadata.height;
+          }
         }
 
         data.hName = hast.tagName;

package/src/themes/accelerator/utilities/img.mjs

@@ -94,7 +94,7 @@ for (const file of filesToProcess) {
 
     const ext = path.parse(source).ext;
 
-    let image;
+    let image = null;
     let rawEncodedImage;
 
     // Create optimised fallback image
@@ -117,6 +117,19 @@ for (const file of filesToProcess) {
             await fs.promises.writeFile(destination + '.webp', rawEncodedImage);
             break;
     }
+
+    if (image) {
+        const info = await image.decoded;
+        const metadata = {
+            width: info.bitmap.width,
+            height: info.bitmap.height,
+            sizeInBytes: info.size
+        };
+
+        const metaFile = source + '.json';
+        await fs.promises.writeFile(metaFile, JSON.stringify(metadata));
+    }
+
     await imagePool.close();
 
     // Create resized images