@grove-dev/astro 0.6.1 → 0.8.0

package/src/server/collections.ts

@@ -1,10 +1,10 @@
-import type { Collection, CollectionEntry } from "@grove-dev/core";
-import { collectionSchema, findRelated, runCollection } from "@grove-dev/core";
-import { absoluteUrl, ogPath, type PageSeo, seoDescription, seoTitle } from "./seo.js";
+import type { Collection, CollectionEntry } from '@grove-dev/core';
+import { collectionSchema, findRelated, runCollection } from '@grove-dev/core';
+import { absoluteUrl, ogPath, type PageSeo, seoDescription, seoTitle } from './seo.js';
 
 // Collection YAML loading lives in @grove-dev/core (it also feeds the
 // sitemap and OG-image pipelines there); re-exported for page code.
-export { loadCollections } from "@grove-dev/core";
+export { loadCollections } from '@grove-dev/core';
 
 interface RouteHint {
   routeSlug?: string;
@@ -65,19 +65,18 @@ export function recordsToCollectionEntries(
   records: RawRecord[],
   site: RouteHint,
 ): CollectionEntry[] {
-  const routeSlug = site.routeSlug ?? site.blueprintConfig?.routeSlug ?? "projects";
+  const routeSlug = site.routeSlug ?? site.blueprintConfig?.routeSlug ?? 'projects';
   const out: CollectionEntry[] = [];
   for (const r of records) {
-    if (r.visibility === "hide") continue;
+    if (r.visibility === 'hide') continue;
     if (!r.slug) continue;
-    const categories = [
-      ...(r.category ? [r.category] : []),
-      ...(r.tags ?? []),
-    ].filter((value, index, self) => self.indexOf(value) === index);
+    const categories = [...(r.category ? [r.category] : []), ...(r.tags ?? [])].filter(
+      (value, index, self) => self.indexOf(value) === index,
+    );
     out.push({
       slug: r.slug,
       title: r.name ?? r.title ?? r.slug,
-      description: r.description ?? "",
+      description: r.description ?? '',
       url: `/${routeSlug}/${r.slug}/`,
       repoHref: r.repoUrl ?? r.links?.github,
       homepageHref: r.links?.website,
@@ -89,11 +88,7 @@ export function recordsToCollectionEntries(
       // If only `license` (singular, GitHub-synced) is present, mirror
       // it into the array so the filter still matches it.
       licenses:
-        r.licenses && r.licenses.length > 0
-          ? r.licenses
-          : r.license
-            ? [r.license]
-            : undefined,
+        r.licenses && r.licenses.length > 0 ? r.licenses : r.license ? [r.license] : undefined,
       status: r.visibility,
       stars: r.stars ?? r.github?.repository?.stargazers_count,
       forks: r.forks ?? r.github?.repository?.forks_count,
@@ -118,7 +113,7 @@ export interface CollectionPageModel {
     slug: string;
     title: string;
     description: string;
-    kind: "curated" | "generated";
+    kind: 'curated' | 'generated';
     selectionNote?: string;
     introduction?: string;
   };
@@ -140,7 +135,7 @@ export interface CollectionIndexModel {
     slug: string;
     title: string;
     description: string;
-    kind: "curated" | "generated";
+    kind: 'curated' | 'generated';
     count: number;
     url: string;
   }>;
@@ -151,14 +146,19 @@ export interface CollectionIndexModel {
 
 export interface CollectionTeaserModel {
   total: number;
-  collections: CollectionIndexModel["collections"];
+  collections: CollectionIndexModel['collections'];
 }
 
 export function getCollectionPageModel(
   collection: Collection,
   entries: CollectionEntry[],
   allCollections: Collection[],
-  site?: { name?: string; url?: string; siteUrl?: string; blueprintConfig?: { labelPlural?: string } },
+  site?: {
+    name?: string;
+    url?: string;
+    siteUrl?: string;
+    blueprintConfig?: { labelPlural?: string };
+  },
 ): CollectionPageModel {
   const result = runCollection(collection, entries);
   const related = findRelated(collection, allCollections, 4).map((c) => ({
@@ -166,9 +166,9 @@ export function getCollectionPageModel(
     title: c.title,
     url: `/collections/${c.slug}/`,
   }));
-  const siteUrl = (site?.siteUrl ?? site?.url ?? "https://example.com").replace(/\/$/, "");
-  const siteName = site?.name ?? "";
-  const plural = site?.blueprintConfig?.labelPlural ?? "items";
+  const siteUrl = (site?.siteUrl ?? site?.url ?? 'https://example.com').replace(/\/$/, '');
+  const siteName = site?.name ?? '';
+  const plural = site?.blueprintConfig?.labelPlural ?? 'items';
   const pageUrl = absoluteUrl(siteUrl, `collections/${collection.slug}/`);
   // CollectionPage + ItemList + BreadcrumbList. The ItemList is capped
   // at 50 entries to keep the payload bounded; search engines don't
@@ -178,13 +178,13 @@ export function getCollectionPageModel(
     name: collection.seo?.title ?? collection.title,
     description: collection.seo?.description ?? collection.description,
     items: result.entries.slice(0, 50).map((entry) => ({
-      url: entry.url.startsWith("http") ? entry.url : absoluteUrl(siteUrl, entry.url),
+      url: entry.url.startsWith('http') ? entry.url : absoluteUrl(siteUrl, entry.url),
       name: entry.title,
       ...(entry.description ? { description: entry.description } : {}),
     })),
     crumbs: [
-      { url: `${siteUrl}/`, name: "Home" },
-      { url: absoluteUrl(siteUrl, "collections/"), name: "Collections" },
+      { url: `${siteUrl}/`, name: 'Home' },
+      { url: absoluteUrl(siteUrl, 'collections/'), name: 'Collections' },
       { url: pageUrl, name: collection.title },
     ],
   });
@@ -195,11 +195,8 @@ export function getCollectionPageModel(
     title:
       collection.seo?.title ??
       seoTitle(`${collection.title} — ${result.entries.length} ${plural}`, siteName),
-    description: seoDescription(
-      collection.seo?.description,
-      collection.description,
-    ),
-    image: ogPath("collection", collection.slug),
+    description: seoDescription(collection.seo?.description, collection.description),
+    image: ogPath('collection', collection.slug),
     ...(siteName ? { imageAlt: `${collection.title} — ${siteName}` } : {}),
     jsonLd: jsonLd as unknown as Record<string, unknown>[],
     noindex: collection.seo?.index === false,
@@ -225,7 +222,12 @@ export function getCollectionPageModel(
 export function getCollectionIndexModel(
   collections: Collection[],
   entries: CollectionEntry[],
-  site?: { name?: string; url?: string; siteUrl?: string; blueprintConfig?: { labelPlural?: string } },
+  site?: {
+    name?: string;
+    url?: string;
+    siteUrl?: string;
+    blueprintConfig?: { labelPlural?: string };
+  },
 ): CollectionIndexModel {
   const rows = collections.map((c) => {
     const result = runCollection(c, entries);
@@ -240,20 +242,20 @@ export function getCollectionIndexModel(
   });
   let seo: PageSeo | undefined;
   if (site) {
-    const siteUrl = (site.siteUrl ?? site.url ?? "https://example.com").replace(/\/$/, "");
-    const siteName = site.name ?? "";
-    const plural = site.blueprintConfig?.labelPlural ?? "items";
-    const title = seoTitle("Collections", siteName);
+    const siteUrl = (site.siteUrl ?? site.url ?? 'https://example.com').replace(/\/$/, '');
+    const siteName = site.name ?? '';
+    const plural = site.blueprintConfig?.labelPlural ?? 'items';
+    const title = seoTitle('Collections', siteName);
     const description = seoDescription(
       undefined,
-      `${rows.length} curated and generated collections of ${plural} on ${siteName || "this site"} — hand-picked lists kept in sync with the source files.`,
+      `${rows.length} curated and generated collections of ${plural} on ${siteName || 'this site'} — hand-picked lists kept in sync with the source files.`,
     );
     seo = {
       title,
       description,
-      image: ogPath("default"),
+      image: ogPath('default'),
       jsonLd: collectionSchema({
-        url: absoluteUrl(siteUrl, "collections/"),
+        url: absoluteUrl(siteUrl, 'collections/'),
         name: title,
         description,
         items: rows.map((row) => ({
@@ -262,8 +264,8 @@ export function getCollectionIndexModel(
           ...(row.description ? { description: row.description } : {}),
         })),
         crumbs: [
-          { url: `${siteUrl}/`, name: "Home" },
-          { url: absoluteUrl(siteUrl, "collections/"), name: "Collections" },
+          { url: `${siteUrl}/`, name: 'Home' },
+          { url: absoluteUrl(siteUrl, 'collections/'), name: 'Collections' },
         ],
       }) as unknown as Record<string, unknown>[],
     };
@@ -300,7 +302,16 @@ export function getCollectionTeaserModel(
  * label without re-loading the collection YAML.
  */
 export function findCollectionsFor(
-  target: { slug?: string; stack?: string; stacks?: string[]; platforms?: string[]; licenses?: string[]; category?: string; visibility?: string; status?: string },
+  target: {
+    slug?: string;
+    stack?: string;
+    stacks?: string[];
+    platforms?: string[];
+    licenses?: string[];
+    category?: string;
+    visibility?: string;
+    status?: string;
+  },
   collections: Collection[],
   entries: CollectionEntry[],
 ): { slug: string; title: string; url: string }[] {

package/src/server/contrast.ts

@@ -9,16 +9,22 @@
  * values are plain hex.
  */
 
-const INK_950 = "#0a0a0a";
-const WHITE = "#ffffff";
+const INK_950 = '#0a0a0a';
+const WHITE = '#ffffff';
 const AA_NORMAL = 4.5;
 
 export type Rgb = [number, number, number];
 
 /** Parse #rgb / #rrggbb (also tolerates #rrggbbaa, alpha ignored). */
 export function hexToRgb(hex: string): Rgb | null {
-  const raw = hex.replace("#", "");
-  const full = raw.length === 3 ? raw.split("").map((c) => c + c).join("") : raw;
+  const raw = hex.replace('#', '');
+  const full =
+    raw.length === 3
+      ? raw
+          .split('')
+          .map((c) => c + c)
+          .join('')
+      : raw;
   if (!/^[0-9a-fA-F]{6}([0-9a-fA-F]{2})?$/.test(full)) return null;
   const int = Number.parseInt(full.slice(0, 6), 16);
   return [(int >> 16) & 255, (int >> 8) & 255, int & 255];
@@ -26,7 +32,7 @@ export function hexToRgb(hex: string): Rgb | null {
 
 export function rgbToHex([r, g, b]: Rgb): string {
   const clamp = (v: number) => Math.max(0, Math.min(255, Math.round(v)));
-  return `#${[r, g, b].map((v) => clamp(v).toString(16).padStart(2, "0")).join("")}`;
+  return `#${[r, g, b].map((v) => clamp(v).toString(16).padStart(2, '0')).join('')}`;
 }
 
 /** WCAG relative luminance (sRGB linearization, not the quick luma). */
@@ -104,14 +110,13 @@ export function derivePrimaryPalette(hex: string): PrimaryPalette | null {
   } else if (contrastRatio(hex, INK_950) >= AA_NORMAL) {
     solidForeground = INK_950;
   } else {
-    solid = adjustUntilAA(hex, "#000000", WHITE);
+    solid = adjustUntilAA(hex, '#000000', WHITE);
     solidForeground = WHITE;
   }
 
   const lifted = rgbToHex(mix(rgb, hexToRgb(WHITE) as Rgb, 0.28));
-  const dark = contrastRatio(lifted, INK_950) >= AA_NORMAL
-    ? lifted
-    : adjustUntilAA(lifted, WHITE, INK_950);
+  const dark =
+    contrastRatio(lifted, INK_950) >= AA_NORMAL ? lifted : adjustUntilAA(lifted, WHITE, INK_950);
 
   return { solid, solidForeground, dark, darkForeground: INK_950 };
 }

package/src/server/directory.ts

@@ -30,27 +30,28 @@
  *  resolution error, which is the correct signal — a build that
  *  silently renders an empty directory hides real config mistakes.
  */
+
+import { existsSync, readFileSync } from 'node:fs';
+import { dirname, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
 import fullPayload from '@grove/generated/records.full.json';
 import indexPayload from '@grove/generated/records.index.json';
 import siteConfigPayload from '@grove/generated/site-config.json';
-import { existsSync, readFileSync } from 'node:fs';
-import { fileURLToPath } from 'node:url';
-import { dirname, resolve } from 'node:path';
-import { marked } from 'marked';
-import sanitizeHtml from 'sanitize-html';
-import { getSingletonHighlighter } from 'shiki';
-import { prettySlug } from '../lib/display.js';
-import { headingSlug, readContentFile, stripFrontmatter, uniqueSlug } from '@grove-dev/core';
 import type {
-  ProjectRecord,
-  ResourceRecord,
   EntityRecord,
-  Resource,
-  IndexRecord,
+  IndexEntityRecord,
   IndexProjectRecord,
+  IndexRecord,
   IndexResourceRecord,
-  IndexEntityRecord,
+  ProjectRecord,
+  Resource,
+  ResourceRecord,
 } from '@grove-dev/core';
+import { headingSlug, readContentFile, stripFrontmatter, uniqueSlug } from '@grove-dev/core';
+import { marked } from 'marked';
+import sanitizeHtml from 'sanitize-html';
+import { getSingletonHighlighter } from 'shiki';
+import { prettySlug } from '../lib/display.js';
 
 interface FullPayload {
   schemaVersion?: number;
@@ -676,10 +677,14 @@ const SUPPORTED_LANGS = [
   'properties',
 ];
 const globalAny = globalThis as GlobalWithShiki;
-const highlighter = await (globalAny[SHIKI_HIGHLIGHTER] ??= getSingletonHighlighter({
-  themes: ['github-light', 'github-dark-default'],
-  langs: SUPPORTED_LANGS,
-}));
+const pendingHighlighter =
+  globalAny[SHIKI_HIGHLIGHTER] ??
+  getSingletonHighlighter({
+    themes: ['github-light', 'github-dark-default'],
+    langs: SUPPORTED_LANGS,
+  });
+globalAny[SHIKI_HIGHLIGHTER] = pendingHighlighter;
+const highlighter = await pendingHighlighter;
 
 // Release the previous engine's WASM heap on HMR. Without this the
 // old engine is unreachable but not disposed, which is the leak

package/src/server/index.ts

@@ -1,5 +1,6 @@
-export * from './directory.js';
-export * from './models.js';
 export * from './collections.js';
+export * from './contrast.js';
+export * from './directory.js';
 export * from './github-repo.js';
+export * from './models.js';
 export * from './seo.js';