Break out utils file

Each function in its own file as a default export

src/components/PostCard.astro

@@ -1,7 +1,8 @@
 ---
 import type { CollectionEntry } from "astro:content";
-import { getPostDate, formatPostDate } from "../utils/utils";
 import renderInlineMarkdown from "../utils/renderInlineMarkdown";
+import formatPostDate from "../utils/formatPostDate";
+import getPostDate from "../utils/getPostDate";
 
 export type Props = {
   post: CollectionEntry<"posts">;

src/components/SiteNavHeader.astro

@@ -1,5 +1,5 @@
 ---
-import { trimTrailingSlash } from "../utils/utils";
+import trimTrailingSlash from "../utils/trimTrailingSlash";
 import Logo from "./Logo.astro";
 
 const isCurrent = (path: string) =>

src/layouts/Post.astro

@@ -3,15 +3,12 @@ import { type CollectionEntry } from "astro:content";
 import Layout from "./Base.astro";
 import MungedEmail from "../components/MungedEmail.astro";
 import ShareLinks from "../components/ShareLinks.astro";
-import {
-  countWords,
-  formatPostDate,
-  getPostDate,
-  type WithNextAndPrev,
-} from "../utils/utils";
 import NextPrevLinks from "../components/NextPrevLinks.astro";
-import renderInlineMarkdown from "../utils/renderInlineMarkdown";
 import PostDescription from "../components/PostDescription.astro";
+import type { WithNextAndPrev } from "../utils/toWithNextAndPrev";
+import countWords from "../utils/countWords";
+import formatPostDate from "../utils/formatPostDate";
+import getPostDate from "../utils/getPostDate";
 
 export type Props = {
   post: WithNextAndPrev<CollectionEntry<"posts">>;

src/pages/feeds/feed.json.ts

@@ -1,6 +1,11 @@
 import metadata from '../../content/_metadata';
 import { getCollection } from 'astro:content';
-import { filterOutDraftsIfProduction, formatDateIso, getPostDate, sortByDate, renderMarkdown, getCategory } from '../../utils/utils';
+import formatDateIso from '../../utils/formatDateIso';
+import getPostDate from "../../utils/getPostDate";
+import sortByDate from "../../utils/sortByDate";
+import filterOutDraftsIfProduction from "../../utils/filterOutDraftsIfProduction";
+import getCategory from "../../utils/getCategory";
+import renderMarkdown from "../../utils/renderMarkdown";
 
 export async function GET(context) {
     const blog = sortByDate(filterOutDraftsIfProduction(await getCollection('posts')));

src/pages/feeds/feed.xml.ts

@@ -2,7 +2,11 @@ import rss from '@astrojs/rss';
 
 import metadata from '../../content/_metadata';
 import { getCollection } from 'astro:content';
-import { filterOutDraftsIfProduction, formatDateIso, getPostDate, renderMarkdown, sortByDate } from '../../utils/utils';
+import formatDateIso from '../../utils/formatDateIso';
+import getPostDate from "../../utils/getPostDate";
+import sortByDate from "../../utils/sortByDate";
+import filterOutDraftsIfProduction from "../../utils/filterOutDraftsIfProduction";
+import renderMarkdown from "../../utils/renderMarkdown";
 
 export async function GET(context) {
     const blog = sortByDate(filterOutDraftsIfProduction(await getCollection('posts')));

src/pages/index.astro

@@ -1,8 +1,11 @@
 ---
 import { getCollection } from "astro:content";
 import Layout from "../layouts/Home.astro";
-import { filterOutDraftsIfProduction, firstFive, labelDrafts, sortByDate } from "../utils/utils";
 import metadata from "../content/_metadata";
+import filterOutDraftsIfProduction from "../utils/filterOutDraftsIfProduction";
+import firstFive from "../utils/firstFive";
+import labelDrafts from "../utils/labelDrafts";
+import sortByDate from "../utils/sortByDate";
 
 const { title, description } = metadata;
 

src/pages/og-images/[...collectionAndSlug].png.ts

@@ -1,7 +1,10 @@
 import { getCollection, getEntryBySlug, type ContentCollectionKey, type CollectionEntry } from "astro:content";
 import type { APIRoute } from "astro";
 
-import { labelDrafts, sortByDate, filterOutDraftsIfProduction, getCategory } from "../../utils/utils";
+import sortByDate from "../../utils/sortByDate";
+import filterOutDraftsIfProduction from "../../utils/filterOutDraftsIfProduction";
+import labelDrafts from "../../utils/labelDrafts";
+import getCategory from "../../utils/getCategory";
 import { renderImage } from "./_renderImage";
 
 export async function getStaticPaths() {

src/pages/og-images/_renderImage.ts

@@ -5,7 +5,7 @@ import sharp from "sharp";
 import styles from './_styles.css?raw';
 import faustinaRaw from '@fontsource/faustina/files/faustina-latin-400-normal.woff';
 import figtreeRaw from '@fontsource/figtree/files/figtree-latin-700-normal.woff';
-import { formatPostDate } from "../../utils/utils";
+import formatPostDate from "../../utils/formatPostDate";
 
 // They already are Buffers because of the custom rawFonts Vite plugin in astro.config.js, but TS doesn't know that
 const figtree = figtreeRaw as unknown as Buffer;

src/pages/posts/[...post].astro

@@ -1,14 +1,11 @@
 ---
 import Layout from "../../layouts/Post.astro";
 import { type CollectionEntry, getCollection } from "astro:content";
-import {
-  filterOutDraftsIfProduction,
-  getCategory,
-  labelDrafts,
-  sortByDate,
-  toWithNextAndPrev,
-type WithNextAndPrev,
-} from "../../utils/utils";
+import filterOutDraftsIfProduction from "../../utils/filterOutDraftsIfProduction";
+import getCategory from "../../utils/getCategory";
+import labelDrafts from "../../utils/labelDrafts";
+import sortByDate from "../../utils/sortByDate";
+import toWithNextAndPrev, { type WithNextAndPrev } from "../../utils/toWithNextAndPrev";
 
 export async function getStaticPaths() {
   const posts = await getCollection("posts");

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

@@ -2,7 +2,11 @@
 import type { GetStaticPaths } from "astro";
 import { getCollection, type CollectionEntry } from "astro:content";
 import Layout from "../../../layouts/Category.astro";
-import { checkCategory, filterOutDraftsIfProduction, getCategory, labelDrafts, sortByDate } from "../../../utils/utils";
+import checkCategory from "../../../utils/checkCategory";
+import filterOutDraftsIfProduction from "../../../utils/filterOutDraftsIfProduction";
+import getCategory from "../../../utils/getCategory";
+import labelDrafts from "../../../utils/labelDrafts";
+import sortByDate from "../../../utils/sortByDate";
 
 export type Props = {
     page: {

src/pages/posts/[page].astro

@@ -2,8 +2,10 @@
 import type { GetStaticPaths } from "astro";
 import { getCollection, type CollectionEntry } from "astro:content";
 import Layout from "../../layouts/Category.astro";
-import { filterOutDraftsIfProduction, labelDrafts, sortByDate } from "../../utils/utils";
 import category from '../../content/_allPostsCategory';
+import filterOutDraftsIfProduction from "../../utils/filterOutDraftsIfProduction";
+import labelDrafts from "../../utils/labelDrafts";
+import sortByDate from "../../utils/sortByDate";
 
 export type Props = {
     page: {

src/utils/checkCategory.ts

@@ -0,0 +1,5 @@
+import { type CollectionEntry } from "astro:content";
+
+export default function checkCategory(entry: CollectionEntry<'posts'>, knownCategorySlug: string) {
+    return entry.id.split('/').at(0) === knownCategorySlug;
+}

src/utils/countWords.ts

@@ -0,0 +1,6 @@
+// Adapted from Nunjuck's wordcount filter implementation
+
+export default function countWords(str: string): number {
+    const words = (str) ? str.match(/\w+/g) : null;
+    return (words) ? words.length : 0;
+}

src/utils/filterOutDraftsIfProduction.ts

@@ -0,0 +1,10 @@
+import { type CollectionEntry } from "astro:content";
+import isDraft from "./isDraft";
+
+export default function filterOutDraftsIfProduction(entries: CollectionEntry<'posts'>[]): CollectionEntry<'posts'>[] {
+    const isProduction = (import.meta.env.MODE === 'production');
+    if (!isProduction) return entries;
+    return entries.filter(
+        (e: CollectionEntry<'posts'>) => !isDraft(e)
+    );
+}

src/utils/firstFive.ts

@@ -0,0 +1,4 @@
+
+export default function firstFive(collection: any[]) {
+    return collection.slice(0, 5);
+}

src/utils/formatDateIso.ts

@@ -0,0 +1,4 @@
+
+export default function formatDateIso(date: Date) {
+    return date.toISOString();
+}

src/utils/formatPostDate.ts

@@ -0,0 +1,5 @@
+import { DateTime } from "luxon";
+
+export default function formatPostDate(date: Date) {
+    return DateTime.fromJSDate(date).toLocaleString(DateTime.DATE_MED);
+}

src/utils/getCategory.ts

@@ -0,0 +1,8 @@
+import { getCollection, type CollectionEntry } from "astro:content";
+
+export default async function getCategory(entry: CollectionEntry<'posts'>): Promise<CollectionEntry<'categories'> | undefined> {
+    const categories = await getCollection('categories');
+    const category = entry.id.split('/').at(0);
+    if (!category) return undefined;
+    return categories.find(c => c.id === category);
+}

src/utils/getPostDate.ts

@@ -0,0 +1,10 @@
+import { type CollectionEntry } from "astro:content";
+
+const now = new Date();
+
+export default function getPostDate(entry: CollectionEntry<'posts'>) {
+    if (entry.data.date) {
+        return entry.data.date;
+    }
+    else return now;
+}

src/utils/isDraft.ts

@@ -0,0 +1,7 @@
+import { type CollectionEntry } from "astro:content";
+
+const now = new Date();
+
+export default function isDraft(entry: CollectionEntry<'posts'>): boolean {
+    return !(entry.data.date && entry.data.date < now);
+}

src/utils/labelDrafts.ts

@@ -0,0 +1,11 @@
+import { type CollectionEntry } from "astro:content";
+import isDraft from "./isDraft";
+
+
+export default function labelDrafts(entries: CollectionEntry<'posts'>[]): CollectionEntry<'posts'>[] {
+    const label = `[Draft]`;
+    return entries.map((e: CollectionEntry<'posts'>) => {
+        e.data.title = (isDraft(e) && !e.data.title.startsWith(label)) ? `${label} ${e.data.title}` : e.data.title;
+        return e;
+    });
+}

src/utils/renderMarkdown.ts

@@ -0,0 +1,17 @@
+import sanitizeHtml from 'sanitize-html';
+import MarkdownIt from 'markdown-it';
+import anchor from 'markdown-it-anchor';
+import footnote from 'markdown-it-footnote';
+
+const parser = new MarkdownIt({
+    html: true,
+    typographer: true
+}).use(anchor, {
+    permalink: anchor.permalink.headerLink({
+        safariReaderFix: true
+    })
+}).use(footnote);
+
+export default function renderMarkdown(markdown: string) {
+    return sanitizeHtml(parser.render(markdown));
+}

src/utils/sortByDate.ts

@@ -0,0 +1,8 @@
+import { type CollectionEntry } from "astro:content";
+import getPostDate from "./getPostDate";
+
+
+export default function sortByDate(entries: CollectionEntry<'posts'>[]): CollectionEntry<'posts'>[] {
+    return entries.sort(
+        (a, b) => getPostDate(b).getTime() - getPostDate(a).getTime());
+}

src/utils/toWithNextAndPrev.ts

@@ -0,0 +1,14 @@
+
+export type WithNextAndPrev<T> = {
+    item: T,
+    next?: T,
+    prev?: T
+}
+
+export default function toWithNextAndPrev<T>(items: T[], reverse: boolean = false): WithNextAndPrev<T>[] {
+    return items.map((t, i, a) => ({
+        item: t,
+        next: reverse ? a[i - 1] : a[i + 1],
+        prev: reverse ? a[i + 1] : a[i - 1]
+    }));
+}

src/utils/trimTrailingSlash.ts

@@ -0,0 +1,4 @@
+
+export default function trimTrailingSlash(str: string): string {
+    return str.replace(/\/$/, "");
+}

src/utils/unMarkdown.ts

@@ -0,0 +1,3 @@
+export default function unMarkdown(raw: string): string {
+    return raw?.replace(/[\*_`]/g, '')
+}