@unhead/schema 2.0.0-alpha.5 → 2.0.0-alpha.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/dist/index.d.cts +46 -30
  2. package/dist/index.d.mts +46 -30
  3. package/dist/index.d.ts +46 -30
  4. package/package.json +1 -1
package/dist/index.d.cts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { NestedHooks, Hookable } from 'hookable';
2
- import { MergeHead, BaseBodyAttributes, HtmlAttributes as HtmlAttributes$1, Meta as Meta$1, Stringable, Merge, Base as Base$1, DefinedValueOrEmptyObject, LinkBase, DataKeys, HttpEventAttributes, Style as Style$1, ScriptBase, Noscript as Noscript$1, BodyEvents, MetaFlatInput } from 'zhead';
3
- export { BodyEvents, DataKeys, DefinedValueOrEmptyObject, MergeHead, MetaFlatInput, ScriptBase, SpeculationRules } from 'zhead';
2
+ import { MergeHead, BaseBodyAttributes, HtmlAttributes as HtmlAttributes$1, Meta as Meta$1, Stringable, Base as Base$1, DefinedValueOrEmptyObject, LinkBase, DataKeys, HttpEventAttributes, Style as Style$1, ScriptBase, Noscript as Noscript$1, BodyEvents, Merge, MetaFlatInput } from 'zhead';
3
+ export { BodyEvents, DataKeys, DefinedValueOrEmptyObject, HttpEventAttributes, LinkBase, MergeHead, MetaFlatInput, ScriptBase, SpeculationRules } from 'zhead';
4
4
 
5
5
  type Never<T> = {
6
6
  [P in keyof T]?: never;
@@ -27,6 +27,22 @@ interface SchemaAugmentations extends MergeHead {
27
27
  script: TagUserProperties;
28
28
  noscript: TagUserProperties;
29
29
  }
30
+ interface ResolvedSchemaAugmentations extends MergeHead {
31
+ title: TagPriority;
32
+ titleTemplate: TagPriority;
33
+ base: ResolvesDuplicates & TagPriority & Never<InnerContent & TagPosition>;
34
+ htmlAttrs: ResolvesDuplicates & TagPriority & Never<InnerContent & TagPosition>;
35
+ bodyAttrs: ResolvesDuplicates & TagPriority & Never<InnerContent & TagPosition>;
36
+ link: TagPriority & TagPosition & ResolvesDuplicates & Never<InnerContent> & {
37
+ processTemplateParams?: false;
38
+ };
39
+ meta: TagPriority & TagPosition & ResolvesDuplicates & Never<InnerContent> & {
40
+ processTemplateParams?: false;
41
+ };
42
+ style: TagPriority & TagPosition & InnerContent & ResolvesDuplicates & ProcessesTemplateParams;
43
+ script: TagPriority & TagPosition & InnerContent & ResolvesDuplicates & ProcessesTemplateParams;
44
+ noscript: TagPriority & TagPosition & InnerContent & ResolvesDuplicates & ProcessesTemplateParams;
45
+ }
30
46
  type MaybeArray<T> = T | T[];
31
47
  type BaseBodyAttr = BaseBodyAttributes;
32
48
  type BaseHtmlAttr = HtmlAttributes$1;
@@ -67,28 +83,28 @@ type Title = MaybeFunction<number | string | Falsey> | ResolvableValues<({
67
83
  type TitleTemplate = TitleTemplateResolver | null | ({
68
84
  textContent: TitleTemplateResolver;
69
85
  } & SchemaAugmentations['titleTemplate']);
70
- type Base<E extends EntryAugmentation = Record<string, any>> = Partial<Merge<SchemaAugmentations['base'], ResolvableValues<Base$1>>> & DefinedValueOrEmptyObject<E>;
71
- type Link<E extends EntryAugmentation = Record<string, any>> = ResolvableValues<LinkBase & DataKeys> & MaybeEventFnHandlers<HttpEventAttributes> & SchemaAugmentations['link'] & DefinedValueOrEmptyObject<E>;
72
- type Meta<E extends EntryAugmentation = Record<string, any>> = ResolvableValues<BaseMeta & DataKeys> & SchemaAugmentations['meta'] & DefinedValueOrEmptyObject<E>;
73
- type Style<E extends EntryAugmentation = Record<string, any>> = ResolvableValues<Style$1 & DataKeys> & SchemaAugmentations['style'] & DefinedValueOrEmptyObject<E>;
74
- type Script<E extends EntryAugmentation = Record<string, any>> = ResolvableValues<ScriptBase & DataKeys> & MaybeEventFnHandlers<HttpEventAttributes> & SchemaAugmentations['script'] & DefinedValueOrEmptyObject<E>;
75
- type Noscript<E extends EntryAugmentation = Record<string, any>> = ResolvableValues<Noscript$1 & DataKeys> & SchemaAugmentations['noscript'] & DefinedValueOrEmptyObject<E>;
76
- type HtmlAttributes<E extends EntryAugmentation = Record<string, any>> = ResolvableValues<HtmlAttr & DataKeys> & SchemaAugmentations['htmlAttrs'] & DefinedValueOrEmptyObject<E>;
77
- type BodyAttributes<E extends EntryAugmentation = Record<string, any>> = ResolvableValues<BodyAttr & DataKeys> & MaybeEventFnHandlers<BodyEvents> & SchemaAugmentations['bodyAttrs'] & DefinedValueOrEmptyObject<E>;
86
+ type Base<E extends EntryAugmentation = Record<string, any>> = ResolvableValues<Base$1 & SchemaAugmentations['base']> & DefinedValueOrEmptyObject<E>;
87
+ type Link<E extends EntryAugmentation = Record<string, any>> = ResolvableValues<LinkBase & DataKeys & SchemaAugmentations['link']> & MaybeEventFnHandlers<HttpEventAttributes> & DefinedValueOrEmptyObject<E>;
88
+ type Meta<E extends EntryAugmentation = Record<string, any>> = ResolvableValues<BaseMeta & DataKeys & SchemaAugmentations['meta']> & DefinedValueOrEmptyObject<E>;
89
+ type Style<E extends EntryAugmentation = Record<string, any>> = ResolvableValues<Style$1 & DataKeys & SchemaAugmentations['style']> & DefinedValueOrEmptyObject<E>;
90
+ type Script<E extends EntryAugmentation = Record<string, any>> = ResolvableValues<ScriptBase & DataKeys & SchemaAugmentations['script']> & MaybeEventFnHandlers<HttpEventAttributes> & DefinedValueOrEmptyObject<E>;
91
+ type Noscript<E extends EntryAugmentation = Record<string, any>> = ResolvableValues<Noscript$1 & DataKeys & SchemaAugmentations['noscript']> & DefinedValueOrEmptyObject<E>;
92
+ type HtmlAttributes<E extends EntryAugmentation = Record<string, any>> = ResolvableValues<HtmlAttr & DataKeys & SchemaAugmentations['htmlAttrs']> & DefinedValueOrEmptyObject<E>;
93
+ type BodyAttributes<E extends EntryAugmentation = Record<string, any>> = ResolvableValues<BodyAttr & DataKeys & SchemaAugmentations['bodyAttrs']> & MaybeEventFnHandlers<BodyEvents> & DefinedValueOrEmptyObject<E>;
78
94
  type ResolvedTitle = ({
79
95
  textContent: string;
80
- } & SchemaAugmentations['title']);
96
+ } & ResolvedSchemaAugmentations['title']);
81
97
  type ResolvedTitleTemplate = TitleTemplateResolver | null | ({
82
98
  textContent: TitleTemplateResolver;
83
- } & SchemaAugmentations['titleTemplate']);
84
- type ResolvedBase<E extends EntryAugmentation = Record<string, any>> = Partial<Merge<SchemaAugmentations['base'], Base$1>> & DefinedValueOrEmptyObject<E>;
85
- type ResolvedLink<E extends EntryAugmentation = Record<string, any>> = LinkBase & MaybeEventFnHandlers<HttpEventAttributes> & DataKeys & SchemaAugmentations['link'] & DefinedValueOrEmptyObject<E>;
99
+ } & ResolvedSchemaAugmentations['titleTemplate']);
100
+ type ResolvedBase<E extends EntryAugmentation = Record<string, any>> = Partial<Merge<ResolvedSchemaAugmentations['base'], Base$1>> & DefinedValueOrEmptyObject<E>;
101
+ type ResolvedLink<E extends EntryAugmentation = Record<string, any>> = LinkBase & MaybeEventFnHandlers<HttpEventAttributes> & DataKeys & ResolvedSchemaAugmentations['link'] & DefinedValueOrEmptyObject<E>;
86
102
  type ResolvedMeta<E extends EntryAugmentation = Record<string, any>> = BaseMeta & DataKeys & SchemaAugmentations['meta'] & DefinedValueOrEmptyObject<E>;
