@unhead/schema 1.10.0-beta.1 → 1.10.0-beta.2

package/dist/index.d.cts

@@ -521,7 +521,7 @@ type UseScriptResolvedInput = Omit<Script, 'src'> & {
 };
 type BaseScriptApi = Record<symbol | string, any>;
 type AsAsyncFunctionValues<T extends BaseScriptApi> = {
-    [key in keyof T]: T[key] extends any[] ? T[key] : T[key] extends object ? AsAsyncFunctionValues<T[key]> : T[key] extends (...args: infer A) => infer R ? (...args: A) => Promise<R> : () => Promise<T[key]>;
+    [key in keyof T]: T[key] extends any[] ? T[key] : T[key] extends (...args: infer A) => infer R ? (...args: A) => R extends Promise<any> ? R : Promise<R> : T[key] extends Record<any, any> ? AsAsyncFunctionValues<T[key]> : never;
 };
 interface ScriptInstance<T extends BaseScriptApi> {
     proxy: AsAsyncFunctionValues<T>;
@@ -531,8 +531,20 @@ interface ScriptInstance<T extends BaseScriptApi> {
     entry?: ActiveHeadEntry<any>;
     load: () => Promise<T>;
     remove: () => boolean;
+    onLoaded: (fn: (instance: T) => void | Promise<void>) => void;
+    onError: (fn: (err?: Error) => void | Promise<void>) => void;
+    /**
+     * @internal
+     */
+    _cbs: {
+        loaded: ((instance: T) => void | Promise<void>)[];
+        error: ((err?: Error) => void | Promise<void>)[];
+    };
 }
-interface UseScriptOptions<T extends BaseScriptApi> extends HeadEntryOptions {
+type UseFunctionType<T, U> = T extends {
+    use: infer V;
+} ? V extends () => infer W ? W : U : U;
+interface UseScriptOptions<T extends BaseScriptApi = {}, U = {}> extends HeadEntryOptions {
     /**
      * Resolve the script instance from the window.
      */
@@ -565,4 +577,4 @@ interface UseScriptOptions<T extends BaseScriptApi> extends HeadEntryOptions {
     beforeInit?: () => void;
 }
 
-export type { ActiveHeadEntry, AsAsyncFunctionValues, Base, BaseBodyAttr, BaseHtmlAttr, BaseMeta, BodyAttr, BodyAttributes, CreateHeadOptions, DomBeforeRenderCtx, DomRenderTagContext, DomState, EntryAugmentation, EntryResolveCtx, HasTemplateParams, Head, HeadEntry, HeadEntryOptions, HeadHooks, HeadPlugin, HeadPluginInput, HeadPluginOptions, HeadSafe, HeadTag, HeadTagKeys, HeadUtils, HookResult, HtmlAttr, HtmlAttributes, InnerContent, InnerContentVal, Link, MaybeArray, MaybeFunctionEntries, MaybePromiseOrFalseProps, Meta, Never, Noscript, ProcessesTemplateParams, RenderSSRHeadOptions, ResolvesDuplicates, RuntimeMode, SSRHeadPayload, SSRRenderContext, SafeBodyAttr, SafeHtmlAttr, SafeLink, SafeMeta, SafeNoscript, SafeScript, SchemaAugmentations, Script, ScriptInstance, ShouldRenderContext, SideEffectsRecord, Style, TagKey, TagPosition, TagPriority, TagUserProperties, TemplateParams, Title, TitleTemplate, Unhead, UseScriptInput, UseScriptOptions, UseScriptResolvedInput, UseScriptStatus, UseSeoMetaInput, UserAttributesConfig, UserTagConfigWithoutInnerContent, ValidTagPositions };
+export type { ActiveHeadEntry, AsAsyncFunctionValues, Base, BaseBodyAttr, BaseHtmlAttr, BaseMeta, BodyAttr, BodyAttributes, CreateHeadOptions, DomBeforeRenderCtx, DomRenderTagContext, DomState, EntryAugmentation, EntryResolveCtx, HasTemplateParams, Head, HeadEntry, HeadEntryOptions, HeadHooks, HeadPlugin, HeadPluginInput, HeadPluginOptions, HeadSafe, HeadTag, HeadTagKeys, HeadUtils, HookResult, HtmlAttr, HtmlAttributes, InnerContent, InnerContentVal, Link, MaybeArray, MaybeFunctionEntries, MaybePromiseOrFalseProps, Meta, Never, Noscript, ProcessesTemplateParams, RenderSSRHeadOptions, ResolvesDuplicates, RuntimeMode, SSRHeadPayload, SSRRenderContext, SafeBodyAttr, SafeHtmlAttr, SafeLink, SafeMeta, SafeNoscript, SafeScript, SchemaAugmentations, Script, ScriptInstance, ShouldRenderContext, SideEffectsRecord, Style, TagKey, TagPosition, TagPriority, TagUserProperties, TemplateParams, Title, TitleTemplate, Unhead, UseFunctionType, UseScriptInput, UseScriptOptions, UseScriptResolvedInput, UseScriptStatus, UseSeoMetaInput, UserAttributesConfig, UserTagConfigWithoutInnerContent, ValidTagPositions };

package/dist/index.d.mts

@@ -521,7 +521,7 @@ type UseScriptResolvedInput = Omit<Script, 'src'> & {
 };
 type BaseScriptApi = Record<symbol | string, any>;
 type AsAsyncFunctionValues<T extends BaseScriptApi> = {
-    [key in keyof T]: T[key] extends any[] ? T[key] : T[key] extends object ? AsAsyncFunctionValues<T[key]> : T[key] extends (...args: infer A) => infer R ? (...args: A) => Promise<R> : () => Promise<T[key]>;
+    [key in keyof T]: T[key] extends any[] ? T[key] : T[key] extends (...args: infer A) => infer R ? (...args: A) => R extends Promise<any> ? R : Promise<R> : T[key] extends Record<any, any> ? AsAsyncFunctionValues<T[key]> : never;
 };
 interface ScriptInstance<T extends BaseScriptApi> {
     proxy: AsAsyncFunctionValues<T>;
@@ -531,8 +531,20 @@ interface ScriptInstance<T extends BaseScriptApi> {
     entry?: ActiveHeadEntry<any>;
     load: () => Promise<T>;
     remove: () => boolean;
+    onLoaded: (fn: (instance: T) => void | Promise<void>) => void;
+    onError: (fn: (err?: Error) => void | Promise<void>) => void;
+    /**
+     * @internal
+     */
+    _cbs: {
+        loaded: ((instance: T) => void | Promise<void>)[];
+        error: ((err?: Error) => void | Promise<void>)[];
+    };
 }
-interface UseScriptOptions<T extends BaseScriptApi> extends HeadEntryOptions {
+type UseFunctionType<T, U> = T extends {
+    use: infer V;
+} ? V extends () => infer W ? W : U : U;
+interface UseScriptOptions<T extends BaseScriptApi = {}, U = {}> extends HeadEntryOptions {
     /**
      * Resolve the script instance from the window.
      */
@@ -565,4 +577,4 @@ interface UseScriptOptions<T extends BaseScriptApi> extends HeadEntryOptions {
     beforeInit?: () => void;
 }
 
-export type { ActiveHeadEntry, AsAsyncFunctionValues, Base, BaseBodyAttr, BaseHtmlAttr, BaseMeta, BodyAttr, BodyAttributes, CreateHeadOptions, DomBeforeRenderCtx, DomRenderTagContext, DomState, EntryAugmentation, EntryResolveCtx, HasTemplateParams, Head, HeadEntry, HeadEntryOptions, HeadHooks, HeadPlugin, HeadPluginInput, HeadPluginOptions, HeadSafe, HeadTag, HeadTagKeys, HeadUtils, HookResult, HtmlAttr, HtmlAttributes, InnerContent, InnerContentVal, Link, MaybeArray, MaybeFunctionEntries, MaybePromiseOrFalseProps, Meta, Never, Noscript, ProcessesTemplateParams, RenderSSRHeadOptions, ResolvesDuplicates, RuntimeMode, SSRHeadPayload, SSRRenderContext, SafeBodyAttr, SafeHtmlAttr, SafeLink, SafeMeta, SafeNoscript, SafeScript, SchemaAugmentations, Script, ScriptInstance, ShouldRenderContext, SideEffectsRecord, Style, TagKey, TagPosition, TagPriority, TagUserProperties, TemplateParams, Title, TitleTemplate, Unhead, UseScriptInput, UseScriptOptions, UseScriptResolvedInput, UseScriptStatus, UseSeoMetaInput, UserAttributesConfig, UserTagConfigWithoutInnerContent, ValidTagPositions };
+export type { ActiveHeadEntry, AsAsyncFunctionValues, Base, BaseBodyAttr, BaseHtmlAttr, BaseMeta, BodyAttr, BodyAttributes, CreateHeadOptions, DomBeforeRenderCtx, DomRenderTagContext, DomState, EntryAugmentation, EntryResolveCtx, HasTemplateParams, Head, HeadEntry, HeadEntryOptions, HeadHooks, HeadPlugin, HeadPluginInput, HeadPluginOptions, HeadSafe, HeadTag, HeadTagKeys, HeadUtils, HookResult, HtmlAttr, HtmlAttributes, InnerContent, InnerContentVal, Link, MaybeArray, MaybeFunctionEntries, MaybePromiseOrFalseProps, Meta, Never, Noscript, ProcessesTemplateParams, RenderSSRHeadOptions, ResolvesDuplicates, RuntimeMode, SSRHeadPayload, SSRRenderContext, SafeBodyAttr, SafeHtmlAttr, SafeLink, SafeMeta, SafeNoscript, SafeScript, SchemaAugmentations, Script, ScriptInstance, ShouldRenderContext, SideEffectsRecord, Style, TagKey, TagPosition, TagPriority, TagUserProperties, TemplateParams, Title, TitleTemplate, Unhead, UseFunctionType, UseScriptInput, UseScriptOptions, UseScriptResolvedInput, UseScriptStatus, UseSeoMetaInput, UserAttributesConfig, UserTagConfigWithoutInnerContent, ValidTagPositions };

package/dist/index.d.ts

@@ -521,7 +521,7 @@ type UseScriptResolvedInput = Omit<Script, 'src'> & {
 };
 type BaseScriptApi = Record<symbol | string, any>;
 type AsAsyncFunctionValues<T extends BaseScriptApi> = {
-    [key in keyof T]: T[key] extends any[] ? T[key] : T[key] extends object ? AsAsyncFunctionValues<T[key]> : T[key] extends (...args: infer A) => infer R ? (...args: A) => Promise<R> : () => Promise<T[key]>;
+    [key in keyof T]: T[key] extends any[] ? T[key] : T[key] extends (...args: infer A) => infer R ? (...args: A) => R extends Promise<any> ? R : Promise<R> : T[key] extends Record<any, any> ? AsAsyncFunctionValues<T[key]> : never;
 };
 interface ScriptInstance<T extends BaseScriptApi> {
     proxy: AsAsyncFunctionValues<T>;
@@ -531,8 +531,20 @@ interface ScriptInstance<T extends BaseScriptApi> {
     entry?: ActiveHeadEntry<any>;
     load: () => Promise<T>;
     remove: () => boolean;
+    onLoaded: (fn: (instance: T) => void | Promise<void>) => void;
+    onError: (fn: (err?: Error) => void | Promise<void>) => void;
+    /**
+     * @internal
+     */
+    _cbs: {
+        loaded: ((instance: T) => void | Promise<void>)[];
+        error: ((err?: Error) => void | Promise<void>)[];
+    };
 }
-interface UseScriptOptions<T extends BaseScriptApi> extends HeadEntryOptions {
+type UseFunctionType<T, U> = T extends {
+    use: infer V;
+} ? V extends () => infer W ? W : U : U;
+interface UseScriptOptions<T extends BaseScriptApi = {}, U = {}> extends HeadEntryOptions {
     /**
      * Resolve the script instance from the window.
      */
@@ -565,4 +577,4 @@ interface UseScriptOptions<T extends BaseScriptApi> extends HeadEntryOptions {
     beforeInit?: () => void;
 }
 
-export type { ActiveHeadEntry, AsAsyncFunctionValues, Base, BaseBodyAttr, BaseHtmlAttr, BaseMeta, BodyAttr, BodyAttributes, CreateHeadOptions, DomBeforeRenderCtx, DomRenderTagContext, DomState, EntryAugmentation, EntryResolveCtx, HasTemplateParams, Head, HeadEntry, HeadEntryOptions, HeadHooks, HeadPlugin, HeadPluginInput, HeadPluginOptions, HeadSafe, HeadTag, HeadTagKeys, HeadUtils, HookResult, HtmlAttr, HtmlAttributes, InnerContent, InnerContentVal, Link, MaybeArray, MaybeFunctionEntries, MaybePromiseOrFalseProps, Meta, Never, Noscript, ProcessesTemplateParams, RenderSSRHeadOptions, ResolvesDuplicates, RuntimeMode, SSRHeadPayload, SSRRenderContext, SafeBodyAttr, SafeHtmlAttr, SafeLink, SafeMeta, SafeNoscript, SafeScript, SchemaAugmentations, Script, ScriptInstance, ShouldRenderContext, SideEffectsRecord, Style, TagKey, TagPosition, TagPriority, TagUserProperties, TemplateParams, Title, TitleTemplate, Unhead, UseScriptInput, UseScriptOptions, UseScriptResolvedInput, UseScriptStatus, UseSeoMetaInput, UserAttributesConfig, UserTagConfigWithoutInnerContent, ValidTagPositions };
+export type { ActiveHeadEntry, AsAsyncFunctionValues, Base, BaseBodyAttr, BaseHtmlAttr, BaseMeta, BodyAttr, BodyAttributes, CreateHeadOptions, DomBeforeRenderCtx, DomRenderTagContext, DomState, EntryAugmentation, EntryResolveCtx, HasTemplateParams, Head, HeadEntry, HeadEntryOptions, HeadHooks, HeadPlugin, HeadPluginInput, HeadPluginOptions, HeadSafe, HeadTag, HeadTagKeys, HeadUtils, HookResult, HtmlAttr, HtmlAttributes, InnerContent, InnerContentVal, Link, MaybeArray, MaybeFunctionEntries, MaybePromiseOrFalseProps, Meta, Never, Noscript, ProcessesTemplateParams, RenderSSRHeadOptions, ResolvesDuplicates, RuntimeMode, SSRHeadPayload, SSRRenderContext, SafeBodyAttr, SafeHtmlAttr, SafeLink, SafeMeta, SafeNoscript, SafeScript, SchemaAugmentations, Script, ScriptInstance, ShouldRenderContext, SideEffectsRecord, Style, TagKey, TagPosition, TagPriority, TagUserProperties, TemplateParams, Title, TitleTemplate, Unhead, UseFunctionType, UseScriptInput, UseScriptOptions, UseScriptResolvedInput, UseScriptStatus, UseSeoMetaInput, UserAttributesConfig, UserTagConfigWithoutInnerContent, ValidTagPositions };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unhead/schema",
   "type": "module",
-  "version": "1.10.0-beta.1",
+  "version": "1.10.0-beta.2",
   "author": "Harlan Wilton <harlan@harlanzw.com>",
   "license": "MIT",
   "funding": "https://github.com/sponsors/harlan-zw",