@liiift-studio/sanity-font-manager 2.3.16 → 2.3.18

package/dist/index.js

@@ -644,21 +644,25 @@ var FAMILY_CLASS_MAP = {
   7: "serif",
   8: "sans-serif"
 };
-function detectFontCategory(font) {
-  var _a, _b;
+var SERIF_NAMES = /jubilat|corundum|dapifer|birra|daith/i;
+var SANS_NAMES = /halyard|gamay|omnes|kit/i;
+function detectFontCategory(font, fontName) {
+  var _a;
+  if (fontName && SERIF_NAMES.test(fontName)) return "serif";
+  if (fontName && SANS_NAMES.test(fontName)) return "sans-serif";
   try {
-    const familyClass = ((_b = (_a = font._tables) == null ? void 0 : _a["OS/2"]) == null ? void 0 : _b.sFamilyClass) ?? 0;
+    const familyClass = ((_a = font["OS/2"]) == null ? void 0 : _a.sFamilyClass) ?? 0;
     const highByte = familyClass >> 8 & 255;
     return FAMILY_CLASS_MAP[highByte] ?? "default";
   } catch {
     return "default";
   }
 }
-function calcFallbackData(arrayBuffer) {
+function calcFallbackData(arrayBuffer, fontName) {
   try {
     let font = fontkit2.create(import_buffer.Buffer.from(arrayBuffer));
     let upm = font.unitsPerEm;
-    let category = detectFontCategory(font);
+    let category = detectFontCategory(font, fontName);
     return {
       fallbackSrc: FALLBACK_STACKS[category],
       ascentOverride: `${(font.ascent / upm * 100).toFixed(2)}%`,
@@ -690,7 +694,7 @@ async function generateCssFile({
     let arrayBuffer = await woff2File.arrayBuffer();
     let b64 = _arrayBufferToBase64(arrayBuffer);
     let fontkitFont = fontkit2.create(import_buffer.Buffer.from(arrayBuffer));
-    let { fallbackSrc, ascentOverride, descentOverride, lineGapOverride } = calcFallbackData(arrayBuffer);
+    let { fallbackSrc, ascentOverride, descentOverride, lineGapOverride } = calcFallbackData(arrayBuffer, fontName);
     let cssString;
     if (variableFont) {
       let { descriptors, skipped } = buildVFDescriptors(fontkitFont);
@@ -6806,7 +6810,19 @@ var stylisticSetField = {
 };
 
 // src/schema/stylesField.js
+var import_react21 = __toESM(require("react"));
 var import_sanity_advanced_reference_array = require("@liiift-studio/sanity-advanced-reference-array");
+var typefaceParams = (doc) => ({ typefaceName: (doc == null ? void 0 : doc.title) || "" });
+var FontsRefArray = (props) => import_react21.default.createElement(import_sanity_advanced_reference_array.AdvancedRefArray, {
+  ...props,
+  filterGroq: "lower(typefaceName) == lower($typefaceName)",
+  filterParams: typefaceParams
+});
+var VariableFontsRefArray = (props) => import_react21.default.createElement(import_sanity_advanced_reference_array.AdvancedRefArray, {
+  ...props,
+  filterGroq: "lower(typefaceName) == lower($typefaceName) && variableFont == true",
+  filterParams: typefaceParams
+});
 var field = (condition, def) => condition ? [def] : [];
 var fontsFilter = async ({ getClient, document, parent }) => {
   const client = getClient({ apiVersion: "2022-11-09" });
@@ -6881,7 +6897,7 @@ function createStylesField({
       title: "Fonts",
       name: "fonts",
       type: "array",
-      components: { input: import_sanity_advanced_reference_array.AdvancedRefArray },
+      components: { input: FontsRefArray },
       of: [{ type: "reference", weak: true, to: [{ type: "font" }] }],
       options: {
         sortable: true,
@@ -6958,7 +6974,7 @@ function createStylesField({
       title: "Fonts",
       name: "fonts",
       type: "array",
-      components: { input: import_sanity_advanced_reference_array.AdvancedRefArray },
+      components: { input: FontsRefArray },
       of: [{
         type: "reference",
         weak: true,
@@ -6971,7 +6987,7 @@ function createStylesField({
       title: "Variable Fonts",
       name: "variableFont",
       type: "array",
-      components: { input: import_sanity_advanced_reference_array.AdvancedRefArray },
+      components: { input: VariableFontsRefArray },
       of: [{
         type: "reference",
         weak: true,

package/dist/index.mjs

@@ -554,21 +554,25 @@ var FAMILY_CLASS_MAP = {
   7: "serif",
   8: "sans-serif"
 };
-function detectFontCategory(font) {
-  var _a, _b;
+var SERIF_NAMES = /jubilat|corundum|dapifer|birra|daith/i;
+var SANS_NAMES = /halyard|gamay|omnes|kit/i;
+function detectFontCategory(font, fontName) {
+  var _a;
+  if (fontName && SERIF_NAMES.test(fontName)) return "serif";
+  if (fontName && SANS_NAMES.test(fontName)) return "sans-serif";
   try {
-    const familyClass = ((_b = (_a = font._tables) == null ? void 0 : _a["OS/2"]) == null ? void 0 : _b.sFamilyClass) ?? 0;
+    const familyClass = ((_a = font["OS/2"]) == null ? void 0 : _a.sFamilyClass) ?? 0;
     const highByte = familyClass >> 8 & 255;
     return FAMILY_CLASS_MAP[highByte] ?? "default";
   } catch {
     return "default";
   }
 }
-function calcFallbackData(arrayBuffer) {
+function calcFallbackData(arrayBuffer, fontName) {
   try {
     let font = fontkit2.create(Buffer.from(arrayBuffer));
     let upm = font.unitsPerEm;
-    let category = detectFontCategory(font);
+    let category = detectFontCategory(font, fontName);
     return {
       fallbackSrc: FALLBACK_STACKS[category],
       ascentOverride: `${(font.ascent / upm * 100).toFixed(2)}%`,
@@ -600,7 +604,7 @@ async function generateCssFile({
     let arrayBuffer = await woff2File.arrayBuffer();
     let b64 = _arrayBufferToBase64(arrayBuffer);
     let fontkitFont = fontkit2.create(Buffer.from(arrayBuffer));
-    let { fallbackSrc, ascentOverride, descentOverride, lineGapOverride } = calcFallbackData(arrayBuffer);
+    let { fallbackSrc, ascentOverride, descentOverride, lineGapOverride } = calcFallbackData(arrayBuffer, fontName);
     let cssString;
     if (variableFont) {
       let { descriptors, skipped } = buildVFDescriptors(fontkitFont);
@@ -6716,7 +6720,19 @@ var stylisticSetField = {
 };
 
 // src/schema/stylesField.js
+import React19 from "react";
 import { AdvancedRefArray } from "@liiift-studio/sanity-advanced-reference-array";
+var typefaceParams = (doc) => ({ typefaceName: (doc == null ? void 0 : doc.title) || "" });
+var FontsRefArray = (props) => React19.createElement(AdvancedRefArray, {
+  ...props,
+  filterGroq: "lower(typefaceName) == lower($typefaceName)",
+  filterParams: typefaceParams
+});
+var VariableFontsRefArray = (props) => React19.createElement(AdvancedRefArray, {
+  ...props,
+  filterGroq: "lower(typefaceName) == lower($typefaceName) && variableFont == true",
+  filterParams: typefaceParams
+});
 var field = (condition, def) => condition ? [def] : [];
 var fontsFilter = async ({ getClient, document, parent }) => {
   const client = getClient({ apiVersion: "2022-11-09" });
@@ -6791,7 +6807,7 @@ function createStylesField({
       title: "Fonts",
       name: "fonts",
       type: "array",
-      components: { input: AdvancedRefArray },
+      components: { input: FontsRefArray },
       of: [{ type: "reference", weak: true, to: [{ type: "font" }] }],
       options: {
         sortable: true,
@@ -6868,7 +6884,7 @@ function createStylesField({
       title: "Fonts",
       name: "fonts",
       type: "array",
-      components: { input: AdvancedRefArray },
+      components: { input: FontsRefArray },
       of: [{
         type: "reference",
         weak: true,
@@ -6881,7 +6897,7 @@ function createStylesField({
       title: "Variable Fonts",
       name: "variableFont",
       type: "array",
-      components: { input: AdvancedRefArray },
+      components: { input: VariableFontsRefArray },
       of: [{
         type: "reference",
         weak: true,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@liiift-studio/sanity-font-manager",
-	"version": "2.3.16",
+	"version": "2.3.18",
 	"description": "Sanity Studio plugin — full font management suite with batch upload, format conversion, metadata extraction, CSS generation, collection/pair generation, and script variant support. Supports Sanity v3, v4, and v5.",
 	"license": "MIT",
 	"author": "Liiift Studio",

package/src/schema/stylesField.js

@@ -1,7 +1,25 @@
 // Sanity schema factory function for the Styles object field — call createStylesField(options) to generate the field definition for a typeface document
+import React from 'react';
 import { AdvancedRefArray } from '@liiift-studio/sanity-advanced-reference-array';
 import { RegenerateSubfamiliesComponent } from '../components/RegenerateSubfamiliesComponent.jsx';
 
+// Returns extra GROQ params scoped to the current typeface document
+const typefaceParams = (doc) => ({ typefaceName: doc?.title || '' });
+
+// AdvancedRefArray wrapper — limits search results to fonts belonging to this typeface
+const FontsRefArray = (props) => React.createElement(AdvancedRefArray, {
+	...props,
+	filterGroq: 'lower(typefaceName) == lower($typefaceName)',
+	filterParams: typefaceParams,
+});
+
+// AdvancedRefArray wrapper — limits search results to variable fonts belonging to this typeface
+const VariableFontsRefArray = (props) => React.createElement(AdvancedRefArray, {
+	...props,
+	filterGroq: 'lower(typefaceName) == lower($typefaceName) && variableFont == true',
+	filterParams: typefaceParams,
+});
+
 // Conditionally includes a field definition in an array
 const field = (condition, def) => condition ? [def] : [];
 
@@ -102,7 +120,7 @@ export function createStylesField({
 			title: 'Fonts',
 			name: 'fonts',
 			type: 'array',
-			components: { input: AdvancedRefArray },
+			components: { input: FontsRefArray },
 			of: [{ type: 'reference', weak: true, to: [{ type: 'font' }] }],
 			options: {
 				sortable: true,
@@ -181,7 +199,7 @@ export function createStylesField({
 			title: 'Fonts',
 			name: 'fonts',
 			type: 'array',
-			components: { input: AdvancedRefArray },
+			components: { input: FontsRefArray },
 			of: [{
 				type: 'reference',
 				weak: true,
@@ -194,7 +212,7 @@ export function createStylesField({
 			title: 'Variable Fonts',
 			name: 'variableFont',
 			type: 'array',
-			components: { input: AdvancedRefArray },
+			components: { input: VariableFontsRefArray },
 			of: [{
 				type: 'reference',
 				weak: true,

package/src/utils/generateCssFile.js

@@ -84,10 +84,18 @@ const FAMILY_CLASS_MAP = {
 	8: 'sans-serif',
 };
 
-/** Detects font category from the OS/2 sFamilyClass field; returns a key into FALLBACK_STACKS */
-function detectFontCategory(font) {
+// Darden Studio fonts have sFamilyClass: 0 (No Classification) in their OS/2 table,
+// so name-based matching is used as the primary signal.
+const SERIF_NAMES  = /jubilat|corundum|dapifer|birra|daith/i;
+const SANS_NAMES   = /halyard|gamay|omnes|kit/i;
+
+/** Detects font category from the font name first, then OS/2 sFamilyClass as fallback */
+function detectFontCategory(font, fontName) {
+	if (fontName && SERIF_NAMES.test(fontName)) return 'serif';
+	if (fontName && SANS_NAMES.test(fontName)) return 'sans-serif';
 	try {
-		const familyClass = font._tables?.['OS/2']?.sFamilyClass ?? 0;
+		// fontkit v2: font['OS/2'] exposes the parsed OS/2 table directly
+		const familyClass = font['OS/2']?.sFamilyClass ?? 0;
 		const highByte = (familyClass >> 8) & 0xFF;
 		return FAMILY_CLASS_MAP[highByte] ?? 'default';
 	} catch {
@@ -96,11 +104,11 @@ function detectFontCategory(font) {
 }
 
 /** Extracts metric override percentages and detects the category fallback stack from a font ArrayBuffer */
-function calcFallbackData(arrayBuffer) {
+function calcFallbackData(arrayBuffer, fontName) {
 	try {
 		let font = fontkit.create(Buffer.from(arrayBuffer));
 		let upm = font.unitsPerEm;
-		let category = detectFontCategory(font);
+		let category = detectFontCategory(font, fontName);
 		return {
 			fallbackSrc: FALLBACK_STACKS[category],
 			ascentOverride: `${(font.ascent / upm * 100).toFixed(2)}%`,
@@ -134,7 +142,7 @@ export default async function generateCssFile({
 		let arrayBuffer = await woff2File.arrayBuffer();
 		let b64 = _arrayBufferToBase64(arrayBuffer);
 		let fontkitFont = fontkit.create(Buffer.from(arrayBuffer));
-		let { fallbackSrc, ascentOverride, descentOverride, lineGapOverride } = calcFallbackData(arrayBuffer);
+		let { fallbackSrc, ascentOverride, descentOverride, lineGapOverride } = calcFallbackData(arrayBuffer, fontName);
 
 		let cssString;
 		if (variableFont) {