unhead 0.6.9 → 0.7.0

package/dist/index.cjs

@@ -17,13 +17,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];
@@ -49,8 +49,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") {
@@ -561,10 +564,13 @@ const useServerTitleTemplate = (titleTemplate) => useServerHead({ titleTemplate
 
 const TagEntityBits = 10;
 
-function normaliseEntryTags(e) {
-  return Object.entries(e.input).filter(([k, v]) => typeof v !== "undefined" && ValidHeadTags.includes(k)).map(
-    ([k, value]) => asArray(value).map((props) => asArray(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(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;
@@ -647,7 +653,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);

package/dist/index.d.ts

@@ -27,7 +27,7 @@ declare const PatchDomOnEntryUpdatesPlugin: (options?: TriggerDomPatchingOnUpdat
  */
 declare const EventHandlersPlugin: () => _unhead_schema.HeadPlugin;
 
-declare type Arrayable<T> = T | Array<T>;
+type Arrayable<T> = T | Array<T>;
 declare function asArray<T>(value: Arrayable<T>): T[];
 declare const HasElementTags: string[];
 
@@ -75,7 +75,7 @@ declare function createHeadCore<T extends {} = Head>(options?: CreateHeadOptions
 
 declare function defineHeadPlugin(plugin: HeadPlugin): HeadPlugin;
 
-declare function normaliseEntryTags<T extends {} = Head>(e: HeadEntry<T>): HeadTag[];
+declare function normaliseEntryTags<T extends {} = Head>(e: HeadEntry<T>): Promise<HeadTag[]>;
 
 declare const composableNames: string[];
 declare const unheadComposablesImports: {

package/dist/index.mjs

@@ -15,13 +15,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];
@@ -47,8 +47,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") {
@@ -559,10 +562,13 @@ const useServerTitleTemplate = (titleTemplate) => useServerHead({ titleTemplate
 
 const TagEntityBits = 10;
 
-function normaliseEntryTags(e) {
-  return Object.entries(e.input).filter(([k, v]) => typeof v !== "undefined" && ValidHeadTags.includes(k)).map(
-    ([k, value]) => asArray(value).map((props) => asArray(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(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;
@@ -645,7 +651,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);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "unhead",
   "type": "module",
-  "version": "0.6.9",
+  "version": "0.7.0",
   "packageManager": "pnpm@7.14.0",
   "author": "Harlan Wilton <harlan@harlanzw.com>",
   "license": "MIT",
@@ -30,12 +30,12 @@
     "dist"
   ],
   "dependencies": {
-    "@unhead/dom": "0.6.9",
-    "@unhead/schema": "0.6.9",
+    "@unhead/dom": "0.7.0",
+    "@unhead/schema": "0.7.0",
     "hookable": "^5.4.1"
   },
   "devDependencies": {
-    "zhead": "1.0.0-beta.13"
+    "zhead": "^1.0.1"
   },
   "scripts": {
     "build": "unbuild .",