@grove-dev/astro 0.5.0-next.0 → 0.5.0-next.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grove-dev/astro",
-  "version": "0.5.0-next.0",
+  "version": "0.5.0-next.2",
   "type": "module",
   "description": "Composable Astro UI, data adapters, and integration for Grove directories.",
   "license": "MIT",
@@ -56,7 +56,7 @@
     "sanitize-html": "^2.17.5",
     "shiki": "^1.29.2",
     "yaml": "^2.9.0",
-    "@grove-dev/core": "0.5.0-next.0"
+    "@grove-dev/core": "0.5.0-next.2"
   },
   "peerDependencies": {
     "astro": "^6.0.0 || ^7.0.0"

package/src/components/IndexRow.astro

@@ -1,7 +1,7 @@
 ---
 import type { IndexRecord } from "@grove-dev/core";
 import StackPlatformChips from "./StackPlatformChips.astro";
-import { formatRelative, formatStars, getOwnerAndRepoFromRepoUrl, getOwnerAvatarUrl, projectStackIds, statusDisplay } from "@grove-dev/astro";
+import { formatRelative, formatStars, getOwnerAndRepoFromRepoUrl, getOwnerAvatarUrl, projectStackIds, statusDisplay, licenseDisplay } from "@grove-dev/astro";
 
 interface Props {
   record: IndexRecord;
@@ -71,7 +71,7 @@ const curated = Boolean(item.curation?.reviewed || (project && (project.bestFor.
   <dl class="grid grid-cols-3 gap-x-3 text-2xs">
     <div class="flex items-baseline gap-1.5"><dt class="font-medium uppercase tracking-wider text-ink-500 dark:text-ink-400">Stars</dt><dd class="font-mono text-ink-700 dark:text-ink-300">{formatStars(stars) ?? "—"}</dd></div>
     <div class="flex items-baseline gap-1.5"><dt class="font-medium uppercase tracking-wider text-ink-500 dark:text-ink-400">Updated</dt><dd class="font-mono text-ink-700 dark:text-ink-300">{formatRelative(updatedAt)}</dd></div>
-    <div class="flex items-baseline gap-1.5"><dt class="font-medium uppercase tracking-wider text-ink-500 dark:text-ink-400">License</dt><dd class="font-mono text-ink-700 dark:text-ink-300">{license ?? "—"}</dd></div>
+    <div class="flex items-baseline gap-1.5"><dt class="font-medium uppercase tracking-wider text-ink-500 dark:text-ink-400">License</dt><dd class="font-mono text-ink-700 dark:text-ink-300">{license ? licenseDisplay(license) : "—"}</dd></div>
   </dl>
 
   {showChips && (platforms.length > 0 || stacks.length > 0) && (

package/src/components/ItemCard.astro

@@ -28,6 +28,7 @@ import StackPlatformChips from "./StackPlatformChips.astro";
 import { getOwnerAndRepoFromRepoUrl, getOwnerAvatarUrl, projectStackIds } from "@grove-dev/astro";
 import { formatStars, formatRelative } from "@grove-dev/astro";
 import { statusDisplay } from "@grove-dev/astro";
+import { licenseDisplay } from "@grove-dev/astro";
 
 type CardRecord = IndexRecord | Resource | ProjectRecord | IndexProjectRecord;
 
@@ -273,7 +274,7 @@ const category = (item as { category?: string }).category;
       )}
       {license && (
         <span class="inline-flex items-center gap-1" title={`License: ${license}`}>
-          <span class="font-mono uppercase tracking-wide text-[10px]">{license}</span>
+          <span class="font-mono uppercase tracking-wide text-[10px]">{licenseDisplay(license)}</span>
         </span>
       )}
     </div>

package/src/components/RecordHeader.astro

@@ -36,6 +36,9 @@ const {
   initials,
   curationLabels,
   activityBadge,
+  summary,
+  sourceDescription,
+  screenshots,
   category,
   description,
   name,
@@ -123,9 +126,15 @@ const {
       </p>
     )}
 
-    {description && (
+    {summary && (
       <p class="m-0 mt-3 max-w-[68ch] text-base leading-relaxed text-ink-700 dark:text-ink-200">
-        {description}
+        {summary}
+      </p>
+    )}
+    {sourceDescription && sourceDescription !== summary && (
+      <p class="m-0 mt-2 max-w-[68ch] text-sm leading-relaxed text-ink-500 dark:text-ink-400">
+        <span class="text-2xs font-semibold uppercase tracking-wider">From the project's README: </span>
+        {sourceDescription}
       </p>
     )}
 
@@ -153,4 +162,26 @@ const {
       )}
     </div>
   </div>
+  {screenshots && screenshots.length > 0 && (
+    <div class="mt-6 grid grid-cols-1 gap-3 sm:grid-cols-2 lg:grid-cols-3" aria-label="Screenshots">
+      {screenshots.map((shot) => (
+        <figure class="m-0 overflow-hidden rounded-[var(--radius-lg)] border border-ink-200 bg-muted dark:border-ink-800">
+          <img
+            src={shot.src}
+            alt={shot.alt}
+            loading="lazy"
+            decoding="async"
+            width={shot.width}
+            height={shot.height}
+            class="block h-auto w-full object-cover"
+          />
+          {shot.source && (
+            <figcaption class="px-3 py-1.5 text-2xs text-ink-500 dark:text-ink-400">
+              Source: <a href={shot.source} target="_blank" rel="noopener noreferrer" class="text-inherit no-underline hover:underline">{shot.source.replace(/^https?:\/\//, "")}</a>
+            </figcaption>
+          )}
+        </figure>
+      ))}
+    </div>
+  )}
 </header>

package/src/components/RecordSidebar.astro

@@ -19,7 +19,7 @@
  * scrolls the body. Cards are individually rendered so the
  * sticky container's height is bounded by the actual content.
  */
-import { formatStars, compact } from "@grove-dev/core";
+import { formatStars, compact, licenseDisplay } from "@grove-dev/core";
 import type { RecordDetailModel } from "../server/models.js";
 import LanguageBreakdown from "./LanguageBreakdown.astro";
 
@@ -119,7 +119,7 @@ function row(label: string, value: unknown) {
         {row("License", licenseSpdx) && (
           <div class="flex items-baseline justify-between gap-3">
             <dt class="text-ink-500 dark:text-ink-400">License</dt>
-            <dd class="font-mono text-ink-900 dark:text-ink-100">{licenseSpdx}</dd>
+            <dd class="font-mono text-ink-900 dark:text-ink-100">{licenseDisplay(licenseSpdx)}</dd>
           </div>
         )}
         {row("Default branch", repo?.default_branch) && (
@@ -274,7 +274,7 @@ function row(label: string, value: unknown) {
           <ul class="m-0 flex list-none flex-wrap gap-1.5 p-0">
             {tags.map((t) => (
               <li>
-                <a href={`/${detail.slug}?q=${encodeURIComponent(t)}`} class="rounded-full border border-ink-200 px-2 py-0.5 text-2xs font-medium text-ink-700 no-underline dark:border-ink-800 dark:text-ink-300">
+                <a href={`/${detail.slug}?tag=${encodeURIComponent(t)}`} class="rounded-full border border-ink-200 px-2 py-0.5 text-2xs font-medium text-ink-700 no-underline dark:border-ink-800 dark:text-ink-300">
                   {t}
                 </a>
               </li>
@@ -319,6 +319,16 @@ function row(label: string, value: unknown) {
           {record.curation?.reviewedAt ? new Date(String(record.curation.reviewedAt)).toLocaleDateString() : "—"}
         </time>.
       </p>
+      {detail.collectionMembership && detail.collectionMembership.length > 0 && (
+        <p class="m-0 mt-1.5 leading-relaxed">
+          <span class="font-semibold">Also in: </span>
+          {detail.collectionMembership.map((c, i) => (
+            <>
+              <a href={c.url} class="text-inherit no-underline hover:underline">{c.title}</a>{i < detail.collectionMembership.length - 1 ? ", " : ""}
+            </>
+          ))}
+        </p>
+      )}
       {readingMetrics.wordCount > 0 && (
         <p class="m-0 mt-1 leading-relaxed">
           Notes: {readingMetrics.wordCount.toLocaleString()} words · {readingMetrics.minutes} min read.

package/src/components/SubmissionClient.astro

@@ -4,11 +4,17 @@ interface Props {
   existingFullNames: string[];
   repoUrl: string;
   fields: { category: boolean; stack: boolean; platforms: boolean; tags: boolean };
+  /** Taxonomy ids for client-side validation. */
+  taxonomy?: {
+    categoryIds?: string[];
+    stackIds?: string[];
+    platformIds?: string[];
+  };
 }
-const { existingSlugs, existingFullNames, repoUrl, fields } = Astro.props;
+const { existingSlugs, existingFullNames, repoUrl, fields, taxonomy } = Astro.props;
 ---
 
-<script is:inline define:vars={{ existingSlugs, existingFullNames, repoUrl, fields }}>
+<script is:inline define:vars={{ existingSlugs, existingFullNames, repoUrl, fields, taxonomy }}>
     // @ts-nocheck
     const $ = (selector) => document.querySelector(selector);
     const inputs = {
@@ -24,6 +30,9 @@ const { existingSlugs, existingFullNames, repoUrl, fields } = Astro.props;
     const openPrLink = $("#open-pr-link");
     const slugSet = new Set(existingSlugs);
     const repoSet = new Set(existingFullNames);
+    const categoryIds = new Set(taxonomy?.categoryIds ?? []);
+    const stackIds = new Set(taxonomy?.stackIds ?? []);
+    const platformIds = new Set(taxonomy?.platformIds ?? []);
     let repository = null;
 
     const slugify = (value) => String(value || "").toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
@@ -80,10 +89,45 @@ const { existingSlugs, existingFullNames, repoUrl, fields } = Astro.props;
         "",
       ].join("\n");
     };
+    const validationIssues = () => {
+      const issues = [];
+      if (slugSet.has(slugify(inputs.slug.value))) {
+        issues.push("A record with that slug already exists — update the existing one instead of opening a duplicate PR.");
+      }
+      if (inputs.description.value.trim().length < 40) {
+        issues.push("Description must be at least 40 characters.");
+      }
+      if (fields.category && (!inputs.category.value || inputs.category.value === "uncategorized" || (categoryIds.size > 0 && !categoryIds.has(inputs.category.value)))) {
+        issues.push("Choose a category from the taxonomy.");
+      }
+      if (fields.stack && (!inputs.stack.value || (stackIds.size > 0 && !stackIds.has(inputs.stack.value)))) {
+        issues.push("Choose a primary stack from the taxonomy.");
+      }
+      if (fields.platforms && selectedPlatforms().length === 0) {
+        issues.push("Select at least one platform.");
+      } else if (fields.platforms && platformIds.size > 0) {
+        const bad = selectedPlatforms().find((p) => !platformIds.has(p));
+        if (bad) issues.push(`Platform "${bad}" is not in the taxonomy.`);
+      }
+      return issues;
+    };
     const refresh = () => {
       const yaml = generateYaml();
       preview.textContent = yaml || "Paste a GitHub URL to generate a draft.";
-      if (!yaml) return;
+      if (!yaml) {
+        openPrLink.classList.add("pointer-events-none", "opacity-50");
+        copyButton.disabled = true;
+        copyButton.classList.add("pointer-events-none", "opacity-50");
+        return;
+      }
+      const issues = validationIssues();
+      if (issues.length > 0) {
+        setStatus(issues[0], "error");
+        openPrLink.classList.add("pointer-events-none", "opacity-50");
+        copyButton.disabled = true;
+        copyButton.classList.add("pointer-events-none", "opacity-50");
+        return;
+      }
       const params = new URLSearchParams({ filename: `data/records/${slugify(inputs.slug.value)}.yml`, value: yaml });
       openPrLink.href = `${repoUrl}/new/main?${params}`;
       openPrLink.classList.remove("pointer-events-none", "opacity-50");

package/src/server/collections.ts

@@ -19,7 +19,12 @@ interface RawRecord {
   platforms?: string[];
   license?: string;
   visibility?: string;
+  /** GitHub stargazers count. Stored on `github.repository.stargazers_count`
+   *  in the full payload; read explicitly because the index payload
+   *  does not flatten it. */
   stars?: number;
+  /** GitHub fork count. Stored on `github.repository.forks_count`. */
+  forks?: number;
   pushedAt?: string;
   lastCommitAt?: string;
   category?: string;
@@ -27,6 +32,15 @@ interface RawRecord {
   scores?: { curation?: number; activity?: number };
   repoUrl?: string;
   links?: { github?: string; website?: string };
+  /** GitHub metadata block on the full record. The star / fork counts
+   *  are read from `github.repository.stargazers_count` /
+   *  `github.repository.forks_count` here. */
+  github?: {
+    repository?: {
+      stargazers_count?: number;
+      forks_count?: number;
+    };
+  };
 }
 
 /**
@@ -68,7 +82,8 @@ export function recordsToCollectionEntries(
       platform: r.platforms,
       license: r.license,
       status: r.visibility,
-      stars: r.stars,
+      stars: r.stars ?? r.github?.repository?.stargazers_count,
+      forks: r.forks ?? r.github?.repository?.forks_count,
       pushedAt: r.pushedAt ?? r.lastCommitAt,
       curationScore: r.scores?.curation,
       activityScore: r.scores?.activity,
@@ -97,6 +112,10 @@ export interface CollectionPageModel {
   total: number;
   isEmpty: boolean;
   entries: CollectionEntry[];
+  /** ItemList JSON-LD block. Pass to BaseLayout as the `jsonLd` prop
+   *  so it ships in the document head and is indexable by search
+   *  engines as a list of `SoftwareApplication` items. */
+  jsonLd?: unknown;
   related: Array<{ slug: string; title: string; url: string }>;
 }
 
@@ -121,6 +140,7 @@ export function getCollectionPageModel(
   collection: Collection,
   entries: CollectionEntry[],
   allCollections: Collection[],
+  site?: { name?: string; url?: string },
 ): CollectionPageModel {
   const result = runCollection(collection, entries);
   const related = findRelated(collection, allCollections, 4).map((c) => ({
@@ -128,6 +148,29 @@ export function getCollectionPageModel(
     title: c.title,
     url: `/collections/${c.slug}/`,
   }));
+  // ItemList JSON-LD. Search engines can use this to surface
+  // individual entries directly from the collection URL.
+  // Cap at 50 entries to keep the JSON-LD payload bounded;
+  // search engines don't index beyond that anyway.
+  const itemListElement = result.entries.slice(0, 50).map((entry, index) => ({
+    "@type": "ListItem",
+    position: index + 1,
+    item: {
+      "@type": "SoftwareApplication",
+      name: entry.title,
+      url: entry.url,
+      description: entry.description,
+    },
+  }));
+  const jsonLd = {
+    "@context": "https://schema.org",
+    "@type": "ItemList",
+    name: collection.title,
+    description: collection.description,
+    url: site?.url ? `${site.url.replace(/\/$/, "")}/collections/${collection.slug}/` : undefined,
+    numberOfItems: result.entries.length,
+    itemListElement,
+  };
   return {
     collection: {
       slug: collection.slug,
@@ -141,6 +184,7 @@ export function getCollectionPageModel(
     isEmpty: result.isEmpty,
     entries: result.entries,
     related,
+    jsonLd,
   };
 }
 
@@ -202,3 +246,35 @@ export async function loadCollections(cwd: string): Promise<Collection[]> {
   }
   return out;
 }
+
+/**
+ * Reverse lookup — given a record, return the slugs of every
+ * curated collection that includes it. Walks each collection's
+ * query + ranking once, applies the same filter the collection
+ * page uses, and returns the collection slugs that contain the
+ * target record. Used by the detail page's sidebar to show
+ * "Also in" / "Collection membership" links.
+ *
+ * The returned array includes `{slug, title}` pairs so the
+ * sidebar can render both the link target and a user-facing
+ * 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 },
+  collections: Collection[],
+  entries: CollectionEntry[],
+): { slug: string; title: string; url: string }[] {
+  if (!target.slug) return [];
+  const result: { slug: string; title: string; url: string }[] = [];
+  for (const collection of collections) {
+    const filtered = runCollection(collection, entries).entries;
+    if (filtered.some((entry) => entry.slug === target.slug)) {
+      result.push({
+        slug: collection.slug,
+        title: collection.title,
+        url: `/collections/${collection.slug}/`,
+      });
+    }
+  }
+  return result;
+}

package/src/server/models.ts

@@ -186,7 +186,10 @@ function configuredFacets(site?: DirectorySiteConfig) {
 
 export function getDirectoryIndexModel(searchParams: URLSearchParams, site?: DirectorySiteConfig) {
   const filters = filtersFromSearchParams(searchParams);
-  const rawFacets = buildFacets(items);
+  const rawFacets = buildFacets(items, {
+    curatedTagIds: site.taxonomy?.topics?.map((t) => t.id),
+    filters, // Intersection counts: each facet reflects all OTHER filters.
+  });
   const enabled = configuredFacets(site);
   const facets = {
     stacks: enabled.has("stacks") ? rawFacets.stacks.map((option) => ({ ...option, label: taxonomyLabel("stacks", option.value) })) : [],
@@ -215,7 +218,13 @@ export function getDirectoryIndexModel(searchParams: URLSearchParams, site?: Dir
 
 export function getContributorsPageModel(site: DirectorySiteConfig) {
   const contributors = loadDirectoryContributors();
-  const sorted = [...contributors].sort((a, b) =>
+  // Render-time guard: even if a stale `data/generated/contributors.json`
+  // was produced before the sync-time filter was added, never surface
+  // bot accounts (login ends with `[bot]`) on the public contributors
+  // page. The ContributorsGrid uses the same total for its heading, so
+  // the headline count always agrees with the rendered grid.
+  const human = contributors.filter((c) => !c.username.endsWith("[bot]"));
+  const sorted = [...human].sort((a, b) =>
     (b.contributions ?? 0) - (a.contributions ?? 0) || a.username.localeCompare(b.username)
   );
   const repo = site.repoUrl?.replace(/\/$/, "");
@@ -433,6 +442,18 @@ const tocBody = readContentFile(typeof record.content === "string" ? record.cont
     tags,
     healthLabel,
     contentHtml: isProject ? getContentHtml(recordSlug) : null,
+    // Curated summary (Open Apps-written) takes priority over the
+    // raw `description` (typically copied from GitHub). Fall back to
+    // `description` when the curator has not written a summary yet.
+    summary: (record.summary && record.summary.trim()) || record.description || "",
+    sourceDescription: record.sourceDescription ?? record.description ?? "",
+    // Collection membership is populated by the consumer detail page
+    // after calling `findCollectionsFor`. Defaulting to [] keeps the
+    // model safe when the consumer doesn't wire it.
+    collectionMembership: [],
+    // Curated screenshots array. Defaulting to [] keeps the renderer
+    // safe; RecordHeader shows a gallery strip when non-empty.
+    screenshots: proj?.screenshots ?? [],
     monthlyCommits,
     maxMonthlyCommits: Math.max(1, ...monthlyCommits.map((item) => item.commits)),
     contributionSignals,