87
- type ResolvedStyle<E extends EntryAugmentation = Record<string, any>> = Style$1 & DataKeys & SchemaAugmentations['style'] & DefinedValueOrEmptyObject<E>;
88
- type ResolvedScript<E extends EntryAugmentation = Record<string, any>> = ScriptBase & MaybeEventFnHandlers<HttpEventAttributes> & DataKeys & SchemaAugmentations['script'] & DefinedValueOrEmptyObject<E>;
89
- type ResolvedNoscript<E extends EntryAugmentation = Record<string, any>> = Noscript$1 & DataKeys & SchemaAugmentations['noscript'] & DefinedValueOrEmptyObject<E>;
90
- type ResolvedHtmlAttributes<E extends EntryAugmentation = Record<string, any>> = HtmlAttr & DataKeys & SchemaAugmentations['htmlAttrs'] & DefinedValueOrEmptyObject<E>;
91
- type ResolvedBodyAttributes<E extends EntryAugmentation = Record<string, any>> = BodyAttr & MaybeEventFnHandlers<BodyEvents> & DataKeys & SchemaAugmentations['bodyAttrs'] & DefinedValueOrEmptyObject<E>;
103
+ type ResolvedStyle<E extends EntryAugmentation = Record<string, any>> = Style$1 & DataKeys & ResolvedSchemaAugmentations['style'] & DefinedValueOrEmptyObject<E>;
104
+ type ResolvedScript<E extends EntryAugmentation = Record<string, any>> = ScriptBase & MaybeEventFnHandlers<HttpEventAttributes> & DataKeys & ResolvedSchemaAugmentations['script'] & DefinedValueOrEmptyObject<E>;
105
+ type ResolvedNoscript<E extends EntryAugmentation = Record<string, any>> = Noscript$1 & DataKeys & ResolvedSchemaAugmentations['noscript'] & DefinedValueOrEmptyObject<E>;
106
+ type ResolvedHtmlAttributes<E extends EntryAugmentation = Record<string, any>> = HtmlAttr & DataKeys & ResolvedSchemaAugmentations['htmlAttrs'] & DefinedValueOrEmptyObject<E>;
107
+ type ResolvedBodyAttributes<E extends EntryAugmentation = Record<string, any>> = BodyAttr & MaybeEventFnHandlers<BodyEvents> & DataKeys & ResolvedSchemaAugmentations['bodyAttrs'] & DefinedValueOrEmptyObject<E>;
92
108
  interface HeadUtils {
93
109
  /**
94
110
  * Generate the title from a template.
@@ -163,16 +179,16 @@ interface Head<E extends MergeHead = SchemaAugmentations> extends HeadUtils {
163
179
  */
164
180
  bodyAttrs?: BodyAttributes<E['bodyAttrs']>;
165
181
  }
