refactor: minor types clean up

nuxt-modules · Jan 27, 2024 · 5fde697 · 5fde697
1 parent 119918e
commit 5fde697
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 9 deletions.
diff --git a/src/module.ts b/src/module.ts
@@ -45,6 +45,7 @@ import { setupPrerenderHandler } from './build/prerender'
 import { setupBuildHandler } from './build/build'
 import { ensureChromium } from './build/ensureChromium'
 import { normaliseFontInput } from './runtime/utils.pure'
+import { isUndefinedOrTruthy } from './util'
 
 export interface ModuleOptions {
   /**
@@ -297,19 +298,19 @@ export default defineNuxtModule<ModuleOptions>({
     addServerHandler({
       lazy: true,
       route: '/__og-image__/font/**',
-      handler: resolve('./runtime/server/routes/__og-image__/font-[name]-[weight].[extension]'),
+      handler: resolve('./runtime/nitro/routes/__og-image__/font-[name]-[weight].[extension]'),
     })
     if (config.debug || nuxt.options.dev) {
       addServerHandler({
         lazy: true,
         route: '/__og-image__/debug.json',
-        handler: resolve('./runtime/server/routes/__og-image__/debug.json'),
+        handler: resolve('./runtime/nitro/routes/__og-image__/debug.json'),
       })
     }
     addServerHandler({
       lazy: true,
       route: '/__og-image__/image/**',
-      handler: resolve('./runtime/server/routes/__og-image__/image'),
+      handler: resolve('./runtime/nitro/routes/__og-image__/image'),
     })
 
     nuxt.options.optimization.treeShake.composables.client['nuxt-og-image'] = []

diff --git a/src/runtime/composables/defineOgImage.ts b/src/runtime/composables/defineOgImage.ts
@@ -39,12 +39,12 @@ export function defineOgImage(_options: DefineOgImageInput = {}) {
   const resolvedOptions = normaliseOptions(defu(separateProps(_options), separateProps(routeRules), defaults) as OgImageOptions)
   // allow overriding using a prebuild config
   if (_options.url) {
-    createOgImageMeta(null, options, resolvedOptions, nuxtApp.ssrContext)
+    createOgImageMeta(null, options, resolvedOptions, nuxtApp.ssrContext!)
   }
   else {
     const path = getOgImagePath(basePath, resolvedOptions)
     if (import.meta.prerender)
       appendHeader(useRequestEvent(), 'x-nitro-prerender', path)
-    createOgImageMeta(path, options, resolvedOptions, nuxtApp.ssrContext)
+    createOgImageMeta(path, options, resolvedOptions, nuxtApp.ssrContext!)
   }
 }
diff --git a/.../server/routes/__og-image__/debug.json.ts → ...e/nitro/routes/__og-image__/debug.json.ts b/.../server/routes/__og-image__/debug.json.ts → ...e/nitro/routes/__og-image__/debug.json.ts
diff --git a/...age__/font-[name]-[weight].[extension].ts → ...age__/font-[name]-[weight].[extension].ts b/...age__/font-[name]-[weight].[extension].ts → ...age__/font-[name]-[weight].[extension].ts
diff --git a/...ntime/server/routes/__og-image__/image.ts → ...untime/nitro/routes/__og-image__/image.ts b/...ntime/server/routes/__og-image__/image.ts → ...untime/nitro/routes/__og-image__/image.ts
diff --git a/src/runtime/nuxt/utils.ts b/src/runtime/nuxt/utils.ts
@@ -4,11 +4,10 @@ import { withQuery } from 'ufo'
 import { getExtension, separateProps } from '../utils'
 import type { DefineOgImageInput, OgImageOptions, OgImagePrebuilt } from '../types'
 import { unref, useServerHead } from '#imports'
-
-// @ts-expect-error untyped
 import { componentNames } from '#build/nuxt-og-image/components.mjs'
+import type { NuxtSSRContext } from '#app'
 
-export function createOgImageMeta(src: string | null, input: OgImageOptions | OgImagePrebuilt, resolvedOptions: OgImageOptions, ssrContext: Record<string, any>) {
+export function createOgImageMeta(src: string | null, input: OgImageOptions | OgImagePrebuilt, resolvedOptions: OgImageOptions, ssrContext: NuxtSSRContext) {
   const _input = separateProps(defu(input, ssrContext._ogImagePayload))
   let url = src || input.url || resolvedOptions.url
   if (!url)

diff --git a/src/runtime/types.ts b/src/runtime/types.ts
@@ -67,7 +67,7 @@ export interface ScreenshotOptions {
   delay?: number
 }
 
-export type OgImagePrebuilt = { url: string } & Pick<OgImageOptions, 'width' | 'height' | 'alt'>
+export type OgImagePrebuilt = { url: string } & Pick<OgImageOptions, 'width' | 'height' | 'alt' | '_query'>
 
 export type DefineOgImageInput = OgImageOptions | OgImagePrebuilt | false
 

diff --git a/src/util.ts b/src/util.ts
@@ -0,0 +1 @@
+export const isUndefinedOrTruthy = (v?: any) => typeof v === 'undefined' || v !== false
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		export const isUndefinedOrTruthy = (v?: any) => typeof v === 'undefined' \|\| v !== false