astro-accelerator 0.0.39 → 0.0.41

package/README.md

@@ -1,6 +1,9 @@
 # Astro Accelerator
 
-Review the documentation at [astro.stevefenton.co.uk](https://astro.stevefenton.co.uk/)
 
 [![Deploy and Test](https://github.com/Steve-Fenton/astro-accelerator/actions/workflows/build-astro.yml/badge.svg)](https://github.com/Steve-Fenton/astro-accelerator/actions/workflows/build-astro.yml)
 
+Review the documentation at [astro.stevefenton.co.uk](https://astro.stevefenton.co.uk/)
+
+[![npm](https://img.shields.io/npm/v/astro-accelerator?color=blue&style=plastic)](https://www.npmjs.com/package/astro-accelerator/)
+[![npm](https://img.shields.io/npm/dm/astro-accelerator?style=plastic)](https://www.npmjs.com/package/astro-accelerator/)

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.39",
+  "version": "0.0.41",
   "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.1.18",
+    "astro-accelerator-utils": "^0.2.8",
     "hast-util-from-selector": "^2.0.0",
     "remark-directive": "^2.0.1"
   },

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 { PostFiltering, PostOrdering, Paging } from 'astro-accelerator-utils';
+import { PostFiltering, PostOrdering, Accelerator } from 'astro-accelerator-utils';
 import type { Frontmatter } from 'astro-accelerator-utils/types/Frontmatter';
 import type { MarkdownInstance } from 'astro-accelerator-utils/types/Astro';
 import type { Page } from 'astro';
@@ -35,7 +35,7 @@ const frontmatter: Frontmatter = {
 const _ = Lang(lang);
 
 // Logic
-const paging = new Paging();
+const accelerator = new Accelerator(SITE);
 
 export async function getData() {
   const sourcePosts = await Astro.glob('./**/*.md') as MarkdownInstance[];
@@ -55,7 +55,7 @@ export async function getStaticPaths({ paginate }: any) {
 }
 
 // Page Links
-const pageLinks = paging.links(SITE.pageLinks, page.lastPage, page.currentPage, page.url.current);
+const pageLinks = accelerator.paging.links(SITE.pageLinks, page.lastPage, page.currentPage, page.url.current);
 ---
 <Default frontmatter={ frontmatter } headings={ headings }>
   <h2>{ _(Translations.articles.page_title).replace('{n}', page.currentPage.toString())}</h2>

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

@@ -2,13 +2,13 @@
 
 // Generates an ATOM feed of recent posts
 import { SITE } from '@config';
-import { Markdown, PostFiltering, UrlFormatter } from 'astro-accelerator-utils';
+import { Accelerator, PostFiltering } 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();
+
+  const accelerator = new Accelerator(SITE);
   
   let articles = [];
   
@@ -16,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 accelerator.markdown.getTextFrom(article.frontmatter.title ?? '');
 
       articles.push({
         url: article.url,
@@ -34,7 +34,7 @@ async function getData() {
     <entry>
       <title>${a.frontmatter.title ?? ''}</title>
       <link href="${ SITE.url + a.url }" />
-      <id>${ SITE.url + urlFormatter.addSlashToAddress(a.url) }</id>
+      <id>${ SITE.url + accelerator.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,28 +2,32 @@
 // warning: This file is overwritten by Astro Accelerator
 
 // For listing all articles in this folder
-import { PostFiltering, PostOrdering, Cache, Markdown, Paging, Posts } from 'astro-accelerator-utils';
+import { PostFiltering, PostOrdering, Accelerator } from 'astro-accelerator-utils';
 import type { Frontmatter } from 'astro-accelerator-utils/types/Frontmatter';
 import type { MarkdownInstance } from 'astro-accelerator-utils/types/Astro';
 import type { Page } from 'astro';
 import { Translations, Lang } from '@util/Languages';
 import { SITE } from '@config';
-import Default from '@layouts/Default.astro';
+import Default from 'src/layouts/Default.astro';
 import ArticleList from '@components/ArticleList.astro';
 import PagingLinks from '@components/PagingLinks.astro';
 
+const accelerator = new Accelerator(SITE);
+
 const lang = SITE.default.lang;
 const currentUrl = new URL(Astro.request.url);
-const slug = currentUrl.pathname.split('/')[2];
-
-const markdown = new Markdown();
-const cache = new Cache(SITE.cacheMaxAge);
-const posts = new Posts(cache);
+const slug = accelerator.urlFormatter.getAuthorId(currentUrl);
 
-const author = posts.all()
+const author = accelerator.posts.all()
   .filter(PostFiltering.isAuthor)
-  .filter(x => x.url?.split('/')[2] == slug)[0];
+  .filter(x => {
+    if (!x.url) {
+      return false;
+    }
 
+    const url = new URL(x.url, SITE.url);
+    return accelerator.urlFormatter.getAuthorId(url) == slug;
+  })[0];
 
 // Props
 type Props = {
@@ -39,14 +43,12 @@ const authorFrontmatter = {
 } as Frontmatter;
 
 const text = (author.frontmatter.summary ?? '').replace('\n', '\n\n');
-const authorText = markdown.getHtmlFrom(text);
+const authorText = accelerator.markdown.getHtmlFrom(text);
 
 // Language
 const _ = Lang(lang);
 
 // Logic
-const paging = new Paging();
-
 type AuthorData = {
   posts: MarkdownInstance[];
   authors: string[];
@@ -92,7 +94,7 @@ export async function getStaticPaths({ paginate }: any) {
 }
 
 // Page Links
-const pageLinks = paging.links(SITE.pageLinks, page.lastPage, page.currentPage, page.url.current);
+const pageLinks = accelerator.paging.links(SITE.pageLinks, page.lastPage, page.currentPage, page.url.current);
 ---
 <Default frontmatter={ authorFrontmatter } headings={ headings }>
   <Fragment set:html={ authorText } />

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 { PostFiltering, PostOrdering, Paging } from 'astro-accelerator-utils';
+import { PostFiltering, PostOrdering, Accelerator } from 'astro-accelerator-utils';
 import type { Frontmatter } from 'astro-accelerator-utils/types/Frontmatter';
 import type { MarkdownInstance } from 'astro-accelerator-utils/types/Astro';
 import type { Page } from 'astro';
@@ -38,7 +38,7 @@ const frontmatter: Frontmatter = {
 const _ = Lang(lang);
 
 // Logic
-const paging = new Paging();
+const accelerator = new Accelerator(SITE);
 
 type CategoryData = {
   posts: MarkdownInstance[];
@@ -87,7 +87,7 @@ export async function getStaticPaths({ paginate }: any) {
 }
 
 // Page Links
-const pageLinks = paging.links(SITE.pageLinks, page.lastPage, page.currentPage, page.url.current);
+const pageLinks = accelerator.paging.links(SITE.pageLinks, page.lastPage, page.currentPage, page.url.current);
 ---
 <Default frontmatter={ frontmatter } headings={ headings }>
   <h2>{ _(Translations.articles.page_title).replace('{n}', page.currentPage.toString())}</h2>

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

@@ -1,13 +1,11 @@
 ---
-import { PostOrdering, Cache, Posts, UrlFormatter } from 'astro-accelerator-utils';
+import { PostOrdering, Accelerator } from 'astro-accelerator-utils';
 import { SITE } from '@config';
 
 // Logic
-const cache = new Cache(SITE.cacheMaxAge);
-const posts = new Posts(cache);
-const urlFormatter = new UrlFormatter(SITE.url);
+const accelerator = new Accelerator(SITE);
 
-const allPages = posts.all();
+const allPages = accelerator.posts.all();
 const missingBanner = allPages.filter(p => p.frontmatter.bannerImage == null && p.frontmatter.layout != 'src/layouts/Redirect.astro');
 const pageCount = missingBanner.length;
 const pages = missingBanner.sort(PostOrdering.sortByPubDateDesc).slice(0, Math.min(50, pageCount));
@@ -30,7 +28,7 @@ const pages = missingBanner.sort(PostOrdering.sortByPubDateDesc).slice(0, Math.m
             </thead>
         {pages.map(p => 
         <tr>
-            <td><a href={ urlFormatter.addSlashToAddress(p.url) }>{ p.frontmatter.title }</a></td>
+            <td><a href={ accelerator.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,13 +1,11 @@
 ---
-import { PostOrdering, Cache, Posts, UrlFormatter } from 'astro-accelerator-utils';
+import { PostOrdering, Accelerator } from 'astro-accelerator-utils';
 import { SITE } from '@config';
 
 // Logic
-const cache = new Cache(SITE.cacheMaxAge);
-const posts = new Posts(cache);
-const urlFormatter = new UrlFormatter(SITE.url);
+const accelerator = new Accelerator(SITE);
 
-const allPages = posts.all();
+const allPages = accelerator.posts.all();
 const missingMeta = allPages.filter(p => (p.frontmatter.keywords == null || p.frontmatter.description == null) && p.frontmatter.layout != 'src/layouts/Redirect.astro');
 const pageCount = missingMeta.length;
 const pages = missingMeta.sort(PostOrdering.sortByPubDateDesc).slice(0, Math.min(50, pageCount));
@@ -30,7 +28,7 @@ const pages = missingMeta.sort(PostOrdering.sortByPubDateDesc).slice(0, Math.min
             </thead>
         {pages.map(p => 
         <tr>
-            <td><a href={ urlFormatter.addSlashToAddress(p.url) }>{ p.frontmatter.title }</a></td>
+            <td><a href={ accelerator.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,13 +1,11 @@
 ---
-import { Cache, Posts, UrlFormatter } from 'astro-accelerator-utils';
+import { Accelerator } from 'astro-accelerator-utils';
 import { SITE } from '@config';
 
 // Logic
-const cache = new Cache(SITE.cacheMaxAge);
-const posts = new Posts(cache);
-const urlFormatter = new UrlFormatter(SITE.url);
+const accelerator = new Accelerator(SITE);
 
-const allPages = posts.all();
+const allPages = accelerator.posts.all();
 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));
@@ -30,7 +28,7 @@ const pages = missingMeta.slice(0, Math.min(50, pageCount));
             </thead>
         {pages.map(p => 
         <tr>
-            <td><a href={ urlFormatter.addSlashToAddress(p.url) }>{ p.frontmatter.title }</a></td>
+            <td><a href={ accelerator.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,13 +1,11 @@
 ---
-import { PostOrdering, PostFiltering, Cache, Posts, UrlFormatter } from 'astro-accelerator-utils';
+import { PostOrdering, PostFiltering, Accelerator } from 'astro-accelerator-utils';
 import { SITE } from '@config';
 
 // Logic
-const cache = new Cache(SITE.cacheMaxAge);
-const posts = new Posts(cache);
-const urlFormatter = new UrlFormatter(SITE.url);
+const accelerator = new Accelerator(SITE);
 
-const allPages = posts.all();
+const allPages = accelerator.posts.all();
 const pageCount = allPages.length;
 const pages = allPages.sort(PostOrdering.sortByModDate).slice(0, Math.min(50, pageCount));
 ---
@@ -31,7 +29,7 @@ const pages = allPages.sort(PostOrdering.sortByModDate).slice(0, Math.min(50, pa
         <tr>
             <td>
                 {PostFiltering.isListable(p) && (
-                    <a href={ urlFormatter.addSlashToAddress(p.url) }>{ p.frontmatter.title }</a>
+                    <a href={ accelerator.urlFormatter.addSlashToAddress(p.url) }>{ p.frontmatter.title }</a>
                 )}
                 {PostFiltering.isListable(p) == false && (
                     <span>{ p.frontmatter.title }</span>

package/src/pages/report/taxonomy.astro

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

package/src/pages/search.json.ts

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

package/src/pages/sitemap.xml.ts

@@ -2,14 +2,14 @@
 
 // Generates an ATOM feed of recent posts
 import { SITE } from '@config';
-import { PostFiltering, UrlFormatter } from 'astro-accelerator-utils';
+import { PostFiltering, Accelerator } from 'astro-accelerator-utils';
 
 async function getData() {
   //@ts-ignore
   const allPages = import.meta.glob('./**/*.md');
   
+  const accelerator = new Accelerator(SITE);
   let pages = [];
-  const urlFormatter = new UrlFormatter(SITE.url);
   
   for (const path in allPages) {
     const article: any = await allPages[path]();
@@ -18,7 +18,7 @@ async function getData() {
     if (addToSitemap) {
       pages.push(`
         <url>
-          <loc>${ SITE.url + urlFormatter.addSlashToAddress(article.url) }</loc>
+          <loc>${ SITE.url + accelerator.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 { PostFiltering, PostOrdering, Paging } from 'astro-accelerator-utils';
+import { PostFiltering, PostOrdering, Accelerator } from 'astro-accelerator-utils';
 import type { Frontmatter } from 'astro-accelerator-utils/types/Frontmatter';
 import type { MarkdownInstance } from 'astro-accelerator-utils/types/Astro';
 import type { Page } from 'astro';
@@ -38,7 +38,7 @@ const frontmatter: Frontmatter = {
 const _ = Lang(lang);
 
 // Logic
-const paging = new Paging();
+const accelerator = new Accelerator(SITE);
 
 type CacheData = {
   posts: MarkdownInstance[];
@@ -86,7 +86,7 @@ export async function getStaticPaths({ paginate }: any) {
 }
 
 // Page Links
-const pageLinks = paging.links(SITE.pageLinks, page.lastPage, page.currentPage, page.url.current);
+const pageLinks = accelerator.paging.links(SITE.pageLinks, page.lastPage, page.currentPage, page.url.current);
 ---
 <Default frontmatter={ frontmatter } headings={ headings }>
   <h2>{ _(Translations.articles.page_title).replace('{n}', page.currentPage.toString())}</h2>

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

@@ -1,5 +1,5 @@
 ---
-import { Markdown, UrlFormatter } from 'astro-accelerator-utils';
+import { Accelerator } from 'astro-accelerator-utils';
 import type { Frontmatter } from 'astro-accelerator-utils/types/Frontmatter';
 import type { MarkdownInstance } from 'astro';
 import { SITE } from '@config';
@@ -14,8 +14,7 @@ type Props = {
 const { lang, posts } = Astro.props as Props;
 
 // Logic
-const urlFormatter = new UrlFormatter(SITE.url);
-const markdown = new Markdown();
+const accelerator = new Accelerator(SITE);
 
 type ImageInfo = {
   src: string;
@@ -40,7 +39,7 @@ const articles: Article[] = [];
 for (let p of posts) {
   const item = {
     url: p.url ?? '',
-    title: await markdown.getTextFrom(p.frontmatter.title),
+    title: await accelerator.markdown.getTextFrom(p.frontmatter.title),
     frontmatter: p.frontmatter,
     img: p.frontmatter.bannerImage
       ? getImageInfo(p.frontmatter.bannerImage.src, '', SITE.images.listerSize)
@@ -60,7 +59,7 @@ function getLoadingAttribute() {
 ---
 <ul class="post-list anim-show-parent">
   {articles.map((post) => (
-  <li class="list-item" data-destination={ urlFormatter.addSlashToAddress(post.url) } data-image={ (post.frontmatter.bannerImage?.src.length > 0).toString() }>
+  <li class="list-item" data-destination={ accelerator.urlFormatter.addSlashToAddress(post.url) } data-image={ (post.frontmatter.bannerImage?.src.length > 0).toString() }>
     <article>
       <div class="list-item-image">
       {post.img && (
@@ -77,7 +76,7 @@ function getLoadingAttribute() {
       </div>
       <div class="list-item-content">
         <h3>
-          <a href={ urlFormatter.addSlashToAddress(post.url) }>{ post.title }</a>
+          <a href={ accelerator.urlFormatter.addSlashToAddress(post.url) }>{ post.title }</a>
         </h3>
         <AuthorsMini lang={ lang } frontmatter={ post.frontmatter as Frontmatter } />
       </div>

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

@@ -1,5 +1,5 @@
 ---
-import { Authors, Cache, DateFormatter, Posts, UrlFormatter } from 'astro-accelerator-utils';
+import { Accelerator } from 'astro-accelerator-utils';
 import type { Frontmatter } from 'astro-accelerator-utils/types/Frontmatter';
 import { SITE } from '@config';
 import { Translations, Lang } from '@util/Languages';
@@ -16,13 +16,9 @@ const { lang, frontmatter } = Astro.props as Props;
 const _ = Lang(lang);
 
 // Logic
-const cache = new Cache(SITE.cacheMaxAge);
-const posts = new Posts(cache);
-const authors = new Authors(posts);
-const dateFormatter = new DateFormatter(SITE.dateOptions);
-const urlFormatter = new UrlFormatter(SITE.url);
+const accelerator = new Accelerator(SITE);
 
-const authorList = authors.forPost(frontmatter);
+const authorList = accelerator.authors.forPost(frontmatter);
 
 // Get image info
 const authorImage = authorList?.image?.src 
@@ -42,16 +38,16 @@ const authorImage = authorList?.image?.src
   <div class="author-info">
     <span>{ _(Translations.post.written_by) }
       {authorList.mainAuthor &&
-        <a href={ urlFormatter.addSlashToAddress(authorList.mainAuthor.url) + '1/' } itemprop="author">{ authorList.mainAuthor.frontmatter.title }</a>
+        <a href={ accelerator.urlFormatter.addSlashToAddress(authorList.mainAuthor.url) + '1/' } itemprop="author">{ authorList.mainAuthor.frontmatter.title }</a>
       }{authorList.contributors.map((writer) => (
-        <a href={ urlFormatter.addSlashToAddress(writer.url) + '1/' } itemprop="contributor">{ writer.frontmatter.title }</a>
+        <a href={ accelerator.urlFormatter.addSlashToAddress(writer.url) + '1/' } itemprop="contributor">{ writer.frontmatter.title }</a>
       ))}.
       <br /><time datetime={ frontmatter.pubDate.toString() } itemprop="datePublished">
-      { dateFormatter.formatDate(frontmatter.pubDate, lang) }
+      { accelerator.dateFormatter.formatDate(frontmatter.pubDate, lang) }
       </time>
       {frontmatter.modDate &&
       <br /><time datetime={ frontmatter.modDate.toString() } itemprop="dateModified">
-        { _(Translations.post.last_modified) } { dateFormatter.formatDate(frontmatter.modDate, lang) }
+        { _(Translations.post.last_modified) } { accelerator.dateFormatter.formatDate(frontmatter.modDate, lang) }
       </time>
       }
     </span>

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

@@ -1,5 +1,5 @@
 ---
-import { Authors, Cache, DateFormatter, Posts, UrlFormatter } from 'astro-accelerator-utils';
+import { Accelerator } from 'astro-accelerator-utils';
 import type { Frontmatter } from 'astro-accelerator-utils/types/Frontmatter';
 import { SITE } from '@config';
 import { Translations, Lang } from '@util/Languages';;
@@ -15,12 +15,9 @@ const { lang, frontmatter } = Astro.props as Props;
 const _ = Lang(lang);
 
 // Logic
-const cache = new Cache(SITE.cacheMaxAge);
-const posts = new Posts(cache);
-const authors = new Authors(posts);
-const dateFormatter = new DateFormatter(SITE.dateOptions);
+const accelerator = new Accelerator(SITE);
 
-const authorList = authors.forPost(frontmatter);
+const authorList = accelerator.authors.forPost(frontmatter);
 ---
 {authorList.writers.length > 0 && 
 <div class="post-meta">
@@ -30,7 +27,7 @@ const authorList = authors.forPost(frontmatter);
         <span>{ writer.frontmatter.title }</span>
       ))}.<br />
       <time datetime={ frontmatter.pubDate.toString() }>
-      { dateFormatter.formatDate(frontmatter.pubDate, lang) }
+      { accelerator.dateFormatter.formatDate(frontmatter.pubDate, lang) }
       </time>
     </span>
   </div>

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

@@ -1,5 +1,5 @@
 ---
-import { Cache, Navigation, Posts, UrlFormatter } from 'astro-accelerator-utils';
+import { Accelerator } from 'astro-accelerator-utils';
 import type { Frontmatter } from 'astro-accelerator-utils/types/Frontmatter';
 import { SITE } from '@config';
 import { Translations, Lang } from '@util/Languages';
@@ -16,20 +16,17 @@ const { lang } = Astro.props as Props;
 const _ = Lang(lang);
 
 // Logic
-const cache = new Cache(SITE.cacheMaxAge);
-const posts = new Posts(cache);
-const urlFormatter = new UrlFormatter(SITE.url);
-const navigation = new Navigation(posts, urlFormatter);
+const accelerator = new Accelerator(SITE);
 
 const currentUrl = new URL(Astro.request.url);
-const navPages = navigation.breadcrumbs(currentUrl, SITE.subfolder);
+const navPages = accelerator.navigation.breadcrumbs(currentUrl, SITE.subfolder);
 ---
 <nav class="site-breadcrumbs" aria-label={ _(Translations.aria.breadcrumbs) }>
   <ol vocab="http://schema.org/" typeof="BreadcrumbList">
     {navPages.map((page, index) => (
     <li property="itemListElement" typeof="ListItem">
       <meta property="position" content={ index.toString() } />
-      <a property="item" typeof="WebPage" href={ urlFormatter.addSlashToAddress(page.url) } aria-current={ page.ariaCurrent } rel={ page.rel }><span property="name">{ page.title }</span></a>
+      <a property="item" typeof="WebPage" href={ accelerator.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/Footer.astro

@@ -1,5 +1,5 @@
 ---
-import { FooterMenu } from 'astro-accelerator-utils';
+import { Accelerator } from 'astro-accelerator-utils';
 import type { Frontmatter } from 'astro-accelerator-utils/types/Frontmatter';
 import { SITE } from '@config';
 import { Translations, Lang } from '@util/Languages';
@@ -18,8 +18,10 @@ const { lang } = Astro.props as Props;
 const _ = Lang(lang);
 
 // Logic
+const accelerator = new Accelerator(SITE);
+
 const currentUrl = new URL(Astro.request.url);
-const pages = await FooterMenu.getMenu(currentUrl, _, Translations, SITE, menu);
+const pages = accelerator.navigation.footer(currentUrl, _, Translations, SITE.subfolder, menu);
 ---
 <footer class="site-footer" id="site-footer">
   <div class="footer-columns">

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

@@ -1,5 +1,5 @@
 ---
-import { PostFiltering, Cache, Posts, UrlFormatter } from 'astro-accelerator-utils';
+import { PostFiltering, Accelerator } from 'astro-accelerator-utils';
 import type { Frontmatter } from 'astro-accelerator-utils/types/Frontmatter';
 import { SITE } from '@config';
 import { Translations, Lang } from '@util/Languages';
@@ -16,11 +16,9 @@ const { lang } = Astro.props as Props;
 const _ = Lang(lang);
 
 // Logic
-const cache = new Cache(SITE.cacheMaxAge);
-const posts = new Posts(cache);
-const urlFormatter = new UrlFormatter(SITE.url);
+const accelerator = new Accelerator(SITE);
 
-const search = posts.all().filter(PostFiltering.isSearch).shift() ?? null;
+const search = accelerator.posts.all().filter(PostFiltering.isSearch).shift() ?? null;
 ---
 <header class="site-header">
   <a href="#site-nav" class="navigation-icon" title={ _(Translations.header.open_menu) }><svg xmlns="http://www.w3.org/2000/svg" 
@@ -33,7 +31,7 @@ const search = posts.all().filter(PostFiltering.isSearch).shift() ?? null;
   </svg></a>
   <a href={ (SITE.subfolder ?? '') + '/' } class="site-title" translate="no">{ SITE.title }</a>
   {search != null &&
-  <a href={ urlFormatter.addSlashToAddress(search.url) } class="search-icon" title={ _(Translations.header.open_search) }><svg xmlns="http://www.w3.org/2000/svg" 
+  <a href={ accelerator.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, UrlFormatter } from 'astro-accelerator-utils';
+import { Accelerator } from 'astro-accelerator-utils';
 import type { Frontmatter } from 'astro-accelerator-utils/types/Frontmatter';
 import { SITE, OPEN_GRAPH, HEADER_SCRIPTS } from '@config';
 
@@ -12,15 +12,14 @@ type Props = {
 const { frontmatter } = Astro.props;
 
 // Logic
-const urlFormatter = new UrlFormatter(SITE.url);
-const markdown = new Markdown();
+const accelerator = new Accelerator(SITE);
 
 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 =  urlFormatter.addSlashToUrl(new URL(Astro.url.pathname, Astro.site + SITE.subfolder));
-const socialTitle = await markdown.getTextFrom(frontmatter.title);
+const canonicalURL =  accelerator.urlFormatter.addSlashToUrl(new URL(Astro.url.pathname, Astro.site + SITE.subfolder));
+const socialTitle = await accelerator.markdown.getTextFrom(frontmatter.title);
 const title = `${ socialTitle } | ${ SITE.title }`;
 ---
 <head>

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

@@ -1,5 +1,5 @@
 ---
-import { Cache, Navigation, Posts, UrlFormatter } from 'astro-accelerator-utils';
+import { Accelerator } from 'astro-accelerator-utils';
 import { Translations, Lang } from '@util/Languages';
 import NavigationItem from '@components/NavigationItem.astro';
 import { SITE } from '@config';
@@ -15,13 +15,10 @@ const { lang } = Astro.props as Props;
 const _ = Lang(lang);
 
 // Logic
-const cache = new Cache(SITE.cacheMaxAge);
-const posts = new Posts(cache);
-const urlFormatter = new UrlFormatter(SITE.url);
-const navigation = new Navigation(posts, urlFormatter);
+const accelerator = new Accelerator(SITE);
 
 const currentUrl = new URL(Astro.request.url);
-const pages = navigation.menu(currentUrl, SITE.subfolder, menu);
+const pages = accelerator.navigation.menu(currentUrl, SITE.subfolder, menu);
 ---
 <nav class="site-nav" id="site-nav" aria-label={ _(Translations.aria.site_navigation) }>
   <h2 class="site-nav-title">{ _(Translations.navigation.title) }</h2>

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

@@ -1,5 +1,5 @@
 ---
-import { Cache, Navigation, Posts, UrlFormatter } from 'astro-accelerator-utils';
+import { Accelerator } from 'astro-accelerator-utils';
 import { Translations, Lang } from '@util/Languages';
 import { SITE } from '@config';
 import { menu } from '@data/navigation';
@@ -14,13 +14,10 @@ const { lang } = Astro.props as Props;
 const _ = Lang(lang);
 
 // Logic
-const cache = new Cache(SITE.cacheMaxAge);
-const posts = new Posts(cache);
-const urlFormatter = new UrlFormatter(SITE.url);
-const navigation = new Navigation(posts, urlFormatter);
+const accelerator = new Accelerator(SITE);
 
 const currentUrl = new URL(Astro.request.url);
-const pages = navigation.menu(currentUrl, SITE.subfolder, menu);
+const pages = accelerator.navigation.menu(currentUrl, SITE.subfolder, menu);
 ---
 <nav class="site-nav-bar" id="site-nav" aria-label={ _(Translations.aria.site_navigation) }>
   <h2 class="site-nav-title">{ _(Translations.navigation.title) }</h2>

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

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

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

@@ -1,6 +1,6 @@
 ---
-import { UrlFormatter } from 'astro-accelerator-utils';
-import type { Link } from 'astro-accelerator-utils/types/Link';
+import { Accelerator } from 'astro-accelerator-utils';
+import type { Link } from 'astro-accelerator-utils/lib/v1/paging.mjs';
 import { SITE } from '@config';
 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);
+const accelerator = new Accelerator(SITE);
 ---
 <nav class="post-paging" aria-label={ _(Translations.aria.paging) }>
   {page.url.prev
-    ? <a href={ urlFormatter.addSlashToAddress(page.url.prev) }>{ _(Translations.articles.previous) }</a>
+    ? <a href={ accelerator.urlFormatter.addSlashToAddress(page.url.prev) }>{ _(Translations.articles.previous) }</a>
     : <span>{ _(Translations.articles.previous) }</span>}
   {pageLinks.map((link) => (
-      <a href={ urlFormatter.addSlashToAddress(link.url) } aria-current={ link.ariaCurrent } class={ link.class }>{ link.title }</a>
+      <a href={ accelerator.urlFormatter.addSlashToAddress(link.url) } aria-current={ link.ariaCurrent } class={ link.class }>{ link.title }</a>
   ))}
   {page.url.next
-    ? <a href={ urlFormatter.addSlashToAddress(page.url.next) }>{ _(Translations.articles.next) }</a>
+    ? <a href={ accelerator.urlFormatter.addSlashToAddress(page.url.next) }>{ _(Translations.articles.next) }</a>
     : <span>{ _(Translations.articles.next) }</span>}
   </nav>

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

@@ -1,5 +1,5 @@
 ---
-import { PostFiltering, PostOrdering, Cache, Posts, UrlFormatter } from 'astro-accelerator-utils';
+import { PostFiltering, PostOrdering, Accelerator } from 'astro-accelerator-utils';
 import type { Frontmatter } from 'astro-accelerator-utils/types/Frontmatter';
 import { SITE } from '@config';
 import type { MarkdownInstance } from 'astro';
@@ -16,15 +16,13 @@ type Props = {
 const { lang, frontmatter, headings } = Astro.props as Props;
 
 // Logic
-const cache = new Cache(SITE.cacheMaxAge);
-const posts = new Posts(cache);
-const urlFormatter = new UrlFormatter(SITE.url);
+const accelerator = new Accelerator(SITE);
 
 let relatedPosts: MarkdownInstance<Record<string, any>>[] = [];
 const parentCagory = (frontmatter.categories ?? [null])[0];
 
 if (parentCagory != null) {
-  const allPages = posts.all().filter(PostFiltering.isListable);
+  const allPages = accelerator.posts.all().filter(PostFiltering.isListable);
   const allPosts = allPages
     .filter(p => p.frontmatter.title != frontmatter.title && p.frontmatter.categories && p.frontmatter.categories.includes(parentCagory))
     .sort(PostOrdering.sortByPubDateDesc)
@@ -57,7 +55,7 @@ const articles = relatedPosts.map(p => {
 {articles.length > 0 &&
 <ul class="post-list anim-show-parent">
   {articles.map((post) => (
-  <li class="list-item" data-destination={ urlFormatter.addSlashToAddress(post.url) } data-image={ (post.frontmatter.bannerImage?.src.length > 0).toString() }>
+  <li class="list-item" data-destination={ accelerator.urlFormatter.addSlashToAddress(post.url) } data-image={ (post.frontmatter.bannerImage?.src.length > 0).toString() }>
     <article>
       <div class="list-item-image">
       {post.img && (
@@ -72,7 +70,7 @@ const articles = relatedPosts.map(p => {
       </div>
       <div class="list-item-content">
         <h3>
-          <a href={ urlFormatter.addSlashToAddress(post.url) }>{ post.frontmatter.title }</a>
+          <a href={ accelerator.urlFormatter.addSlashToAddress(post.url) }>{ post.frontmatter.title }</a>
         </h3>
         <AuthorsMini lang={ lang } frontmatter={ post.frontmatter as Frontmatter } />
       </div>

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

@@ -1,5 +1,5 @@
 ---
-import { Taxonomy } from 'astro-accelerator-utils';
+import { Accelerator } from 'astro-accelerator-utils';
 import type { Frontmatter } from 'astro-accelerator-utils/types/Frontmatter';
 import { Translations, Lang } from '@util/Languages';
 import { SITE } from '@config';
@@ -15,10 +15,12 @@ const { lang, frontmatter } = Astro.props as Props;
 const _ = Lang(lang);
 
 // Logic
+const accelerator = new Accelerator(SITE);
+
 const categories = frontmatter.categories ?? [];
 const tags = frontmatter.tags ?? [];
 
-const links = Taxonomy.taxonomyLinks(Translations, _, SITE);
+const links = accelerator.taxonomy.links(Translations, _, SITE.subfolder);
 const hasTaxonomy = (categories.length + tags.length) > 0;
 ---
 {hasTaxonomy && (

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

@@ -1,5 +1,5 @@
 ---
-import { UrlFormatter } from 'astro-accelerator-utils';
+import { Accelerator } from 'astro-accelerator-utils';
 import type { Frontmatter } from 'astro-accelerator-utils/types/Frontmatter';
 import { SITE } from '@config';
 import Redirect from './Redirect.astro';
@@ -13,10 +13,10 @@ const { frontmatter, headings } = Astro.props as Props;
 const lang = frontmatter.lang ?? SITE.default.lang;
 
 // Logic
-const urlFormatter = new UrlFormatter(SITE.url);
+const accelerator = new Accelerator(SITE);
 const redirectFrontmatter = { 
     ...frontmatter,
-    redirect: urlFormatter.addSlashToAddress(Astro.request.url) + '1/'
+    redirect: accelerator.urlFormatter.addSlashToAddress(Astro.request.url) + '1/'
 };
 ---
 <Redirect frontmatter={ redirectFrontmatter } headings={ headings } />

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

@@ -1,5 +1,5 @@
 ---
-import { Markdown } from 'astro-accelerator-utils';
+import { Accelerator } from 'astro-accelerator-utils';
 import type { Frontmatter } from 'astro-accelerator-utils/types/Frontmatter';
 import { SITE } from '@config';
 import Head from '@components/HtmlHead.astro';
@@ -23,11 +23,11 @@ const lang = frontmatter.lang ?? SITE.default.lang;
 const textDirection = frontmatter.dir ?? SITE.default.dir;
 
 // Logic
-const markdown = new Markdown();
+const accelerator = new Accelerator(SITE);
 
-const title = await markdown.getInlineHtmlFrom(frontmatter.title ?? SITE.title);
+const title = await accelerator.markdown.getInlineHtmlFrom(frontmatter.title ?? SITE.title);
 const subtitle = frontmatter.subtitle
-    ? await markdown.getInlineHtmlFrom(frontmatter.subtitle)
+    ? await accelerator.markdown.getInlineHtmlFrom(frontmatter.subtitle)
     : null;
 
 const site_url = SITE.url;

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

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