166
- interface ResolvedHead<E extends MergeHead = SchemaAugmentations> extends HeadUtils {
167
- title: ResolvedTitle;
168
- base: ResolvedBase<E['base']>;
169
- link: ResolvedLink<E['link']>[];
170
- meta: ResolvedMeta<E['meta']>[];
171
- style: (ResolvedStyle<E['style']> | string)[];
172
- script: (ResolvedScript<E['script']> | string)[];
173
- noscript: (ResolvedNoscript<E['noscript']> | string)[];
174
- htmlAttrs: ResolvedHtmlAttributes<E['htmlAttrs']>;
175
- bodyAttrs: ResolvedBodyAttributes<E['bodyAttrs']>;
182
+ interface ResolvedHead<E extends MergeHead = ResolvedSchemaAugmentations> extends HeadUtils {
183
+ title?: ResolvedTitle;
184
+ base?: ResolvedBase<E['base']>;
185
+ link?: ResolvedLink<E['link']>[];
186
+ meta?: ResolvedMeta<E['meta']>[];
187
+ style?: (ResolvedStyle<E['style']> | string)[];
188
+ script?: (ResolvedScript<E['script']> | string)[];
189
+ noscript?: (ResolvedNoscript<E['noscript']> | string)[];
190
+ htmlAttrs?: ResolvedHtmlAttributes<E['htmlAttrs']>;
191
+ bodyAttrs?: ResolvedBodyAttributes<E['bodyAttrs']>;
176
192
  }
177
193
  type UseSeoMetaInput = MetaFlatInput & {
178
194
  title?: Title;
@@ -540,4 +556,4 @@ interface HeadSafe extends Pick<Head, 'title' | 'titleTemplate' | 'templateParam
540
556
  bodyAttrs?: SafeBodyAttr;
541
557
  }
542
558
 
543
- export type { ActiveHeadEntry, Base, BaseBodyAttr, BaseHtmlAttr, BaseMeta, BodyAttr, BodyAttributes, CreateClientHeadOptions, CreateHeadOptions, DomBeforeRenderCtx, DomPluginOptions, DomRenderTagContext, DomState, EntryAugmentation, EntryResolveCtx, HasTemplateParams, Head, HeadEntry, HeadEntryOptions, HeadHooks, HeadPlugin, HeadPluginInput, HeadPluginOptions, HeadSafe, HeadTag, HeadTagKeys, HeadUtils, HookResult, HtmlAttr, HtmlAttributes, InnerContent, InnerContentVal, Link, MaybeArray, MaybeEventFnHandlers, Meta, Noscript, ProcessesTemplateParams, RenderDomHeadOptions, RenderSSRHeadOptions, ResolvedBase, ResolvedBodyAttributes, ResolvedHead, ResolvedHtmlAttributes, ResolvedLink, ResolvedMeta, ResolvedNoscript, ResolvedScript, ResolvedStyle, ResolvedTitle, ResolvedTitleTemplate, ResolvesDuplicates, RuntimeMode, SSRHeadPayload, SSRRenderContext, SafeBodyAttr, SafeHtmlAttr, SafeLink, SafeMeta, SafeNoscript, SafeScript, SchemaAugmentations, Script, ShouldRenderContext, SideEffectsRecord, Style, TagKey, TagPosition, TagPriority, TagUserProperties, TemplateParams, Title, TitleTemplate, Unhead, UseSeoMetaInput, UserAttributesConfig, UserTagConfigWithoutInnerContent, ValidTagPositions };
559
+ export type { ActiveHeadEntry, Base, BaseBodyAttr, BaseHtmlAttr, BaseMeta, BodyAttr, BodyAttributes, CreateClientHeadOptions, CreateHeadOptions, DomBeforeRenderCtx, DomPluginOptions, DomRenderTagContext, DomState, EntryAugmentation, EntryResolveCtx, Falsey, HasTemplateParams, Head, HeadEntry, HeadEntryOptions, HeadHooks, HeadPlugin, HeadPluginInput, HeadPluginOptions, HeadSafe, HeadTag, HeadTagKeys, HeadUtils, HookResult, HtmlAttr, HtmlAttributes, InnerContent, InnerContentVal, Link, MaybeArray, MaybeEventFnHandlers, MaybeFunction, Meta, Never, Noscript, ProcessesTemplateParams, RenderDomHeadOptions, RenderSSRHeadOptions, ResolvableValues, ResolvedBase, ResolvedBodyAttributes, ResolvedHead, ResolvedHtmlAttributes, ResolvedLink, ResolvedMeta, ResolvedNoscript, ResolvedSchemaAugmentations, ResolvedScript, ResolvedStyle, ResolvedTitle, ResolvedTitleTemplate, ResolvesDuplicates, RuntimeMode, SSRHeadPayload, SSRRenderContext, SafeBodyAttr, SafeHtmlAttr, SafeLink, SafeMeta, SafeNoscript, SafeScript, SchemaAugmentations, Script, ShouldRenderContext, SideEffectsRecord, Style, TagKey, TagPosition, TagPriority, TagUserProperties, TemplateParams, Title, TitleTemplate, Unhead, UseSeoMetaInput, UserAttributesConfig, UserTagConfigWithoutInnerContent, ValidTagPositions };
package/dist/index.d.mts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { NestedHooks, Hookable } from 'hookable';
2
- import { MergeHead, BaseBodyAttributes, HtmlAttributes as HtmlAttributes$1, Meta as Meta$1, Stringable, Merge, Base as Base$1, DefinedValueOrEmptyObject, LinkBase, DataKeys, HttpEventAttributes, Style as Style$1, ScriptBase, Noscript as Noscript$1, BodyEvents, MetaFlatInput } from 'zhead';
3
- export { BodyEvents, DataKeys, DefinedValueOrEmptyObject, MergeHead, MetaFlatInput, ScriptBase, SpeculationRules } from 'zhead';
2
+ import { MergeHead, BaseBodyAttributes, HtmlAttributes as HtmlAttributes$1, Meta as Meta$1, Stringable, Base as Base$1, DefinedValueOrEmptyObject, LinkBase, DataKeys, HttpEventAttributes, Style as Style$1, ScriptBase, Noscript as Noscript$1, BodyEvents, Merge, MetaFlatInput } from 'zhead';
3
+ export { BodyEvents, DataKeys, DefinedValueOrEmptyObject, HttpEventAttributes, LinkBase, MergeHead, MetaFlatInput, ScriptBase, SpeculationRules } from 'zhead';
4
4
 
5
5
  type Never<T> = {
6
6
  [P in keyof T]?: never;
@@ -27,6 +27,22 @@ interface SchemaAugmentations extends MergeHead {
27
27
  script: TagUserProperties;
28
28
  noscript: TagUserProperties;
29
29
  }
30
+ interface ResolvedSchemaAugmentations extends MergeHead {
31
+ title: TagPriority;
32
+ titleTemplate: TagPriority;
33
+ base: ResolvesDuplicates & TagPriority & Never<InnerContent & TagPosition>;
34
+ htmlAttrs: ResolvesDuplicates & TagPriority & Never<InnerContent & TagPosition>;
35
+ bodyAttrs: ResolvesDuplicates & TagPriority & Never<InnerContent & TagPosition>;
36
+ link: TagPriority & TagPosition & ResolvesDuplicates & Never<InnerContent> & {
37
+ processTemplateParams?: false;
38
+ };
39
+ meta: TagPriority & TagPosition & ResolvesDuplicates & Never<InnerContent> & {
40
+ processTemplateParams?: false;
41
+ };
42
+ style: TagPriority & TagPosition & InnerContent & ResolvesDuplicates & ProcessesTemplateParams;
43
+ script: TagPriority & TagPosition & InnerContent & ResolvesDuplicates & ProcessesTemplateParams;
44
+ noscript: TagPriority & TagPosition & InnerContent & ResolvesDuplicates & ProcessesTemplateParams;
45
+ }
30
46
  type MaybeArray<T> = T | T[];
31
47
  type BaseBodyAttr = BaseBodyAttributes;
32
48
  type BaseHtmlAttr = HtmlAttributes$1;
@@ -67,28 +83,28 @@ type Title = MaybeFunction<number | string | Falsey> | ResolvableValues<({
67
83
  type TitleTemplate = TitleTemplateResolver | null | ({
68
84
  textContent: TitleTemplateResolver;
69
85
  } & SchemaAugmentations['titleTemplate']);
70
- type Base<E extends EntryAugmentation = Record<string, any>> = Partial<Merge<SchemaAugmentations['base'], ResolvableValues<Base$1>>> & DefinedValueOrEmptyObject<E>;
71
- type Link<E extends EntryAugmentation = Record<string, any>> = ResolvableValues<LinkBase & DataKeys> & MaybeEventFnHandlers<HttpEventAttributes> & SchemaAugmentations['link'] & DefinedValueOrEmptyObject<E>;
72
- type Meta<E extends EntryAugmentation = Record<string, any>> = ResolvableValues<BaseMeta & DataKeys> & SchemaAugmentations['meta'] & DefinedValueOrEmptyObject<E>;
73
- type Style<E extends EntryAugmentation = Record<string, any>> = ResolvableValues<Style$1 & DataKeys> & SchemaAugmentations['style'] & DefinedValueOrEmptyObject<E>;
74
- type Script<E extends EntryAugmentation = Record<string, any>> = ResolvableValues<ScriptBase & DataKeys> & MaybeEventFnHandlers<HttpEventAttributes> & SchemaAugmentations['script'] & DefinedValueOrEmptyObject<E>;
75
- type Noscript<E extends EntryAugmentation = Record<string, any>> = ResolvableValues<Noscript$1 & DataKeys> & SchemaAugmentations['noscript'] & DefinedValueOrEmptyObject<E>;
76
- type HtmlAttributes<E extends EntryAugmentation = Record<string, any>> = ResolvableValues<HtmlAttr & DataKeys> & SchemaAugmentations['htmlAttrs'] & DefinedValueOrEmptyObject<E>;
77
- type BodyAttributes<E extends EntryAugmentation = Record<string, any>> = ResolvableValues<BodyAttr & DataKeys> & MaybeEventFnHandlers<BodyEvents> & SchemaAugmentations['bodyAttrs'] & DefinedValueOrEmptyObject<E>;
86
+ type Base<E extends EntryAugmentation = Record<string, any>> = ResolvableValues<Base$1 & SchemaAugmentations['base']> & DefinedValueOrEmptyObject<E>;
87
+ type Link<E extends EntryAugmentation = Record<string, any>> = ResolvableValues<LinkBase & DataKeys & SchemaAugmentations['link']> & MaybeEventFnHandlers<HttpEventAttributes> & DefinedValueOrEmptyObject<E>;
88
+ type Meta<E extends EntryAugmentation = Record<string, any>> = ResolvableValues<BaseMeta & DataKeys & SchemaAugmentations['meta']> & DefinedValueOrEmptyObject<E>;
89
+ type Style<E extends EntryAugmentation = Record<string, any>> = ResolvableValues<Style$1 & DataKeys & SchemaAugmentations['style']> & DefinedValueOrEmptyObject<E>;
90
+ type Script<E extends EntryAugmentation = Record<string, any>> = ResolvableValues<ScriptBase & DataKeys & SchemaAugmentations['script']> & MaybeEventFnHandlers<HttpEventAttributes> & DefinedValueOrEmptyObject<E>;
91
+ type Noscript<E extends EntryAugmentation = Record<string, any>> = ResolvableValues<Noscript$1 & DataKeys & SchemaAugmentations['noscript']> & DefinedValueOrEmptyObject<E>;
92
+ type HtmlAttributes<E extends EntryAugmentation = Record<string, any>> = ResolvableValues<HtmlAttr & DataKeys & SchemaAugmentations['htmlAttrs']> & DefinedValueOrEmptyObject<E>;
93
+ type BodyAttributes<E extends EntryAugmentation = Record<string, any>> = ResolvableValues<BodyAttr & DataKeys & SchemaAugmentations['bodyAttrs']> & MaybeEventFnHandlers<BodyEvents> & DefinedValueOrEmptyObject<E>;
78
94
  type ResolvedTitle = ({
79
95
  textContent: string;
80
- } & SchemaAugmentations['title']);
96
+ } & ResolvedSchemaAugmentations['title']);
81
97
  type ResolvedTitleTemplate = TitleTemplateResolver | null | ({
82
98
  textContent: TitleTemplateResolver;
83
- } & SchemaAugmentations['titleTemplate']);
84
- type ResolvedBase<E extends EntryAugmentation = Record<string, any>> = Partial<Merge<SchemaAugmentations['base'], Base$1>> & DefinedValueOrEmptyObject<E>;
85
- type ResolvedLink<E extends EntryAugmentation = Record<string, any>> = LinkBase & MaybeEventFnHandlers<HttpEventAttributes> & DataKeys & SchemaAugmentations['link'] & DefinedValueOrEmptyObject<E>;
99
+ } & ResolvedSchemaAugmentations['titleTemplate']);
100
+ type ResolvedBase<E extends EntryAugmentation = Record<string, any>> = Partial<Merge<ResolvedSchemaAugmentations['base'], Base$1>> & DefinedValueOrEmptyObject<E>;
101
+ type ResolvedLink<E extends EntryAugmentation = Record<string, any>> = LinkBase & MaybeEventFnHandlers<HttpEventAttributes> & DataKeys & ResolvedSchemaAugmentations['link'] & DefinedValueOrEmptyObject<E>;
86
102
  type ResolvedMeta<E extends EntryAugmentation = Record<string, any>> = BaseMeta & DataKeys & SchemaAugmentations['meta'] & DefinedValueOrEmptyObject<E>;
