@leavepulse/ui 0.89.1 → 0.90.0

package/README.md

@@ -312,7 +312,7 @@ from the comment that opens the component.
 - `LpPopover`: A floating panel anchored to a trigger, for content that is more than a tip.
 - `LpRelativeTime`: A date said the way people say it ("3 min ago", "in 2 h"), kept true as time passes, with the exact date one hover away.
 - `LpScrollArea`: Drawn overlay scrollbar (reka ScrollArea).
-- `LpSection`: A section heading: a title, an optional line under it, and actions on the right.
+- `LpSection`: A section heading with no default slot: a title, an optional line under it and actions on the right; the section's content goes after it, not inside.
 - `LpSkeleton`: Loading placeholder, in two shapes.
 - `LpStatus`: What state something is in, as a light and a word: a server online, a bot starting, a region degraded.
 - `LpTooltip`: Tooltip for controls whose meaning is not written on them — an icon button, a truncated value, a disabled action that owes an explanation.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leavepulse/ui",
-  "version": "0.89.1",
+  "version": "0.90.0",
   "type": "module",
   "description": "LeavePulse token-driven Vue component kit.",
   "repository": {

package/src/components/LpSection.vue

@@ -1,7 +1,8 @@
 <script setup lang="ts">
 /*
- * A section heading: a title, an optional line under it, and actions on the
- * right.
+ * A section heading with no default slot: a title, an optional line under
+ * it and actions on the right; the section's content goes after it, not
+ * inside.
  *
  *   <LpSection title="Recent invoices">
  *     <template #actions><LpButton size="sm">Export</LpButton></template>

package/src/iconSubset.d.mts

@@ -5,6 +5,8 @@ export interface IconCollection {
   width?: number
   height?: number
 }
+export function refsInText(text: string): [prefix: string, name: string][]
+export function refsInDirs(dirs: string[]): Map<string, Set<string>>
 export function namesInText(text: string): string[]
 export function namesInDirs(dirs: string[]): Set<string>
 export function subset(collection: IconCollection, names: Iterable<string>): IconCollection

package/src/iconSubset.mjs

@@ -1,19 +1,32 @@
 // Shared by the kit's own icon generator and the Nuxt module's app scan: find
-// "lucide:<name>" literals in source text and cut an iconify collection down to
-// just those icons (aliases keep their parent).
+// "<prefix>:<name>" literals in source text and cut an iconify collection down
+// to just those icons (aliases keep their parent). Any prefix is collected;
+// whoever reads the result decides which prefixes are icon sets (the module
+// keeps those the app has an @iconify-json package for), so "node:fs" in a
+// source file costs nothing.
 import { readdirSync, readFileSync, statSync } from "node:fs"
 import { join } from "node:path"
 
-const NAME = /lucide:([a-z0-9]+(?:-[a-z0-9]+)*)/g
+const PART = "[a-z0-9]+(?:-[a-z0-9]+)*"
+const REF = new RegExp(`(?<![a-z0-9-])(${PART}):(${PART})`, "g")
 const SOURCE = /\.(vue|ts|tsx|js|jsx|mjs|md|html)$/
 const SKIP = new Set(["node_modules", "dist", ".nuxt", ".output", ".git"])
 
+/** Every "<prefix>:<name>" literal, as [prefix, name] pairs. */
+export function refsInText(text) {
+  return [...text.matchAll(REF)].map((m) => [m[1], m[2]])
+}
+
+/** The lucide names in a text. */
 export function namesInText(text) {
-  return [...text.matchAll(NAME)].map((m) => m[1])
+  return refsInText(text)
+    .filter(([prefix]) => prefix === "lucide")
+    .map(([, name]) => name)
 }
 
-export function namesInDirs(dirs) {
-  const names = new Set()
+/** Every "<prefix>:<name>" literal under the dirs, as prefix -> names. */
+export function refsInDirs(dirs) {
+  const refs = new Map()
   const walk = (dir) => {
     let entries
     try {
@@ -25,11 +38,21 @@ export function namesInDirs(dirs) {
       if (SKIP.has(entry)) continue
       const path = join(dir, entry)
       if (statSync(path).isDirectory()) walk(path)
-      else if (SOURCE.test(entry)) for (const n of namesInText(readFileSync(path, "utf8"))) names.add(n)
+      else if (SOURCE.test(entry)) {
+        for (const [prefix, name] of refsInText(readFileSync(path, "utf8"))) {
+          if (!refs.has(prefix)) refs.set(prefix, new Set())
+          refs.get(prefix).add(name)
+        }
+      }
     }
   }
   for (const dir of dirs) walk(dir)
-  return names
+  return refs
+}
+
+/** The lucide names under the dirs. */
+export function namesInDirs(dirs) {
+  return refsInDirs(dirs).get("lucide") ?? new Set()
 }
 
 export function subset(collection, names) {

package/src/nuxt.ts

@@ -18,11 +18,16 @@
  *   link         false to skip providing NuxtLink as the kit's link component
  *   exclude      component names not to auto-register (e.g. ["LayoutCanvas"]
  *                when the app has its own component of that name)
- *   icons        which lucide icons render in the server pass and ship in the
- *                main bundle: "scan" (default) finds "lucide:*" literals in the
- *                app's source, "all" registers the whole set, "kit" only the
- *                kit's own, or a list of names. Anything else still renders,
- *                from a lazily loaded chunk of the bundled collection.
+ *   icons        which icons render in the server pass and ship in the main
+ *                bundle: "scan" (default) finds "lucide:*" literals in the
+ *                app's source, "all" registers the whole lucide set, "kit"
+ *                only the kit's own, or a list of names. Anything else in
+ *                lucide still renders, from a lazily loaded chunk of the
+ *                bundled collection. Other sets ("logos:google-icon") are
+ *                found the same way, by "scan" or in the list, for every
+ *                prefix the app has an @iconify-json/<prefix> package for:
+ *                registered offline from that package, never fetched from
+ *                the iconify API.
  *   propCheck    false to skip the dev warning for an unknown prop on a kit
  *                component (default: on in `nuxt dev`, never in a build)
  */
@@ -30,7 +35,7 @@ import { readFileSync } from "node:fs"
 import { createRequire } from "node:module"
 import { addComponent, addPlugin, addPluginTemplate, addTemplate, createResolver, defineNuxtModule } from "@nuxt/kit"
 import { COMPONENT_NAMES } from "./component-names"
-import { namesInDirs, subset } from "./iconSubset.mjs"
+import { type IconCollection, refsInDirs, subset } from "./iconSubset.mjs"
 
 export interface LeavepulseUiOptions {
   /** Register the SSR theme plugin. Disable to wire theming yourself. */
@@ -43,18 +48,52 @@ export interface LeavepulseUiOptions {
   link?: boolean
   /** Component names to leave unregistered. */
   exclude?: string[]
-  /** Lucide icons registered up front (default "scan"). */
+  /** Icons registered up front (default "scan"). */
   icons?: "scan" | "all" | "kit" | string[]
   /** Warn in `nuxt dev` about an unknown prop on a kit component (default true). */
   propCheck?: boolean
 }
 
-function iconsPlugin(mode: LeavepulseUiOptions["icons"], srcDir: string): string {
+/** The names asked for, as prefix -> names; a bare name is lucide. */
+function iconRefs(mode: LeavepulseUiOptions["icons"], srcDir: string): Map<string, Set<string>> {
+  if (!Array.isArray(mode)) return refsInDirs([srcDir])
+  const refs = new Map<string, Set<string>>()
+  for (const ref of mode) {
+    const [prefix, name] = ref.includes(":") ? ref.split(":", 2) : ["lucide", ref]
+    if (!refs.has(prefix!)) refs.set(prefix!, new Set())
+    refs.get(prefix!)!.add(name!)
+  }
+  return refs
+}
+
+/** An installed iconify set, read from the app's own dependencies; null if it has none. */
+function collectionOf(prefix: string, rootDir: string): IconCollection | null {
+  try {
+    const path = createRequire(`${rootDir}/package.json`).resolve(`@iconify-json/${prefix}/icons.json`)
+    return JSON.parse(readFileSync(path, "utf8")) as IconCollection
+  } catch {
+    return null
+  }
+}
+
+export function iconsPlugin(mode: LeavepulseUiOptions["icons"], srcDir: string, rootDir: string): string {
   if (mode === "kit") return ""
-  if (mode === "all") return 'import "@leavepulse/ui/icons-all"\n'
-  const lucide = JSON.parse(readFileSync(createRequire(import.meta.url).resolve("@iconify-json/lucide/icons.json"), "utf8"))
-  const names = Array.isArray(mode) ? mode.map((n) => n.replace(/^lucide:/, "")) : namesInDirs([srcDir])
-  return `import { registerIconCollection } from "@leavepulse/ui"\nregisterIconCollection(${JSON.stringify(subset(lucide, names))})\n`
+  const refs = iconRefs(mode, srcDir)
+  const sets: IconCollection[] = []
+  if (mode !== "all") {
+    const lucide = JSON.parse(readFileSync(createRequire(import.meta.url).resolve("@iconify-json/lucide/icons.json"), "utf8"))
+    sets.push(subset(lucide, refs.get("lucide") ?? []))
+  }
+  for (const [prefix, names] of refs) {
+    if (prefix === "lucide") continue
+    const collection = collectionOf(prefix, rootDir)
+    if (!collection) continue
+    const cut = subset(collection, names)
+    if (Object.keys(cut.icons).length) sets.push(cut)
+  }
+  const head = mode === "all" ? 'import "@leavepulse/ui/icons-all"\n' : ""
+  if (!sets.length) return head
+  return `${head}import { registerIconCollection } from "@leavepulse/ui"\n${sets.map((set) => `registerIconCollection(${JSON.stringify(set)})\n`).join("")}`
 }
 
 export default defineNuxtModule<LeavepulseUiOptions>({
@@ -74,7 +113,7 @@ export default defineNuxtModule<LeavepulseUiOptions>({
       })
     }
 
-    const icons = iconsPlugin(options.icons, nuxt.options.srcDir)
+    const icons = iconsPlugin(options.icons, nuxt.options.srcDir, nuxt.options.rootDir)
     if (icons) {
       addPluginTemplate({
         filename: "leavepulse-ui-icons.mjs",