Skip to content

fix: do not mark invalid/non-primitive fontFamily tokens as fontFamily #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 13, 2025
Merged

fix: do not mark invalid/non-primitive fontFamily tokens as fontFamily #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/destructure-font-family.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,18 @@ test('multiple font-family with spaces and quotes', () => {
expect.soft(destructure_font_family('"Arial Black", sans-serif')).toEqual(['Arial Black', 'sans-serif'])
})

test('with emoji name', () => {
expect.soft(destructure_font_family('💪')).toEqual(['💪'])
})

test('single var()', () => {
expect.soft(destructure_font_family('var(--family)')).toEqual(['var(--family)'])
expect.soft(destructure_font_family('var(--family)')).toBeUndefined()
})

test('multiple var()', () => {
expect.soft(destructure_font_family('var(--family), var(--family2)')).toEqual(['var(--family)', 'var(--family2)'])
expect.soft(destructure_font_family('var(--family), var(--family2)')).toBeUndefined()
})

test('var() with fallback', () => {
expect.soft(destructure_font_family('var(--family, Arial)')).toEqual(['var(--family, Arial)'])
})

test('with emoji name', () => {
expect.soft(destructure_font_family('💪')).toEqual(['💪'])
expect.soft(destructure_font_family('var(--family, Arial)')).toBeUndefined()
})
8 changes: 6 additions & 2 deletions src/destructure-font-family.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
import { parse, type Value, type CssNode } from 'css-tree'
import { unquote } from './unquote.js'

export function destructure_font_family(value: string): string[] {
export function destructure_font_family(value: string): string[] | undefined {
if (value.toLowerCase().includes('var(')) {
return undefined
}

let ast = parse(value, {
context: 'value',
positions: true
positions: true,
}) as Value

function generate(node: CssNode) {
Expand Down
Loading