87
- type ResolvedStyle<E extends EntryAugmentation = Record<string, any>> = Style$1 & DataKeys & SchemaAugmentations['style'] & DefinedValueOrEmptyObject<E>;
88
- type ResolvedScript<E extends EntryAugmentation = Record<string, any>> = ScriptBase & MaybeEventFnHandlers<HttpEventAttributes> & DataKeys & SchemaAugmentations['script'] & DefinedValueOrEmptyObject<E>;
89
- type ResolvedNoscript<E extends EntryAugmentation = Record<string, any>> = Noscript$1 & DataKeys & SchemaAugmentations['noscript'] & DefinedValueOrEmptyObject<E>;
90
- type ResolvedHtmlAttributes<E extends EntryAugmentation = Record<string, any>> = HtmlAttr & DataKeys & SchemaAugmentations['htmlAttrs'] & DefinedValueOrEmptyObject<E>;
91
- type ResolvedBodyAttributes<E extends EntryAugmentation = Record<string, any>> = BodyAttr & MaybeEventFnHandlers<BodyEvents> & DataKeys & SchemaAugmentations['bodyAttrs'] & DefinedValueOrEmptyObject<E>;
103
+ type ResolvedStyle<E extends EntryAugmentation = Record<string, any>> = Style$1 & DataKeys & ResolvedSchemaAugmentations['style'] & DefinedValueOrEmptyObject<E>;
104
+ type ResolvedScript<E extends EntryAugmentation = Record<string, any>> = ScriptBase & MaybeEventFnHandlers<HttpEventAttributes> & DataKeys & ResolvedSchemaAugmentations['script'] & DefinedValueOrEmptyObject<E>;
105
+ type ResolvedNoscript<E extends EntryAugmentation = Record<string, any>> = Noscript$1 & DataKeys & ResolvedSchemaAugmentations['noscript'] & DefinedValueOrEmptyObject<E>;
106
+ type ResolvedHtmlAttributes<E extends EntryAugmentation = Record<string, any>> = HtmlAttr & DataKeys & ResolvedSchemaAugmentations['htmlAttrs'] & DefinedValueOrEmptyObject<E>;
107
+ type ResolvedBodyAttributes<E extends EntryAugmentation = Record<string, any>> = BodyAttr & MaybeEventFnHandlers<BodyEvents> & DataKeys & ResolvedSchemaAugmentations['bodyAttrs'] & DefinedValueOrEmptyObject<E>;
92
108
  interface HeadUtils {
93
109
  /**
94
110
  * Generate the title from a template.
@@ -163,16 +179,16 @@ interface Head<E extends MergeHead = SchemaAugmentations> extends HeadUtils {
163
179
  */
164
180
  bodyAttrs?: BodyAttributes<E['bodyAttrs']>;
165
181
  }
