chore: type issues

Author: harlan-zw

src/content.ts

@@ -1,5 +1,4 @@
 import type { Collection } from '@nuxt/content'
-import type { TypeOf, ZodRawShape } from 'zod'
 import { z } from '@nuxt/content'
 
 export const ogImageSchema = z.object({
@@ -12,16 +11,10 @@ export const schema = z.object({
   ogImage: ogImageSchema,
 })
 
-export type OgImageSchema = TypeOf<typeof schema>
-
-type ExtendedSchema<T extends ZodRawShape> = T & {
-  ogImage: typeof ogImageSchema
-}
-
-export function asOgImageCollection<T extends ZodRawShape>(collection: Collection<T>): Collection<ExtendedSchema<T>> {
+export function asOgImageCollection<T>(collection: Collection<T>): Collection<T> {
   if (collection.type === 'page') {
     // @ts-expect-error untyped
     collection.schema = collection.schema ? schema.extend(collection.schema.shape) : schema
   }
-  return collection as Collection<ExtendedSchema<T>>
+  return collection
 }

src/runtime/app/utils/plugins.ts

@@ -23,7 +23,6 @@ export function ogImageCanonicalUrls(nuxtApp: NuxtSSRContext['nuxt']) {
     if (isInternalRoute(path))
       return
 
-    // @ts-expect-error untyped
     ssrContext?.head.use(TemplateParamsPlugin)
     // unhead plugin to correct missing site URL, this is to fix the Nuxt Content integration not being able to resolve the correct URL
     ssrContext?.head.use({

src/runtime/server/util/cache.ts

@@ -10,7 +10,7 @@ import { prefixStorage } from 'unstorage'
 export async function useOgImageBufferCache(ctx: OgImageRenderEventContext, options: {
   baseCacheKey: string | false
   cacheMaxAgeSeconds?: number
-}): Promise<void | H3Error | { cachedItem: false | BufferSource, enabled: boolean, update: (image: BufferSource) => Promise<void> }> {
+}): Promise<void | H3Error | { cachedItem: false | BufferSource, enabled: boolean, update: (image: BufferSource | Buffer | Uint8Array) => Promise<void> }> {
   const maxAge = Number(options.cacheMaxAgeSeconds)
   let enabled = !import.meta.dev && import.meta.env?.MODE !== 'test' && maxAge > 0
   const cache = prefixStorage(useStorage(), withTrailingSlash(options.baseCacheKey || '/'))
@@ -81,7 +81,6 @@ export async function useOgImageBufferCache(ctx: OgImageRenderEventContext, opti
         'cache-control': `public, s-maxage=${maxAge}, stale-while-revalidate`,
       }
       setHeaders(ctx.e, headers)
-      // @ts-expect-error untyped
       await cache.setItem(key, {
         value,
         headers,

src/runtime/server/util/eventHandlers.ts

@@ -173,7 +173,7 @@ export async function imageEventHandler(e: H3Event) {
   if (cacheApi instanceof H3Error)
     return cacheApi
 
-  let image: H3Error | BufferSource | false | void = cacheApi.cachedItem
+  let image: H3Error | BufferSource | Buffer | Uint8Array | false | void = cacheApi.cachedItem
   if (!image) {
     image = await renderer.createImage(ctx)
     if (image instanceof H3Error)

src/runtime/types.ts

@@ -179,7 +179,7 @@ export type RendererOptions = Omit<OgImageOptions, 'extension'> & { extension: O
 export interface Renderer {
   name: 'chromium' | 'satori'
   supportedFormats: Partial<RendererOptions['extension']>[]
-  createImage: (e: OgImageRenderEventContext) => Promise<H3Error | BufferSource | void>
+  createImage: (e: OgImageRenderEventContext) => Promise<H3Error | BufferSource | Buffer | Uint8Array | void | undefined>
   debug: (e: OgImageRenderEventContext) => Promise<Record<string, any>>
 }