Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion _includes/packages/macros.njk
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,9 @@
{% set icon_id = (label | label_icon_id) if with_icons else '' %}
{% if icon_id %}
{% set tint = (label | label_icon_tint) if with_icons else '' %}
{% set icon_sprite = (label | label_icon_sprite) if with_icons else '' %}
<svg class="label-icon{{ (' label-icon--' ~ tint) if tint }}" aria-hidden="true">
<use href="/{{ 'static/label-icons.svg' | bust }}#{{ icon_id }}"></use>
<use href="/{{ icon_sprite | bust }}#{{ icon_id }}"></use>
</svg>
{% endif %}
{{ label }}
Expand Down
55 changes: 52 additions & 3 deletions eleventy.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ const FEATURED_LABELS = [
'theme',
]
const LABELS_RANK = new Map(FEATURED_LABELS.map((label, index) => [label, index]))
const LABEL_ICON_MINIMUM_USAGE = 3
const LABEL_ICON_RECENT_WINDOW_DAYS = 365

const MS_IN_DAY = 24 * 60 * 60 * 1000
const MAGIC_FRESHNESS_WINDOW_DAYS = 365 * 2 // bonus for packages that had updates
Expand Down Expand Up @@ -374,6 +376,7 @@ export default async function (eleventyConfig) {
const siteOrigin = isProd ? prodOrigin : devOrigin
const staticOutputDir = isProd ? 'static_' + util.gitHash : 'static'
const bundledScriptEntries = new Set()
let labelIcons = null

eleventyConfig.addPassthroughCopy(
{ static: staticOutputDir },
Expand All @@ -388,6 +391,11 @@ export default async function (eleventyConfig) {
eleventyConfig.on('eleventy.after', async ({ directories } = {}) => {
const outputDir = directories?.output ?? '_site'
await writeVendorModules(path.join(outputDir, staticOutputDir, 'vendor'))
writeLabelIconSprites(
'static/label-icons.svg',
path.join(outputDir, staticOutputDir),
labelIcons,
)

if (!isProd) {
return
Expand Down Expand Up @@ -524,6 +532,7 @@ export default async function (eleventyConfig) {

const packages = all_packages.map(packageData)
const packagesWithMagic = computeMagicMetadata(packages)
const labels = util.collectLabels(all_packages)

const livingHomePackages = packages.filter(pkg => !pkg.removed)

Expand All @@ -535,6 +544,21 @@ export default async function (eleventyConfig) {

const newestHomePackages = packagesByDate('first_seen').slice(0, HOME_SECTION_PACKAGE_LIMIT)
const updatedHomePackages = packagesByDate('last_modified').slice(0, HOME_SECTION_PACKAGE_LIMIT)
const latestPackageUpdate = livingHomePackages.reduce(
(latest, pkg) => Math.max(latest, new Date(pkg.last_modified ?? 0).getTime() || 0),
0,
)
const recentCutoff = latestPackageUpdate - LABEL_ICON_RECENT_WINDOW_DAYS * MS_IN_DAY
const recentlyUpdatedPackages = livingHomePackages.filter(
pkg => new Date(pkg.last_modified ?? 0).getTime() >= recentCutoff,
)
labelIcons = filters.configureLabelIcons(labels, {
minimumUsage: LABEL_ICON_MINIMUM_USAGE,
preferredPackages: [
...newestHomePackages,
...recentlyUpdatedPackages,
],
})

const remarkablePackages = () => {
const alreadyFeatured = new Set()
Expand Down Expand Up @@ -613,9 +637,7 @@ export default async function (eleventyConfig) {
}
}

eleventyConfig.addCollection('labels', () => {
return util.collectLabels(all_packages)
})
eleventyConfig.addCollection('labels', () => labels)

eleventyConfig.addCollection('libraries', () => {
return Object.values(workspace.libraries)
Expand Down Expand Up @@ -678,6 +700,7 @@ export default async function (eleventyConfig) {

// Register all named exports from external module as filters
for (const [name, fn] of Object.entries(filters)) {
if (name === 'configureLabelIcons') continue
eleventyConfig.addFilter(name, fn)
}

Expand All @@ -696,6 +719,32 @@ export default async function (eleventyConfig) {
}
}

function writeLabelIconSprites(sourcePath, outputDir, labelIcons) {
if (!(labelIcons?.primarySources instanceof Set) || !fs.existsSync(sourcePath)) {
return
}

const source = fs.readFileSync(sourcePath, 'utf8')
fs.mkdirSync(outputDir, { recursive: true })
fs.writeFileSync(
path.join(outputDir, 'label-icons.svg'),
labelIconSpriteForSources(source, labelIcons.primarySources),
'utf8',
)
fs.writeFileSync(
path.join(outputDir, 'label-icons-extra.svg'),
labelIconSpriteForSources(source, labelIcons.secondarySources),
'utf8',
)
}

function labelIconSpriteForSources(source, sources) {
return source.replace(
/<symbol\b[^>]*\bid="label-icon-([^"]+)"[^>]*>[\s\S]*?<\/symbol>\r?\n?/g,
(symbol, iconSource) => sources.has(iconSource) ? symbol : '',
)
}

async function bundleJs(staticOutputDir, entries, isProd) {
if (!entries.size) {
return
Expand Down
88 changes: 88 additions & 0 deletions eleventy.filters.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ const configPath = path.join(__dirname, 'label-icons-config.json')
let labelIconSourceSet = new Set()
let labelIconAliases = {}
let labelIconTints = {}
let labelIconPrimarySourceSet = null
let labelIconSecondarySourceSet = null

const longDateFormatter = new Intl.DateTimeFormat('en-US', { dateStyle: 'long' })
const compactNumberFormatter = new Intl.NumberFormat('en', { notation: 'compact' })
Expand Down Expand Up @@ -70,6 +72,18 @@ export function label_icon_tints_json() {
return JSON.stringify(labelIconTints)
}

export function configureLabelIcons(labels, { minimumUsage = 1, preferredPackages = [] } = {}) {
labelIconPrimarySourceSet = primaryLabelIconSources(labels, minimumUsage, preferredPackages)
labelIconSecondarySourceSet = new Set(
Array.from(labelIconSourceSet).filter(source => !labelIconPrimarySourceSet.has(source)),
)

return {
primarySources: labelIconPrimarySourceSet,
secondarySources: labelIconSecondarySourceSet,
}
}

export function label_normalization_note(changes) {
const sortedChanges = changes
.map(change => ({ from: String(change.from), to: String(change.to) }))
Expand Down Expand Up @@ -103,6 +117,7 @@ export function search_index_json(packages) {
packages: packages.map(compactSearchPackage),
label_icon_aliases: labelIconAliases,
label_icon_tints: labelIconTints,
label_icon_secondary: Array.from(labelIconSecondarySourceSet ?? []),
})
}

Expand Down Expand Up @@ -186,6 +201,53 @@ function joinAsSentenceList(parts) {
return `${parts.slice(0, -1).join(', ')}, and ${parts.at(-1)}`
}

function primaryLabelIconSources(labels, minimumUsage, preferredPackages) {
const counts = new Map()
const threshold = Math.max(1, Number(minimumUsage) || 1)

for (const item of labels ?? []) {
const key = typeof item?.key === 'string' ? item.key : String(item ?? '')
const canonical = sourceLabelFor(key)
if (!canonical) continue

const count = Number(item?.count ?? 1)
counts.set(canonical, (counts.get(canonical) ?? 0) + (Number.isFinite(count) ? count : 1))
}

const sources = new Set()
for (const source of labelIconSourceSet) {
if ((counts.get(source) ?? 0) >= threshold) {
sources.add(source)
}
}

for (const pkg of preferredPackages) {
for (const label of pkg.labels ?? []) {
const source = sourceLabelFor(label)
if (source) sources.add(source)
}
}

return sources
}

function sourceLabelFor(label) {
if (typeof label !== 'string') return ''
const normalized = label.trim().toLowerCase()
if (!normalized) return ''

const alias = labelIconAliases[normalized]
if (alias && labelIconSourceSet.has(alias)) {
return alias
}

if (labelIconSourceSet.has(normalized)) {
return normalized
}

return ''
}

function canonicalLabel(label) {
if (typeof label !== 'string') return ''
const normalized = label.trim().toLowerCase()
Expand Down Expand Up @@ -215,6 +277,14 @@ export function label_icon_tint(label) {
return labelIconTints[canonical] ?? ''
}

export function label_icon_sprite(label) {
const canonical = canonicalLabel(label)
if (!canonical) return ''
return labelIconSecondarySourceSet?.has(canonical)
? 'static/label-icons-extra.svg'
: 'static/label-icons.svg'
}

// number formatting with grouping (e.g. 10,000)
export function grouping(count) {
return groupedNumberFormatter.format(count)
Expand Down Expand Up @@ -265,6 +335,24 @@ export function bust(p) {
if (import.meta.vitest) {
const { describe, it, expect } = import.meta.vitest

describe('label icon sprites', () => {
it('keeps common and preferred icons in the primary sprite', () => {
const sprites = configureLabelIcons([
{ key: 'python', count: 3 },
{ key: 'typst', count: 1 },
], {
minimumUsage: 3,
preferredPackages: [{ labels: ['typst'] }],
})

expect(sprites.primarySources).toContain('python')
expect(sprites.primarySources).toContain('typst')
expect(sprites.secondarySources).toContain('audio')
expect(label_icon_sprite('typst')).toBe('static/label-icons.svg')
expect(label_icon_sprite('audio')).toBe('static/label-icons-extra.svg')
})
})

describe('date_time_format', () => {
it.each([
[[new Date('2025-09-08T11:12:59Z')], '2025-09-08 11:12'],
Expand Down
5 changes: 3 additions & 2 deletions label-icons-config.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{
"_": "Manually maintained set of icons to exclude and an alias map from labels to icon/language ids",
"exclude": ["ai"],
"exclude": ["ai", "c", "c#", "c++"],
"aliases": {
"javascript": "js",
"ecmascript": "js",
"ecmascript6": "js"
"ecmascript6": "js",
"cpp": "c++"
}
}
4 changes: 0 additions & 4 deletions label-icons.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,11 @@
"binary": "graphite",
"blade": "orange",
"bower": "yellow",
"c": "purple",
"c#": "blue",
"c++": "sky",
"cairo": "graphite",
"clojure": "purple",
"cmake": "blue",
"coffeescript": "orange",
"composer": "orange",
"cpp": "sky",
"crystal": "graphite",
"css": "blue",
"csv": "green",
Expand Down
3 changes: 2 additions & 1 deletion labels.njk
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,9 @@ page_type: labels
{% set icon_id = item.key | label_icon_id %}
{% if icon_id %}
{% set tint = item.key | label_icon_tint %}
{% set icon_sprite = item.key | label_icon_sprite %}
<svg class="label-icon{{ (' label-icon--' ~ tint) if tint }}" aria-hidden="true">
<use href="/{{ 'static/label-icons.svg' | bust }}#{{ icon_id }}"></use>
<use href="/{{ icon_sprite | bust }}#{{ icon_id }}"></use>
</svg>
{% endif %}
{{ item.key }}
Expand Down
Loading
Loading