166
- interface ResolvedHead<E extends MergeHead = SchemaAugmentations> extends HeadUtils {
167
- title: ResolvedTitle;
168
- base: ResolvedBase<E['base']>;
169
- link: ResolvedLink<E['link']>[];
170
- meta: ResolvedMeta<E['meta']>[];
171
- style: (ResolvedStyle<E['style']> | string)[];
172
- script: (ResolvedScript<E['script']> | string)[];
173
- noscript: (ResolvedNoscript<E['noscript']> | string)[];
174
- htmlAttrs: ResolvedHtmlAttributes<E['htmlAttrs']>;
175
- bodyAttrs: ResolvedBodyAttributes<E['bodyAttrs']>;
182
+ interface ResolvedHead<E extends MergeHead = ResolvedSchemaAugmentations> extends HeadUtils {
183
+ title?: ResolvedTitle;
184
+ base?: ResolvedBase<E['base']>;
185
+ link?: ResolvedLink<E['link']>[];
186
+ meta?: ResolvedMeta<E['meta']>[];
187
+ style?: (ResolvedStyle<E['style']> | string)[];
188
+ script?: (ResolvedScript<E['script']> | string)[];
189
+ noscript?: (ResolvedNoscript<E['noscript']> | string)[];
190
+ htmlAttrs?: ResolvedHtmlAttributes<E['htmlAttrs']>;
191
+ bodyAttrs?: ResolvedBodyAttributes<E['bodyAttrs']>;
176
192
  }
177
193
  type UseSeoMetaInput = MetaFlatInput & {
178
194
  title?: Title;
@@ -540,4 +556,4 @@ interface HeadSafe extends Pick<Head, 'title' | 'titleTemplate' | 'templateParam
540
556
  bodyAttrs?: SafeBodyAttr;
541
557
  }
542
558
 
543
- export type { ActiveHeadEntry, Base, BaseBodyAttr, BaseHtmlAttr, BaseMeta, BodyAttr, BodyAttributes, CreateClientHeadOptions, CreateHeadOptions, DomBeforeRenderCtx, DomPluginOptions, DomRenderTagContext, DomState, EntryAugmentation, EntryResolveCtx, HasTemplateParams, Head, HeadEntry, HeadEntryOptions, HeadHooks, HeadPlugin, HeadPluginInput, HeadPluginOptions, HeadSafe, HeadTag, HeadTagKeys, HeadUtils, HookResult, HtmlAttr, HtmlAttributes, InnerContent, InnerContentVal, Link, MaybeArray, MaybeEventFnHandlers, Meta, Noscript, ProcessesTemplateParams, RenderDomHeadOptions, RenderSSRHeadOptions, ResolvedBase, ResolvedBodyAttributes, ResolvedHead, ResolvedHtmlAttributes, ResolvedLink, ResolvedMeta, ResolvedNoscript, ResolvedScript, ResolvedStyle, ResolvedTitle, ResolvedTitleTemplate, ResolvesDuplicates, RuntimeMode, SSRHeadPayload, SSRRenderContext, SafeBodyAttr, SafeHtmlAttr, SafeLink, SafeMeta, SafeNoscript, SafeScript, SchemaAugmentations, Script, ShouldRenderContext, SideEffectsRecord, Style, TagKey, TagPosition, TagPriority, TagUserProperties, TemplateParams, Title, TitleTemplate, Unhead, UseSeoMetaInput, UserAttributesConfig, UserTagConfigWithoutInnerContent, ValidTagPositions };
559
+ export type { ActiveHeadEntry, Base, BaseBodyAttr, BaseHtmlAttr, BaseMeta, BodyAttr, BodyAttributes, CreateClientHeadOptions, CreateHeadOptions, DomBeforeRenderCtx, DomPluginOptions, DomRenderTagContext, DomState, EntryAugmentation, EntryResolveCtx, Falsey, HasTemplateParams, Head, HeadEntry, HeadEntryOptions, HeadHooks, HeadPlugin, HeadPluginInput, HeadPluginOptions, HeadSafe, HeadTag, HeadTagKeys, HeadUtils, HookResult, HtmlAttr, HtmlAttributes, InnerContent, InnerContentVal, Link, MaybeArray, MaybeEventFnHandlers, MaybeFunction, Meta, Never, Noscript, ProcessesTemplateParams, RenderDomHeadOptions, RenderSSRHeadOptions, ResolvableValues, ResolvedBase, ResolvedBodyAttributes, ResolvedHead, ResolvedHtmlAttributes, ResolvedLink, ResolvedMeta, ResolvedNoscript, ResolvedSchemaAugmentations, ResolvedScript, ResolvedStyle, ResolvedTitle, ResolvedTitleTemplate, ResolvesDuplicates, RuntimeMode, SSRHeadPayload, SSRRenderContext, SafeBodyAttr, SafeHtmlAttr, SafeLink, SafeMeta, SafeNoscript, SafeScript, SchemaAugmentations, Script, ShouldRenderContext, SideEffectsRecord, Style, TagKey, TagPosition, TagPriority, TagUserProperties, TemplateParams, Title, TitleTemplate, Unhead, UseSeoMetaInput, UserAttributesConfig, UserTagConfigWithoutInnerContent, ValidTagPositions };
package/dist/index.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { NestedHooks, Hookable } from 'hookable';
2
- import { MergeHead, BaseBodyAttributes, HtmlAttributes as HtmlAttributes$1, Meta as Meta$1, Stringable, Merge, Base as Base$1, DefinedValueOrEmptyObject, LinkBase, DataKeys, HttpEventAttributes, Style as Style$1, ScriptBase, Noscript as Noscript$1, BodyEvents, MetaFlatInput } from 'zhead';
3
- export { BodyEvents, DataKeys, DefinedValueOrEmptyObject, MergeHead, MetaFlatInput, ScriptBase, SpeculationRules } from 'zhead';
2
+ import { MergeHead, BaseBodyAttributes, HtmlAttributes as HtmlAttributes$1, Meta as Meta$1, Stringable, Base as Base$1, DefinedValueOrEmptyObject, LinkBase, DataKeys, HttpEventAttributes, Style as Style$1, ScriptBase, Noscript as Noscript$1, BodyEvents, Merge, MetaFlatInput } from 'zhead';
3
+ export { BodyEvents, DataKeys, DefinedValueOrEmptyObject, HttpEventAttributes, LinkBase, MergeHead, MetaFlatInput, ScriptBase, SpeculationRules } from 'zhead';
4
4
 
5
5
  type Never<T> = {
6
6
  [P in keyof T]?: never;
@@ -27,6 +27,22 @@ interface SchemaAugmentations extends MergeHead {
27
27
  script: TagUserProperties;
28
28
  noscript: TagUserProperties;
29
29
  }
30
+ interface ResolvedSchemaAugmentations extends MergeHead {
31
+ title: TagPriority;
32
+ titleTemplate: TagPriority;
33
+ base: ResolvesDuplicates & TagPriority & Never<InnerContent & TagPosition>;
34
+ htmlAttrs: ResolvesDuplicates & TagPriority & Never<InnerContent & TagPosition>;
35
+ bodyAttrs: ResolvesDuplicates & TagPriority & Never<InnerContent & TagPosition>;
36
+ link: TagPriority & TagPosition & ResolvesDuplicates & Never<InnerContent> & {
37
+ processTemplateParams?: false;
38
+ };
39
+ meta: TagPriority & TagPosition & ResolvesDuplicates & Never<InnerContent> & {
40
+ processTemplateParams?: false;
41
+ };
42
+ style: TagPriority & TagPosition & InnerContent & ResolvesDuplicates & ProcessesTemplateParams;
43
+ script: TagPriority & TagPosition & InnerContent & ResolvesDuplicates & ProcessesTemplateParams;
44
+ noscript: TagPriority & TagPosition & InnerContent & ResolvesDuplicates & ProcessesTemplateParams;
45
+ }
30
46
  type MaybeArray<T> = T | T[];
31
47
  type BaseBodyAttr = BaseBodyAttributes;
32
48
  type BaseHtmlAttr = HtmlAttributes$1;
@@ -67,28 +83,28 @@ type Title = MaybeFunction<number | string | Falsey> | ResolvableValues<({
67
83
  type TitleTemplate = TitleTemplateResolver | null | ({
68
84
  textContent: TitleTemplateResolver;
69
85
  } & SchemaAugmentations['titleTemplate']);
70
- type Base<E extends EntryAugmentation = Record<string, any>> = Partial<Merge<SchemaAugmentations['base'], ResolvableValues<Base$1>>> & DefinedValueOrEmptyObject<E>;
71
- type Link<E extends EntryAugmentation = Record<string, any>> = ResolvableValues<LinkBase & DataKeys> & MaybeEventFnHandlers<HttpEventAttributes> & SchemaAugmentations['link'] & DefinedValueOrEmptyObject<E>;
72
- type Meta<E extends EntryAugmentation = Record<string, any>> = ResolvableValues<BaseMeta & DataKeys> & SchemaAugmentations['meta'] & DefinedValueOrEmptyObject<E>;
73
- type Style<E extends EntryAugmentation = Record<string, any>> = ResolvableValues<Style$1 & DataKeys> & SchemaAugmentations['style'] & DefinedValueOrEmptyObject<E>;
74
- type Script<E extends EntryAugmentation = Record<string, any>> = ResolvableValues<ScriptBase & DataKeys> & MaybeEventFnHandlers<HttpEventAttributes> & SchemaAugmentations['script'] & DefinedValueOrEmptyObject<E>;
75
- type Noscript<E extends EntryAugmentation = Record<string, any>> = ResolvableValues<Noscript$1 & DataKeys> & SchemaAugmentations['noscript'] & DefinedValueOrEmptyObject<E>;
76
- type HtmlAttributes<E extends EntryAugmentation = Record<string, any>> = ResolvableValues<HtmlAttr & DataKeys> & SchemaAugmentations['htmlAttrs'] & DefinedValueOrEmptyObject<E>;
77
- type BodyAttributes<E extends EntryAugmentation = Record<string, any>> = ResolvableValues<BodyAttr & DataKeys> & MaybeEventFnHandlers<BodyEvents> & SchemaAugmentations['bodyAttrs'] & DefinedValueOrEmptyObject<E>;
86
+ type Base<E extends EntryAugmentation = Record<string, any>> = ResolvableValues<Base$1 & SchemaAugmentations['base']> & DefinedValueOrEmptyObject<E>;
87
+ type Link<E extends EntryAugmentation = Record<string, any>> = ResolvableValues<LinkBase & DataKeys & SchemaAugmentations['link']> & MaybeEventFnHandlers<HttpEventAttributes> & DefinedValueOrEmptyObject<E>;
88
+ type Meta<E extends EntryAugmentation = Record<string, any>> = ResolvableValues<BaseMeta & DataKeys & SchemaAugmentations['meta']> & DefinedValueOrEmptyObject<E>;
89
+ type Style<E extends EntryAugmentation = Record<string, any>> = ResolvableValues<Style$1 & DataKeys & SchemaAugmentations['style']> & DefinedValueOrEmptyObject<E>;
90
+ type Script<E extends EntryAugmentation = Record<string, any>> = ResolvableValues<ScriptBase & DataKeys & SchemaAugmentations['script']> & MaybeEventFnHandlers<HttpEventAttributes> & DefinedValueOrEmptyObject<E>;
91
+ type Noscript<E extends EntryAugmentation = Record<string, any>> = ResolvableValues<Noscript$1 & DataKeys & SchemaAugmentations['noscript']> & DefinedValueOrEmptyObject<E>;
92
+ type HtmlAttributes<E extends EntryAugmentation = Record<string, any>> = ResolvableValues<HtmlAttr & DataKeys & SchemaAugmentations['htmlAttrs']> & DefinedValueOrEmptyObject<E>;
93
+ type BodyAttributes<E extends EntryAugmentation = Record<string, any>> = ResolvableValues<BodyAttr & DataKeys & SchemaAugmentations['bodyAttrs']> & MaybeEventFnHandlers<BodyEvents> & DefinedValueOrEmptyObject<E>;
78
94
  type ResolvedTitle = ({
79
95
  textContent: string;
80
- } & SchemaAugmentations['title']);
96
+ } & ResolvedSchemaAugmentations['title']);
81
97
  type ResolvedTitleTemplate = TitleTemplateResolver | null | ({
82
98
  textContent: TitleTemplateResolver;
83
- } & SchemaAugmentations['titleTemplate']);
84
- type ResolvedBase<E extends EntryAugmentation = Record<string, any>> = Partial<Merge<SchemaAugmentations['base'], Base$1>> & DefinedValueOrEmptyObject<E>;
85
- type ResolvedLink<E extends EntryAugmentation = Record<string, any>> = LinkBase & MaybeEventFnHandlers<HttpEventAttributes> & DataKeys & SchemaAugmentations['link'] & DefinedValueOrEmptyObject<E>;
99
+ } & ResolvedSchemaAugmentations['titleTemplate']);
100
+ type ResolvedBase<E extends EntryAugmentation = Record<string, any>> = Partial<Merge<ResolvedSchemaAugmentations['base'], Base$1>> & DefinedValueOrEmptyObject<E>;
101
+ type ResolvedLink<E extends EntryAugmentation = Record<string, any>> = LinkBase & MaybeEventFnHandlers<HttpEventAttributes> & DataKeys & ResolvedSchemaAugmentations['link'] & DefinedValueOrEmptyObject<E>;
86
102
  type ResolvedMeta<E extends EntryAugmentation = Record<string, any>> = BaseMeta & DataKeys & SchemaAugmentations['meta'] & DefinedValueOrEmptyObject<E>;
