nuxt-og-image 6.4.6 → 6.4.8

package/dist/runtime/server/og-image/font-source.js

@@ -0,0 +1,20 @@
+export function fontFormat(src) {
+  if (src.endsWith(".woff2"))
+    return "woff2";
+  if (src.endsWith(".woff"))
+    return "woff";
+  if (src.endsWith(".otf"))
+    return "otf";
+  return "ttf";
+}
+export function selectFontSource(f, supportedFormats, preferStatic) {
+  const primarySupported = supportedFormats.has(fontFormat(f.src));
+  const satoriSupported = !!(f.satoriSrc && supportedFormats.has(fontFormat(f.satoriSrc)));
+  if (preferStatic && satoriSupported && f.satoriSrc !== f.src)
+    return { src: f.satoriSrc, isStaticFallback: true };
+  if (primarySupported)
+    return { src: f.src, isStaticFallback: false };
+  if (satoriSupported)
+    return { src: f.satoriSrc, isStaticFallback: true };
+  return null;
+}

package/dist/runtime/server/og-image/fonts.d.ts

@@ -1,8 +1,8 @@
 import type { H3Event } from 'h3';
 import type { OgImageRenderEventContext, RuntimeFontConfig } from '../../types.js';
+import type { FontFormat } from './font-source.js';
 export { buildSubsetFamilyChain, renameSubsetFonts, resolveSubsetChain } from './font-subsets.js';
 export { codepointsIntersectRanges, extractCodepoints, parseUnicodeRange } from './unicode-range.js';
-type FontFormat = 'ttf' | 'otf' | 'woff' | 'woff2';
 export interface LoadFontsOptions {
     /**
      * Font formats the renderer can parse.
@@ -16,6 +16,13 @@ export interface LoadFontsOptions {
     fontFamilyOverride?: string;
     /** Codepoints present in the template — fonts whose unicodeRange doesn't intersect are skipped */
     codepoints?: Set<number>;
+    /**
+     * Prefer the static satoriSrc (full TTF/WOFF from fontless) over the primary src
+     * (subset WOFF2 from @nuxt/fonts) when both are usable. Takumi uses this so non-Latin
+     * glyphs (devanagari, CJK, etc.) render — @nuxt/fonts CSS often only ships latin
+     * subsets for a family, but the fontless static file contains the full glyph set.
+     */
+    preferStatic?: boolean;
 }
 export declare function loadAllFontsDebug(component?: string): {
     component: string | undefined;

package/dist/runtime/server/og-image/fonts.js

@@ -4,19 +4,11 @@ import resolvedFonts from "#og-image/fonts";
 import availableFonts from "#og-image/fonts-available";
 import { logger } from "../../logger.js";
 import { fontArrayCache, fontCache } from "./cache/lru.js";
+import { fontFormat, selectFontSource } from "./font-source.js";
 import { renameSubsetFonts } from "./font-subsets.js";
 import { codepointsIntersectRanges, parseUnicodeRange } from "./unicode-range.js";
 export { buildSubsetFamilyChain, renameSubsetFonts, resolveSubsetChain } from "./font-subsets.js";
 export { codepointsIntersectRanges, extractCodepoints, parseUnicodeRange } from "./unicode-range.js";
-function fontFormat(src) {
-  if (src.endsWith(".woff2"))
-    return "woff2";
-  if (src.endsWith(".woff"))
-    return "woff";
-  if (src.endsWith(".otf"))
-    return "otf";
-  return "ttf";
-}
 async function loadFont(event, font, src) {
   const cacheKey = `${font.family}-${font.weight}-${font.style}-${src}`;
   const cached = fontCache.get(cacheKey);
@@ -103,39 +95,37 @@ export async function loadAllFonts(event, options) {
       }
     }
   }
