@grove-dev/astro 0.7.0 → 0.8.0

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';