fix: optional Valibot schema (#287)

Author: huang-julien

src/runtime/types.ts

@@ -138,13 +138,14 @@ export type EmptyOptionsSchema = typeof _emptyOptions
 
 type ScriptInput = ScriptBase & DataKeys & SchemaAugmentations['script']
 
+export type InferIfSchema<T> = T extends ObjectSchema<any, any> ? InferInput<T> : T
 export type RegistryScriptInput<
-  T extends ObjectSchema<any, any> = EmptyOptionsSchema,
+  T = EmptyOptionsSchema,
   Bundelable extends boolean = true,
   Usable extends boolean = false,
   CanBypassOptions extends boolean = true,
 > =
-    (InferInput<T>
+    (InferIfSchema<T>
       & {
       /**
        * A unique key to use for the script, this can be used to load multiple of the same script with different options.
@@ -153,7 +154,7 @@ export type RegistryScriptInput<
         scriptInput?: ScriptInput
         scriptOptions?: Omit<NuxtUseScriptOptions, Bundelable extends true ? '' : 'bundle' | Usable extends true ? '' : 'use'>
       })
-      | Partial<InferInput<T>> & (
+      | Partial<InferIfSchema<T>> & (
       CanBypassOptions extends true ? {
       /**
        * A unique key to use for the script, this can be used to load multiple of the same script with different options.

src/runtime/utils.ts

@@ -6,6 +6,7 @@ import { parse } from '#nuxt-scripts-validator'
 import { useRuntimeConfig } from '#imports'
 import type {
   EmptyOptionsSchema,
+  InferIfSchema,
   NuxtUseScriptOptions,
   RegistryScriptInput,
   ScriptRegistry,
@@ -27,21 +28,21 @@ function validateScriptInputSchema<T extends GenericSchema>(key: string, schema:
   }
 }
 
-type OptionsFn<O extends ObjectSchema<any, any>> = (options: InferInput<O>) => ({
+type OptionsFn<O> = (options: InferIfSchema<O>) => ({
   scriptInput?: UseScriptInput
   scriptOptions?: NuxtUseScriptOptions
-  schema?: O
+  schema?: O extends ObjectSchema<any, any> ? O : undefined
   clientInit?: () => void
 })
 
 export function scriptRuntimeConfig<T extends keyof ScriptRegistry>(key: T) {
   return ((useRuntimeConfig().public.scripts || {}) as ScriptRegistry)[key]
 }
 
-export function useRegistryScript<T extends Record<string | symbol, any>, O extends ObjectSchema<any, any> = EmptyOptionsSchema, U = {}>(registryKey: keyof ScriptRegistry | string, optionsFn: OptionsFn<O>, _userOptions?: RegistryScriptInput<O>) {
+export function useRegistryScript<T extends Record<string | symbol, any>, O = EmptyOptionsSchema, U = {}>(registryKey: keyof ScriptRegistry | string, optionsFn: OptionsFn<O>, _userOptions?: RegistryScriptInput<O>) {
   const scriptConfig = scriptRuntimeConfig(registryKey as keyof ScriptRegistry)
   const userOptions = Object.assign(_userOptions || {}, typeof scriptConfig === 'object' ? scriptConfig : {})
-  const options = optionsFn(userOptions)
+  const options = optionsFn(userOptions as InferIfSchema<O>)
 
   const scriptInput = defu(userOptions.scriptInput, options.scriptInput, { key: registryKey }) as any as UseScriptInput
   const scriptOptions = Object.assign(userOptions?.scriptOptions || {}, options.scriptOptions || {})