astro-accelerator 5.10.29 → 5.10.32

package/package.json

@@ -1,5 +1,5 @@
 {
-    "version": "5.10.29",
+    "version": "5.10.32",
     "author": "Steve Fenton",
     "name": "astro-accelerator",
     "description": "A super-lightweight, accessible, SEO-friendly starter project for Astro",
@@ -36,9 +36,9 @@
     "dependencies": {
         "@astrojs/mdx": "^4.3.13",
         "@img/sharp-linux-x64": "^0.34.5",
-        "astro": "^5.16.7",
-        "astro-accelerator-utils": "^0.3.64",
-        "cspell": "^9.4.0",
+        "astro": "^5.16.11",
+        "astro-accelerator-utils": "^0.3.67",
+        "cspell": "^9.6.0",
         "csv": "^6.4.1",
         "glob": "^13.0.0",
         "hast-util-from-selector": "^3.0.1",

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

@@ -55,7 +55,7 @@ export async function getData() {
   const data: CategoryData = { posts: [], categories: []};
 
   data.posts = sourcePosts
-    .filter(PostFiltering.isListable)
+    .filter(PostFiltering.forTaxonomy)
     .sort(PostOrdering.sortByPubDateDesc);
 
     data.posts.forEach(p => {

package/src/pages/search.json.ts

@@ -5,7 +5,7 @@
 import { Accelerator, PostFiltering } from 'astro-accelerator-utils';
 import type { MarkdownInstance } from 'astro';
 import { SITE } from '@config';
-import { htmlToText, convert } from 'html-to-text';
+import { convert } from 'html-to-text';
 import keywordExtractor from 'keyword-extractor';
 
 const getData = async () => {

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

@@ -2,23 +2,27 @@
 // warning: This file is overwritten by Astro Accelerator
 
 // For listing by frontmatter.tags
-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 'src/layouts/Default.astro';
-import ArticleList from '@components/ArticleList.astro';
-import PagingLinks from '@components/PagingLinks.astro';
+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 "src/layouts/Default.astro";
+import ArticleList from "@components/ArticleList.astro";
+import PagingLinks from "@components/PagingLinks.astro";
 
 const accelerator = new Accelerator(SITE);
-const stats = new accelerator.statistics('pages/authors/[tag]/[page].astro');
+const stats = new accelerator.statistics("pages/authors/[tag]/[page].astro");
 stats.start();
 
 const lang = SITE.default.lang;
 const currentUrl = new URL(Astro.request.url);
-const slug = currentUrl.pathname.split('/')[3];
+const slug = currentUrl.pathname.split("/")[3];
 
 // Language
 const _ = Lang(lang);
@@ -27,43 +31,45 @@ const _ = Lang(lang);
 type Props = {
   title: string;
   page: Page<MarkdownInstance>;
-  headings: { depth: number; slug: string; text: string; }[];
+  headings: { depth: number; slug: string; text: string }[];
   pubDate: Date;
 };
 const { title, page, headings, pubDate } = Astro.props satisfies Props;
 
 // Enhance the title
-const pageTitle = `${_(Translations.articles.archive_title).replace('{name}', title)} - ${_(Translations.articles.page_title).replace('{n}', page.currentPage.toString())}`;
+const pageTitle = `${_(Translations.articles.archive_title).replace("{name}", title)} - ${_(Translations.articles.page_title).replace("{n}", page.currentPage.toString())}`;
 
 const frontmatter: Frontmatter = {
-  layout: 'src/layouts/Default.astro',
+  layout: "src/layouts/Default.astro",
   title: pageTitle,
   keywords: `${slug},articles`,
   description: `${SITE.title} ${slug} articles.`,
-  pubDate: pubDate
+  pubDate: pubDate,
 };
 
 // Logic
 type CacheData = {
   posts: MarkdownInstance[];
   tags: string[];
-}
+};
 
 export async function getData() {
-  const sourcePosts = Object.values(import.meta.glob('../../**/*.md*', { eager: true })) satisfies MarkdownInstance[];
-    
-  const data: CacheData = { posts: [], tags: []};
+  const sourcePosts = Object.values(
+    import.meta.glob("../../**/*.md*", { eager: true })
+  ) satisfies MarkdownInstance[];
+
+  const data: CacheData = { posts: [], tags: [] };
 
   data.posts = sourcePosts
-    .filter(PostFiltering.isListable)
+    .filter(PostFiltering.forTaxonomy)
     .sort(PostOrdering.sortByPubDateDesc);
 
-    data.posts.forEach(p => {
+  data.posts.forEach((p) => {
     const auths: string[] = p.frontmatter.tags ?? [];
     if (auths.length == 0) {
-      console.log('No categories found', p.url);
+      console.log("No categories found", p.url);
     }
-    auths.forEach(a => {
+    auths.forEach((a) => {
       if (!data.tags.includes(a)) {
         data.tags.push(a);
       }
@@ -76,30 +82,37 @@ export async function getData() {
 export async function getStaticPaths({ paginate }: any) {
   let data = await getData();
 
-  return data.tags.map(t => {
-    const filtered = data.posts.filter(p => {
-      const tags: string[] = p.frontmatter.tags ?? [];
-      return tags.includes(t);
-    });
-    return paginate(filtered, {
-      params: { tag: t.toLowerCase().replace(/ /g, '-') },
-      props: { title: t, pubDate: filtered[0].frontmatter.pubDate },
-      pageSize: SITE.pageSize 
-    });
-  }).flat();
+  return data.tags
+    .map((t) => {
+      const filtered = data.posts.filter((p) => {
+        const tags: string[] = p.frontmatter.tags ?? [];
+        return tags.includes(t);
+      });
+      return paginate(filtered, {
+        params: { tag: t.toLowerCase().replace(/ /g, "-") },
+        props: { title: t, pubDate: filtered[0].frontmatter.pubDate },
+        pageSize: SITE.pageSize,
+      });
+    })
+    .flat();
 }
 
 // Page Links
-const pageLinks = accelerator.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
+);
 
 // Breadcrumbs
-const breadcrumbs: { url: string; title: string; ariaCurrent?: string; }[] = []
+const breadcrumbs: { url: string; title: string; ariaCurrent?: string }[] = [];
 
 if (page.url.current == pageLinks[0].url) {
   breadcrumbs.push({
     url: pageLinks[0].url as string,
     title: title,
-    ariaCurrent: 'page'
+    ariaCurrent: "page",
   });
 }
 
@@ -111,14 +124,21 @@ if (page.url.current != pageLinks[0].url) {
 
   breadcrumbs.push({
     url: page.url.current,
-    title: _(Translations.articles.page_title).replace('{n}', page.currentPage.toString()),
-    ariaCurrent: 'page',
+    title: _(Translations.articles.page_title).replace(
+      "{n}",
+      page.currentPage.toString()
+    ),
+    ariaCurrent: "page",
   });
 }
 
 stats.stop();
 ---
-<Default frontmatter={ frontmatter } headings={ headings } breadcrumbs={ breadcrumbs }>
-  <ArticleList lang={ lang } posts={ page.data } />
-  <PagingLinks lang={ lang } page={ page } pageLinks={ pageLinks } />
-</Default>
+
+<Default
+  frontmatter={frontmatter}
+  headings={headings}
+  breadcrumbs={breadcrumbs}>
+  <ArticleList lang={lang} posts={page.data} />
+  <PagingLinks lang={lang} page={page} pageLinks={pageLinks} />
+</Default>

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

@@ -1,21 +1,23 @@
 ---
 // warning: This file is overwritten by Astro Accelerator
 
-import { Accelerator } from 'astro-accelerator-utils';
-import type { Frontmatter } from 'astro-accelerator-utils/types/Frontmatter';
-import type { MarkdownInstance } from 'astro';
-import { SITE } from '@config';
-import { getImageInfo } from '@util/custom-markdown.mjs';
-import AuthorsMini from '@components/AuthorsMini.astro';
+import { Accelerator, PostFiltering } from "astro-accelerator-utils";
+import type { Frontmatter } from "astro-accelerator-utils/types/Frontmatter";
+import type { MarkdownInstance } from "astro";
+import { SITE } from "@config";
+import { getImageInfo } from "@util/custom-markdown.mjs";
+import AuthorsMini from "@components/AuthorsMini.astro";
 
 const accelerator = new Accelerator(SITE);
-const stats = new accelerator.statistics('accelerator/components/ArticleList.astro');
+const stats = new accelerator.statistics(
+  "accelerator/components/ArticleList.astro"
+);
 stats.start();
 
 // Properties
 type Props = {
   lang: string;
-  posts: MarkdownInstance<Record<string, any>>[]
+  posts: MarkdownInstance<Record<string, any>>[];
 };
 const { lang, posts } = Astro.props satisfies Props;
 
@@ -28,7 +30,7 @@ type ImageInfo = {
   metadata: {
     width: number;
     height: number;
-  }
+  };
 };
 
 type Article = {
@@ -40,53 +42,63 @@ type Article = {
 
 const articles: Article[] = [];
 
-for (let p of posts) {
+for (let p of posts.filter(PostFiltering.isListable)) {
   const item = {
-    url: p.url ?? '',
+    url: p.url ?? "",
     title: await accelerator.markdown.getTextFrom(p.frontmatter?.title),
     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,
   };
 
-  articles.push(item)
+  articles.push(item);
 }
 
 let articleIndex = 0;
 function getLoadingAttribute() {
   articleIndex++;
-  return articleIndex > 2
-    ? 'lazy'
-    : 'eager';
+  return articleIndex > 2 ? "lazy" : "eager";
 }
 
 stats.stop();
 ---
+
 <ul class="post-list anim-show-parent">
-  {articles.map((post) => (
-  <li class="list-item" data-destination={ accelerator.urlFormatter.formatAddress(post.url) } data-image={ (post.frontmatter.bannerImage?.src.length > 0).toString() }>
-    <article>
-      <div class="list-item-image">
-      {post.img && (
-        <img
-          srcset={ post.img.srcset }
-          sizes={ post.img.sizes }
-          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">
-        <h2>
-          <a href={ accelerator.urlFormatter.formatAddress(post.url) }>{ post.title }</a>
-        </h2>
-        <AuthorsMini lang={ lang } frontmatter={ post.frontmatter satisfies Frontmatter } />
-      </div>
-    </article>
-  </li>
-  ))}
-</ul>
+  {
+    articles.map((post) => (
+      <li
+        class="list-item"
+        data-destination={accelerator.urlFormatter.formatAddress(post.url)}
+        data-image={(post.frontmatter.bannerImage?.src.length > 0).toString()}>
+        <article>
+          <div class="list-item-image">
+            {post.img && (
+              <img
+                srcset={post.img.srcset}
+                sizes={post.img.sizes}
+                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">
+            <h2>
+              <a href={accelerator.urlFormatter.formatAddress(post.url)}>
+                {post.title}
+              </a>
+            </h2>
+            <AuthorsMini
+              lang={lang}
+              frontmatter={post.frontmatter satisfies Frontmatter}
+            />
+          </div>
+        </article>
+      </li>
+    ))
+  }
+</ul>