@liiift-studio/sanity-font-manager 2.7.0 → 2.8.0

package/src/utils/retitleFontEntries.js

@@ -1,154 +1,154 @@
-// Lightweight retitle pass — re-derives title, documentId, weightName, and
-// subfamilyName from cached parsedMetadata when preserveShortenedNames changes.
-// No fontkit parsing, no file I/O, no Sanity queries — pure string manipulation.
-
-import { expandAbbreviations, generateStyleKeywords } from './generateKeywords.js';
-import { formatFontTitle, addItalicToFontTitle, processSubfamilyName } from './processFontFiles.js';
-import { sanitizeForSanityId } from './sanitizeForSanityId.js';
-
-const { weightKeywordList: WEIGHT_KW, italicKeywordList: ITALIC_KW } = generateStyleKeywords();
-
-/**
- * Re-derive title, documentId, weightName, and subfamilyName for a single
- * font entry using cached metadata and the new preserveShortenedNames setting.
- * Skips entries with user overrides on title (user edits take precedence).
- *
- * @param {object} entry - Font plan entry with parsedMetadata and decisions
- * @param {boolean} preserveShortenedNames - New setting value
- * @param {string} typefaceTitle - Parent typeface title (for prefix stripping)
- * @returns {object} Updated entry (shallow copy if changed, same ref if unchanged)
- */
-export function retitleFontEntry(entry, preserveShortenedNames, typefaceTitle) {
-	if (!entry || !entry.parsedMetadata) return entry;
-
-	// Skip entries with user overrides on title — user edits take precedence
-	if (entry.decisions?.title?.userOverride) return entry;
-
-	const meta = entry.parsedMetadata;
-	const fullName = meta.fullName || '';
-	const familyName = meta.familyName || '';
-	const trimmedTitle = (typefaceTitle || '').trim();
-
-	// Re-derive weightName from the original detected value
-	let weightName = entry.decisions?.weightName?.detected || entry.weightName || '';
-	if (!preserveShortenedNames) {
-		weightName = expandAbbreviations(weightName);
-	}
-
-	// Re-derive subfamilyName
-	const nameId4Remainder = fullName ? fullName.replace(trimmedTitle, '').trim() : '';
-	const nameId1Remainder = familyName ? familyName.replace(trimmedTitle, '').trim() : '';
-	let subfamilyName = nameId4Remainder || nameId1Remainder;
-
-	if (!preserveShortenedNames) {
-		subfamilyName = expandAbbreviations(subfamilyName);
-	}
-
-	subfamilyName = processSubfamilyName(subfamilyName, WEIGHT_KW, ITALIC_KW, preserveShortenedNames);
-
-	// Strip style-only names from subfamily
-	subfamilyName = subfamilyName
-		.replace(/\b(Italic|Slant|Slanted|Oblique|Backslant|Roman|Upright)\b/gi, '')
-		.replace(/\s+/g, ' ')
-		.trim();
-
-	// Strip subfamily from weightName to avoid duplication
-	if (subfamilyName !== '') {
-		weightName = weightName
-			.replace(`${subfamilyName} `, '')
-			.replace(` ${subfamilyName}`, '')
-			.trim();
-	}
-
-	// Re-derive title
-	let fontTitle = fullName.trim() || '';
-	fontTitle = formatFontTitle(fontTitle, preserveShortenedNames);
-
-	// Variable fonts get " VF" suffix
-	if (entry.variableFont) {
-		if (!fontTitle.toLowerCase().includes('vf')) {
-			fontTitle = fontTitle + ' VF';
-		}
-		subfamilyName = '';
-	}
-
-	// Add italic suffix if needed
-	if (!(entry.variableFont && fontTitle.toLowerCase().includes('italic'))) {
-		// Build a minimal font-like object for addItalicToFontTitle
-		const italicKW = entry.parsedMetadata.italicAngle !== 0 ? 'Italic' : '';
-		fontTitle = addItalicToFontTitle(
-			{ opentype: { tables: { post: { italicAngle: entry.parsedMetadata.italicAngle || 0 } } } },
-			fontTitle,
-			italicKW,
-			entry.style,
-			preserveShortenedNames
-		);
-	}
-
-	const documentId = sanitizeForSanityId(fontTitle);
-
-	// Only return a new object if something actually changed
-	if (
-		entry.title === fontTitle &&
-		entry.documentId === documentId &&
-		entry.weightName === weightName &&
-		entry.subfamily === (entry.variableFont ? '' : (subfamilyName || 'Regular'))
-	) {
-		return entry;
-	}
-
-	const finalSubfamily = entry.variableFont ? '' : (subfamilyName || 'Regular');
-
-	return {
-		...entry,
-		title: fontTitle,
-		documentId,
-		weightName,
-		subfamily: finalSubfamily,
-		decisions: {
-			...entry.decisions,
-			title: { ...entry.decisions.title, processed: fontTitle },
-			documentId: { ...entry.decisions.documentId, generated: documentId },
-			weightName: { ...entry.decisions.weightName, detected: weightName },
-			subfamily: { ...entry.decisions.subfamily, detected: finalSubfamily },
-		},
-	};
-}
-
-/**
- * Retitle all font entries in a plan. Returns a new fonts map.
- * Runs collision detection after retitling.
- *
- * @param {object} fonts - plan.fonts map
- * @param {boolean} preserveShortenedNames
- * @param {string} typefaceTitle
- * @returns {object} New fonts map with updated titles and _idConflict flags
- */
-export function retitleAllFonts(fonts, preserveShortenedNames, typefaceTitle) {
-	const updated = {};
-	for (const [tempId, entry] of Object.entries(fonts)) {
-		updated[tempId] = retitleFontEntry(entry, preserveShortenedNames, typefaceTitle);
-	}
-
-	// Run collision detection
-	const idMap = {};
-	for (const [tempId, font] of Object.entries(updated)) {
-		updated[tempId] = { ...font, _idConflict: false };
-		const docId = font.documentId;
-		if (!idMap[docId]) {
-			idMap[docId] = [tempId];
-		} else {
-			idMap[docId].push(tempId);
-		}
-	}
-
-	for (const ids of Object.values(idMap)) {
-		if (ids.length > 1) {
-			for (const id of ids) {
-				updated[id] = { ...updated[id], _idConflict: true };
-			}
-		}
-	}
-
-	return updated;
-}
+// Lightweight retitle pass — re-derives title, documentId, weightName, and
+// subfamilyName from cached parsedMetadata when preserveShortenedNames changes.
+// No fontkit parsing, no file I/O, no Sanity queries — pure string manipulation.
+
+import { expandAbbreviations, generateStyleKeywords } from './generateKeywords.js';
+import { formatFontTitle, addItalicToFontTitle, processSubfamilyName } from './processFontFiles.js';
+import { sanitizeForSanityId } from './sanitizeForSanityId.js';
+
+const { weightKeywordList: WEIGHT_KW, italicKeywordList: ITALIC_KW } = generateStyleKeywords();
+
+/**
+ * Re-derive title, documentId, weightName, and subfamilyName for a single
+ * font entry using cached metadata and the new preserveShortenedNames setting.
+ * Skips entries with user overrides on title (user edits take precedence).
+ *
+ * @param {object} entry - Font plan entry with parsedMetadata and decisions
+ * @param {boolean} preserveShortenedNames - New setting value
+ * @param {string} typefaceTitle - Parent typeface title (for prefix stripping)
+ * @returns {object} Updated entry (shallow copy if changed, same ref if unchanged)
+ */
+export function retitleFontEntry(entry, preserveShortenedNames, typefaceTitle) {
+	if (!entry || !entry.parsedMetadata) return entry;
+
+	// Skip entries with user overrides on title — user edits take precedence
+	if (entry.decisions?.title?.userOverride) return entry;
+
+	const meta = entry.parsedMetadata;
+	const fullName = meta.fullName || '';
+	const familyName = meta.familyName || '';
+	const trimmedTitle = (typefaceTitle || '').trim();
+
+	// Re-derive weightName from the original detected value
+	let weightName = entry.decisions?.weightName?.detected || entry.weightName || '';
+	if (!preserveShortenedNames) {
+		weightName = expandAbbreviations(weightName);
+	}
+
+	// Re-derive subfamilyName
+	const nameId4Remainder = fullName ? fullName.replace(trimmedTitle, '').trim() : '';
+	const nameId1Remainder = familyName ? familyName.replace(trimmedTitle, '').trim() : '';
+	let subfamilyName = nameId4Remainder || nameId1Remainder;
+
+	if (!preserveShortenedNames) {
+		subfamilyName = expandAbbreviations(subfamilyName);
+	}
+
+	subfamilyName = processSubfamilyName(subfamilyName, WEIGHT_KW, ITALIC_KW, preserveShortenedNames);
+
+	// Strip style-only names from subfamily
+	subfamilyName = subfamilyName
+		.replace(/\b(Italic|Slant|Slanted|Oblique|Backslant|Roman|Upright)\b/gi, '')
+		.replace(/\s+/g, ' ')
+		.trim();
+
+	// Strip subfamily from weightName to avoid duplication
+	if (subfamilyName !== '') {
+		weightName = weightName
+			.replace(`${subfamilyName} `, '')
+			.replace(` ${subfamilyName}`, '')
+			.trim();
+	}
+
+	// Re-derive title
+	let fontTitle = fullName.trim() || '';
+	fontTitle = formatFontTitle(fontTitle, preserveShortenedNames);
+
+	// Variable fonts get " VF" suffix
+	if (entry.variableFont) {
+		if (!fontTitle.toLowerCase().includes('vf')) {
+			fontTitle = fontTitle + ' VF';
+		}
+		subfamilyName = '';
+	}
+
+	// Add italic suffix if needed
+	if (!(entry.variableFont && fontTitle.toLowerCase().includes('italic'))) {
+		// Build a minimal font-like object for addItalicToFontTitle
+		const italicKW = entry.parsedMetadata.italicAngle !== 0 ? 'Italic' : '';
+		fontTitle = addItalicToFontTitle(
+			{ opentype: { tables: { post: { italicAngle: entry.parsedMetadata.italicAngle || 0 } } } },
+			fontTitle,
+			italicKW,
+			entry.style,
+			preserveShortenedNames
+		);
+	}
+
+	const documentId = sanitizeForSanityId(fontTitle);
+
+	// Only return a new object if something actually changed
+	if (
+		entry.title === fontTitle &&
+		entry.documentId === documentId &&
+		entry.weightName === weightName &&
+		entry.subfamily === (entry.variableFont ? '' : (subfamilyName || 'Regular'))
+	) {
+		return entry;
+	}
+
+	const finalSubfamily = entry.variableFont ? '' : (subfamilyName || 'Regular');
+
+	return {
+		...entry,
+		title: fontTitle,
+		documentId,
+		weightName,
+		subfamily: finalSubfamily,
+		decisions: {
+			...entry.decisions,
+			title: { ...entry.decisions.title, processed: fontTitle },
+			documentId: { ...entry.decisions.documentId, generated: documentId },
+			weightName: { ...entry.decisions.weightName, detected: weightName },
+			subfamily: { ...entry.decisions.subfamily, detected: finalSubfamily },
+		},
+	};
+}
+
+/**
+ * Retitle all font entries in a plan. Returns a new fonts map.
+ * Runs collision detection after retitling.
+ *
+ * @param {object} fonts - plan.fonts map
+ * @param {boolean} preserveShortenedNames
+ * @param {string} typefaceTitle
+ * @returns {object} New fonts map with updated titles and _idConflict flags
+ */
+export function retitleAllFonts(fonts, preserveShortenedNames, typefaceTitle) {
+	const updated = {};
+	for (const [tempId, entry] of Object.entries(fonts)) {
+		updated[tempId] = retitleFontEntry(entry, preserveShortenedNames, typefaceTitle);
+	}
+
+	// Run collision detection
+	const idMap = {};
+	for (const [tempId, font] of Object.entries(updated)) {
+		updated[tempId] = { ...font, _idConflict: false };
+		const docId = font.documentId;
+		if (!idMap[docId]) {
+			idMap[docId] = [tempId];
+		} else {
+			idMap[docId].push(tempId);
+		}
+	}
+
+	for (const ids of Object.values(idMap)) {
+		if (ids.length > 1) {
+			for (const id of ids) {
+				updated[id] = { ...updated[id], _idConflict: true };
+			}
+		}
+	}
+
+	return updated;
+}

