Shared icon registry (curated Lucide + Font Awesome, namespaced resolver) (#242)

admin/src/definitions/definitionIcons.tsx

@@ -1,96 +1,18 @@
 /**
- * The shipped Lucide subset a definition's `icon` may name (ADMIN-SPEC §3.3).
- * Only these named imports are bundled — no CDN, no runtime fetch. The stored
- * value is the namespaced `lucide:<kebab-name>`; a legacy bare `<kebab-name>`
- * still names the same Lucide entry.
+ * The curated Lucide set a definition's `icon` may name (ADMIN-SPEC §3.3).
+ * The names, labels and path data come from the shared icon registry
+ * (`src/icons/registry.generated.ts`, generated from
+ * `tools/icons/curated-icons.json`) — no CDN, no runtime fetch. The stored
+ * value is the namespaced `lucide:<kebab-name>`; a legacy bare
+ * `<kebab-name>` still names the same Lucide entry.
  */
-import {
-  Apple,
-  Backpack,
-  Bath,
-  Bed,
-  Bike,
-  BookOpen,
-  Brush,
-  BrushCleaning,
-  Calendar,
-  Cat,
-  Clock,
-  CookingPot,
-  Dog,
-  Droplets,
-  Fish,
-  Gamepad2,
-  Heart,
-  House,
-  ListChecks,
-  Moon,
-  Music,
-  Pencil,
-  Recycle,
-  Shirt,
-  ShowerHead,
-  Smile,
-  Sofa,
-  SprayCan,
-  Sprout,
-  Star,
-  Sun,
-  Toilet,
-  Trash2,
-  Utensils,
-  Volleyball,
-  WashingMachine,
-  type LucideIcon,
-} from "lucide-react";
+import { GlyphSvg } from "../icons/GlyphSvg";
+import { LUCIDE_ICONS, resolveIcon, type GlyphIcon } from "../icons/registry.generated";
 import { TaskGlyph } from "./glyphs";
 
-export interface DefinitionIconEntry {
-  name: string;
-  label: string;
-  Icon: LucideIcon;
-}
+export type DefinitionIconEntry = GlyphIcon;
 
-export const DEFINITION_ICONS: readonly DefinitionIconEntry[] = [
-  { name: "bed", label: "Bed", Icon: Bed },
-  { name: "bath", label: "Bath", Icon: Bath },
-  { name: "shower-head", label: "Shower", Icon: ShowerHead },
-  { name: "toilet", label: "Toilet", Icon: Toilet },
-  { name: "brush", label: "Brush", Icon: Brush },
-  { name: "smile", label: "Smile", Icon: Smile },
-  { name: "shirt", label: "Clothes", Icon: Shirt },
-  { name: "washing-machine", label: "Laundry", Icon: WashingMachine },
-  { name: "utensils", label: "Meal", Icon: Utensils },
-  { name: "cooking-pot", label: "Cooking", Icon: CookingPot },
-  { name: "apple", label: "Snack", Icon: Apple },
-  { name: "brush-cleaning", label: "Sweep", Icon: BrushCleaning },
-  { name: "spray-can", label: "Clean", Icon: SprayCan },
-  { name: "trash-2", label: "Bins", Icon: Trash2 },
-  { name: "recycle", label: "Recycling", Icon: Recycle },
-  { name: "sofa", label: "Tidy", Icon: Sofa },
-  { name: "house", label: "Home", Icon: House },
-  { name: "backpack", label: "School bag", Icon: Backpack },
-  { name: "book-open", label: "Reading", Icon: BookOpen },
-  { name: "pencil", label: "Homework", Icon: Pencil },
-  { name: "music", label: "Music", Icon: Music },
-  { name: "dog", label: "Dog", Icon: Dog },
-  { name: "cat", label: "Cat", Icon: Cat },
-  { name: "fish", label: "Fish", Icon: Fish },
-  { name: "sprout", label: "Plants", Icon: Sprout },
-  { name: "droplets", label: "Water", Icon: Droplets },
-  { name: "bike", label: "Bike", Icon: Bike },
-  { name: "volleyball", label: "Sport", Icon: Volleyball },
-  { name: "gamepad-2", label: "Games", Icon: Gamepad2 },
-  { name: "star", label: "Star", Icon: Star },
-  { name: "heart", label: "Heart", Icon: Heart },
-  { name: "sun", label: "Morning", Icon: Sun },
-  { name: "moon", label: "Bedtime", Icon: Moon },
-  { name: "clock", label: "Clock", Icon: Clock },
-  { name: "calendar", label: "Calendar", Icon: Calendar },
-  { name: "list-checks", label: "Checklist", Icon: ListChecks },
-];
-
-const BY_NAME = new Map(DEFINITION_ICONS.map((entry) => [entry.name, entry]));
+export const DEFINITION_ICONS: readonly DefinitionIconEntry[] = LUCIDE_ICONS;
 
 const LUCIDE_PREFIX = "lucide:";
 
@@ -110,14 +32,19 @@ export function normalizeDefinitionIconName(value: string | null): string | null
   return value.includes(":") ? null : value;
 }
 
+/**
+ * The curated Lucide entry an icon value resolves to via the shared parser.
+ * The admin draws only Lucide glyphs for now; `fa:`, `emoji:`, unknown and
+ * null values give null.
+ */
 export function findDefinitionIcon(value: string | null): DefinitionIconEntry | null {
-  const name = normalizeDefinitionIconName(value);
-  return name === null ? null : (BY_NAME.get(name) ?? null);
+  const icon = resolveIcon(value);
+  return icon.kind === "lucide" ? icon : null;
 }
 
-/** A definition's glyph; no icon, or one outside the subset, gets the generic task glyph. */
+/** A definition's glyph; no icon, or one outside the Lucide subset, gets the generic task glyph. */
 export function DefinitionIcon({ name, size = 17 }: { name: string | null; size?: number }) {
   const entry = findDefinitionIcon(name);
   if (!entry) return <TaskGlyph size={size} />;
-  return <entry.Icon size={size} aria-hidden="true" focusable="false" data-icon={entry.name} />;
+  return <GlyphSvg icon={entry} size={size} />;
 }