@unhead/vue 0.6.9 → 0.7.0

package/dist/index.cjs

@@ -233,13 +233,13 @@ const ValidHeadTags = [
 ];
 const TagConfigKeys = ["tagPosition", "tagPriority", "tagDuplicateStrategy"];
 
-function normaliseTag(tagName, input) {
+async function normaliseTag(tagName, input) {
   const tag = { tag: tagName, props: {} };
   if (tagName === "title" || tagName === "titleTemplate") {
-    tag.children = input;
+    tag.children = input instanceof Promise ? await input : input;
     return tag;
   }
-  tag.props = normaliseProps({ ...input });
+  tag.props = await normaliseProps({ ...input });
   ["children", "innerHtml", "innerHTML"].forEach((key) => {
     if (typeof tag.props[key] !== "undefined") {
       tag.children = tag.props[key];
@@ -265,8 +265,11 @@ function normaliseTag(tagName, input) {
   }
   return tag;
 }
-function normaliseProps(props) {
-  for (const k in props) {
+async function normaliseProps(props) {
+  for (const k of Object.keys(props)) {
+    if (props[k] instanceof Promise) {
+      props[k] = await props[k];
+    }
     if (String(props[k]) === "true") {
       props[k] = "";
     } else if (String(props[k]) === "false") {
@@ -600,10 +603,13 @@ const getActiveHead = () => activeHead;
 
 const TagEntityBits = 10;
 
-function normaliseEntryTags(e) {
-  return Object.entries(e.input).filter(([k, v]) => typeof v !== "undefined" && ValidHeadTags.includes(k)).map(
-    ([k, value]) => asArray$1(value).map((props) => asArray$1(normaliseTag(k, props)))
-  ).flat(3).map((t, i) => {
+async function normaliseEntryTags(e) {
+  const tagPromises = [];
+  Object.entries(e.input).filter(([k, v]) => typeof v !== "undefined" && ValidHeadTags.includes(k)).forEach(([k, value]) => {
+    const v = asArray$1(value);
+    tagPromises.push(...v.map((props) => normaliseTag(k, props)).flat());
+  });
+  return (await Promise.all(tagPromises)).flat().map((t, i) => {
     t._e = e._i;
     t._p = (e._i << TagEntityBits) + i;
     return t;
@@ -686,7 +692,7 @@ function createHeadCore(options = {}) {
       const resolveCtx = { tags: [], entries: [...entries] };
       await hooks.callHook("entries:resolve", resolveCtx);
       for (const entry of resolveCtx.entries) {
-        for (const tag of normaliseEntryTags(entry)) {
+        for (const tag of await normaliseEntryTags(entry)) {
           const tagCtx = { tag, entry };
           await hooks.callHook("tag:normalise", tagCtx);
           resolveCtx.tags.push(tagCtx.tag);
@@ -741,6 +747,8 @@ function resolveUnref(r) {
   return typeof r === "function" ? r() : vue.unref(r);
 }
 function resolveUnrefHeadInput(ref, lastKey = "") {
+  if (ref instanceof Promise)
+    return ref;
   const root = resolveUnref(ref);
   if (!ref || !root)
     return root;

package/dist/index.d.ts

@@ -11,12 +11,13 @@ import { ComputedRef, Ref, Plugin } from 'vue';
  */
 declare function createHeadCore<T extends {} = Head>(options?: CreateHeadOptions): Unhead<T>;
 
-declare type MaybeReadonlyRef<T> = (() => T) | ComputedRef<T>;
-declare type MaybeComputedRef<T> = T | MaybeReadonlyRef<T> | Ref<T>;
-declare type MaybeComputedRefEntries<T> = MaybeComputedRef<T> | {
-    [key in keyof T]?: MaybeComputedRef<T[key]>;
+type MaybeReadonlyRef<T> = (() => T) | ComputedRef<T>;
+type MaybeComputedRef<T> = T | MaybeReadonlyRef<T> | Ref<T>;
+type MaybeComputedRefOrPromise<T> = T | MaybeReadonlyRef<T> | Ref<T> | Promise<T>;
+type MaybeComputedRefEntries<T> = MaybeComputedRef<T> | {
+    [key in keyof T]?: MaybeComputedRefOrPromise<T[key]>;
 };
-declare type Arrayable<T> = T | Array<T>;
+type Arrayable<T> = T | Array<T>;
 
 interface HtmlAttr extends Omit<BaseHtmlAttr, 'class'> {
     /**
@@ -34,16 +35,16 @@ interface BodyAttr extends Omit<BaseBodyAttr, 'class'> {
      */
     class?: MaybeArray<MaybeComputedRef<string>> | Record<string, MaybeComputedRef<boolean>>;
 }
-declare type Title = MaybeComputedRef<Title$1>;
-declare type TitleTemplate = TitleTemplate$1 | Ref<TitleTemplate$1> | ((title?: string) => TitleTemplate$1);
-declare type Base<E extends EntryAugmentation = {}> = MaybeComputedRef<MaybeComputedRefEntries<Base$1<E>>>;
-declare type Link<E extends EntryAugmentation = {}> = MaybeComputedRefEntries<Link$1<E>>;
-declare type Meta<E extends EntryAugmentation = {}> = MaybeComputedRefEntries<Meta$1<E>>;
-declare type Style<E extends EntryAugmentation = {}> = MaybeComputedRefEntries<Style$1<E>>;
-declare type Script<E extends EntryAugmentation = {}> = MaybeComputedRefEntries<Script$1<E>>;
-declare type Noscript<E extends EntryAugmentation = {}> = MaybeComputedRefEntries<Noscript$1<E>>;
-declare type HtmlAttributes<E extends EntryAugmentation = {}> = MaybeComputedRef<MaybeComputedRefEntries<HtmlAttr & DataKeys & SchemaAugmentations['htmlAttrs'] & DefinedValueOrEmptyObject<E>>>;
-declare type BodyAttributes<E extends EntryAugmentation = {}> = MaybeComputedRef<MaybeComputedRefEntries<BodyAttr & DataKeys & SchemaAugmentations['bodyAttrs'] & DefinedValueOrEmptyObject<E>>>;
+type Title = MaybeComputedRef<Title$1>;
+type TitleTemplate = TitleTemplate$1 | Ref<TitleTemplate$1> | ((title?: string) => TitleTemplate$1);
+type Base<E extends EntryAugmentation = {}> = MaybeComputedRef<MaybeComputedRefEntries<Base$1<E>>>;
+type Link<E extends EntryAugmentation = {}> = MaybeComputedRefEntries<Link$1<E>>;
+type Meta<E extends EntryAugmentation = {}> = MaybeComputedRefEntries<Meta$1<E>>;
+type Style<E extends EntryAugmentation = {}> = MaybeComputedRefEntries<Style$1<E>>;
+type Script<E extends EntryAugmentation = {}> = MaybeComputedRefEntries<Script$1<E>>;
+type Noscript<E extends EntryAugmentation = {}> = MaybeComputedRefEntries<Noscript$1<E>>;
+type HtmlAttributes<E extends EntryAugmentation = {}> = MaybeComputedRef<MaybeComputedRefEntries<HtmlAttr & DataKeys & SchemaAugmentations['htmlAttrs'] & DefinedValueOrEmptyObject<E>>>;
+type BodyAttributes<E extends EntryAugmentation = {}> = MaybeComputedRef<MaybeComputedRefEntries<BodyAttr & DataKeys & SchemaAugmentations['bodyAttrs'] & DefinedValueOrEmptyObject<E>>>;
 interface ReactiveHead<E extends MergeHead = MergeHead> {
     /**
      * The <title> HTML element defines the document's title that is shown in a browser's title bar or a page's tab.
@@ -51,7 +52,7 @@ interface ReactiveHead<E extends MergeHead = MergeHead> {
      *
      * @see https://developer.mozilla.org/en-US/docs/Web/HTML/Element/title
      */
-    title?: Title;
+    title?: Title | Promise<Title>;
     /**
      * Generate the title from a template.
      */
@@ -110,12 +111,12 @@ interface ReactiveHead<E extends MergeHead = MergeHead> {
      */
     bodyAttrs?: BodyAttributes<E['bodyAttrs']>;
 }
-declare type UseHeadInput<T extends MergeHead = {}> = MaybeComputedRef<ReactiveHead<T>>;
+type UseHeadInput<T extends MergeHead = {}> = MaybeComputedRef<ReactiveHead<T>>;
 
 declare function resolveUnrefHeadInput(ref: any, lastKey?: string | number): any;
 declare function asArray<T>(value: Arrayable<T>): T[];
 
-declare type VueHeadClient<T extends MergeHead> = Unhead<MaybeComputedRef<ReactiveHead<T>>> & Plugin;
+type VueHeadClient<T extends MergeHead> = Unhead<MaybeComputedRef<ReactiveHead<T>>> & Plugin;
 declare const headSymbol = "usehead";
 declare function injectHead<T extends MergeHead>(): VueHeadClient<T>;
 declare function createHead<T extends MergeHead>(options?: Omit<CreateHeadOptions, 'domDelayFn'>): VueHeadClient<T>;
@@ -160,4 +161,4 @@ declare const unheadVueComposablesImports: {
     imports: string[];
 }[];
 
-export { Arrayable, Base, BodyAttributes, HtmlAttributes, Link, MaybeComputedRef, MaybeComputedRefEntries, MaybeReadonlyRef, Meta, Noscript, ReactiveHead, Script, Style, Title, TitleTemplate, UseHeadInput, Vue2ProvideUnheadPlugin, VueHeadClient, VueHeadMixin, VueReactiveUseHeadPlugin, asArray, createHead, createHeadCore, headSymbol, injectHead, resolveUnrefHeadInput, unheadVueComposablesImports, useBodyAttrs, useHead, useHtmlAttrs, useSeoMeta, useServerBodyAttrs, useServerHead, useServerHtmlAttrs, useServerTagBase, useServerTagLink, useServerTagMeta, useServerTagMetaFlat, useServerTagNoscript, useServerTagScript, useServerTagStyle, useServerTagTitle, useServerTitleTemplate, useTagBase, useTagLink, useTagMeta, useTagMetaFlat, useTagNoscript, useTagScript, useTagStyle, useTagTitle, useTitleTemplate };
+export { Arrayable, Base, BodyAttributes, HtmlAttributes, Link, MaybeComputedRef, MaybeComputedRefEntries, MaybeComputedRefOrPromise, MaybeReadonlyRef, Meta, Noscript, ReactiveHead, Script, Style, Title, TitleTemplate, UseHeadInput, Vue2ProvideUnheadPlugin, VueHeadClient, VueHeadMixin, VueReactiveUseHeadPlugin, asArray, createHead, createHeadCore, headSymbol, injectHead, resolveUnrefHeadInput, unheadVueComposablesImports, useBodyAttrs, useHead, useHtmlAttrs, useSeoMeta, useServerBodyAttrs, useServerHead, useServerHtmlAttrs, useServerTagBase, useServerTagLink, useServerTagMeta, useServerTagMetaFlat, useServerTagNoscript, useServerTagScript, useServerTagStyle, useServerTagTitle, useServerTitleTemplate, useTagBase, useTagLink, useTagMeta, useTagMetaFlat, useTagNoscript, useTagScript, useTagStyle, useTagTitle, useTitleTemplate };

package/dist/index.mjs

@@ -231,13 +231,13 @@ const ValidHeadTags = [
 ];
 const TagConfigKeys = ["tagPosition", "tagPriority", "tagDuplicateStrategy"];
 
-function normaliseTag(tagName, input) {
+async function normaliseTag(tagName, input) {
   const tag = { tag: tagName, props: {} };
   if (tagName === "title" || tagName === "titleTemplate") {
-    tag.children = input;
+    tag.children = input instanceof Promise ? await input : input;
     return tag;
   }
-  tag.props = normaliseProps({ ...input });
+  tag.props = await normaliseProps({ ...input });
   ["children", "innerHtml", "innerHTML"].forEach((key) => {
     if (typeof tag.props[key] !== "undefined") {
       tag.children = tag.props[key];
@@ -263,8 +263,11 @@ function normaliseTag(tagName, input) {
   }
   return tag;
 }
-function normaliseProps(props) {
-  for (const k in props) {
+async function normaliseProps(props) {
+  for (const k of Object.keys(props)) {
+    if (props[k] instanceof Promise) {
+      props[k] = await props[k];
+    }
     if (String(props[k]) === "true") {
       props[k] = "";
     } else if (String(props[k]) === "false") {
@@ -598,10 +601,13 @@ const getActiveHead = () => activeHead;
 
 const TagEntityBits = 10;
 
-function normaliseEntryTags(e) {
-  return Object.entries(e.input).filter(([k, v]) => typeof v !== "undefined" && ValidHeadTags.includes(k)).map(
-    ([k, value]) => asArray$1(value).map((props) => asArray$1(normaliseTag(k, props)))
-  ).flat(3).map((t, i) => {
+async function normaliseEntryTags(e) {
+  const tagPromises = [];
+  Object.entries(e.input).filter(([k, v]) => typeof v !== "undefined" && ValidHeadTags.includes(k)).forEach(([k, value]) => {
+    const v = asArray$1(value);
+    tagPromises.push(...v.map((props) => normaliseTag(k, props)).flat());
+  });
+  return (await Promise.all(tagPromises)).flat().map((t, i) => {
     t._e = e._i;
     t._p = (e._i << TagEntityBits) + i;
     return t;
@@ -684,7 +690,7 @@ function createHeadCore(options = {}) {
       const resolveCtx = { tags: [], entries: [...entries] };
       await hooks.callHook("entries:resolve", resolveCtx);
       for (const entry of resolveCtx.entries) {
-        for (const tag of normaliseEntryTags(entry)) {
+        for (const tag of await normaliseEntryTags(entry)) {
           const tagCtx = { tag, entry };
           await hooks.callHook("tag:normalise", tagCtx);
           resolveCtx.tags.push(tagCtx.tag);
@@ -739,6 +745,8 @@ function resolveUnref(r) {
   return typeof r === "function" ? r() : unref(r);
 }
 function resolveUnrefHeadInput(ref, lastKey = "") {
+  if (ref instanceof Promise)
+    return ref;
   const root = resolveUnref(ref);
   if (!ref || !root)
     return root;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unhead/vue",
   "type": "module",
-  "version": "0.6.9",
+  "version": "0.7.0",
   "packageManager": "pnpm@7.14.0",
   "author": "Harlan Wilton <harlan@harlanzw.com>",
   "license": "MIT",
@@ -33,11 +33,11 @@
     "vue": ">=2.7 || >=3"
   },
   "dependencies": {
-    "@unhead/schema": "0.6.9",
+    "@unhead/schema": "0.7.0",
     "hookable": "^5.4.1"
   },
   "devDependencies": {
-    "unhead": "0.6.9",
+    "unhead": "0.7.0",
     "vue": "^3.2.45"
   },
   "scripts": {