87
- type ResolvedStyle<E extends EntryAugmentation = Record<string, any>> = Style$1 & DataKeys & SchemaAugmentations['style'] & DefinedValueOrEmptyObject<E>;
88
- type ResolvedScript<E extends EntryAugmentation = Record<string, any>> = ScriptBase & MaybeEventFnHandlers<HttpEventAttributes> & DataKeys & SchemaAugmentations['script'] & DefinedValueOrEmptyObject<E>;
89
- type ResolvedNoscript<E extends EntryAugmentation = Record<string, any>> = Noscript$1 & DataKeys & SchemaAugmentations['noscript'] & DefinedValueOrEmptyObject<E>;
90
- type ResolvedHtmlAttributes<E extends EntryAugmentation = Record<string, any>> = HtmlAttr & DataKeys & SchemaAugmentations['htmlAttrs'] & DefinedValueOrEmptyObject<E>;
91
- type ResolvedBodyAttributes<E extends EntryAugmentation = Record<string, any>> = BodyAttr & MaybeEventFnHandlers<BodyEvents> & DataKeys & SchemaAugmentations['bodyAttrs'] & DefinedValueOrEmptyObject<E>;
103
+ type ResolvedStyle<E extends EntryAugmentation = Record<string, any>> = Style$1 & DataKeys & ResolvedSchemaAugmentations['style'] & DefinedValueOrEmptyObject<E>;
104
+ type ResolvedScript<E extends EntryAugmentation = Record<string, any>> = ScriptBase & MaybeEventFnHandlers<HttpEventAttributes> & DataKeys & ResolvedSchemaAugmentations['script'] & DefinedValueOrEmptyObject<E>;
105
+ type ResolvedNoscript<E extends EntryAugmentation = Record<string, any>> = Noscript$1 & DataKeys & ResolvedSchemaAugmentations['noscript'] & DefinedValueOrEmptyObject<E>;
106
+ type ResolvedHtmlAttributes<E extends EntryAugmentation = Record<string, any>> = HtmlAttr & DataKeys & ResolvedSchemaAugmentations['htmlAttrs'] & DefinedValueOrEmptyObject<E>;
107
+ type ResolvedBodyAttributes<E extends EntryAugmentation = Record<string, any>> = BodyAttr & MaybeEventFnHandlers<BodyEvents> & DataKeys & ResolvedSchemaAugmentations['bodyAttrs'] & DefinedValueOrEmptyObject<E>;
92
108
  interface HeadUtils {
93
109
  /**
94
110
  * Generate the title from a template.
@@ -163,16 +179,16 @@ interface Head<E extends MergeHead = SchemaAugmentations> extends HeadUtils {
163
179
  */
164
180
  bodyAttrs?: BodyAttributes<E['bodyAttrs']>;
165
181
  }
