fix: support explicit scriptInput.src override

Relates to #152

Author: harlan-zw

src/runtime/registry/crisp.ts

@@ -35,7 +35,7 @@ export const CrispOptions = object({
   cookieExpiry: optional(number()),
 })
 
-export type CrispInput = RegistryScriptInput<typeof CrispOptions, false>
+export type CrispInput = RegistryScriptInput<typeof CrispOptions, false, false, false>
 
 export interface CrispApi {
   push: (...args: any[]) => void

src/runtime/registry/fathom-analytics.ts

@@ -25,7 +25,7 @@ export const FathomAnalyticsOptions = object({
   honorDnt: optional(boolean()),
 })
 
-export type FathomAnalyticsInput = RegistryScriptInput<typeof FathomAnalyticsOptions, false>
+export type FathomAnalyticsInput = RegistryScriptInput<typeof FathomAnalyticsOptions, false, false, false>
 
 export interface FathomAnalyticsApi {
   beacon: (ctx: { url: string, referrer?: string }) => void

src/runtime/registry/google-adsense.ts

@@ -11,7 +11,7 @@ export const GoogleAdsenseOptions = object({
   client: optional(string()),
 })
 
-export type GoogleAdsenseInput = RegistryScriptInput<typeof GoogleAdsenseOptions>
+export type GoogleAdsenseInput = RegistryScriptInput<typeof GoogleAdsenseOptions, true, false, false>
 
 export interface GoogleAdsenseApi {
   /**

src/runtime/registry/hotjar.ts

@@ -19,7 +19,7 @@ export const HotjarOptions = object({
   sv: optional(number()),
 })
 
-export type HotjarInput = RegistryScriptInput<typeof HotjarOptions>
+export type HotjarInput = RegistryScriptInput<typeof HotjarOptions, true, false, false>
 
 export function useScriptHotjar<T extends HotjarApi>(_options?: HotjarInput) {
   return useRegistryScript<T, typeof HotjarOptions>(_options?.key || 'hotjar', options => ({

src/runtime/registry/intercom.ts

@@ -16,7 +16,7 @@ export const IntercomOptions = object({
   vertical_padding: optional(number()),
 })
 
-export type IntercomInput = RegistryScriptInput<typeof IntercomOptions>
+export type IntercomInput = RegistryScriptInput<typeof IntercomOptions, true, false, false>
 
 export interface IntercomApi {
   Intercom: ((event: 'boot', data?: InferInput<typeof IntercomOptions>) => void)

src/runtime/registry/matomo-analytics.ts

@@ -10,7 +10,7 @@ export const MatomoAnalyticsOptions = object({
   enableLinkTracking: optional(boolean()),
 })
 
-export type MatomoAnalyticsInput = RegistryScriptInput<typeof MatomoAnalyticsOptions, false>
+export type MatomoAnalyticsInput = RegistryScriptInput<typeof MatomoAnalyticsOptions, false, false, false>
 
 interface MatomoAnalyticsApi {
   _paq: unknown[]

src/runtime/registry/meta-pixel.ts

@@ -39,7 +39,7 @@ declare global {
 export const MetaPixelOptions = object({
   id: union([string(), number()]),
 })
-export type MetaPixelInput = RegistryScriptInput<typeof MetaPixelOptions>
+export type MetaPixelInput = RegistryScriptInput<typeof MetaPixelOptions, true, false, false>
 
 export function useScriptMetaPixel<T extends MetaPixelApi>(_options?: MetaPixelInput) {
   return useRegistryScript<T, typeof MetaPixelOptions>(_options?.key || 'metaPixel', options => ({

src/runtime/registry/npm.ts

@@ -10,7 +10,7 @@ export const NpmOptions = object({
   type: optional(string()),
 })
 
-export type NpmInput = RegistryScriptInput<typeof NpmOptions, true, true>
+export type NpmInput = RegistryScriptInput<typeof NpmOptions, true, true, false>
 
 export function useScriptNpm<T extends Record<string | symbol, any>>(_options: NpmInput) {
   // TODO support multiple providers? (e.g. jsdelivr, cdnjs, etc.) Only unpkg for now

src/runtime/registry/x-pixel.ts

@@ -44,7 +44,7 @@ export const XPixelOptions = object({
   id: string(),
   version: optional(string()),
 })
-export type XPixelInput = RegistryScriptInput<typeof XPixelOptions>
+export type XPixelInput = RegistryScriptInput<typeof XPixelOptions, true, false, false>
 
 export function useScriptXPixel<T extends XPixelApi>(_options?: XPixelInput) {
   return useRegistryScript<T, typeof XPixelOptions>(_options?.key || 'xPixel', (options) => {

src/runtime/types.ts

@@ -1,5 +1,5 @@
 import type { UseScriptOptions, DataKeys, SchemaAugmentations, ScriptBase } from '@unhead/schema'
-import type { UseScriptInput, VueScriptInstance, MaybeComputedRefEntriesOnly } from '@unhead/vue'
+import type { UseScriptInput, VueScriptInstance } from '@unhead/vue'
 import type { ComputedRef, Ref } from 'vue'
 import type { InferInput, ObjectSchema } from 'valibot'
 import type { Import } from 'unimport'
@@ -120,14 +120,31 @@ const emptyOptions = object({})
 
 export type EmptyOptionsSchema = typeof emptyOptions
 
-export type RegistryScriptInput<T extends ObjectSchema<any, any> = EmptyOptionsSchema, Bundelable extends boolean = true, Usable extends boolean = false> = InferInput<T> & {
-  /**
-   * A unique key to use for the script, this can be used to load multiple of the same script with different options.
-   */
-  key?: string
-  scriptInput?: MaybeComputedRefEntriesOnly<Omit<ScriptBase & DataKeys & SchemaAugmentations['script'], 'src'>>
-  scriptOptions?: Omit<NuxtUseScriptOptions, Bundelable extends true ? '' : 'bundle' | Usable extends true ? '' : 'use'>
-}
+type ScriptInput = ScriptBase & DataKeys & SchemaAugmentations['script']
+
+export type RegistryScriptInput<
+  T extends ObjectSchema<any, any> = EmptyOptionsSchema,
+  Bundelable extends boolean = true,
+  Usable extends boolean = false,
+  CanBypassOptions extends boolean = true,
+> =
+    (InferInput<T>
+    & {
+      /**
+       * A unique key to use for the script, this can be used to load multiple of the same script with different options.
+       */
+      key?: string
+      scriptInput?: ScriptInput
+      scriptOptions?: Omit<NuxtUseScriptOptions, Bundelable extends true ? '' : 'bundle' | Usable extends true ? '' : 'use'>
+    })
+    | (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.
+       */
+      key?: string
+      scriptInput: Required<Pick<ScriptInput, 'src'>> & ScriptInput
+      scriptOptions?: Omit<NuxtUseScriptOptions, Bundelable extends true ? '' : 'bundle' | Usable extends true ? '' : 'use'>
+    } : never)
 
 export interface RegistryScript {
   import?: Import // might just be a component