fix(local): scan for fonts in all public assets dirs

danielroe · danielroe · commit 6e7ae2b49d13 · 2024-05-20T16:19:24.000+01:00
diff --git a/src/providers/local.ts b/src/providers/local.ts
@@ -12,22 +12,24 @@ const providerContext = {
 }
 
 export default {
-  async setup(_options, nuxt) {
-    // Scan for all font files in public directories
-    for (const layer of nuxt.options._layers) {
-      const publicDir = join(layer.config.srcDir || layer.cwd, layer.config.dir?.public || 'public')
-      const possibleFontFiles = await globby('**/*.{ttf,woff,woff2,eot,otf}', {
-        absolute: true,
-        cwd: publicDir,
-      })
-      providerContext.rootPaths.push(withTrailingSlash(publicDir))
-      for (const file of possibleFontFiles) {
-        registerFont(file)
+  setup(_options, nuxt) {
+    // TODO: rework when providers can respond with font metric data
+    // Scan for all font files in public asset directories
+    nuxt.hook('nitro:init', async (nitro) => {
+      for (const assetsDir of nitro.options.publicAssets) {
+        const possibleFontFiles = await globby('**/*.{ttf,woff,woff2,eot,otf}', {
+          absolute: true,
+          cwd: assetsDir.dir,
+        })
+        providerContext.rootPaths.push(withTrailingSlash(assetsDir.dir))
+        for (const file of possibleFontFiles) {
+          registerFont(file.replace(assetsDir.dir, join(assetsDir.dir, assetsDir.baseURL || '/')))
+        }
       }
-    }
 
-    // Sort rootPaths so we resolve to most specific path first
-    providerContext.rootPaths = providerContext.rootPaths.sort((a, b) => b.length - a.length)
+      // Sort rootPaths so we resolve to most specific path first
+      providerContext.rootPaths = providerContext.rootPaths.sort((a, b) => b.length - a.length)
+    })
 
     // Update registry when files change
     nuxt.hook('builder:watch', (event, relativePath) => {
@@ -73,6 +75,8 @@ const NON_WORD_RE = /[^\w\d]+/g
 
 export const isFontFile = (id: string) => FONT_RE.test(id)
 
+// TODO: support without hyphen
+// TODO: support reading font metrics
 const weightMap: Record<string, string> = {
   100: 'thin',
   200: 'extra-light',
@@ -86,7 +90,7 @@ const weightMap: Record<string, string> = {
 }
 
 const weights = Object.entries(weightMap).flatMap(e => e).filter(r => r !== 'normal')
-const WEIGHT_RE = createRegExp(anyOf(...weights).groupedAs('weight').after(not.digit).before(not.digit.or(wordBoundary)), ['i'])
+const WEIGHT_RE = createRegExp(anyOf(...new Set([...weights, ...weights.map(w => w.replace('-', ''))])).groupedAs('weight').after(not.digit).before(not.digit.or(wordBoundary)), ['i'])
 
 const styles = ['italic', 'oblique'] as const
 const STYLE_RE = createRegExp(anyOf(...styles).groupedAs('style').before(not.wordChar.or(wordBoundary)), ['i'])
diff --git a/test/providers/local.test.ts b/test/providers/local.test.ts
@@ -2,6 +2,7 @@ import { fileURLToPath } from 'node:url'
 import fsp from 'node:fs/promises'
 
 import type { Nuxt } from '@nuxt/schema'
+import type { Nitro, NitroOptions } from 'nitropack'
 import { describe, expect, it } from 'vitest'
 import { dirname, join } from 'pathe'
 
@@ -17,7 +18,7 @@ describe('local font provider', () => {
       'font.otf',
       'font.txt',
     ].flatMap(l => [`public/${l}`, `layer/public/${l}`]))
-    const provider = await setupFixture(['scanning', 'scanning/layer'])
+    const provider = await setupFixture(['scanning/public', 'scanning/layer/public'])
     const faces = provider.resolveFontFaces('font', {
       fallbacks: [],
       weights: ['normal'],
@@ -55,7 +56,7 @@ describe('local font provider', () => {
       'public/MyFontbold-latin.ttf',
       'public/MyFontbold-latin.woff',
     ])
-    const provider = await setupFixture(['resolve-weights'])
+    const provider = await setupFixture(['resolve-weights/public'])
     expect(provider.resolveFontFaces('MyFont', {
       fallbacks: [],
       weights: ['normal'],
@@ -130,13 +131,20 @@ type DeepPartial<T> = {
   [P in keyof T]?: DeepPartial<T[P]>
 }
 
-async function setupFixture(layers: string[]) {
+async function setupFixture(publicAssetDirs: string[]) {
+  let promise: Promise<unknown>
   const mockNuxt = {
-    options: {
-      _layers: layers.map(l => ({ cwd: join(fixturePath, l), config: { srcDir: join(fixturePath, l) } })),
+    hook: (event: string, callback: (nitro: Nitro) => Promise<unknown>) => {
+      if (event === 'nitro:init') {
+        promise = callback({
+          options: {
+            publicAssets: publicAssetDirs.map(l => ({ dir: join(fixturePath, l), baseURL: '/', maxAge: 1 })) satisfies NitroOptions['publicAssets'],
+          },
+        } as Partial<Nitro> as Nitro)
+      }
     },
-    hook: () => {},
   } satisfies DeepPartial<Nuxt> as unknown as Nuxt
   await localProvider.setup({}, mockNuxt)
+  await promise!
   return localProvider
 }
