astro-accelerator 0.0.27 → 0.0.28

package/package.json

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

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

@@ -1,9 +1,9 @@
 ---
-import { Dates, Urls } from 'astro-accelerator-utils';
+import { Dates, Urls, PostQueries } from 'astro-accelerator-utils';
 import { SITE, Frontmatter } from '@config';
 import { Translations, Lang } from '@util/Languages';
-import { getAuthorList } from '@util/Authors';
 import { getImageInfo } from '@util/custom-markdown.mjs';
+import { fetchPages } from '@util/PageQueries';
 
 // Properties
 type Props = {
@@ -16,11 +16,12 @@ const { lang, frontmatter } = Astro.props as Props;
 const _ = Lang(lang);
 
 // Logic
-const authorList = await getAuthorList(frontmatter);
+const authorList = await PostQueries.getAuthors(fetchPages, frontmatter);
 
-const author = authorList.writers.slice(0, 1)[0];
-const authorImage = authorList?.image?.src ? getImageInfo(authorList.image.src, 'author-image', SITE.images.authorSize) : null;
-const contributors = authorList.writers.slice(1);
+// Get image info
+const authorImage = authorList?.image?.src 
+  ? getImageInfo(authorList.image.src, 'author-image', SITE.images.authorSize)
+  : null;
 ---
 {authorList.writers.length > 0 && 
 <div class="post-meta">
@@ -34,9 +35,9 @@ const contributors = authorList.writers.slice(1);
   }
   <div class="author-info">
     <span>{ _(Translations.post.written_by) }
-      {author &&
-        <a href={ Urls.addSlashToAddress(author.url, SITE) + '1/' } itemprop="author">{ author.frontmatter.title }</a>
-      }{contributors.map((writer) => (
+      {authorList.mainAuthor &&
+        <a href={ Urls.addSlashToAddress(authorList.mainAuthor.url, SITE) + '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>
       ))}.
       <br /><time datetime={ frontmatter.pubDate.toString() } itemprop="datePublished">

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

@@ -1,8 +1,8 @@
 ---
+import { Dates, PostQueries } from 'astro-accelerator-utils';
 import { SITE, Frontmatter } from '@config';
 import { Translations, Lang } from '@util/Languages';;
-import { Dates } from 'astro-accelerator-utils';
-import { getAuthorList } from '@util/Authors';
+import { fetchPages } from '@util/PageQueries';
 
 // Properties
 type Props = {
@@ -15,7 +15,7 @@ const { lang, frontmatter } = Astro.props as Props;
 const _ = Lang(lang);
 
 // Logic
-const authorList = await getAuthorList(frontmatter);
+const authorList = await PostQueries.getAuthors(fetchPages, frontmatter);
 ---
 {authorList.writers.length > 0 && 
 <div class="post-meta">

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

@@ -2,8 +2,8 @@ import type { MarkdownInstance } from "astro";
 import { SITE } from '@config';
 import { Cache, PostQueries, PostFiltering } from 'astro-accelerator-utils';
 
-export function fetchPages(): Record<string, any> {
-    return import.meta.glob("../../../pages/**/*.md", { eager: true });
+export function fetchPages(): MarkdownInstance<Record<string, any>>[] {
+    return import.meta.glob<any>("../../../pages/**/*.md", { eager: true }) as MarkdownInstance<Record<string, any>>[];
 }
 
 export type PagePredicate = (value: MarkdownInstance<Record<string, any>>, index: number, array: MarkdownInstance<Record<string, any>>[]) => boolean;

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

@@ -1,45 +0,0 @@
-import type { MarkdownInstance } from 'astro';
-import { PostQueries, PostFiltering } from "astro-accelerator-utils";
-import type { Frontmatter } from '@config';
-import { fetchPages } from "@util/PageQueries";
-
-type BannerImage = { src: string; alt: string } | null;
-type AuthorList = {
-    image: BannerImage | null;
-    writers: MarkdownInstance<Record<string, any>>[];
-};
-
-export async function getAuthors () {
-    const authors = await PostQueries.getPages(fetchPages, PostFiltering.isAuthor);
-    return authors;
-}
-
-export async function getAuthorList (frontmatter: Frontmatter) {
-    const authors = await getAuthors();
-
-    const result: AuthorList = {
-        image: null,
-        writers: [],
-    };
-
-    (frontmatter.authors ?? []).forEach((a) => {
-        const matches = authors.filter((x) => x.frontmatter.id == a);
-
-        if (matches.length == 0) {
-            console.warn("Unknown author", a);
-        }
-
-        if (matches.length > 1) {
-            console.warn("Multiple authors with id", a);
-        }
-
-        if (matches.length == 1) {
-            result.writers.push(matches[0]);
-            if (result.image == null) {
-                result.image = matches[0].frontmatter.bannerImage;
-            }
-        }
-    });
-
-    return result;
-}