package/src/utils/sanitizeForSanityId.js

@@ -1,65 +1,65 @@
-// Converts arbitrary strings into valid Sanity document IDs (lowercase, hyphens, no special characters)
-import slugify from 'slugify';
-
-/**
- * Sanitizes a string into a valid Sanity document ID.
- *
- * Sanity ID requirements:
- * - Must start with a letter or underscore (not a number or hyphen)
- * - Can only contain lowercase letters (a-z), numbers (0-9), hyphens (-), and underscores (_)
- * - Must be between 1 and 128 characters
- *
- * @param {string} str - The raw string (e.g. font title or filename) to sanitize
- * @returns {string} A valid Sanity document ID
- */
-export function sanitizeForSanityId(str) {
-	if (!str || typeof str !== 'string') {
-		return 'font-' + Date.now();
-	}
-
-	let sanitized = str.toLowerCase().trim();
-
-	// Replace common symbols before slugify
-	sanitized = sanitized.replace(/\+/g, 'plus');
-	sanitized = sanitized.replace(/&/g, 'and');
-	sanitized = sanitized.replace(/@/g, 'at');
-
-	sanitized = slugify(sanitized, {
-		replacement: '-',
-		remove: /[^\w\s-]/g,
-		lower: true,
-		strict: true,
-		locale: 'en',
-		trim: true,
-	});
-
-	// Strip any characters that still aren't lowercase-alphanumeric, hyphens, or underscores
-	sanitized = sanitized.replace(/[^a-z0-9\-_]/g, '-');
-
-	// Collapse repeated hyphens and strip leading/trailing hyphens or underscores
-	sanitized = sanitized.replace(/-+/g, '-');
-	sanitized = sanitized.replace(/^[-_]+|[-_]+$/g, '');
-
-	// IDs must not start with a number or hyphen
-	if (sanitized && !/^[a-z_]/.test(sanitized)) {
-		sanitized = 'font_' + sanitized;
-	}
-
-	if (!sanitized) {
-		sanitized = 'font_' + Date.now();
-	}
-
-	// Sanity hard-caps IDs at 128 characters
-	if (sanitized.length > 128) {
-		const hash = Math.random().toString(36).substring(2, 8);
-		sanitized = sanitized.substring(0, 120) + '_' + hash;
-	}
-
-	// Paranoid final validation
-	if (!/^[a-z_][a-z0-9\-_]*$/.test(sanitized)) {
-		console.warn(`ID sanitization produced invalid result: "${sanitized}", using fallback`);
-		sanitized = 'font_' + Date.now();
-	}
-
-	return sanitized;
-}
+// Converts arbitrary strings into valid Sanity document IDs (lowercase, hyphens, no special characters)
+import slugify from 'slugify';
+
+/**
+ * Sanitizes a string into a valid Sanity document ID.
+ *
+ * Sanity ID requirements:
+ * - Must start with a letter or underscore (not a number or hyphen)
+ * - Can only contain lowercase letters (a-z), numbers (0-9), hyphens (-), and underscores (_)
+ * - Must be between 1 and 128 characters
+ *
+ * @param {string} str - The raw string (e.g. font title or filename) to sanitize
+ * @returns {string} A valid Sanity document ID
+ */
+export function sanitizeForSanityId(str) {
+	if (!str || typeof str !== 'string') {
+		return 'font-' + Date.now();
+	}
+
+	let sanitized = str.toLowerCase().trim();
+
+	// Replace common symbols before slugify
+	sanitized = sanitized.replace(/\+/g, 'plus');
+	sanitized = sanitized.replace(/&/g, 'and');
+	sanitized = sanitized.replace(/@/g, 'at');
+
+	sanitized = slugify(sanitized, {
+		replacement: '-',
+		remove: /[^\w\s-]/g,
+		lower: true,
+		strict: true,
+		locale: 'en',
+		trim: true,
+	});
+
+	// Strip any characters that still aren't lowercase-alphanumeric, hyphens, or underscores
+	sanitized = sanitized.replace(/[^a-z0-9\-_]/g, '-');
+
+	// Collapse repeated hyphens and strip leading/trailing hyphens or underscores
+	sanitized = sanitized.replace(/-+/g, '-');
+	sanitized = sanitized.replace(/^[-_]+|[-_]+$/g, '');
+
+	// IDs must not start with a number or hyphen
+	if (sanitized && !/^[a-z_]/.test(sanitized)) {
+		sanitized = 'font_' + sanitized;
+	}
+
+	if (!sanitized) {
+		sanitized = 'font_' + Date.now();
+	}
+
+	// Sanity hard-caps IDs at 128 characters
+	if (sanitized.length > 128) {
+		const hash = Math.random().toString(36).substring(2, 8);
+		sanitized = sanitized.substring(0, 120) + '_' + hash;
+	}
+
+	// Paranoid final validation
+	if (!/^[a-z_][a-z0-9\-_]*$/.test(sanitized)) {
+		console.warn(`ID sanitization produced invalid result: "${sanitized}", using fallback`);
+		sanitized = 'font_' + Date.now();
+	}
+
+	return sanitized;
+}