-  if (options.codepoints && options.codepoints.size > 0) {
-    for (let i = fonts.length - 1; i >= 0; i--) {
-      const f = fonts[i];
-      if (!f.unicodeRange)
-        continue;
-      const ranges = parseUnicodeRange(f.unicodeRange);
-      if (!ranges)
-        continue;
-      if (!codepointsIntersectRanges(options.codepoints, ranges))
-        fonts.splice(i, 1);
-    }
+  const resolved = [];
+  for (const f of fonts) {
+    const selection = selectFontSource(f, options.supportedFormats, options.preferStatic ?? false);
+    if (selection)
+      resolved.push({ font: f, ...selection });
   }
+  const filtered = options.codepoints && options.codepoints.size > 0 ? resolved.filter(({ font: f, isStaticFallback }) => {
+    if (isStaticFallback || !f.unicodeRange)
+      return true;
+    const ranges = parseUnicodeRange(f.unicodeRange);
+    if (!ranges)
+      return true;
+    return codepointsIntersectRanges(options.codepoints, ranges);
+  }) : resolved;
   const results = await Promise.all(
-    fonts.map(async (f) => {
-      let src = f.src;
-      const srcFormat = fontFormat(f.src);
-      if (!options.supportedFormats.has(srcFormat)) {
-        if (f.satoriSrc && options.supportedFormats.has(fontFormat(f.satoriSrc))) {
-          src = f.satoriSrc;
-        } else {
-          return null;
-        }
-      }
+    filtered.map(async ({ font: f, src: initialSrc, isStaticFallback }) => {
+      let src = initialSrc;
       let data = await loadFont(event, f, src);
-      if (!data && src !== f.src && options.supportedFormats.has(srcFormat)) {
+      if (!data && src !== f.src && options.supportedFormats.has(fontFormat(f.src))) {
         data = await loadFont(event, f, f.src);
-        if (data)
+        if (data) {
           src = f.src;
+          isStaticFallback = false;
+        }
       }
       if (!data)
         return null;
       return {
         ...f,
+        src,
+        ...isStaticFallback ? { unicodeRange: void 0 } : {},
         cacheKey: `${f.family}-${f.weight}-${f.style}-${src}`,
         data
       };

package/dist/runtime/server/og-image/takumi/renderer.js

@@ -25,26 +25,54 @@ function withTakumiLock(state, fn) {
   state.lock = next.catch(() => void 0);
   return next;
 }
-async function loadFontsIntoRenderer(state, fonts) {
+function dedupeFontsByBinary(fonts) {
+  const byBinary = /* @__PURE__ */ new Map();
   for (const font of fonts) {
     if (!font.data)
       continue;
-    const uniqueKey = font.cacheKey || `${font.family}-${font.weight}-${font.style}`;
-    if (state.loadedFontKeys.has(uniqueKey))
+    const binaryKey = `${font.family}|${font.style || "normal"}|${font.src || ""}`;
+    const existing = byBinary.get(binaryKey);
+    if (existing) {
+      existing.weights.add(font.weight);
+    } else {
+      byBinary.set(binaryKey, {
+        family: font.family,
+        style: font.style,
+        data: font.data,
+        weights: /* @__PURE__ */ new Set([font.weight])
+      });
+    }
+  }
+  const result = [];
+  for (const [binaryKey, entry] of byBinary) {
+    const isVariable = entry.weights.size > 1;
+    result.push({
+      binaryKey,
+      family: entry.family,
+      style: entry.style,
+      data: entry.data,
+      weight: isVariable ? void 0 : [...entry.weights][0]
+    });
+  }
+  return result;
+}
+async function loadFontsIntoRenderer(state, fonts) {
+  for (const entry of dedupeFontsByBinary(fonts)) {
+    if (state.loadedFontKeys.has(entry.binaryKey))
       continue;
-    const fontData = font.data instanceof ArrayBuffer ? new Uint8Array(font.data) : Uint8Array.from(font.data);
+    const fontData = entry.data instanceof ArrayBuffer ? new Uint8Array(entry.data) : Uint8Array.from(entry.data);
     try {
       await state.renderer.loadFont({
-        name: font.family,
+        name: entry.family,
         data: fontData,
-        weight: font.weight,
-        style: font.style
+        ...entry.weight !== void 0 ? { weight: entry.weight } : {},
+        style: entry.style
       });
-      state.loadedFamilies.add(font.family);
+      state.loadedFamilies.add(entry.family);
     } catch (err) {
-      logger.warn(`Failed to load font "${font.family}" (weight: ${font.weight}) into takumi renderer: ${err.message}`);
+      logger.warn(`Failed to load font "${entry.family}" into takumi renderer: ${err.message}`);
     }
-    state.loadedFontKeys.add(uniqueKey);
+    state.loadedFontKeys.add(entry.binaryKey);
   }
 }
 function lookupFontFamily(family, loadedFamilies) {
@@ -88,7 +116,7 @@ async function createImage(event, format) {
   const { fontFamilyOverride, defaultFont } = getDefaultFontFamily(options);
   const nodes = await createTakumiNodes(event);
   const codepoints = extractCodepoints(nodes);
-  const fonts = await timings.measure("font-load", () => loadFontsForRenderer(event, { supportedFormats: /* @__PURE__ */ new Set(["ttf", "woff2"]), component: options.component, fontFamilyOverride: fontFamilyOverride || defaultFont, codepoints }));
+  const fonts = await timings.measure("font-load", () => loadFontsForRenderer(event, { supportedFormats: /* @__PURE__ */ new Set(["ttf", "woff2"]), preferStatic: true, component: options.component, fontFamilyOverride: fontFamilyOverride || defaultFont, codepoints }));
   await event._nitro.hooks.callHook("nuxt-og-image:takumi:nodes", nodes, event);
   const subsetChains = buildSubsetFamilyChain(fonts);
   const state = await getTakumiState(event);
@@ -163,7 +191,7 @@ const TakumiRenderer = {
   async debug(e) {
     const [vnodes, fonts] = await Promise.all([
       createTakumiNodes(e),
-      loadFontsForRenderer(e, { supportedFormats: /* @__PURE__ */ new Set(["ttf", "woff2"]), component: e.options.component })
+      loadFontsForRenderer(e, { supportedFormats: /* @__PURE__ */ new Set(["ttf", "woff2"]), preferStatic: true, component: e.options.component })
     ]);
     return {
       vnodes,

package/dist/shared/{nuxt-og-image.TJuh6pW5.cjs → nuxt-og-image.KwJtn8oJ.cjs}

@@ -4320,7 +4320,7 @@ const module$1 = kit.defineNuxtModule({
     await onUpgrade(nuxt, options, previousVersion);
   },
   async setup(config, nuxt) {
-    const _resolver = kit.createResolver((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('shared/nuxt-og-image.TJuh6pW5.cjs', document.baseURI).href)));
+    const _resolver = kit.createResolver((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('shared/nuxt-og-image.KwJtn8oJ.cjs', document.baseURI).href)));
     const fixSharedPath = (p) => {
       if (p.includes("/shared/runtime/"))
         return p.replace("/shared/runtime/", "/runtime/");
@@ -5087,7 +5087,7 @@ export const resolve = (import.meta.dev || import.meta.prerender) ? devResolve :
       if (hasNuxtFonts && fontContext) {
         persistFontUrlMapping({ fontContext, buildDir: nuxt.options.buildDir, logger: logger_js.logger });
       }
-      if (!fontProcessingDone && convertedWoff2Files.size === 0 && hasSatoriRenderer() && hasNuxtFonts) {
+      if (!fontProcessingDone && convertedWoff2Files.size === 0 && (hasSatoriRenderer() || hasTakumiRenderer()) && hasNuxtFonts) {
         if (pendingFontRequirements.length > 0)
           await Promise.all(pendingFontRequirements);
         await convertWoff2ToTtf({
@@ -5156,7 +5156,7 @@ export const rootDir = ${JSON.stringify(nuxt.options.rootDir)}`;
       });
       nuxt.hook("vite:compiled", async () => {
         persistFontUrlMapping({ fontContext, buildDir: nuxt.options.buildDir, logger: logger_js.logger });
-        if (fontProcessingDone || !hasSatoriRenderer())
+        if (fontProcessingDone || !hasSatoriRenderer() && !hasTakumiRenderer())
           return;
         if (pendingFontRequirements.length === 0)
           return;

package/dist/shared/{nuxt-og-image.Cr3WHMk1.mjs → nuxt-og-image.ZQrnalbB.mjs}

@@ -5067,7 +5067,7 @@ export const resolve = (import.meta.dev || import.meta.prerender) ? devResolve :
       if (hasNuxtFonts && fontContext) {
         persistFontUrlMapping({ fontContext, buildDir: nuxt.options.buildDir, logger });
       }
-      if (!fontProcessingDone && convertedWoff2Files.size === 0 && hasSatoriRenderer() && hasNuxtFonts) {
+      if (!fontProcessingDone && convertedWoff2Files.size === 0 && (hasSatoriRenderer() || hasTakumiRenderer()) && hasNuxtFonts) {
         if (pendingFontRequirements.length > 0)
           await Promise.all(pendingFontRequirements);
         await convertWoff2ToTtf({
@@ -5136,7 +5136,7 @@ export const rootDir = ${JSON.stringify(nuxt.options.rootDir)}`;
       });
       nuxt.hook("vite:compiled", async () => {
         persistFontUrlMapping({ fontContext, buildDir: nuxt.options.buildDir, logger });
-        if (fontProcessingDone || !hasSatoriRenderer())
+        if (fontProcessingDone || !hasSatoriRenderer() && !hasTakumiRenderer())
           return;
         if (pendingFontRequirements.length === 0)
           return;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nuxt-og-image",
   "type": "module",
-  "version": "6.4.6",
+  "version": "6.4.8",
   "description": "Enlightened OG Image generation for Nuxt.",
   "author": {
     "website": "https://harlanzw.com",
@@ -109,7 +109,7 @@
     "mocked-exports": "^0.1.1",
     "nuxt-site-config": "^4.0.8",
     "nuxtseo-shared": "^5.1.3",
-    "nypm": "^0.6.5",
+    "nypm": "^0.6.6",
     "ofetch": "^1.5.1",
     "ohash": "^2.0.11",
     "oxc-parser": "^0.127.0",
@@ -142,18 +142,18 @@
     "@nuxt/image": "^2.0.0",
     "@nuxt/module-builder": "^1.0.2",
     "@nuxt/test-utils": "^4.0.2",
-    "@nuxt/ui": "^4.6.1",
+    "@nuxt/ui": "^4.7.0",
     "@nuxtjs/color-mode": "^4.0.0",
     "@nuxtjs/eslint-config-typescript": "^12.1.0",
-    "@nuxtjs/i18n": "^10.2.4",
+    "@nuxtjs/i18n": "^10.3.0",
     "@nuxtjs/tailwindcss": "7.0.0-beta.1",
     "@resvg/resvg-js": "^2.6.2",
     "@resvg/resvg-wasm": "^2.6.2",
     "@shikijs/langs": "^4.0.2",
     "@shikijs/themes": "^4.0.2",
     "@tailwindcss/vite": "^4.2.4",
-    "@takumi-rs/core": "^1.0.16",
-    "@takumi-rs/wasm": "^1.0.16",
+    "@takumi-rs/core": "^1.1.2",
+    "@takumi-rs/wasm": "^1.1.2",
     "@unocss/nuxt": "^66.6.8",
     "@vitejs/plugin-vue": "^6.0.6",
     "@vueuse/nuxt": "^14.2.1",
@@ -181,7 +181,7 @@
     "unocss": "^66.6.8",
     "vitest": "^4.1.5",
     "vue-tsc": "^3.2.7",
-    "wrangler": "^4.84.1",
+    "wrangler": "^4.85.0",
     "yoga-wasm-web": "^0.3.3"
   },
   "scripts": {

package/dist/devtools/_nuxt/671cdwR5.js

@@ -1 +0,0 @@
-import{At as e,Dt as t,M as n,Q as r,S as i,T as a,U as o,_ as s,g as c,q as l,v as u,y as d}from"./B75jVnAo.js";import{D as f}from"./CHmOAOu6.js";import{t as p}from"./CP0tQR2M.js";var m=[`open`],h={class:`flex-1 min-w-0`},g={class:`section-label`},_={key:0,class:`section-description`},v=Object.assign(p(a({__name:`DevtoolsSection`,props:n({icon:{},text:{},description:{},containerClass:{default:``},headerClass:{},collapse:{type:Boolean,default:!0},open:{type:Boolean},padding:{type:[Boolean,String],default:!0}},{open:{default:!0},openModifiers:{}}),emits:[`update:open`],setup(n){let a=r(n,`open`);function p(e){a.value=e.target.open}return(r,v)=>{let y=f;return o(),d(`details`,{open:a.value,class:`section-block`,onToggle:p},[c(`summary`,{class:t([`section-header`,n.collapse?``:`pointer-events-none`])},[c(`div`,{class:t([`section-title`,[a.value?``:`opacity-60`,n.headerClass]])},[n.icon?(o(),s(y,{key:0,name:n.icon,class:`section-icon`},null,8,[`name`])):u(``,!0),c(`div`,h,[c(`div`,g,[l(r.$slots,`text`,{},()=>[i(e(n.text),1)],!0)]),n.description||r.$slots.description?(o(),d(`div`,_,[l(r.$slots,`description`,{},()=>[i(e(n.description),1)],!0)])):u(``,!0)]),l(r.$slots,`actions`,{},void 0,!0),n.collapse?(o(),s(y,{key:1,name:`carbon:chevron-down`,class:`chevron`})):u(``,!0)],2)],2),c(`div`,{class:t([`section-content`,typeof n.padding==`string`?n.padding:n.padding?`px-4`:``])},[l(r.$slots,`details`,{},void 0,!0),c(`div`,{class:t(n.containerClass)},[l(r.$slots,`default`,{},void 0,!0)],2),l(r.$slots,`footer`,{},void 0,!0)],2)],40,m)}}}),[[`__scopeId`,`data-v-c5ad32d6`]]),{__name:`DevtoolsSection`});export{v as t};

package/dist/devtools/_nuxt/8kkJjsM6.js

@@ -1,2 +0,0 @@
-import{At as e,C as t,K as n,T as r,Tt as i,U as a,_ as o,at as s,g as c,u as l,v as u,y as d}from"./B75jVnAo.js";import{t as f}from"./CHmOAOu6.js";import{t as p}from"./671cdwR5.js";import{t as m}from"./Ci8ZvNRB.js";var h={class:`h-full max-h-full overflow-hidden space-y-5`},g={class:`space-y-2 p-3 bg-amber-500/10 rounded-lg border border-amber-500/20`},_=r({__name:`debug`,setup(r){let{globalDebug:_,debug:v}=f();return(r,f)=>{let y=p,b=m;return a(),d(`div`,h,[i(v)?.warnings?.length?(a(),o(y,{key:0,icon:`carbon:warning`,text:`Satori Warnings`},{default:s(()=>[c(`div`,g,[(a(!0),d(l,null,n(i(v).warnings,(t,n)=>(a(),d(`div`,{key:n,class:`text-sm text-amber-200 font-mono`},e(t),1))),128))])]),_:1})):u(``,!0),t(y,{icon:`carbon:settings`,text:`Compatibility`},{default:s(()=>[t(b,{code:JSON.stringify(i(_)?.compatibility||{},null,2),lang:`json`,label:`Compatibility`},null,8,[`code`])]),_:1}),t(y,{icon:`carbon:ibm-cloud-pak-manta-automated-data-lineage`,text:`vNodes`},{default:s(()=>[t(b,{code:JSON.stringify(i(v)?.vnodes||{},null,2),lang:`json`,label:`vNodes`},null,8,[`code`])]),_:1}),t(y,{icon:`carbon:ibm-cloud-pak-manta-automated-data-lineage`,text:`SVG`},{default:s(()=>[t(b,{code:i(v)?.svg?.replaceAll(`>`,`>
-`)||``,lang:`xml`,label:`SVG`},null,8,[`code`])]),_:1}),t(y,{icon:`carbon:settings`,text:`Runtime Config`},{default:s(()=>[t(b,{code:JSON.stringify(i(_)?.runtimeConfig||{},null,2),lang:`json`,label:`Runtime Config`},null,8,[`code`])]),_:1})])}}});export{_ as default};

package/dist/devtools/_nuxt/BJ9iyiD_.js

@@ -1,3 +0,0 @@
-import{At as e,B as t,C as n,Ct as r,Dt as i,L as a,T as o,Tt as s,U as c,g as l,gt as u,kt as d,o as f,ot as p,tt as m,v as h,y as g}from"./B75jVnAo.js";import{Ht as _}from"./cIRSrPLM.js";import{Ct as v,D as y,jt as b,o as x}from"./CHmOAOu6.js";import{t as S}from"./CP0tQR2M.js";var C=[`src`],w={key:0,class:`loading-state`},T={key:1,class:`error-state`},E={class:`error-header`},D={class:`error-type`},O={class:`error-message`},k={key:0,class:`error-stack`},A=Object.assign(S(o({__name:`ImageLoader`,props:{src:{},aspectRatio:{},maxHeight:{},maxWidth:{},minHeight:{}},emits:[`load`],setup(t,{emit:o}){let _=t,v=o,b=u(!1),S=u(!1),A=u(!1),j=u(0),M;m(()=>_.src,()=>{S.value=!0,A.value=!1,b.value=!1,j.value=Date.now(),clearTimeout(M),M=setTimeout(()=>{S.value&&(A.value=!0)},200)},{immediate:!0});function N(){S.value=!1,A.value=!1,clearTimeout(M),v(`load`,{timeTaken:Date.now()-j.value,sizeKb:``})}a(()=>clearTimeout(M));function P(){S.value=!1,A.value=!1,clearTimeout(M),$fetch(_.src).catch(e=>{b.value=e.data?.stack||[`Failed to load image`]})}return(a,o)=>{let u=y;return c(),g(`div`,{class:i([`image-loader`,{"is-valid":!s(b)&&!s(S),"is-error":s(b)}]),style:d({aspectRatio:t.aspectRatio,minHeight:t.minHeight})},[p(l(`img`,{src:t.src,style:d({aspectRatio:t.aspectRatio,maxWidth:`${s(r)(s(x).width)||1200}px`}),onLoad:N,onError:P},null,44,C),[[f,!s(S)&&!s(b)]]),s(A)?(c(),g(`div`,w,[...o[0]||=[l(`div`,{class:`loading-spinner`},null,-1)]])):h(``,!0),s(b)?(c(),g(`div`,T,[l(`div`,E,[n(u,{name:`carbon:warning`,class:`error-icon`}),l(`span`,D,e(s(b).join(`
-`).includes(`satori`)?`SatoriError`:`ImageError`),1)]),l(`p`,O,e(s(b)[0]?.replace(`Error:`,``)),1),s(b).length>1?(c(),g(`pre`,k,e(s(b).slice(1).join(`
-`)),1)):h(``,!0)])):h(``,!0)],6)}}}),[[`__scopeId`,`data-v-7f953e88`]]),{__name:`ImageLoader`}),j=Object.assign(S(o({__name:`IFrameLoader`,props:{src:{},aspectRatio:{}},emits:[`load`],setup(e,{emit:n}){let i=e,a=n,o=u(),f=u(),p=u(),h=b(()=>{let e=f.value;if(!e||!o.value)return;let t=Date.now();e.src=``;let n=r(x.value.width)||1200,i=p.value?.offsetWidth,s=i?Math.min(1,i/n):1;e.style.opacity=`0`,e.onload=()=>{e.style.opacity=`1`,a(`load`,{timeTaken:Date.now()-t})},e.src=_(o.value,{scale:s})},200);return t(()=>{m(()=>i.src,e=>{o.value!==e&&f.value&&(o.value=e,h())},{immediate:!0}),m(f,()=>{h()})}),v(p,()=>{o.value&&h()}),m(()=>r(x.value.width),()=>{o.value&&h()},{flush:`post`}),(t,n)=>(c(),g(`div`,{ref_key:`container`,ref:p,class:`iframe-loader`,style:d({aspectRatio:e.aspectRatio,maxWidth:`${s(r)(s(x).width)||1200}px`})},[l(`iframe`,{ref_key:`iframe`,ref:f},null,512)],4))}}),[[`__scopeId`,`data-v-6929e48a`]]),{__name:`IFrameLoader`});export{A as n,j as t};