@unocss/preset-web-fonts 66.6.7 → 66.7.0-beta.1

package/dist/index.d.mts

@@ -1,18 +1,19 @@
-import { a as WebFontProcessor, i as WebFontMeta, n as Provider, o as WebFontsOptions, r as ResolvedWebFontMeta, s as WebFontsProviders, t as Axes } from "./types-o6CvBLpT.mjs";
-import * as _unocss_core0 from "@unocss/core";
-
+import { a as WebFontProcessor, i as WebFontMeta, n as Provider, o as WebFontsOptions, r as ResolvedWebFontMeta, s as WebFontsProviders, t as Axes } from "./types-Bbb4MXF_.mjs";
 //#region src/preset.d.ts
 declare function normalizedFontMeta(meta: WebFontMeta | string, defaultProvider: WebFontsProviders): ResolvedWebFontMeta;
 //#endregion
 //#region src/providers/google.d.ts
 declare function createGoogleCompatibleProvider(name: WebFontsProviders, host: string): Provider;
 //#endregion
+//#region src/providers/zeoseven.d.ts
+declare const ZeoSevenFontsProvider: Provider;
+//#endregion
 //#region src/index.d.ts
 /**
  * Preset for using web fonts by provide just the names.
  *
  * @see https://unocss.dev/presets/web-fonts
  */
-declare const presetWebFonts: _unocss_core0.PresetFactory<any, WebFontsOptions>;
+declare const presetWebFonts: import("@unocss/core").PresetFactory<any, WebFontsOptions>;
 //#endregion
-export { Axes, Provider, ResolvedWebFontMeta, WebFontMeta, WebFontProcessor, WebFontsOptions, WebFontsProviders, createGoogleCompatibleProvider as createGoogleProvider, presetWebFonts as default, presetWebFonts, normalizedFontMeta };
+export { Axes, Provider, ResolvedWebFontMeta, WebFontMeta, WebFontProcessor, WebFontsOptions, WebFontsProviders, ZeoSevenFontsProvider, createGoogleCompatibleProvider as createGoogleProvider, presetWebFonts as default, presetWebFonts, normalizedFontMeta };

package/dist/index.mjs

@@ -201,6 +201,52 @@ function getVariableWght(axes) {
 	return `${axes.min} ${axes.max}`;
 }
 //#endregion
