fix: register custom collections handler, fix #322

antfu · antfu · commit ccc00abdfb2a · 2024-12-16T15:03:08.000+08:00
diff --git a/playground/nuxt.config.ts b/playground/nuxt.config.ts
@@ -63,7 +63,7 @@ export default defineNuxtConfig({
         'logos:vitejs',
         'ph:acorn-bold',
       ],
-      includeCustomCollections: true,
+      includeCustomCollections: false,
       scan: true,
     },
   },
diff --git a/src/module.ts b/src/module.ts
@@ -96,6 +96,9 @@ export default defineNuxtModule<ModuleOptions>({
     nuxt.options.appConfig.icon = Object.assign(
       nuxt.options.appConfig.icon || {},
       runtimeOptions,
+      {
+        customCollections: options.customCollections?.map(i => i.prefix),
+      },
     )
     // Define types for the app.config compatible with Nuxt Studio
     nuxt.hook('schema:extend', (schemas) => {
diff --git a/src/runtime/plugin.ts b/src/runtime/plugin.ts
@@ -1,12 +1,13 @@
-import { addAPIProvider, _api, disableCache } from '@iconify/vue'
+import { addAPIProvider, _api, disableCache, setCustomIconsLoader } from '@iconify/vue'
 import type { Plugin } from 'nuxt/app'
+import type { IconifyJSON } from '@iconify/types'
 import type { NuxtIconRuntimeOptions } from '../types'
 import { defineNuxtPlugin, useAppConfig, useRuntimeConfig } from '#imports'
 
 export default defineNuxtPlugin({
   name: '@nuxt/icon',
   setup() {
-    const config = useRuntimeConfig()
+    const configs = useRuntimeConfig()
     const options = useAppConfig().icon as NuxtIconRuntimeOptions
 
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -17,7 +18,7 @@ export default defineNuxtPlugin({
 
     const resources: string[] = []
     if (options.provider === 'server') {
-      const baseURL = config.app?.baseURL?.replace(/\/$/, '') ?? ''
+      const baseURL = configs.app?.baseURL?.replace(/\/$/, '') ?? ''
 
       resources.push(baseURL + (options.localApiEndpoint || '/api/_nuxt_icon'))
       if (options.fallbackToApi === true || options.fallbackToApi === 'client-only') {
@@ -28,6 +29,30 @@ export default defineNuxtPlugin({
       resources.push(options.iconifyApiEndpoint!)
     }
 
+    async function customIconLoader(icons: string[], prefix: string): Promise<IconifyJSON | null> {
+      try {
+        const data = await $fetch(resources[0] + '/' + prefix + '.json', {
+          query: {
+            icons: icons.join(','),
+          },
+        }) as IconifyJSON
+        // Simple data validation
+        if (!data || data.prefix !== prefix || !data.icons)
+          throw new Error('Invalid data' + JSON.stringify(data))
+        return data as IconifyJSON
+      }
+      catch (e) {
+        console.error('Failed to load custom icons', e)
+        return null
+      }
+    }
+
     addAPIProvider('', { resources })
+
+    // Register custom collections handlers
+    for (const prefix of options.customCollections || []) {
+      if (prefix)
+        setCustomIconsLoader(customIconLoader, prefix)
+    }
   },
 }) as Plugin
diff --git a/src/schema-types.ts b/src/schema-types.ts
@@ -86,6 +86,12 @@ export interface NuxtIconRuntimeOptions {
    */
   collections: string[] | null
 
+  /**
+   * Custom Icon Collections
+   *
+   */
+  customCollections: string[] | null
+
   /**
    * Icon Provider
    *
@@ -133,7 +139,7 @@ export interface NuxtIconRuntimeOptions {
   /**
    * Fetch Timeout
    *
-   * Set the timeout for fetching icons on SSR.
+   * Set the timeout for fetching icons.
    *
    * @default 1500
    */
diff --git a/src/schema.ts b/src/schema.ts
@@ -95,6 +95,14 @@ export const schema = {
       tsType: 'string[] | null',
     },
   },
+  customCollections: {
+    $default: null,
+    $schema: {
+      title: 'Custom Icon Collections',
+      tags: ['@studioIcon material-symbols:format-list-bulleted'],
+      tsType: 'string[] | null',
+    },
+  },
   provider: {
     $default: undefined,
     $schema: {
diff --git a/src/types.ts b/src/types.ts
@@ -17,7 +17,7 @@ export interface NuxtIconRuntimeServerOptions {
   serverKnownCssClasses?: string[]
 }
 
-export interface ModuleOptions extends Partial<Omit<NuxtIconRuntimeOptions, 'customize'>> {
+export interface ModuleOptions extends Partial<Omit<NuxtIconRuntimeOptions, 'customize' | 'customCollections'>> {
   /**
    * Name of the component to be registered
    * @default 'Icon'

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ export interface NuxtIconRuntimeServerOptions {`
`17`	`17`	`serverKnownCssClasses?: string[]`
`18`	`18`	`}`
`19`	`19`
`20`		`-export interface ModuleOptions extends Partial<Omit<NuxtIconRuntimeOptions, 'customize'>> {`
	`20`	`+export interface ModuleOptions extends Partial<Omit<NuxtIconRuntimeOptions, 'customize' \| 'customCollections'>> {`
`21`	`21`	`/**`
`22`	`22`	`* Name of the component to be registered`
`23`	`23`	`* @default 'Icon'`