astro-accelerator 0.0.31 → 0.0.33

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.31",
+  "version": "0.0.33",
   "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.44",
+    "astro-accelerator-utils": "^0.1.4",
     "hast-util-from-selector": "^2.0.0",
     "remark-directive": "^2.0.1"
   },

package/src/config.ts

@@ -1,4 +1,6 @@
-const SITE = {
+import type { Site } from "astro-accelerator-utils/types/Site";
+
+const SITE: Site = {
 	owner: 'Steve Fenton',
 	url: 'https://astro.stevefenton.co.uk',
 	feedUrl: '/articles/feed.xml',

package/src/data/footer.ts

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

package/src/data/navigation.ts

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

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

@@ -2,7 +2,7 @@
 // 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 { PostFiltering, PostOrdering, PostPaging } from 'astro-accelerator-utils';
 import { Translations, Lang } from '@util/Languages';
 import type { Page, MarkdownInstance } from 'astro';
 import { Frontmatter, SITE } from '@config';
@@ -33,35 +33,19 @@ const frontmatter: Frontmatter = {
 const _ = Lang(lang);
 
 // Logic
-type CacheData = {
-  posts: MarkdownInstance<Record<string, any>>[];
-}
-
-export async function getCacheData() {
-  const key = 'pages_articles_[page]';
-
-  let cacheData: CacheData = await Cache.getItem(key);
-
-  if (cacheData == null) {
-    // This uses a relative glob, so we only look in the current collection
-    const sourcePosts = await Astro.glob('./**/*.md');
-    
-    cacheData = { posts: []};
-
-    cacheData.posts = sourcePosts
-      .filter(PostFiltering.isListable)
-      .sort(PostOrdering.sortByPubDateDesc);
-    
-    await Cache.setItem(key, cacheData);
-  }
+export async function getData() {
+  const sourcePosts = await Astro.glob('./**/*.md');
+  const posts = sourcePosts
+    .filter(PostFiltering.isListable)
+    .sort(PostOrdering.sortByPubDateDesc);
 
-  return cacheData;
+  return posts;
 }
 
 export async function getStaticPaths({ paginate }: any) {
-  let data = await getCacheData();
-  return paginate(data.posts, {
-    props: { pubDate: data.posts[0].frontmatter.pubDate },
+  let data = await getData();
+  return paginate(data, {
+    props: { pubDate: data[0].frontmatter.pubDate },
     pageSize: SITE.pageSize
   });
 }

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

@@ -2,11 +2,13 @@
 
 // Generates an ATOM feed of recent posts
 import { SITE } from '@config';
-import { Markdown, PostFiltering, Urls } from 'astro-accelerator-utils';
+import { Markdown, PostFiltering, UrlFormatter } from 'astro-accelerator-utils';
 
 async function getData() {
   //@ts-ignore
   const allArticles = import.meta.glob('./**/*.md');
+  const urlFormatter = new UrlFormatter(SITE.url);
+  const markdown = new Markdown();
   
   let articles = [];
   
@@ -14,7 +16,7 @@ async function getData() {
     const article: any = await allArticles[path]();
 
     if (PostFiltering.isListable(article)) {
-      article.frontmatter.title = await Markdown.getTextFrom(article.frontmatter.title ?? '');
+      article.frontmatter.title = await markdown.getTextFrom(article.frontmatter.title ?? '');
 
       articles.push({
         url: article.url,
@@ -32,7 +34,7 @@ async function getData() {
     <entry>
       <title>${a.frontmatter.title ?? ''}</title>
       <link href="${ SITE.url + a.url }" />
-      <id>${ SITE.url + Urls.addSlashToAddress(a.url, SITE) }</id>
+      <id>${ SITE.url + urlFormatter.addSlashToAddress(a.url) }</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

@@ -2,7 +2,7 @@
 // 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 { 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';
@@ -32,45 +32,36 @@ frontmatter.pubDate = pubDate;
 const _ = Lang(lang);
 
 // Logic
-type CacheData = {
+type AuthorData = {
   posts: MarkdownInstance<Record<string, any>>[];
   authors: string[];
 }
 
-export async function getCacheData() {
-  const key = 'pages_authors_[author]_[page]';
-
-  let cacheData: CacheData = await Cache.getItem(key);
-
-  if (cacheData == null) {
-    const sourcePosts = await Astro.glob('../../**/*.md');
-    
-    cacheData = { posts: [], authors: []};
-
-    cacheData.posts = sourcePosts
-      .filter(PostFiltering.isListable)
-      .sort(PostOrdering.sortByPubDateDesc);
-
-    cacheData.posts.forEach(p => {
-      const auths: string[] = p.frontmatter.authors ?? [];
-      if (auths.length == 0) {
-        console.log('No authors found', p.url);
+export async function getData() {
+  const sourcePosts = await Astro.glob('../../**/*.md');
+  const data: AuthorData = { posts: [], authors: []};
+
+  data.posts = sourcePosts
+    .filter(PostFiltering.isListable)
+    .sort(PostOrdering.sortByPubDateDesc);
+
+    data.posts.forEach(p => {
+    const auths: string[] = p.frontmatter.authors ?? [];
+    if (auths.length == 0) {
+      console.log('No authors found', p.url);
+    }
+    auths.forEach(a => {
+      if (!data.authors.includes(a)) {
+        data.authors.push(a);
       }
-      auths.forEach(a => {
-        if (!cacheData.authors.includes(a)) {
-          cacheData.authors.push(a);
-        }
-      });
     });
+  });
     
-    await Cache.setItem(key, cacheData);
-  }
-
-  return cacheData;
+  return data;
 }
 
 export async function getStaticPaths({ paginate }: any) {
-  let data = await getCacheData();
+  let data = await getData();
 
   return data.authors.map(a => {
     const filtered = data.posts.filter(p => {

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

@@ -2,7 +2,7 @@
 // warning: This file is overwritten by Astro Accelerator
 
 // For listing by frontmatter.categories
-import { Cache, PostFiltering, PostOrdering, PostPaging } from 'astro-accelerator-utils';
+import { PostFiltering, PostOrdering, PostPaging } from 'astro-accelerator-utils';
 import { Translations, Lang } from '@util/Languages';
 import type { Page, MarkdownInstance } from 'astro';
 import { SITE, Frontmatter } from '@config';
@@ -36,46 +36,38 @@ const frontmatter: Frontmatter = {
 const _ = Lang(lang);
 
 // Logic
-type CacheData = {
+type CategoryData = {
   posts: MarkdownInstance<Record<string, any>>[];
   categories: string[];
 }
 
-export async function getCacheData() {
-  const key = 'pages_articles_[category]_[page]';
+export async function getData() {
+  // TODO: Replace with call to Posts.all()
+  const sourcePosts = await Astro.glob('../../**/*.md');
+  
+  const data: CategoryData = { posts: [], categories: []};
 
-  let cacheData: CacheData = await Cache.getItem(key);
+  data.posts = sourcePosts
+    .filter(PostFiltering.isListable)
+    .sort(PostOrdering.sortByPubDateDesc);
 
-  if (cacheData == null) {
-    // This uses a relative glob, so we only look in the current collection
-    const sourcePosts = await Astro.glob('../../**/*.md');
-    
-    cacheData = { posts: [], categories: []};
-
-    cacheData.posts = sourcePosts
-      .filter(PostFiltering.isListable)
-      .sort(PostOrdering.sortByPubDateDesc);
-
-    cacheData.posts.forEach(p => {
-      const auths: string[] = p.frontmatter.categories ?? [];
-      if (auths.length == 0) {
-        console.log('No categories found', p.url);
+    data.posts.forEach(p => {
+    const auths: string[] = p.frontmatter.categories ?? [];
+    if (auths.length == 0) {
+      console.log('No categories found', p.url);
+    }
+    auths.forEach(a => {
+      if (!data.categories.includes(a)) {
+        data.categories.push(a);
       }
-      auths.forEach(a => {
-        if (!cacheData.categories.includes(a)) {
-          cacheData.categories.push(a);
-        }
-      });
     });
-    
-    await Cache.setItem(key, cacheData);
-  }
+  });
 
-  return cacheData;
+  return data;
 }
 
 export async function getStaticPaths({ paginate }: any) {
-  let data = await getCacheData();
+  let data = await getData();
 
   return data.categories.map(c => {
     const filtered = data.posts.filter(p => {

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

@@ -1,11 +1,11 @@
 ---
 // warning: This file is overwritten by Astro Accelerator
 
-import { getCacheData } from './[page].astro';
+import { getData } from './[page].astro';
 import Redirect from 'src/layouts/Redirect.astro'
 
 export async function getStaticPaths() {
-    let data = await getCacheData();
+    let data = await getData();
 
     return data.categories.map(item => {
         return { params: { category: item.toLowerCase().replace(' ', '-') }}

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

@@ -1,7 +1,9 @@
 ---
-import { PostQueries, PostOrdering } from 'astro-accelerator-utils';
+import { PostQueries, PostOrdering, UrlFormatter } from 'astro-accelerator-utils';
+import { SITE } from '@config';
 
 // Logic
+const urlFormatter = new UrlFormatter(SITE.url);
 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;
@@ -25,7 +27,7 @@ const pages = missingBanner.sort(PostOrdering.sortByPubDateDesc).slice(0, Math.m
             </thead>
         {pages.map(p => 
         <tr>
-            <td><a href={ p.url }>{ p.frontmatter.title }</a></td>
+            <td><a href={ urlFormatter.addSlashToAddress(p.url) }>{ p.frontmatter.title }</a></td>
             <td>{ p.frontmatter.pubDate }</td>
             <td>{ p.frontmatter.modDate }</td>
         </tr>

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

@@ -1,7 +1,9 @@
 ---
-import { PostQueries, PostOrdering } from 'astro-accelerator-utils';
+import { PostQueries, PostOrdering, UrlFormatter } from 'astro-accelerator-utils';
+import { SITE } from '@config';
 
 // Logic
+const urlFormatter = new UrlFormatter(SITE.url);
 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;
@@ -25,7 +27,7 @@ const pages = missingMeta.sort(PostOrdering.sortByPubDateDesc).slice(0, Math.min
             </thead>
         {pages.map(p => 
         <tr>
-            <td><a href={ p.url }>{ p.frontmatter.title }</a></td>
+            <td><a href={ urlFormatter.addSlashToAddress(p.url) }>{ p.frontmatter.title }</a></td>
             <td>{ p.frontmatter.pubDate }</td>
             <td>{ p.frontmatter.modDate }</td>
         </tr>

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

@@ -1,7 +1,9 @@
 ---
-import { PostQueries } from 'astro-accelerator-utils';
+import { PostQueries, UrlFormatter } from 'astro-accelerator-utils';
+import { SITE } from '@config';
 
 // Logic
+const urlFormatter = new UrlFormatter(SITE.url);
 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;
@@ -25,7 +27,7 @@ const pages = missingMeta.slice(0, Math.min(50, pageCount));
             </thead>
         {pages.map(p => 
         <tr>
-            <td><a href={ p.url }>{ p.frontmatter.title }</a></td>
+            <td><a href={ urlFormatter.addSlashToAddress(p.url) }>{ p.frontmatter.title }</a></td>
             <td>{ p.frontmatter.pubDate }</td>
             <td>{ p.frontmatter.modDate }</td>
         </tr>

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

@@ -1,7 +1,9 @@
 ---
-import { PostQueries, PostOrdering } from 'astro-accelerator-utils';
+import { PostQueries, PostOrdering, PostFiltering, UrlFormatter } from 'astro-accelerator-utils';
+import { SITE } from '@config';
 
 // Logic
+const urlFormatter = new UrlFormatter(SITE.url);
 const allPages = await PostQueries.getPages();
 const pageCount = allPages.length;
 const pages = allPages.sort(PostOrdering.sortByModDate).slice(0, Math.min(50, pageCount));
@@ -24,7 +26,14 @@ const pages = allPages.sort(PostOrdering.sortByModDate).slice(0, Math.min(50, pa
             </thead>
         {pages.map(p => 
         <tr>
-            <td><a href={ p.url }>{ p.frontmatter.title }</a></td>
+            <td>
+                {PostFiltering.isListable(p) && (
+                    <a href={ urlFormatter.addSlashToAddress(p.url) }>{ p.frontmatter.title }</a>
+                )}
+                {PostFiltering.isListable(p) == false && (
+                    <span>{ p.frontmatter.title }</span>
+                )}
+            </td>
             <td>{ p.frontmatter.pubDate }</td>
             <td>{ p.frontmatter.modDate }</td>
         </tr>

package/src/pages/search.json.ts

@@ -1,14 +1,17 @@
 // warning: This file is overwritten by Astro Accelerator
 
+import { Markdown, PostFiltering, UrlFormatter } from 'astro-accelerator-utils';
 import type { MarkdownInstance } from 'astro';
 import { SITE } from '@config';
-import { Markdown, PostFiltering, Urls } from 'astro-accelerator-utils';
 
 const getData = async () => {
     //@ts-ignore
     const allPages = import.meta.glob('./**/*.md');
     const items = [];
 
+    const urlFormatter = new UrlFormatter(SITE.url);
+    const markdown = new Markdown();
+
     for (const path in allPages) {
         const page = await allPages[path]() as  MarkdownInstance<Record<string, any>>;
 
@@ -23,7 +26,7 @@ const getData = async () => {
         }
 
         const headings = await page.getHeadings();
-        const title = await Markdown.getTextFrom(page.frontmatter.title ?? '');
+        const title = await markdown.getTextFrom(page.frontmatter.title ?? '');
               
         items.push({
             title: title,
@@ -32,7 +35,7 @@ const getData = async () => {
             }),
             description: page.frontmatter.description ?? '',
             tags: page.frontmatter.tags ?? [],
-            url: SITE.url + Urls.addSlashToAddress(url, SITE),
+            url: SITE.url + urlFormatter.addSlashToAddress(url),
             date: page.frontmatter.pubDate ?? ''
         });
     }

package/src/pages/sitemap.xml.ts

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

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

@@ -2,7 +2,7 @@
 // warning: This file is overwritten by Astro Accelerator
 
 // For listing by frontmatter.tags
-import {Cache, PostFiltering, PostOrdering, PostPaging } from 'astro-accelerator-utils';
+import { PostFiltering, PostOrdering, PostPaging } from 'astro-accelerator-utils';
 import { Translations, Lang } from '@util/Languages';
 import type { Page, MarkdownInstance } from 'astro';
 import { SITE, Frontmatter } from '@config';
@@ -41,41 +41,32 @@ type CacheData = {
   tags: string[];
 }
 
-export async function getCacheData() {
-  const key = 'pages_articles_[tag]_[page]';
-
-  let cacheData: CacheData = await Cache.getItem(key);
-
-  if (cacheData == null) {
-    // This uses a relative glob, so we only look in the current collection
-    const sourcePosts = await Astro.glob('../../**/*.md');
+export async function getData() {
+  const sourcePosts = await Astro.glob('../../**/*.md');
     
-    cacheData = { posts: [], tags: []};
-
-    cacheData.posts = sourcePosts
-      .filter(PostFiltering.isListable)
-      .sort(PostOrdering.sortByPubDateDesc);
-
-    cacheData.posts.forEach(p => {
-      const auths: string[] = p.frontmatter.tags ?? [];
-      if (auths.length == 0) {
-        console.log('No categories found', p.url);
+  const data: CacheData = { posts: [], tags: []};
+
+  data.posts = sourcePosts
+    .filter(PostFiltering.isListable)
+    .sort(PostOrdering.sortByPubDateDesc);
+
+    data.posts.forEach(p => {
+    const auths: string[] = p.frontmatter.tags ?? [];
+    if (auths.length == 0) {
+      console.log('No categories found', p.url);
+    }
+    auths.forEach(a => {
+      if (!data.tags.includes(a)) {
+        data.tags.push(a);
       }
-      auths.forEach(a => {
-        if (!cacheData.tags.includes(a)) {
-          cacheData.tags.push(a);
-        }
-      });
     });
+  });
 
-    await Cache.setItem(key, cacheData);
-  }
-
-  return cacheData;
+  return data;
 }
 
 export async function getStaticPaths({ paginate }: any) {
-  let data = await getCacheData();
+  let data = await getData();
 
   return data.tags.map(t => {
     const filtered = data.posts.filter(p => {

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

@@ -1,11 +1,11 @@
 ---
 // warning: This file is overwritten by Astro Accelerator
 
-import { getCacheData } from './[page].astro';
+import { getData } from './[page].astro';
 import Redirect from 'src/layouts/Redirect.astro'
 
 export async function getStaticPaths() {
-    let data = await getCacheData();
+    let data = await getData();
 
     return data.tags.map(item => {
         return { params: { tag: item.toLowerCase().replace(' ', '-') }}

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

@@ -1,11 +1,10 @@
 ---
-import { Markdown, Urls } from 'astro-accelerator-utils';
+import { Markdown, UrlFormatter } from 'astro-accelerator-utils';
 import type { MarkdownInstance } from 'astro';
 import { SITE, Frontmatter } from '@config';
 import { getImageInfo } from '@util/custom-markdown.mjs';
 import AuthorsMini from '@components/AuthorsMini.astro';
 
-
 // Properties
 type Props = {
   lang: string;
@@ -14,11 +13,18 @@ type Props = {
 const { lang, posts } = Astro.props as Props;
 
 // Logic
+const urlFormatter = new UrlFormatter(SITE.url);
+const markdown = new Markdown();
+
 type ImageInfo = {
   src: string;
   srcset: string;
   sizes: string;
   class: string;
+  metadata: {
+    width: number;
+    height: number;
+  }
 };
 
 type Article = {
@@ -35,11 +41,11 @@ for (let p of posts) {
     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 Markdown.getTextFrom(p.frontmatter.title);
+  item.frontmatter.title = await markdown.getTextFrom(p.frontmatter.title);
 
   articles.push(item)
 }
@@ -54,7 +60,7 @@ function getLoadingAttribute() {
 ---
 <ul class="post-list anim-show-parent">
   {articles.map((post) => (
-  <li class="list-item" data-destination={ Urls.addSlashToAddress(post.url, SITE) } data-image={ (post.frontmatter.bannerImage?.src.length > 0).toString() }>
+  <li class="list-item" data-destination={ urlFormatter.addSlashToAddress(post.url) } data-image={ (post.frontmatter.bannerImage?.src.length > 0).toString() }>
     <article>
       <div class="list-item-image">
       {post.img && (
@@ -64,12 +70,14 @@ function getLoadingAttribute() {
           src={ post.img.src }
           alt={ post.frontmatter.bannerImage.alt }
           class={ post.img.class }
+          width={ post.img.metadata?.width }
+          height={ post.img.metadata?.height }
           loading={ getLoadingAttribute() } />
       )}
       </div>
       <div class="list-item-content">
         <h3>
-          <a href={ Urls.addSlashToAddress(post.url, SITE) }>{ post.frontmatter.title }</a>
+          <a href={ urlFormatter.addSlashToAddress(post.url) }>{ post.frontmatter.title }</a>
         </h3>
         <AuthorsMini lang={ lang } frontmatter={ post.frontmatter as Frontmatter } />
       </div>

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

@@ -1,5 +1,5 @@
 ---
-import { Dates, Urls, PostQueries } from 'astro-accelerator-utils';
+import { PostQueries, DateFormatter, UrlFormatter } from 'astro-accelerator-utils';
 import { SITE, Frontmatter } from '@config';
 import { Translations, Lang } from '@util/Languages';
 import { getImageInfo } from '@util/custom-markdown.mjs';
@@ -15,6 +15,8 @@ const { lang, frontmatter } = Astro.props as Props;
 const _ = Lang(lang);
 
 // Logic
+const dateFormatter = new DateFormatter(SITE.dateOptions);
+const urlFormatter = new UrlFormatter(SITE.url);
 const authorList = await PostQueries.getAuthors(frontmatter);
 
 // Get image info
@@ -35,16 +37,16 @@ const authorImage = authorList?.image?.src
   <div class="author-info">
     <span>{ _(Translations.post.written_by) }
       {authorList.mainAuthor &&
-        <a href={ Urls.addSlashToAddress(authorList.mainAuthor.url, SITE) + '1/' } itemprop="author">{ authorList.mainAuthor.frontmatter.title }</a>
+        <a href={ urlFormatter.addSlashToAddress(authorList.mainAuthor.url) + '1/' } itemprop="author">{ authorList.mainAuthor.frontmatter.title }</a>
       }{authorList.contributors.map((writer) => (
-        <a href={ Urls.addSlashToAddress(writer.url, SITE) + '1/' } itemprop="contributor">{ writer.frontmatter.title }</a>
+        <a href={ urlFormatter.addSlashToAddress(writer.url) + '1/' } itemprop="contributor">{ writer.frontmatter.title }</a>
       ))}.
       <br /><time datetime={ frontmatter.pubDate.toString() } itemprop="datePublished">
-      { Dates.formatDate(frontmatter, lang, SITE) }
+      { dateFormatter.formatDate(frontmatter.pubDate, lang) }
       </time>
       {frontmatter.modDate &&
       <br /><time datetime={ frontmatter.modDate.toString() } itemprop="dateModified">
-        { _(Translations.post.last_modified) } { Dates.formatModifiedDate(frontmatter, lang, SITE) }
+        { _(Translations.post.last_modified) } { dateFormatter.formatDate(frontmatter.modDate, lang) }
       </time>
       }
     </span>

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

@@ -1,5 +1,5 @@
 ---
-import { Dates, PostQueries } from 'astro-accelerator-utils';
+import { PostQueries, DateFormatter } from 'astro-accelerator-utils';
 import { SITE, Frontmatter } from '@config';
 import { Translations, Lang } from '@util/Languages';;
 
@@ -14,6 +14,7 @@ const { lang, frontmatter } = Astro.props as Props;
 const _ = Lang(lang);
 
 // Logic
+const dateFormatter = new DateFormatter(SITE.dateOptions);
 const authorList = await PostQueries.getAuthors(frontmatter);
 ---
 {authorList.writers.length > 0 && 
@@ -24,7 +25,7 @@ const authorList = await PostQueries.getAuthors(frontmatter);
         <span>{ writer.frontmatter.title }</span>
       ))}.<br />
       <time datetime={ frontmatter.pubDate.toString() }>
-      { Dates.formatDate(frontmatter, lang, SITE) }
+      { dateFormatter.formatDate(frontmatter, lang) }
       </time>
     </span>
   </div>

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

@@ -1,5 +1,5 @@
 ---
-import { Urls, PostQueries } from 'astro-accelerator-utils';
+import { PostQueries, UrlFormatter } from 'astro-accelerator-utils';
 import { SITE, Frontmatter } from '@config';
 import { Translations, Lang } from '@util/Languages';
 
@@ -15,6 +15,7 @@ const { lang } = Astro.props as Props;
 const _ = Lang(lang);
 
 // Logic
+const urlFormatter = new UrlFormatter(SITE.url);
 const currentUrl = new URL(Astro.request.url);
 const navPages = await PostQueries.getBreadcrumbs(currentUrl, SITE);
 ---
@@ -23,7 +24,7 @@ const navPages = await PostQueries.getBreadcrumbs(currentUrl, SITE);
     {navPages.map((page, index) => (
     <li property="itemListElement" typeof="ListItem">
       <meta property="position" content={ index.toString() } />
-      <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>
+      <a property="item" typeof="WebPage" href={ urlFormatter.addSlashToAddress(page.url) } aria-current={ page.ariaCurrent } rel={ page.rel }><span property="name">{ page.title }</span></a>
     </li>
     ))}
   </ol>

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

@@ -1,5 +1,5 @@
 ---
-import type { NavPage } from '@util/TempNavPage';
+import type { NavPage } from 'astro-accelerator-utils/types/NavPage';
 
 // Properties
 type Props = {
@@ -9,7 +9,7 @@ type Props = {
 const { lang, page } = Astro.props as Props;
 ---
 <div class="footer-column">
-  <h2>{ page.title }</h2>
+  <h2><Fragment set:html={page.title} /></h2>
   <ul>
   { page.children.sort((a, b) => a.order - b.order).map((child) => (
     <li>

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

@@ -1,5 +1,5 @@
 ---
-import { Urls, PostQueries, PostFiltering } from 'astro-accelerator-utils';
+import { PostQueries, PostFiltering, UrlFormatter } from 'astro-accelerator-utils';
 import { SITE, Frontmatter } from '@config';
 import { Translations, Lang } from '@util/Languages';
 
@@ -15,6 +15,7 @@ const { lang } = Astro.props as Props;
 const _ = Lang(lang);
 
 // Logic
+const urlFormatter = new UrlFormatter(SITE.url);
 const search = (await PostQueries.getPages(PostFiltering.isSearch))[0] ?? null;
 
 ---
@@ -29,7 +30,7 @@ const search = (await PostQueries.getPages(PostFiltering.isSearch))[0] ?? null;
   </svg></a>
   <a href={ (SITE.subfolder ?? '') + '/' } class="site-title" translate="no">{ SITE.title }</a>
   {search != null &&
-  <a href={ Urls.addSlashToAddress(search.url, SITE) } class="search-icon" title={ _(Translations.header.open_search) }><svg xmlns="http://www.w3.org/2000/svg" 
+  <a href={ urlFormatter.addSlashToAddress(search.url) } 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,5 +1,5 @@
 ---
-import { Markdown, Urls } from 'astro-accelerator-utils';
+import { Markdown, UrlFormatter } from 'astro-accelerator-utils';
 import { SITE, OPEN_GRAPH, HEADER_SCRIPTS, Frontmatter } from '@config';
 
 // Properties
@@ -11,12 +11,15 @@ type Props = {
 const { frontmatter } = Astro.props;
 
 // Logic
+const urlFormatter = new UrlFormatter(SITE.url);
+const markdown = new Markdown();
+
 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 =  Urls.addSlashToUrl(new URL(Astro.url.pathname, Astro.site + SITE.subfolder));
-const socialTitle = await Markdown.getTextFrom(frontmatter.title);
+const canonicalURL =  urlFormatter.addSlashToUrl(new URL(Astro.url.pathname, Astro.site + SITE.subfolder));
+const socialTitle = await markdown.getTextFrom(frontmatter.title);
 const title = `${ socialTitle } | ${ SITE.title }`;
 ---
 <head>

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

@@ -1,7 +1,7 @@
 ---
+import { UrlFormatter } from 'astro-accelerator-utils';
+import type { NavPage } from 'astro-accelerator-utils/types/NavPage';
 import { SITE } from '@config';
-import type { NavPage } from '@util/TempNavPage';
-import { Urls } from 'astro-accelerator-utils';
 
 // Properties
 type Props = {
@@ -9,10 +9,13 @@ type Props = {
   page: NavPage
 };
 const { lang, page } = Astro.props as Props;
+
+// Logic
+const urlFormatter = new UrlFormatter(SITE.url);
 ---
 {(page.children.length == 0) && (
 <li>
-  <a href={ Urls.addSlashToAddress(page.url, SITE) } aria-current={ page.ariaCurrent } rel={ page.rel }>{ page.title }</a>
+  <a href={ urlFormatter.addSlashToAddress(page.url) } aria-current={ page.ariaCurrent } rel={ page.rel }>{ page.title }</a>
 </li>
 )}
 {(page.children.length > 0) && (

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

@@ -1,7 +1,7 @@
 ---
-import { Urls } from 'astro-accelerator-utils';
+import { UrlFormatter } from 'astro-accelerator-utils';
+import type { Link } from 'astro-accelerator-utils/types/Link';
 import { SITE } from '@config';
-import type { Link } from '@util/PageLinks';
 import type { MarkdownInstance, Page } from 'astro';
 import { Translations, Lang } from '@util/Languages';
 
@@ -17,16 +17,16 @@ const { lang, page, pageLinks } = Astro.props as Props;
 const _ = Lang(lang);
 
 // Logic
-// -
+const urlFormatter = new UrlFormatter(SITE.url);
 ---
 <nav class="post-paging" aria-label={ _(Translations.aria.paging) }>
   {page.url.prev
-    ? <a href={ Urls.addSlashToAddress(page.url.prev, SITE) }>{ _(Translations.articles.previous) }</a>
+    ? <a href={ urlFormatter.addSlashToAddress(page.url.prev) }>{ _(Translations.articles.previous) }</a>
     : <span>{ _(Translations.articles.previous) }</span>}
   {pageLinks.map((link) => (
-      <a href={ Urls.addSlashToAddress(link.url, SITE) } aria-current={ link.ariaCurrent } class={ link.class }>{ link.title }</a>
+      <a href={ urlFormatter.addSlashToAddress(link.url) } aria-current={ link.ariaCurrent } class={ link.class }>{ link.title }</a>
   ))}
   {page.url.next
-    ? <a href={ Urls.addSlashToAddress(page.url.next, SITE) }>{ _(Translations.articles.next) }</a>
+    ? <a href={ urlFormatter.addSlashToAddress(page.url.next) }>{ _(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 { Urls, PostQueries, PostFiltering, PostOrdering } from 'astro-accelerator-utils';
+import { PostQueries, PostFiltering, PostOrdering, UrlFormatter } from 'astro-accelerator-utils';
 import { getImageInfo } from '@util/custom-markdown.mjs'
 
 import AuthorsMini from '@components/AuthorsMini.astro';
@@ -15,6 +15,7 @@ type Props = {
 const { lang, frontmatter, headings } = Astro.props as Props;
 
 // Logic
+const urlFormatter = new UrlFormatter(SITE.url);
 let posts: MarkdownInstance<Record<string, any>>[] = [];
 const parentCagory = (frontmatter.categories ?? [null])[0];
 
@@ -52,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={ Urls.addSlashToAddress(post.url, SITE) } data-image={ (post.frontmatter.bannerImage?.src.length > 0).toString() }>
+  <li class="list-item" data-destination={ urlFormatter.addSlashToAddress(post.url) } data-image={ (post.frontmatter.bannerImage?.src.length > 0).toString() }>
     <article>
       <div class="list-item-image">
       {post.img && (
@@ -67,7 +68,7 @@ const articles = posts.map(p => {
       </div>
       <div class="list-item-content">
         <h3>
-          <a href={ Urls.addSlashToAddress(post.url, SITE) }>{ post.frontmatter.title }</a>
+          <a href={ urlFormatter.addSlashToAddress(post.url) }>{ post.frontmatter.title }</a>
         </h3>
         <AuthorsMini lang={ lang } frontmatter={ post.frontmatter as Frontmatter } />
       </div>

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

@@ -22,9 +22,12 @@ const { frontmatter, headings } = Astro.props as Props;
 const lang = frontmatter.lang ?? SITE.default.lang;
 const textDirection = frontmatter.dir ?? SITE.default.dir;
 
-const title = await Markdown.getInlineHtmlFrom(frontmatter.title ?? SITE.title);
+// Logic
+const markdown = new Markdown();
+
+const title = await markdown.getInlineHtmlFrom(frontmatter.title ?? SITE.title);
 const subtitle = frontmatter.subtitle
-    ? await Markdown.getInlineHtmlFrom(frontmatter.subtitle)
+    ? await markdown.getInlineHtmlFrom(frontmatter.subtitle)
     : null;
 
 const site_url = SITE.url;

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

@@ -55,6 +55,17 @@ export function getImageInfo(src, className, sizes) {
   info.srcset = `${imgSmall} ${size.small}w, ${imgMedium} ${size.medium}w, ${imgLarge}`;
   info.sizes = sizes;
   info.class = (className ?? '' + ' resp-img').trim();
+  info.metadata = null;
+
+  try {
+    let metaAddress = path.join(workingDirectory, 'public', src + '.json');
+          
+    if (fs.existsSync(metaAddress)) {
+      info.metadata = JSON.parse(fs.readFileSync(metaAddress));
+    }
+  } catch (e) {
+    console.warn(e);
+  }
 
   return info;
 }
@@ -69,13 +80,6 @@ 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);
 
@@ -84,9 +88,9 @@ export function attributeMarkdown() {
           hast.properties.sizes = info.sizes;
           hast.properties.class = info.class;
 
-          if (metadata) {
-            hast.properties.width = metadata.width;
-            hast.properties.height = metadata.height;
+          if (info.metadata) {
+            hast.properties.width = info.metadata.width;
+            hast.properties.height = info.metadata.height;
           }
         }
 

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

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