Skip to content

refactor: cleanup Takumi glue code #490

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
harlan-zw merged 4 commits into from
Feb 28, 2026
Merged

refactor: cleanup Takumi glue code #490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
96d56bc
refactor: cleanup Takumi glue code
kane50613 Feb 28, 2026
3cfa68e
chore: remove unused test cases
kane50613 Feb 28, 2026
678d16d
lint
kane50613 Feb 28, 2026
e1037d5
fix: bring back `resolveColorMix` for satori
kane50613 Feb 28, 2026
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
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@
"peerDependencies": {
"@resvg/resvg-js": "^2.6.0",
"@resvg/resvg-wasm": "^2.6.0",
"@takumi-rs/core": "^0.69.0",
"@takumi-rs/wasm": "^0.69.0",
"@takumi-rs/core": "^0.69.5",
"@takumi-rs/wasm": "^0.69.5",
"@unhead/vue": "^2.0.5",
"fontless": "^0.2.0",
"playwright-core": "^1.50.0",
Expand Down
12 changes: 6 additions & 6 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

155 changes: 9 additions & 146 deletions src/runtime/server/og-image/takumi/nodes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import type { OgImageRenderEventContext, VNode } from '../../../types'
import { createVNodes, SVG_CAMEL_ATTR_VALUES } from '../core/vnodes'
import { resolveUnsupportedUnits, stripGradientColorSpace } from '../utils/css'

export interface TakumiNode {
type: 'container' | 'image' | 'text'
Expand All @@ -15,116 +14,28 @@ export interface TakumiNode {

export async function createTakumiNodes(ctx: OgImageRenderEventContext): Promise<TakumiNode> {
const vnodeTree = await createVNodes(ctx)
return await vnodeToTakumiNode(vnodeTree, Number(ctx.options.width), Number(ctx.options.height))
return await vnodeToTakumiNode(vnodeTree)
}

async function vnodeToTakumiNode(vnode: VNode, parentWidth?: number, parentHeight?: number, inheritedColor?: string): Promise<TakumiNode> {
let { style, children, class: cls, tw, src, width, height, ...rest } = vnode.props
async function vnodeToTakumiNode(vnode: VNode): Promise<TakumiNode> {
const { style, children, class: cls, tw, src, width, height, ...rest } = vnode.props

if (style && typeof style === 'object') {
style = Object.fromEntries(
Object.entries(style)
.filter(([_, v]) => v !== undefined && v !== null && v !== '')
.map(([k, v]) => [k, typeof v === 'string' ? resolveUnsupportedUnits(v, parentWidth, parentHeight) : v]),
)
// Takumi expects lineClamp as a number, but HTML/CSS parsing yields a string
if (style.lineClamp != null)
style.lineClamp = Number(style.lineClamp)
if (Object.keys(style).length === 0)
style = undefined
}

// Helper to resolve units to pixels
const resolvePx = (val: any, total?: number) => {
if (typeof val === 'string') {
if (val.includes('calc('))
return undefined
const num = Number.parseFloat(val)
if (Number.isNaN(num))
return undefined
if (val.endsWith('%') && total)
return (num / 100) * total
if (val.endsWith('em') || val.endsWith('rem'))
return num * 16
return num
}
if (typeof val === 'number')
return val
return undefined
}

// Dimension fallback logic
const resolvedWidth = resolvePx(width, parentWidth) || resolvePx(style?.width, parentWidth) || extractTwDim(tw || cls, 'w', parentWidth)
const resolvedHeight = resolvePx(height, parentHeight) || resolvePx(style?.height, parentHeight) || extractTwDim(tw || cls, 'h', parentHeight)

// Resolve color for currentColor inheritance (CSS color cascades to children)
const nodeColor = style?.color || inheritedColor

// SVG elements → convert to SVG data URI for takumi to handle
// SVG elements → convert to SVG to string
if (vnode.type === 'svg') {
let finalWidth = resolvedWidth
let finalHeight = resolvedHeight

// Parse viewBox for missing dimensions
if ((!finalWidth || !finalHeight) && typeof rest.viewBox === 'string') {
const parts = rest.viewBox.split(/[ ,]+/).map(Number)
if (parts.length === 4 && !parts.some(Number.isNaN)) {
const vbWidth = parts[2]!
const vbHeight = parts[3]!
if (!finalWidth && !finalHeight) {
finalWidth = vbWidth
finalHeight = vbHeight
}
else if (finalWidth) {
finalHeight = Math.round(finalWidth * (vbHeight / vbWidth))
}
else if (finalHeight) {
finalWidth = Math.round(finalHeight * (vbWidth / vbHeight))
}
}
}

if (finalWidth && !finalHeight)
finalHeight = finalWidth
else if (finalHeight && !finalWidth)
finalWidth = finalHeight

const renderWidth = finalWidth || 100
const renderHeight = finalHeight || 100

const svgProps = { ...vnode.props }
svgProps.width = renderWidth
svgProps.height = renderHeight
let svg = vnodeToHtmlString({ ...vnode, props: svgProps })

// Resolve currentColor before base64 encoding — images lose CSS inheritance context
if (nodeColor && svg.includes('currentColor'))
svg = svg.replaceAll('currentColor', nodeColor)
const src = vnodeToHtmlString(vnode)

return {
type: 'image',
src: `data:image/svg+xml;base64,${Buffer.from(svg).toString('base64')}`,
width: renderWidth,
height: renderHeight,
src,
tw: tw || cls || undefined,
style,
}
}

if (vnode.type === 'img') {
let finalWidth = resolvedWidth
let finalHeight = resolvedHeight

if (finalWidth && !finalHeight)
finalHeight = finalWidth
else if (finalHeight && !finalWidth)
finalWidth = finalHeight

return {
type: 'image',
src: src || rest.href || '',
width: finalWidth,
height: finalHeight,
tw: tw || cls || undefined,
style,
}
Expand All @@ -143,8 +54,6 @@ async function vnodeToTakumiNode(vnode: VNode, parentWidth?: number, parentHeigh
return {
type: 'text',
text: textContent,
width: resolvedWidth,
height: resolvedHeight,
tw: tw || cls || undefined,
style,
}
Expand All @@ -155,16 +64,14 @@ async function vnodeToTakumiNode(vnode: VNode, parentWidth?: number, parentHeigh
const takumiChildren: TakumiNode[] = []
for (const child of children) {
if (child && typeof child === 'object')
takumiChildren.push(await vnodeToTakumiNode(child, resolvedWidth, resolvedHeight, nodeColor))
takumiChildren.push(await vnodeToTakumiNode(child))
else if (typeof child === 'string' && child.trim())
takumiChildren.push({ type: 'text', text: child.trim() })
}

return {
type: 'container',
children: takumiChildren.length ? takumiChildren : undefined,
width: resolvedWidth,
height: resolvedHeight,
tw: tw || cls || undefined,
style,
}
Expand All @@ -173,61 +80,17 @@ async function vnodeToTakumiNode(vnode: VNode, parentWidth?: number, parentHeigh
// No children
return {
type: 'container',
width: resolvedWidth,
height: resolvedHeight,
tw: tw || cls || undefined,
style,
}
}

// Extract dimensions from tailwind classes (enhanced support)
function extractTwDim(twCls: string | undefined, prefix: string, total?: number): number | undefined {
if (!twCls || twCls.includes('calc('))
return undefined

// Match arbitrary value classes (w-[31.5%], h-[48%], w-[100px])
const arbMatch = twCls.match(new RegExp(`\\b${prefix}-\\[([^\\]]+)\\]\\b`))
if (arbMatch?.[1]) {
const val = arbMatch[1]
if (val.endsWith('%') && total)
return (Number.parseFloat(val) / 100) * total
if (val.endsWith('px'))
return Number.parseFloat(val)
if (!Number.isNaN(Number(val)))
return Number(val)
}

// Match basic numeric classes (w-32, h-64)
const numMatch = twCls.match(new RegExp(`\\b${prefix}-(\\d+)\\b`))
if (numMatch?.[1])
return Number.parseInt(numMatch[1]) * 4

// Match fraction classes (w-1/3, w-full, h-screen)
if (total) {
if (twCls.includes(`${prefix}-full`))
return total
if (twCls.includes(`${prefix}-1/2`))
return total * 0.5
if (twCls.includes(`${prefix}-1/3`))
return total * (1 / 3)
if (twCls.includes(`${prefix}-2/3`))
return total * (2 / 3)
if (twCls.includes(`${prefix}-1/4`))
return total * 0.25
if (twCls.includes(`${prefix}-3/4`))
return total * 0.75
}
return undefined
}

function vnodeToHtmlString(vnode: VNode): string {
const { style, children, ...attrs } = vnode.props
const attrParts: string[] = []

const kebabCase = (str: string) => str.replace(/[A-Z]/g, m => `-${m.toLowerCase()}`)

const stripColorSpace = (val: any) => typeof val === 'string' ? stripGradientColorSpace(val) : val

if (vnode.type === 'svg') {
if (!attrs.xmlns)
attrParts.push('xmlns="http://www.w3.org/2000/svg"')
Expand All @@ -254,13 +117,13 @@ function vnodeToHtmlString(vnode: VNode): string {
if (style && typeof style === 'object') {
const styleStr = Object.entries(style)
.filter(([_, v]) => v !== undefined && v !== null && v !== '')
.map(([k, v]) => `${kebabCase(k)}:${stripColorSpace(resolveValue(v))}`)
.map(([k, v]) => `${kebabCase(k)}:${resolveValue(v)}`)
.join(';')
if (styleStr)
attrParts.push(`style="${styleStr.replace(/"/g, '&quot;')}"`)
}
else if (typeof style === 'string') {
attrParts.push(`style="${stripColorSpace(style as string).replace(/"/g, '&quot;')}"`)
attrParts.push(`style="${(style as string).replace(/"/g, '&quot;')}"`)
}

for (const [key, val] of Object.entries(attrs)) {
Expand Down
Loading