@unocss/preset-web-fonts 0.62.4 → 0.63.0

package/dist/index.d.mts

@@ -1,6 +1,6 @@
 import * as _unocss_core from '@unocss/core';
-import { W as WebFontMeta, a as WebFontsProviders, R as ResolvedWebFontMeta, P as Provider, b as WebFontsOptions } from './shared/preset-web-fonts.DSrOMtoz.mjs';
-export { c as WebFontProcessor } from './shared/preset-web-fonts.DSrOMtoz.mjs';
+import { W as WebFontMeta, a as WebFontsProviders, R as ResolvedWebFontMeta, P as Provider, b as WebFontsOptions } from './shared/preset-web-fonts.TGEYFvVV.mjs';
+export { A as Axes, c as WebFontProcessor } from './shared/preset-web-fonts.TGEYFvVV.mjs';
 
 declare function normalizedFontMeta(meta: WebFontMeta | string, defaultProvider: WebFontsProviders): ResolvedWebFontMeta;
 

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import * as _unocss_core from '@unocss/core';
-import { W as WebFontMeta, a as WebFontsProviders, R as ResolvedWebFontMeta, P as Provider, b as WebFontsOptions } from './shared/preset-web-fonts.DSrOMtoz.js';
-export { c as WebFontProcessor } from './shared/preset-web-fonts.DSrOMtoz.js';
+import { W as WebFontMeta, a as WebFontsProviders, R as ResolvedWebFontMeta, P as Provider, b as WebFontsOptions } from './shared/preset-web-fonts.TGEYFvVV.js';
+export { A as Axes, c as WebFontProcessor } from './shared/preset-web-fonts.TGEYFvVV.js';
 
 declare function normalizedFontMeta(meta: WebFontMeta | string, defaultProvider: WebFontsProviders): ResolvedWebFontMeta;
 

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { toArray, definePreset } from '@unocss/core';
+import { mergeDeep, toArray, definePreset } from '@unocss/core';
 
 const LAYER_IMPORTS = "imports";
 
@@ -44,6 +44,122 @@ function createFontshareProvider(name, host) {
   };
 }
 