package/src/utils/setupDecompressors.js

@@ -1,27 +1,27 @@
-// Sets up globalThis.pako and globalThis.unbrotli for lib-font WOFF/WOFF2 decompression.
-// Must be imported before lib-font.
-
-import pako from 'pako';
-
-// Set pako for WOFF (zlib) decompression
-globalThis.pako = pako;
-
-// Set unbrotli for WOFF2 (brotli) decompression
-// The vendor unbrotli.js UMD sets globalThis.unbrotli in browser contexts.
-// In Node/bundler contexts it exports via module.exports instead.
-// We use a side-effect import and then check if the global was set.
-import '../vendor/unbrotli.js';
-
-// If the UMD didn't set the global (CJS path in Node/bundler), try to require it
-if (!globalThis.unbrotli) {
-	try {
-		// In bundler context, the UMD file's module.exports is available
-		// tsup will resolve this at build time
-		const brotli = require('../vendor/unbrotli.js');
-		if (typeof brotli === 'function') {
-			globalThis.unbrotli = brotli;
-		}
-	} catch {
-		// Silently fail — WOFF2 parsing will error gracefully
-	}
-}
+// Sets up globalThis.pako and globalThis.unbrotli for lib-font WOFF/WOFF2 decompression.
+// Must be imported before lib-font.
+
+import pako from 'pako';
+
+// Set pako for WOFF (zlib) decompression
+globalThis.pako = pako;
+
+// Set unbrotli for WOFF2 (brotli) decompression
+// The vendor unbrotli.js UMD sets globalThis.unbrotli in browser contexts.
+// In Node/bundler contexts it exports via module.exports instead.
+// We use a side-effect import and then check if the global was set.
+import '../vendor/unbrotli.js';
+
+// If the UMD didn't set the global (CJS path in Node/bundler), try to require it
+if (!globalThis.unbrotli) {
+	try {
+		// In bundler context, the UMD file's module.exports is available
+		// tsup will resolve this at build time
+		const brotli = require('../vendor/unbrotli.js');
+		if (typeof brotli === 'function') {
+			globalThis.unbrotli = brotli;
+		}
+	} catch {
+		// Silently fail — WOFF2 parsing will error gracefully
+	}
+}