fontaine 1.0.0 → 1.0.2

package/README.md

@@ -53,7 +53,7 @@ import { defineConfig } from 'astro/config'
 
 const options = {
   // You can specify fallbacks as an array (applies to all fonts)
-  fallbacks: ['BlinkMacSystemFont', 'Segoe UI', 'Helvetica Neue', 'Arial', 'Noto Sans'],
+  fallbacks: ['Segoe UI', 'Helvetica Neue', 'Arial', 'Noto Sans'],
 
   // Or as an object to configure specific fallbacks per font family
   // fallbacks: {
@@ -146,7 +146,7 @@ For these setups, use the PostCSS plugin instead. It runs over fully-compiled CS
 module.exports = {
   plugins: [
     require('fontaine/postcss')({
-      fallbacks: ['BlinkMacSystemFont', 'Segoe UI', 'Helvetica Neue', 'Arial', 'Noto Sans'],
+      fallbacks: ['Segoe UI', 'Helvetica Neue', 'Arial', 'Noto Sans'],
     }),
     // ...any other plugins, such as autoprefixer or cssnano
   ],
@@ -183,9 +183,9 @@ const options = {
 
 ### Default Category Fallbacks
 
-- **sans-serif**: `BlinkMacSystemFont`, `Segoe UI`, `Helvetica Neue`, `Arial`, `Noto Sans`
-- **serif**: `Times New Roman`, `Georgia`, `Noto Serif`
-- **monospace**: `Courier New`, `Roboto Mono`, `Noto Sans Mono`
+- **sans-serif**: `Segoe UI`, `Helvetica Neue`, `Arial`, `Noto Sans`, `Liberation Sans`
+- **serif**: `Times New Roman`, `Georgia`, `Noto Serif`, `Liberation Serif`
+- **monospace**: `Courier New`, `Roboto Mono`, `Noto Sans Mono`, `Liberation Mono`
 - **display** & **handwriting**: Same as sans-serif
 
 > **Note:** These presets are available programmatically via `DEFAULT_CATEGORY_FALLBACKS` and can be used with the `resolveCategoryFallbacks` helper function for advanced use cases. Both are exported from the `fontaine` package and shared across related packages (e.g., `fontless`) to ensure consistent fallback behavior.
@@ -226,15 +226,26 @@ Example:
       format('woff');
   font-weight: 700;
 }
-/* This additional font-face declaration will be added to your CSS. */
+/* One additional font-face declaration per fallback font will be added to your CSS. */
 @font-face {
   font-family: 'Roboto fallback';
-  src: local('BlinkMacSystemFont'), local('Segoe UI'), local('Helvetica Neue'),
-      local('Arial'), local('Noto Sans');
-  ascent-override: 92.7734375%;
-  descent-override: 24.4140625%;
+  src: local('Segoe UI'), local('Segoe UI Regular'), local('SegoeUI-Regular'),
+      local('SegoeUI');
+  size-adjust: 100.3304%;
+  ascent-override: 92.4679%;
+  descent-override: 24.3337%;
   line-gap-override: 0%;
 }
+@font-face {
+  font-family: 'Roboto fallback';
+  src: local('Arial'), local('Arial Regular'), local('Arial-Regular'),
+      local('ArialMT');
+  size-adjust: 99.7809%;
+  ascent-override: 92.9771%;
+  descent-override: 24.4677%;
+  line-gap-override: 0%;
+}
+/* ... */
 ```
 
 Then, whenever you use `font-family: 'Roboto'`, `fontaine` will add the fallback to the font-family:

package/dist/index.cjs

@@ -21,7 +21,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 	enumerable: true
 }) : target, mod));
 //#endregion
-const require_metrics = require("./metrics-CS5CISMK.cjs");
+const require_metrics = require("./metrics-CioeRv3e.cjs");
 let css_tree = require("css-tree");
 let node_path = require("node:path");
 let node_url = require("node:url");

package/dist/index.d.cts

@@ -28,7 +28,7 @@ interface FallbackOptions {
    */
   [key: string]: any;
 }
-type FontFaceMetrics = Pick<Font, "ascent" | "descent" | "lineGap" | "unitsPerEm" | "xWidthAvg"> & {
+type FontFaceMetrics = Pick<Font, "ascent" | "descent" | "lineGap" | "unitsPerEm" | "xWidthAvg"> & Partial<Pick<Font, "fullName" | "postscriptName">> & {
   category?: string;
 };
 /**

package/dist/index.d.mts

@@ -28,7 +28,7 @@ interface FallbackOptions {
    */
   [key: string]: any;
 }
-type FontFaceMetrics = Pick<Font, "ascent" | "descent" | "lineGap" | "unitsPerEm" | "xWidthAvg"> & {
+type FontFaceMetrics = Pick<Font, "ascent" | "descent" | "lineGap" | "unitsPerEm" | "xWidthAvg"> & Partial<Pick<Font, "fullName" | "postscriptName">> & {
   category?: string;
 };
 /**

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { a as resolveCategoryFallbacks, c as generateFontFace, d as withoutQueryOrFragment, f as withoutQuotes, i as DEFAULT_CATEGORY_FALLBACKS, l as genericCSSFamilies, n as readMetrics, o as cssWideKeywords, r as readMetricsForSource, s as generateFallbackName, t as getMetricsForFamily, u as parseFontFace } from "./metrics-BfrxJdKT.mjs";
+import { a as resolveCategoryFallbacks, c as generateFontFace, d as withoutQueryOrFragment, f as withoutQuotes, i as DEFAULT_CATEGORY_FALLBACKS, l as genericCSSFamilies, n as readMetrics, o as cssWideKeywords, r as readMetricsForSource, s as generateFallbackName, t as getMetricsForFamily, u as parseFontFace } from "./metrics-Dru3RLLL.mjs";
 import { createRequire } from "node:module";
 import { parse, walk } from "css-tree";
 import { isAbsolute } from "node:path";

package/dist/{metrics-CS5CISMK.cjs → metrics-CioeRv3e.cjs}

@@ -188,7 +188,7 @@ function generateFontFace(metrics, fallback) {
 	const lineGapOverride = metrics.lineGap / adjustedEmSquare;
 	return `@font-face {\n${toCSS({
 		"font-family": JSON.stringify(fallbackName),
-		"src": renderLocalSrc(fallbackFontName),
+		"src": renderLocalSrc(fallbackFontName, fallbackMetrics),
 		"size-adjust": toPercentage(sizeAdjust),
 		"ascent-override": toPercentage(ascentOverride),
 		"descent-override": toPercentage(descentOverride),
@@ -196,8 +196,16 @@ function generateFontFace(metrics, fallback) {
 		...properties
 	})}\n}\n`;
 }
-function renderLocalSrc(font) {
-	return (genericFamilyLocals[withoutQuotes(font).toLowerCase()] || [font]).map((local) => `local(${JSON.stringify(local)})`).join(", ");
+function renderLocalSrc(font, metrics) {
+	const family = withoutQuotes(font);
+	const families = genericFamilyLocals[family.toLowerCase()] || [family];
+	const names = new Set(families.flatMap((family) => [
+		family,
+		`${family} Regular`,
+		`${family.replace(/\s+/g, "")}-Regular`
+	]));
+	for (const name of [metrics?.fullName, metrics?.postscriptName]) if (name) names.add(name);
+	return [...names].map((local) => `local(${JSON.stringify(local)})`).join(", ");
 }
 //#endregion
 //#region src/fallbacks.ts
@@ -207,35 +215,37 @@ function renderLocalSrc(font) {
 */
 const DEFAULT_CATEGORY_FALLBACKS = {
 	"sans-serif": [
-		"BlinkMacSystemFont",
 		"Segoe UI",
 		"Helvetica Neue",
 		"Arial",
-		"Noto Sans"
+		"Noto Sans",
+		"Liberation Sans"
 	],
 	"serif": [
 		"Times New Roman",
 		"Georgia",
-		"Noto Serif"
+		"Noto Serif",
+		"Liberation Serif"
 	],
 	"monospace": [
 		"Courier New",
 		"Roboto Mono",
-		"Noto Sans Mono"
+		"Noto Sans Mono",
+		"Liberation Mono"
 	],
 	"display": [
-		"BlinkMacSystemFont",
 		"Segoe UI",
 		"Helvetica Neue",
 		"Arial",
-		"Noto Sans"
+		"Noto Sans",
+		"Liberation Sans"
 	],
 	"handwriting": [
-		"BlinkMacSystemFont",
 		"Segoe UI",
 		"Helvetica Neue",
 		"Arial",
-		"Noto Sans"
+		"Noto Sans",
+		"Liberation Sans"
 	]
 };
 /**
@@ -270,6 +280,11 @@ function resolveCategoryFallbacks(options) {
 //#endregion
 //#region src/metrics.ts
 const metricCache = {};
+const metricAliases = {
+	"liberation sans": "Arimo",
+	"liberation serif": "Tinos",
+	"liberation mono": "Cousine"
+};
 function filterRequiredMetrics(font) {
 	return {
 		ascent: font.ascent,
@@ -290,7 +305,8 @@ async function getMetricsForFamily(family) {
 	family = withoutQuotes(family);
 	if (family in metricCache) return metricCache[family] ?? null;
 	try {
-		const name = fontFamilyToCamelCase(family);
+		const alias = metricAliases[family.toLowerCase()];
+		const name = fontFamilyToCamelCase(alias ?? family);
 		const { entireMetricsCollection } = await import("#capsize-font-metrics");
 		const metrics = entireMetricsCollection[name];
 		/* v8 ignore next 4 */
@@ -299,6 +315,10 @@ async function getMetricsForFamily(family) {
 			return null;
 		}
 		const filteredMetrics = filterRequiredMetrics(metrics);
+		if (!alias) {
+			filteredMetrics.fullName = metrics.fullName;
+			filteredMetrics.postscriptName = metrics.postscriptName;
+		}
 		metricCache[family] = filteredMetrics;
 		return filteredMetrics;
 	} catch {
@@ -324,7 +344,10 @@ async function readMetrics(_source) {
 	if (url.protocol === "file:") metrics = await (0, _capsizecss_unpack_fs.fromFile)((0, node_url.fileURLToPath)(source));
 	else if (urlRequestCache.has(source)) metrics = await urlRequestCache.get(source);
 	else {
-		const requestPromise = (0, _capsizecss_unpack.fromUrl)(source);
+		const requestPromise = (0, _capsizecss_unpack.fromUrl)(source).catch((error) => {
+			urlRequestCache.delete(source);
+			throw error;
+		});
 		urlRequestCache.set(source, requestPromise);
 		metrics = await requestPromise;
 	}

package/dist/{metrics-BfrxJdKT.mjs → metrics-Dru3RLLL.mjs}

@@ -188,7 +188,7 @@ function generateFontFace(metrics, fallback) {
 	const lineGapOverride = metrics.lineGap / adjustedEmSquare;
 	return `@font-face {\n${toCSS({
 		"font-family": JSON.stringify(fallbackName),
-		"src": renderLocalSrc(fallbackFontName),
+		"src": renderLocalSrc(fallbackFontName, fallbackMetrics),
 		"size-adjust": toPercentage(sizeAdjust),
 		"ascent-override": toPercentage(ascentOverride),
 		"descent-override": toPercentage(descentOverride),
@@ -196,8 +196,16 @@ function generateFontFace(metrics, fallback) {
 		...properties
 	})}\n}\n`;
 }
-function renderLocalSrc(font) {
-	return (genericFamilyLocals[withoutQuotes(font).toLowerCase()] || [font]).map((local) => `local(${JSON.stringify(local)})`).join(", ");
+function renderLocalSrc(font, metrics) {
+	const family = withoutQuotes(font);
+	const families = genericFamilyLocals[family.toLowerCase()] || [family];
+	const names = new Set(families.flatMap((family) => [
+		family,
+		`${family} Regular`,
+		`${family.replace(/\s+/g, "")}-Regular`
+	]));
+	for (const name of [metrics?.fullName, metrics?.postscriptName]) if (name) names.add(name);
+	return [...names].map((local) => `local(${JSON.stringify(local)})`).join(", ");
 }
 //#endregion
 //#region src/fallbacks.ts
@@ -207,35 +215,37 @@ function renderLocalSrc(font) {
 */
 const DEFAULT_CATEGORY_FALLBACKS = {
 	"sans-serif": [
-		"BlinkMacSystemFont",
 		"Segoe UI",
 		"Helvetica Neue",
 		"Arial",
-		"Noto Sans"
+		"Noto Sans",
+		"Liberation Sans"
 	],
 	"serif": [
 		"Times New Roman",
 		"Georgia",
-		"Noto Serif"
+		"Noto Serif",
+		"Liberation Serif"
 	],
 	"monospace": [
 		"Courier New",
 		"Roboto Mono",
-		"Noto Sans Mono"
+		"Noto Sans Mono",
+		"Liberation Mono"
 	],
 	"display": [
-		"BlinkMacSystemFont",
 		"Segoe UI",
 		"Helvetica Neue",
 		"Arial",
-		"Noto Sans"
+		"Noto Sans",
+		"Liberation Sans"
 	],
 	"handwriting": [
-		"BlinkMacSystemFont",
 		"Segoe UI",
 		"Helvetica Neue",
 		"Arial",
-		"Noto Sans"
+		"Noto Sans",
+		"Liberation Sans"
 	]
 };
 /**
@@ -270,6 +280,11 @@ function resolveCategoryFallbacks(options) {
 //#endregion
 //#region src/metrics.ts
 const metricCache = {};
+const metricAliases = {
+	"liberation sans": "Arimo",
+	"liberation serif": "Tinos",
+	"liberation mono": "Cousine"
+};
 function filterRequiredMetrics(font) {
 	return {
 		ascent: font.ascent,
@@ -290,7 +305,8 @@ async function getMetricsForFamily(family) {
 	family = withoutQuotes(family);
 	if (family in metricCache) return metricCache[family] ?? null;
 	try {
-		const name = fontFamilyToCamelCase(family);
+		const alias = metricAliases[family.toLowerCase()];
+		const name = fontFamilyToCamelCase(alias ?? family);
 		const { entireMetricsCollection } = await import("#capsize-font-metrics");
 		const metrics = entireMetricsCollection[name];
 		/* v8 ignore next 4 */
@@ -299,6 +315,10 @@ async function getMetricsForFamily(family) {
 			return null;
 		}
 		const filteredMetrics = filterRequiredMetrics(metrics);
+		if (!alias) {
+			filteredMetrics.fullName = metrics.fullName;
+			filteredMetrics.postscriptName = metrics.postscriptName;
+		}
 		metricCache[family] = filteredMetrics;
 		return filteredMetrics;
 	} catch {
@@ -324,7 +344,10 @@ async function readMetrics(_source) {
 	if (url.protocol === "file:") metrics = await fromFile(fileURLToPath(source));
 	else if (urlRequestCache.has(source)) metrics = await urlRequestCache.get(source);
 	else {
-		const requestPromise = fromUrl(source);
+		const requestPromise = fromUrl(source).catch((error) => {
+			urlRequestCache.delete(source);
+			throw error;
+		});
 		urlRequestCache.set(source, requestPromise);
 		metrics = await requestPromise;
 	}

package/dist/postcss.cjs

@@ -1,4 +1,4 @@
-const require_metrics = require("./metrics-CS5CISMK.cjs");
+const require_metrics = require("./metrics-CioeRv3e.cjs");
 let css_tree = require("css-tree");
 //#region src/postcss.ts
 const supportedExtensions = [

package/dist/postcss.mjs

@@ -1,4 +1,4 @@
-import { a as resolveCategoryFallbacks, c as generateFontFace, d as withoutQueryOrFragment, f as withoutQuotes, l as genericCSSFamilies, o as cssWideKeywords, r as readMetricsForSource, s as generateFallbackName, t as getMetricsForFamily, u as parseFontFace } from "./metrics-BfrxJdKT.mjs";
+import { a as resolveCategoryFallbacks, c as generateFontFace, d as withoutQueryOrFragment, f as withoutQuotes, l as genericCSSFamilies, o as cssWideKeywords, r as readMetricsForSource, s as generateFallbackName, t as getMetricsForFamily, u as parseFontFace } from "./metrics-Dru3RLLL.mjs";
 import { parse } from "css-tree";
 //#region src/postcss.ts
 const supportedExtensions = [

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "fontaine",
   "type": "module",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Automatic font fallback based on font metrics",
   "author": {
     "name": "Daniel Roe",
@@ -66,18 +66,18 @@
   "devDependencies": {
     "@capsizecss/metrics": "4.3.0",
     "@types/css-tree": "3.2.0",
-    "@types/node": "24.13.6",
+    "@types/node": "24.19.1",
     "@types/serve-handler": "6.1.4",
-    "@vitest/coverage-v8": "5.0.1",
-    "eslint": "10.11.0",
+    "@vitest/coverage-v8": "5.0.5",
+    "eslint": "10.13.0",
     "get-port-please": "3.2.0",
-    "magic-regexp": "0.11.0",
-    "postcss": "8.5.28",
+    "magic-regexp": "0.11.2",
+    "postcss": "8.5.29",
     "serve-handler": "6.1.7",
     "tsdown": "0.23.0",
     "typescript": "6.0.3",
-    "vite": "8.3.0",
-    "vitest": "5.0.1"
+    "vite": "8.3.4",
+    "vitest": "5.0.5"
   },
   "scripts": {
     "build": "tsdown",