+function createFontSourceProvider(name, host) {
+  const fontsMap = /* @__PURE__ */ new Map();
+  const variablesMap = /* @__PURE__ */ new Map();
+  return {
+    name,
+    async getPreflight(fonts) {
+      const list = await Promise.all(fonts.map(async (font) => {
+        const css = [];
+        const id = font.name.toLowerCase().replace(/\s+/g, "-");
+        let metadata = fontsMap.get(id);
+        if (!metadata) {
+          const url = `https://api.fontsource.org/v1/fonts/${id}`;
+          try {
+            metadata = await (await import('ofetch')).$fetch(url);
+            fontsMap.set(id, metadata);
+          } catch {
+            throw new Error(`Failed to fetch font: ${font.name}`);
+          }
+        }
+        const { subsets, weights } = metadata;
+        if (metadata.variable) {
+          let variableData = variablesMap.get(id);
+          const url = `https://api.fontsource.org/v1/variable/${id}`;
+          try {
+            variableData = await (await import('ofetch')).$fetch(url);
+            variablesMap.set(id, variableData);
+          } catch {
+            throw new Error(`Failed to fetch font variable: ${font.name}`);
+          }
+          const mergeAxes = mergeDeep(variableData.axes, font.variable ?? {});
+          for (const subset of subsets) {
+            const url2 = `${host}/fontsource/fonts/${metadata.id}:vf@latest/${subset}-${font.italic ? "wght-italic" : "wght-normal"}.woff2`;
+            const fontObj = {
+              family: `${metadata.family}`,
+              display: "swap",
+              style: font.italic ? "italic" : "normal",
+              weight: 400,
+              src: [{
+                url: url2,
+                format: "woff2-variations"
+              }],
+              variable: {
+                wght: mergeAxes.wght ?? void 0,
+                wdth: mergeAxes.wdth ?? void 0,
+                slnt: mergeAxes.slnt ?? void 0
+              },
+              unicodeRange: metadata.unicodeRange[subset],
+              comment: `${metadata.id}-${subset}-wght-normal`
+            };
+            css.push(generateFontFace(fontObj));
+          }
+        } else {
+          const _weights = font.weights && font.weights.length > 0 ? font.weights : weights;
+          for (const subset of subsets) {
+            for (const weight of _weights) {
+              const url = `${host}/fontsource/fonts/${metadata.id}@latest/${subset}-${weight}-${font.italic ? "italic" : "normal"}`;
+              const fontObj = {
+                family: metadata.family,
+                display: "swap",
+                style: font.italic ? "italic" : "normal",
+                weight: Number(weight),
+                src: [{
+                  url: `${url}.woff2`,
+                  format: "woff2"
+                }],
+                unicodeRange: metadata.unicodeRange[subset],
+                comment: `${metadata.id}-${subset}-${weight}${font.italic ? "-italic" : "-normal"}`
+              };
+              css.push(generateFontFace(fontObj));
+            }
+          }
+        }
+        return css;
+      }));
+      return list.flat().join("\n\n");
+    }
+  };
+}
+const FontSourceProvider = createFontSourceProvider("fontsource", "https://cdn.jsdelivr.net");
+function generateFontFace(font) {
+  const {
+    family,
+    style,
+    display,
+    weight,
+    variable,
+    src,
+    unicodeRange,
+    comment,
+    spacer = "\n  "
+  } = font;
+  const { wght, wdth, slnt } = variable ?? {};
+  let result = "@font-face {";
+  result += `${spacer}font-family: '${family}';`;
+  result += `${spacer}font-style: ${slnt ? `oblique ${Number(slnt.max) * -1}deg ${Number(slnt.min) * -1}deg` : style};`;
+  result += `${spacer}font-display: ${display};`;
+  result += `${spacer}font-weight: ${wght ? getVariableWght(wght) : weight};`;
+  if (wdth)
+    result += `${spacer}font-stretch: ${wdth.min}% ${wdth.max}%;`;
+  result += `${spacer}src: ${src.map(({ url, format }) => `url(${url}) format('${format}')`).join(", ")};`;
+  if (unicodeRange)
+    result += `${spacer}unicode-range: ${unicodeRange};`;
+  if (comment)
+    result = `/* ${comment} */
+${result}`;
+  return `${result}
+}`;
+}
+function getVariableWght(axes) {
+  if (!axes)
+    return "400";
+  if (axes.min === axes.max)
+    return `${axes.min}`;
+  return `${axes.min} ${axes.max}`;
+}
+
 function createGoogleCompatibleProvider(name, host) {
   return {
     name,
@@ -80,6 +196,7 @@ const builtinProviders = {
   google: GoogleFontsProvider,
   bunny: BunnyFontsProvider,
   fontshare: FontshareProvider,
+  fontsource: FontSourceProvider,
   none: NoneProvider
 };
 function resolveProvider(provider) {
@@ -165,7 +282,7 @@ function createWebFontPreset(fetcher) {
           if (url)
             preflights.push(await importUrl(url));
         }
-        preflights.push(provider.getPreflight?.(fontsForProvider));
+        preflights.push(await provider.getPreflight?.(fontsForProvider));
       }
       const css = preflights.filter(Boolean).join("\n");
       return css;

package/dist/local.d.mts

@@ -1,4 +1,4 @@
-import { c as WebFontProcessor } from './shared/preset-web-fonts.DSrOMtoz.mjs';
+import { c as WebFontProcessor } from './shared/preset-web-fonts.TGEYFvVV.mjs';
 import '@unocss/core';
 
 interface LocalFontProcessorOptions {

package/dist/local.d.ts

@@ -1,4 +1,4 @@
-import { c as WebFontProcessor } from './shared/preset-web-fonts.DSrOMtoz.js';
+import { c as WebFontProcessor } from './shared/preset-web-fonts.TGEYFvVV.js';
 import '@unocss/core';
 
 interface LocalFontProcessorOptions {

package/dist/shared/{preset-web-fonts.DSrOMtoz.d.mts → preset-web-fonts.TGEYFvVV.d.mts}

@@ -1,10 +1,11 @@
 import { Awaitable, Arrayable } from '@unocss/core';
 
-type WebFontsProviders = 'google' | 'bunny' | 'fontshare' | 'none' | Provider;
+type WebFontsProviders = 'google' | 'bunny' | 'fontshare' | 'fontsource' | 'none' | Provider;
 interface WebFontMeta {
     name: string;
     weights?: (string | number)[];
     italic?: boolean;
+    variable?: Record<string, Partial<Axes>>;
     /**
      * Override the provider
      * @default <matches root config>
@@ -75,9 +76,15 @@ interface WebFontsOptions {
 }
 interface Provider {
     name: WebFontsProviders;
-    getPreflight?: (fonts: WebFontMeta[]) => string;
+    getPreflight?: (fonts: WebFontMeta[]) => Awaitable<string | undefined>;
     getImportUrl?: (fonts: WebFontMeta[]) => string | undefined;
     getFontName?: (font: WebFontMeta) => string;
 }
+interface Axes {
+    default: string;
+    min: string;
+    max: string;
+    step: string;
+}
 
-export type { Provider as P, ResolvedWebFontMeta as R, WebFontMeta as W, WebFontsProviders as a, WebFontsOptions as b, WebFontProcessor as c };
+export type { Axes as A, Provider as P, ResolvedWebFontMeta as R, WebFontMeta as W, WebFontsProviders as a, WebFontsOptions as b, WebFontProcessor as c };

package/dist/shared/{preset-web-fonts.DSrOMtoz.d.ts → preset-web-fonts.TGEYFvVV.d.ts}

@@ -1,10 +1,11 @@
 import { Awaitable, Arrayable } from '@unocss/core';
 
-type WebFontsProviders = 'google' | 'bunny' | 'fontshare' | 'none' | Provider;
+type WebFontsProviders = 'google' | 'bunny' | 'fontshare' | 'fontsource' | 'none' | Provider;
 interface WebFontMeta {
     name: string;
     weights?: (string | number)[];
     italic?: boolean;
+    variable?: Record<string, Partial<Axes>>;
     /**
      * Override the provider
      * @default <matches root config>
@@ -75,9 +76,15 @@ interface WebFontsOptions {
 }
 interface Provider {
     name: WebFontsProviders;
-    getPreflight?: (fonts: WebFontMeta[]) => string;
+    getPreflight?: (fonts: WebFontMeta[]) => Awaitable<string | undefined>;
     getImportUrl?: (fonts: WebFontMeta[]) => string | undefined;
     getFontName?: (font: WebFontMeta) => string;
 }
+interface Axes {
+    default: string;
+    min: string;
+    max: string;
+    step: string;
+}
 
-export type { Provider as P, ResolvedWebFontMeta as R, WebFontMeta as W, WebFontsProviders as a, WebFontsOptions as b, WebFontProcessor as c };
+export type { Axes as A, Provider as P, ResolvedWebFontMeta as R, WebFontMeta as W, WebFontsProviders as a, WebFontsOptions as b, WebFontProcessor as c };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unocss/preset-web-fonts",
   "type": "module",
-  "version": "0.62.4",
+  "version": "0.63.0",
   "description": "Web Fonts support for Uno CSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -49,8 +49,8 @@
     "dist"
   ],
   "dependencies": {
-    "ofetch": "^1.3.4",
-    "@unocss/core": "0.62.4"
+    "ofetch": "^1.4.0",
+    "@unocss/core": "0.63.0"
   },
   "scripts": {
     "build": "unbuild",