+//#region src/providers/none.ts
+const NoneProvider = {
+	name: "none",
+	getPreflight() {
+		return "";
+	},
+	getFontName(font) {
+		return font.name;
+	}
+};
+//#endregion
+//#region src/providers/zeoseven.ts
+function parseFontName(name) {
+	const atIndex = name.lastIndexOf("@");
+	if (atIndex === -1) throw new Error(`[unocss] ZeoSeven provider requires font ID in format "FontFamily@id", e.g. "LXGW WenKai@292". Got: "${name}"`);
+	return {
+		family: name.slice(0, atIndex).trim(),
+		id: name.slice(atIndex + 1).trim()
+	};
+}
+function createZeoSevenProvider(name, host) {
+	return {
+		name,
+		getFontName(font) {
+			const { family } = parseFontName(font.name);
+			return `"${family}"`;
+		},
+		async getPreflight(fonts, fetcher) {
+			const cssParts = [];
+			for (const font of fonts) {
+				const { id } = parseFontName(font.name);
+				const baseUrl = `${host}/${id}/main/`;
+				const url = `${baseUrl}result.css`;
+				try {
+					const processed = (await fetcher(url)).replace(/url\("\.\/([^"]+)"\)/g, `url("${baseUrl}$1")`);
+					cssParts.push(processed);
+				} catch {
+					throw new Error(`[unocss] Failed to fetch ZeoSeven font CSS for ID "${id}"`);
+				}
+			}
+			return cssParts.join("\n");
+		}
+	};
+}
+const ZeoSevenFontsProvider = createZeoSevenProvider("zeoseven", "https://fontsapi.zeoseven.com");
+//#endregion
 //#region src/preset.ts
 const builtinProviders = {
 	google: GoogleFontsProvider,
@@ -208,15 +254,8 @@ const builtinProviders = {
 	fontshare: FontshareProvider,
 	fontsource: FontSourceProvider,
 	coollabs: CoolLabsFontsProvider,
-	none: {
-		name: "none",
-		getPreflight() {
-			return "";
-		},
-		getFontName(font) {
-			return font.name;
-		}
-	}
+	none: NoneProvider,
+	zeoseven: ZeoSevenFontsProvider
 };
 function resolveProvider(provider) {
 	if (typeof provider === "string") return builtinProviders[provider];
@@ -332,4 +371,4 @@ const defaultFetch = async (url) => (await import("ofetch")).$fetch(url, {
 */
 const presetWebFonts = definePreset(createWebFontPreset(defaultFetch));
 //#endregion
-export { createGoogleCompatibleProvider as createGoogleProvider, presetWebFonts as default, presetWebFonts, normalizedFontMeta };
+export { ZeoSevenFontsProvider, createGoogleCompatibleProvider as createGoogleProvider, presetWebFonts as default, presetWebFonts, normalizedFontMeta };

package/dist/local.d.mts

@@ -1,4 +1,5 @@
-import { a as WebFontProcessor } from "./types-o6CvBLpT.mjs";
+import { a as WebFontProcessor } from "./types-Bbb4MXF_.mjs";
+import { Buffer } from "node:buffer";
 import { fetch } from "ofetch";
 
 //#region src/local.d.ts
@@ -31,6 +32,12 @@ interface LocalFontProcessorOptions {
    * Custom fetch function to provide the font data.
    */
   fetch?: typeof fetch;
+  /**
+   * Callback invoked when a font file is downloaded during build.
+   * Receives the filename and file buffer, useful for emitting fonts
+   * directly to the build output instead of relying on public dir copy.
+   */
+  onDownload?: (filename: string, buf: Buffer) => void | Promise<void>;
 }
 declare function createLocalFontProcessor(options?: LocalFontProcessorOptions): WebFontProcessor;
 //#endregion

package/dist/local.mjs

@@ -1,4 +1,3 @@
-import "@unocss/core";
 import { Buffer } from "node:buffer";
 import { createHash } from "node:crypto";
 import fs from "node:fs";
@@ -6,29 +5,9 @@ import fsp from "node:fs/promises";
 import { join, resolve } from "node:path";
 import process from "node:process";
 import { fetch } from "ofetch";
-//#region ../../virtual-shared/integration/src/utils.ts
-function replaceAsync(string, searchValue, replacer) {
-	try {
-		if (typeof replacer === "function") {
-			const values = [];
-			String.prototype.replace.call(string, searchValue, (...args) => {
-				values.push(replacer(...args));
-				return "";
-			});
-			return Promise.all(values).then((resolvedValues) => {
-				return String.prototype.replace.call(string, searchValue, () => {
-					return resolvedValues.shift() || "";
-				});
-			});
-		} else return Promise.resolve(String.prototype.replace.call(string, searchValue, replacer));
-	} catch (error) {
-		return Promise.reject(error);
-	}
-}
-//#endregion
 //#region src/local.ts
 const fontUrlRegex = /[-\w@:%+.~#?&/=]+\.(?:woff2?|eot|ttf|otf|svg)/gi;
-const urlProtocolRegex = /^[\s\w\0+.-]{2,}:([/\\]{1,2})/;
+const urlProtocolRegex = /^[\s\w\0+.-]{2,}:[/\\]{1,2}/;
 function createLocalFontProcessor(options) {
 	const cwd = options?.cwd || process.cwd();
 	const cacheDir = resolve(cwd, options?.cacheDir || "node_modules/.cache/unocss/fonts");
@@ -36,8 +15,11 @@ function createLocalFontProcessor(options) {
 	const fontServeBaseUrl = options?.fontServeBaseUrl || "/assets/fonts";
 	async function _downloadFont(url, assetPath) {
 		const response = await (options?.fetch ?? fetch)(url).then((r) => r.arrayBuffer());
+		const buf = Buffer.from(response);
+		const filename = assetPath.split(/[\\/]/).pop();
+		await options?.onDownload?.(filename, buf);
 		await fsp.mkdir(fontAssetsDir, { recursive: true });
-		await fsp.writeFile(assetPath, Buffer.from(response));
+		await fsp.writeFile(assetPath, buf);
 	}
 	const cache = /* @__PURE__ */ new Map();
 	function downloadFont(url, assetPath) {
@@ -54,7 +36,9 @@ function createLocalFontProcessor(options) {
 			return css;
 		},
 		async transformCSS(css) {
-			return await replaceAsync(css, fontUrlRegex, async (url) => {
+			const matches = css.match(fontUrlRegex) || [];
+			const replacements = /* @__PURE__ */ new Map();
+			await Promise.all(Array.from(new Set(matches)).map(async (url) => {
 				const hash = getHash(url);
 				const ext = url.split(".").pop();
 				let name = "";
@@ -63,8 +47,9 @@ function createLocalFontProcessor(options) {
 				const filename = `${[name, hash].filter(Boolean).join("-")}.${ext}`;
 				const assetPath = join(fontAssetsDir, filename);
 				if (!fs.existsSync(assetPath)) await downloadFont(hasProtocol(url) ? url : withProtocol(url), assetPath);
-				return `${fontServeBaseUrl}/${filename}`;
-			});
+				replacements.set(url, `${fontServeBaseUrl}/${filename}`);
+			}));
+			return css.replace(fontUrlRegex, (match) => replacements.get(match) || match);
 		}
 	};
 }

package/dist/{types-o6CvBLpT.d.mts → types-Bbb4MXF_.d.mts}

@@ -1,7 +1,7 @@
 import { Arrayable, Awaitable } from "@unocss/core";
 
 //#region src/types.d.ts
-type WebFontsProviders = 'google' | 'bunny' | 'fontshare' | 'fontsource' | 'coollabs' | 'none' | Provider;
+type WebFontsProviders = 'google' | 'bunny' | 'fontshare' | 'fontsource' | 'coollabs' | 'zeoseven' | 'none' | Provider;
 interface WebFontMeta {
   /**
    * The name of the font family

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unocss/preset-web-fonts",
   "type": "module",
-  "version": "66.6.7",
+  "version": "66.7.0-beta.1",
   "description": "Web Fonts support for Uno CSS",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -42,7 +42,7 @@
   ],
   "dependencies": {
     "ofetch": "^1.5.1",
-    "@unocss/core": "66.6.7"
+    "@unocss/core": "66.7.0-beta.1"
   },
   "scripts": {
     "build": "tsdown --config-loader unrun",