chore(useScript): prefer existing type

unjs · Oct 29, 2023 · f41a5ea · f41a5ea
1 parent 5105f55
commit f41a5ea
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/packages/schema/src/hooks.ts b/packages/schema/src/hooks.ts
@@ -1,6 +1,6 @@
-import type { ResolvedScript, Script } from './'
 import type { ActiveHeadEntry, CreateHeadOptions, HeadEntry, HeadEntryOptions, Unhead } from './head'
 import type { HeadTag } from './tags'
+import type { Script } from './'
 
 export type HookResult = Promise<void> | void
 
@@ -33,7 +33,7 @@ export interface UseScriptOptions<T> extends Omit<HeadEntryOptions, 'transform'>
   skipEarlyConnections?: boolean
   use?: () => T | undefined | null
   stub?: ((ctx: { script: ScriptInstance<T>; fn: string | symbol }) => any)
-  transform?: (script: ResolvedScript) => Promise<ResolvedScript> | ResolvedScript
+  transform?: (script: UseScriptInput) => Promise<UseScriptInput> | UseScriptInput
   trigger?: 'idle' | 'manual' | Promise<void>
 }
 
@@ -76,6 +76,6 @@ export interface HeadHooks {
   'ssr:render': (ctx: { tags: HeadTag[] }) => HookResult
   'ssr:rendered': (ctx: SSRRenderContext) => HookResult
 
-  'script:transform': (ctx: { script: ResolvedScript }) => HookResult
+  'script:transform': (ctx: { script: UseScriptInput }) => HookResult
   'script:updated': (ctx: { script: ScriptInstance<any> }) => HookResult
 }
diff --git a/packages/schema/src/schema.ts b/packages/schema/src/schema.ts
@@ -70,7 +70,6 @@ export type Link<E extends EntryAugmentation = {}> = MaybePromiseProps<LinkBase>
 export type Meta<E extends EntryAugmentation = {}> = MaybePromiseProps<BaseMeta> & DataKeys & SchemaAugmentations['meta'] & DefinedValueOrEmptyObject<E>
 export type Style<E extends EntryAugmentation = {}> = MaybePromiseProps<_Style> & DataKeys & SchemaAugmentations['style'] & DefinedValueOrEmptyObject<E>
 export type Script<E extends EntryAugmentation = {}> = MaybePromiseProps<ScriptBase> & MaybeFunctionEntries<HttpEventAttributes> & DataKeys & SchemaAugmentations['script'] & DefinedValueOrEmptyObject<E>
-export type ResolvedScript<E extends EntryAugmentation = {}> = ScriptBase & MaybeFunctionEntries<HttpEventAttributes> & DataKeys & SchemaAugmentations['script'] & DefinedValueOrEmptyObject<E>
 export type Noscript<E extends EntryAugmentation = {}> = MaybePromiseProps<_Noscript> & DataKeys & SchemaAugmentations['noscript'] & DefinedValueOrEmptyObject<E>
 export type HtmlAttributes<E extends EntryAugmentation = {}> = MaybePromiseProps<HtmlAttr> & DataKeys & SchemaAugmentations['htmlAttrs'] & DefinedValueOrEmptyObject<E>
 export type BodyAttributes<E extends EntryAugmentation = {}> = MaybePromiseProps<BodyAttr> & MaybeFunctionEntries<BodyEvents> & DataKeys & SchemaAugmentations['bodyAttrs'] & DefinedValueOrEmptyObject<E>

diff --git a/packages/unhead/src/composables/useScript.ts b/packages/unhead/src/composables/useScript.ts
@@ -1,5 +1,5 @@
 import { NetworkEvents, hashCode } from '@unhead/shared'
-import type { DomRenderTagContext, Head, HeadEntryOptions, ResolvedScript, Script, ScriptInstance, UseScriptInput, UseScriptOptions } from '@unhead/schema'
+import type { DomRenderTagContext, Head, HeadEntryOptions, Script, ScriptInstance, UseScriptInput, UseScriptOptions } from '@unhead/schema'
 import { getActiveHead } from './useActiveHead'
 
 const UseScriptDefaults: Script = {
@@ -26,7 +26,7 @@ export function useScript<T>(input: UseScriptInput, _options?: UseScriptOptions<
     return head._scripts[id]
 
   async function transform(entry: Head): Promise<Head> {
-    const script = await (options.transform || (input => input))(entry.script![0] as ResolvedScript)
+    const script = await (options.transform || (input => input))(entry.script![0] as UseScriptInput)
     const ctx = { script }
     await head!.hooks.callHook('script:transform', ctx)
     return { script: [ctx.script] }