166
- interface ResolvedHead<E extends MergeHead = SchemaAugmentations> extends HeadUtils {
167
- title: ResolvedTitle;
168
- base: ResolvedBase<E['base']>;
169
- link: ResolvedLink<E['link']>[];
170
- meta: ResolvedMeta<E['meta']>[];
171
- style: (ResolvedStyle<E['style']> | string)[];
172
- script: (ResolvedScript<E['script']> | string)[];
173
- noscript: (ResolvedNoscript<E['noscript']> | string)[];
174
- htmlAttrs: ResolvedHtmlAttributes<E['htmlAttrs']>;
175
- bodyAttrs: ResolvedBodyAttributes<E['bodyAttrs']>;
182
+ interface ResolvedHead<E extends MergeHead = ResolvedSchemaAugmentations> extends HeadUtils {
183
+ title?: ResolvedTitle;
184
+ base?: ResolvedBase<E['base']>;
185
+ link?: ResolvedLink<E['link']>[];
186
+ meta?: ResolvedMeta<E['meta']>[];
187
+ style?: (ResolvedStyle<E['style']> | string)[];
188
+ script?: (ResolvedScript<E['script']> | string)[];
189
+ noscript?: (ResolvedNoscript<E['noscript']> | string)[];
190
+ htmlAttrs?: ResolvedHtmlAttributes<E['htmlAttrs']>;
191
+ bodyAttrs?: ResolvedBodyAttributes<E['bodyAttrs']>;
176
192
  }
177
193
  type UseSeoMetaInput = MetaFlatInput & {
178
194
  title?: Title;
@@ -540,4 +556,4 @@ interface HeadSafe extends Pick<Head, 'title' | 'titleTemplate' | 'templateParam
540
556
  bodyAttrs?: SafeBodyAttr;
541
557
  }
542
558
 
543
- export type { ActiveHeadEntry, Base, BaseBodyAttr, BaseHtmlAttr, BaseMeta, BodyAttr, BodyAttributes, CreateClientHeadOptions, CreateHeadOptions, DomBeforeRenderCtx, DomPluginOptions, DomRenderTagContext, DomState, EntryAugmentation, EntryResolveCtx, HasTemplateParams, Head, HeadEntry, HeadEntryOptions, HeadHooks, HeadPlugin, HeadPluginInput, HeadPluginOptions, HeadSafe, HeadTag, HeadTagKeys, HeadUtils, HookResult, HtmlAttr, HtmlAttributes, InnerContent, InnerContentVal, Link, MaybeArray, MaybeEventFnHandlers, Meta, Noscript, ProcessesTemplateParams, RenderDomHeadOptions, RenderSSRHeadOptions, ResolvedBase, ResolvedBodyAttributes, ResolvedHead, ResolvedHtmlAttributes, ResolvedLink, ResolvedMeta, ResolvedNoscript, ResolvedScript, ResolvedStyle, ResolvedTitle, ResolvedTitleTemplate, ResolvesDuplicates, RuntimeMode, SSRHeadPayload, SSRRenderContext, SafeBodyAttr, SafeHtmlAttr, SafeLink, SafeMeta, SafeNoscript, SafeScript, SchemaAugmentations, Script, ShouldRenderContext, SideEffectsRecord, Style, TagKey, TagPosition, TagPriority, TagUserProperties, TemplateParams, Title, TitleTemplate, Unhead, UseSeoMetaInput, UserAttributesConfig, UserTagConfigWithoutInnerContent, ValidTagPositions };
559
+ export type { ActiveHeadEntry, Base, BaseBodyAttr, BaseHtmlAttr, BaseMeta, BodyAttr, BodyAttributes, CreateClientHeadOptions, CreateHeadOptions, DomBeforeRenderCtx, DomPluginOptions, DomRenderTagContext, DomState, EntryAugmentation, EntryResolveCtx, Falsey, HasTemplateParams, Head, HeadEntry, HeadEntryOptions, HeadHooks, HeadPlugin, HeadPluginInput, HeadPluginOptions, HeadSafe, HeadTag, HeadTagKeys, HeadUtils, HookResult, HtmlAttr, HtmlAttributes, InnerContent, InnerContentVal, Link, MaybeArray, MaybeEventFnHandlers, MaybeFunction, Meta, Never, Noscript, ProcessesTemplateParams, RenderDomHeadOptions, RenderSSRHeadOptions, ResolvableValues, ResolvedBase, ResolvedBodyAttributes, ResolvedHead, ResolvedHtmlAttributes, ResolvedLink, ResolvedMeta, ResolvedNoscript, ResolvedSchemaAugmentations, ResolvedScript, ResolvedStyle, ResolvedTitle, ResolvedTitleTemplate, ResolvesDuplicates, RuntimeMode, SSRHeadPayload, SSRRenderContext, SafeBodyAttr, SafeHtmlAttr, SafeLink, SafeMeta, SafeNoscript, SafeScript, SchemaAugmentations, Script, ShouldRenderContext, SideEffectsRecord, Style, TagKey, TagPosition, TagPriority, TagUserProperties, TemplateParams, Title, TitleTemplate, Unhead, UseSeoMetaInput, UserAttributesConfig, UserTagConfigWithoutInnerContent, ValidTagPositions };
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@unhead/schema",
3
3
  "type": "module",
4
- "version": "2.0.0-alpha.5",
4
+ "version": "2.0.0-alpha.7",
5
5
  "author": "Harlan Wilton <harlan@harlanzw.com>",
6
6
  "license": "MIT",
7
7
  "funding": "https://github.com/sponsors/harlan-zw",