@unhead/shared 1.9.16 → 1.10.0-beta.1

package/dist/index.cjs

@@ -4,17 +4,17 @@ function asArray$1(value) {
   return Array.isArray(value) ? value : [value];
 }
 
-const SelfClosingTags = ["meta", "link", "base"];
-const TagsWithInnerContent = ["title", "titleTemplate", "script", "style", "noscript"];
-const HasElementTags = [
+const SelfClosingTags = /* @__PURE__ */ new Set(["meta", "link", "base"]);
+const TagsWithInnerContent = /* @__PURE__ */ new Set(["title", "titleTemplate", "script", "style", "noscript"]);
+const HasElementTags = /* @__PURE__ */ new Set([
   "base",
   "meta",
   "link",
   "style",
   "script",
   "noscript"
-];
-const ValidHeadTags = [
+]);
+const ValidHeadTags = /* @__PURE__ */ new Set([
   "title",
   "titleTemplate",
   "templateParams",
@@ -26,9 +26,9 @@ const ValidHeadTags = [
   "style",
   "script",
   "noscript"
-];
-const UniqueTags = ["base", "title", "titleTemplate", "bodyAttrs", "htmlAttrs", "templateParams"];
-const TagConfigKeys = ["tagPosition", "tagPriority", "tagDuplicateStrategy", "children", "innerHTML", "textContent", "processTemplateParams"];
+]);
+const UniqueTags = /* @__PURE__ */ new Set(["base", "title", "titleTemplate", "bodyAttrs", "htmlAttrs", "templateParams"]);
+const TagConfigKeys = /* @__PURE__ */ new Set(["tagPosition", "tagPriority", "tagDuplicateStrategy", "children", "innerHTML", "textContent", "processTemplateParams"]);
 const IsBrowser = typeof window !== "undefined";
 const composableNames = [
   "getActiveHead",
@@ -51,26 +51,34 @@ function hashCode(s) {
   return ((h ^ h >>> 9) + 65536).toString(16).substring(1, 8).toLowerCase();
 }
 function hashTag(tag) {
-  return tag._h || hashCode(tag._d ? tag._d : `${tag.tag}:${tag.textContent || tag.innerHTML || ""}:${Object.entries(tag.props).map(([key, value]) => `${key}:${String(value)}`).join(",")}`);
+  if (tag._h) {
+    return tag._h;
+  }
+  if (tag._d) {
+    return hashCode(tag._d);
+  }
+  let content = `${tag.tag}:${tag.textContent || tag.innerHTML || ""}:`;
+  for (const key in tag.props) {
+    content += `${key}:${tag.props[key]},`;
+  }
+  return hashCode(content);
 }
 
-function tagDedupeKey(tag, fn) {
+const allowedMetaProperties = ["name", "property", "http-equiv"];
+function tagDedupeKey(tag) {
   const { props, tag: tagName } = tag;
-  if (UniqueTags.includes(tagName))
+  if (UniqueTags.has(tagName))
     return tagName;
   if (tagName === "link" && props.rel === "canonical")
     return "canonical";
   if (props.charset)
     return "charset";
-  const name = ["id"];
-  if (tagName === "meta")
-    name.push(...["name", "property", "http-equiv"]);
-  for (const n of name) {
-    if (typeof props[n] !== "undefined") {
-      const val = String(props[n]);
-      if (fn && !fn(val))
-        return false;
-      return `${tagName}:${n}:${val}`;
+  if (props.id) {
+    return `${tagName}:id:${props.id}`;
+  }
+  for (const n of allowedMetaProperties) {
+    if (props[n] !== void 0) {
+      return `${tagName}:${n}:${props[n]}`;
     }
   }
   return false;
@@ -252,15 +260,16 @@ const MetaPackingSchema = {
     metaKey: "http-equiv"
   }
 };
-const openGraphNamespaces = [
+const openGraphNamespaces = /* @__PURE__ */ new Set([
   "og",
   "book",
   "article",
   "profile"
-];
+]);
 function resolveMetaKeyType(key) {
-  const fKey = fixKeyCase(key).split(":")[0];
-  if (openGraphNamespaces.includes(fKey))
+  const fKey = fixKeyCase(key);
+  const prefixIndex = fKey.indexOf(":");
+  if (openGraphNamespaces.has(fKey.substring(0, prefixIndex)))
     return "property";
   return MetaPackingSchema[key]?.metaKey || "name";
 }
@@ -269,8 +278,9 @@ function resolveMetaKeyValue(key) {
 }
 function fixKeyCase(key) {
   const updated = key.replace(/([A-Z])/g, "-$1").toLowerCase();
-  const fKey = updated.split("-")[0];
-  if (openGraphNamespaces.includes(fKey) || fKey === "twitter")
+  const prefixIndex = updated.indexOf("-");
+  const fKey = updated.substring(0, prefixIndex);
+  if (fKey === "twitter" || openGraphNamespaces.has(fKey))
     return key.replace(/([A-Z])/g, ":$1").toLowerCase();
   return updated;
 }
@@ -281,8 +291,12 @@ function changeKeyCasingDeep(input) {
   if (typeof input !== "object" || Array.isArray(input))
     return input;
   const output = {};
-  for (const [key, value] of Object.entries(input))
-    output[fixKeyCase(key)] = changeKeyCasingDeep(value);
+  for (const key in input) {
+    if (!Object.prototype.hasOwnProperty.call(input, key)) {
+      continue;
+    }
+    output[fixKeyCase(key)] = changeKeyCasingDeep(input[key]);
+  }
   return output;
 }
 function resolvePackedMetaObjectValue(value, key) {
@@ -304,24 +318,31 @@ function resolvePackedMetaObjectValue(value, key) {
     }
   );
 }
-const ObjectArrayEntries = ["og:image", "og:video", "og:audio", "twitter:image"];
+const ObjectArrayEntries = /* @__PURE__ */ new Set(["og:image", "og:video", "og:audio", "twitter:image"]);
 function sanitize(input) {
   const out = {};
-  Object.entries(input).forEach(([k2, v]) => {
+  for (const k2 in input) {
+    if (!Object.prototype.hasOwnProperty.call(input, k2)) {
+      continue;
+    }
+    const v = input[k2];
     if (String(v) !== "false" && k2)
       out[k2] = v;
-  });
+  }
   return out;
 }
 function handleObjectEntry(key, v) {
   const value = sanitize(v);
   const fKey = fixKeyCase(key);
   const attr = resolveMetaKeyType(fKey);
-  if (ObjectArrayEntries.includes(fKey)) {
+  if (ObjectArrayEntries.has(fKey)) {
     const input = {};
-    Object.entries(value).forEach(([k2, v2]) => {
-      input[`${key}${k2 === "url" ? "" : `${k2.charAt(0).toUpperCase()}${k2.slice(1)}`}`] = v2;
-    });
+    for (const k2 in value) {
+      if (!Object.prototype.hasOwnProperty.call(value, k2)) {
+        continue;
+      }
+      input[`${key}${k2 === "url" ? "" : `${k2[0].toUpperCase()}${k2.slice(1)}`}`] = value[k2];
+    }
     return unpackMeta(input).sort((a, b) => (a[attr]?.length || 0) - (b[attr]?.length || 0));
   }
   return [{ [attr]: fKey, ...value }];
@@ -329,23 +350,27 @@ function handleObjectEntry(key, v) {
 function unpackMeta(input) {
   const extras = [];
   const primitives = {};
-  Object.entries(input).forEach(([key, value]) => {
+  for (const key in input) {
+    if (!Object.prototype.hasOwnProperty.call(input, key)) {
+      continue;
+    }
+    const value = input[key];
     if (!Array.isArray(value)) {
       if (typeof value === "object" && value) {
-        if (ObjectArrayEntries.includes(fixKeyCase(key))) {
+        if (ObjectArrayEntries.has(fixKeyCase(key))) {
           extras.push(...handleObjectEntry(key, value));
-          return;
+          continue;
         }
         primitives[key] = sanitize(value);
       } else {
         primitives[key] = value;
       }
-      return;
+      continue;
     }
-    value.forEach((v) => {
+    for (const v of value) {
       extras.push(...typeof v === "string" ? unpackMeta({ [key]: v }) : handleObjectEntry(key, v));
-    });
-  });
+    }
+  }
   const meta = unpackToArray(primitives, {
     key({ key }) {
       return resolveMetaKeyType(key);
@@ -437,7 +462,7 @@ function whitelistSafeInput(input) {
             const link = acceptDataAttrs(meta);
             WhitelistAttributes.link.forEach((key2) => {
               const val = meta[key2];
-              if (key2 === "rel" && ["stylesheet", "canonical", "modulepreload", "prerender", "preload", "prefetch"].includes(val))
+              if (key2 === "rel" && (val === "stylesheet" || val === "canonical" || val === "modulepreload" || val === "prerender" || val === "preload" || val === "prefetch"))
                 return;
               if (key2 === "href") {
                 if (val.includes("javascript:") || val.includes("data:"))
@@ -489,25 +514,36 @@ function whitelistSafeInput(input) {
   return filtered;
 }
 
-async function normaliseTag(tagName, input, e) {
+function thenable(val, thenFn) {
+  if (val instanceof Promise) {
+    return val.then(thenFn);
+  }
+  return thenFn(val);
+}
+
+function normaliseTag(tagName, input, e, normalizedProps) {
+  const props = normalizedProps || normaliseProps(
+    // explicitly check for an object
+    // @ts-expect-error untyped
+    typeof input === "object" && typeof input !== "function" && !(input instanceof Promise) ? { ...input } : { [tagName === "script" || tagName === "noscript" || tagName === "style" ? "innerHTML" : "textContent"]: input },
+    tagName === "templateParams" || tagName === "titleTemplate"
+  );
+  if (props instanceof Promise) {
+    return props.then((val) => normaliseTag(tagName, input, e, val));
+  }
   const tag = {
     tag: tagName,
-    props: await normaliseProps(
-      // explicitly check for an object
-      // @ts-expect-error untyped
-      typeof input === "object" && typeof input !== "function" && !(input instanceof Promise) ? { ...input } : { [["script", "noscript", "style"].includes(tagName) ? "innerHTML" : "textContent"]: input },
-      ["templateParams", "titleTemplate"].includes(tagName)
-    )
+    props
   };
-  TagConfigKeys.forEach((k) => {
-    const val = typeof tag.props[k] !== "undefined" ? tag.props[k] : e[k];
-    if (typeof val !== "undefined") {
-      if (!["innerHTML", "textContent", "children"].includes(k) || TagsWithInnerContent.includes(tag.tag)) {
+  for (const k of TagConfigKeys) {
+    const val = tag.props[k] !== void 0 ? tag.props[k] : e[k];
+    if (val !== void 0) {
+      if (!(k === "innerHTML" || k === "textContent" || k === "children") || TagsWithInnerContent.has(tag.tag)) {
         tag[k === "children" ? "innerHTML" : k] = val;
       }
       delete tag.props[k];
     }
-  });
+  }
   if (tag.props.body) {
     tag.tagPosition = "bodyClose";
     delete tag.props.body;
@@ -525,17 +561,22 @@ function normaliseStyleClassProps(key, v) {
   if (typeof v === "object" && !Array.isArray(v)) {
     v = Object.entries(v).filter(([, v2]) => v2).map(([k, v2]) => key === "style" ? `${k}:${v2}` : k);
   }
-  return String(Array.isArray(v) ? v.join(sep) : v)?.split(sep).filter((c) => c.trim()).filter(Boolean).join(sep);
+  return String(Array.isArray(v) ? v.join(sep) : v)?.split(sep).filter((c) => Boolean(c.trim())).join(sep);
 }
-async function normaliseProps(props, virtual) {
-  for (const k of Object.keys(props)) {
-    if (["class", "style"].includes(k)) {
+function nestedNormaliseProps(props, virtual, keys, startIndex) {
+  for (let i = startIndex; i < keys.length; i += 1) {
+    const k = keys[i];
+    if (k === "class" || k === "style") {
       props[k] = normaliseStyleClassProps(k, props[k]);
       continue;
     }
-    if (props[k] instanceof Promise)
-      props[k] = await props[k];
-    if (!virtual && !TagConfigKeys.includes(k)) {
+    if (props[k] instanceof Promise) {
+      return props[k].then((val) => {
+        props[k] = val;
+        return nestedNormaliseProps(props, virtual, keys, i);
+      });
+    }
+    if (!virtual && !TagConfigKeys.has(k)) {
       const v = String(props[k]);
       const isDataKey = k.startsWith("data-");
       if (v === "true" || v === "") {
@@ -548,21 +589,60 @@ async function normaliseProps(props, virtual) {
       }
     }
   }
+}
+function normaliseProps(props, virtual = false) {
+  const resolvedProps = nestedNormaliseProps(props, virtual, Object.keys(props), 0);
+  if (resolvedProps instanceof Promise) {
+    return resolvedProps.then(() => props);
+  }
   return props;
 }
 const TagEntityBits = 10;
-async function normaliseEntryTags(e) {
+function nestedNormaliseEntryTags(headTags, tagPromises, startIndex) {
+  for (let i = startIndex; i < tagPromises.length; i += 1) {
+    const tags = tagPromises[i];
+    if (tags instanceof Promise) {
+      return tags.then((val) => {
+        tagPromises[i] = val;
+        return nestedNormaliseEntryTags(headTags, tagPromises, i);
+      });
+    }
+    if (Array.isArray(tags)) {
+      headTags.push(...tags);
+    } else {
+      headTags.push(tags);
+    }
+  }
+}
+function normaliseEntryTags(e) {
   const tagPromises = [];
-  Object.entries(e.resolvedInput).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, e)).flat());
-  });
-  return (await Promise.all(tagPromises)).flat().filter(Boolean).map((t, i) => {
+  const input = e.resolvedInput;
+  for (const k in input) {
+    if (!Object.prototype.hasOwnProperty.call(input, k)) {
+      continue;
+    }
+    const v = input[k];
+    if (v === void 0 || !ValidHeadTags.has(k)) {
+      continue;
+    }
+    if (Array.isArray(v)) {
+      for (const props of v) {
+        tagPromises.push(normaliseTag(k, props, e));
+      }
+      continue;
+    }
+    tagPromises.push(normaliseTag(k, v, e));
+  }
+  if (tagPromises.length === 0) {
+    return [];
+  }
+  const headTags = [];
+  return thenable(nestedNormaliseEntryTags(headTags, tagPromises, 0), () => headTags.map((t, i) => {
     t._e = e._i;
     e.mode && (t._m = e.mode);
     t._p = (e._i << TagEntityBits) + i;
     return t;
-  });
+  }));
 }
 
 const TAG_WEIGHTS = {
@@ -577,66 +657,72 @@ const TAG_ALIASES = {
   low: 20
 };
 function tagWeight(tag) {
-  let weight = 100;
   const priority = tag.tagPriority;
   if (typeof priority === "number")
     return priority;
+  let weight = 100;
   if (tag.tag === "meta") {
     if (tag.props["http-equiv"] === "content-security-policy")
       weight = -30;
-    if (tag.props.charset)
+    else if (tag.props.charset)
       weight = -20;
-    if (tag.props.name === "viewport")
+    else if (tag.props.name === "viewport")
       weight = -15;
   } else if (tag.tag === "link" && tag.props.rel === "preconnect") {
     weight = 20;
   } else if (tag.tag in TAG_WEIGHTS) {
     weight = TAG_WEIGHTS[tag.tag];
   }
-  if (typeof priority === "string" && priority in TAG_ALIASES) {
+  if (priority && priority in TAG_ALIASES) {
     return weight + TAG_ALIASES[priority];
   }
   return weight;
 }
 const SortModifiers = [{ prefix: "before:", offset: -1 }, { prefix: "after:", offset: 1 }];
 
-const NetworkEvents = ["onload", "onerror", "onabort", "onprogress", "onloadstart"];
-const ScriptNetworkEvents = ["onload", "onerror"];
+const NetworkEvents = /* @__PURE__ */ new Set(["onload", "onerror", "onabort", "onprogress", "onloadstart"]);
+const ScriptNetworkEvents = /* @__PURE__ */ new Set(["onload", "onerror"]);
 
 const sepSub = "%separator";
+function sub(p, token) {
+  let val;
+  if (token === "s" || token === "pageTitle") {
+    val = p.pageTitle;
+  } else if (token.includes(".")) {
+    const dotIndex = token.indexOf(".");
+    val = p[token.substring(0, dotIndex)]?.[token.substring(dotIndex + 1)];
+  } else {
+    val = p[token];
+  }
+  return val !== void 0 ? (val || "").replace(/"/g, '\\"') : void 0;
+}
+const sepSubRe = new RegExp(`${sepSub}(?:\\s*${sepSub})*`, "g");
 function processTemplateParams(s, p, sep) {
   if (typeof s !== "string" || !s.includes("%"))
     return s;
-  function sub(token) {
-    let val;
-    if (["s", "pageTitle"].includes(token)) {
-      val = p.pageTitle;
-    } else if (token.includes(".")) {
-      val = token.split(".").reduce((acc, key) => acc ? acc[key] || void 0 : void 0, p);
-    } else {
-      val = p[token];
-    }
-    return typeof val !== "undefined" ? (val || "").replace(/"/g, '\\"') : false;
-  }
   let decoded = s;
   try {
     decoded = decodeURI(s);
   } catch {
   }
-  const tokens = (decoded.match(/%(\w+\.+\w+)|%(\w+)/g) || []).sort().reverse();
-  tokens.forEach((token) => {
-    const re = sub(token.slice(1));
-    if (typeof re === "string") {
-      s = s.replace(new RegExp(`\\${token}(\\W|$)`, "g"), (_, args) => `${re}${args}`).trim();
+  const tokens = decoded.match(/%\w+(?:\.\w+)?/g);
+  if (!tokens) {
+    return s;
+  }
+  const hasSepSub = s.includes(sepSub);
+  s = s.replace(/%\w+(?:\.\w+)?/g, (token) => {
+    if (token === sepSub || !tokens.includes(token)) {
+      return token;
     }
-  });
-  if (s.includes(sepSub)) {
+    const re = sub(p, token.slice(1));
+    return re !== void 0 ? re : token;
+  }).trim();
+  if (hasSepSub) {
     if (s.endsWith(sepSub))
-      s = s.slice(0, -sepSub.length).trim();
+      s = s.slice(0, -sepSub.length);
     if (s.startsWith(sepSub))
-      s = s.slice(sepSub.length).trim();
-    s = s.replace(new RegExp(`\\${sepSub}\\s*\\${sepSub}`, "g"), sepSub);
-    s = processTemplateParams(s, { separator: sep }, sep);
+      s = s.slice(sepSub.length);
+    s = s.replace(sepSubRe, sep).trim();
   }
   return s;
 }
@@ -671,5 +757,6 @@ exports.resolvePackedMetaObjectValue = resolvePackedMetaObjectValue;
 exports.resolveTitleTemplate = resolveTitleTemplate;
 exports.tagDedupeKey = tagDedupeKey;
 exports.tagWeight = tagWeight;
+exports.thenable = thenable;
 exports.unpackMeta = unpackMeta;
 exports.whitelistSafeInput = whitelistSafeInput;

package/dist/index.d.cts

@@ -3,12 +3,12 @@ import { HeadPluginInput, HeadTag, BaseMeta, MetaFlatInput, Head, MaybeArray, He
 type Arrayable<T> = T | Array<T>;
 declare function asArray<T>(value: Arrayable<T>): T[];
 
-declare const SelfClosingTags: string[];
-declare const TagsWithInnerContent: string[];
-declare const HasElementTags: string[];
-declare const ValidHeadTags: string[];
-declare const UniqueTags: string[];
-declare const TagConfigKeys: string[];
+declare const SelfClosingTags: Set<string>;
+declare const TagsWithInnerContent: Set<string>;
+declare const HasElementTags: Set<string>;
+declare const ValidHeadTags: Set<string>;
+declare const UniqueTags: Set<string>;
+declare const TagConfigKeys: Set<string>;
 declare const IsBrowser: boolean;
 declare const composableNames: string[];
 
@@ -17,7 +17,7 @@ declare function defineHeadPlugin(plugin: HeadPluginInput): HeadPluginInput;
 declare function hashCode(s: string): string;
 declare function hashTag(tag: HeadTag): string;
 
-declare function tagDedupeKey<T extends HeadTag>(tag: T, fn?: (key: string) => boolean): string | false;
+declare function tagDedupeKey<T extends HeadTag>(tag: T): string | false;
 
 declare function resolveTitleTemplate(template: string | ((title?: string) => string | null) | null, title?: string): string | null;
 
@@ -37,11 +37,14 @@ declare function packMeta<T extends Required<Head>['meta']>(inputs: T): MetaFlat
 
 declare function whitelistSafeInput(input: Record<string, MaybeArray<Record<string, string>>>): HeadSafe;
 
-declare function normaliseTag<T extends HeadTag>(tagName: T['tag'], input: HeadTag['props'] | string, e: HeadEntry<T>): Promise<T | T[] | false>;
+type Thenable<T> = Promise<T> | T;
+declare function thenable<T, R>(val: T, thenFn: (val: Awaited<T>) => R): Promise<R> | R;
+
+declare function normaliseTag<T extends HeadTag>(tagName: T['tag'], input: HeadTag['props'] | string, e: HeadEntry<T>, normalizedProps?: HeadTag['props']): Thenable<T | T[]>;
 declare function normaliseStyleClassProps<T extends 'class' | 'style'>(key: T, v: Required<Required<Head>['htmlAttrs']['class']> | Required<Required<Head>['htmlAttrs']['style']>): string;
-declare function normaliseProps<T extends HeadTag>(props: T['props'], virtual?: boolean): Promise<T['props']>;
+declare function normaliseProps<T extends HeadTag>(props: T['props'], virtual?: boolean): Thenable<T['props']>;
 declare const TagEntityBits = 10;
-declare function normaliseEntryTags<T extends {} = Head>(e: HeadEntry<T>): Promise<HeadTag[]>;
+declare function normaliseEntryTags<T extends object = Head>(e: HeadEntry<T>): Thenable<HeadTag[]>;
 
 declare const TAG_WEIGHTS: {
     readonly base: -10;
@@ -52,15 +55,15 @@ declare const TAG_ALIASES: {
     readonly high: -10;
     readonly low: 20;
 };
-declare function tagWeight<T extends HeadTag>(tag: T): any;
+declare function tagWeight<T extends HeadTag>(tag: T): number;
 declare const SortModifiers: {
     prefix: string;
     offset: number;
 }[];
 
-declare const NetworkEvents: string[];
-declare const ScriptNetworkEvents: string[];
+declare const NetworkEvents: Set<string>;
+declare const ScriptNetworkEvents: Set<string>;
 
 declare function processTemplateParams(s: string, p: TemplateParams, sep: string): string;
 
-export { type Arrayable, HasElementTags, IsBrowser, NetworkEvents, ScriptNetworkEvents, SelfClosingTags, SortModifiers, TAG_ALIASES, TAG_WEIGHTS, TagConfigKeys, TagEntityBits, TagsWithInnerContent, UniqueTags, ValidHeadTags, asArray, composableNames, defineHeadPlugin, hashCode, hashTag, normaliseEntryTags, normaliseProps, normaliseStyleClassProps, normaliseTag, packMeta, processTemplateParams, resolveMetaKeyType, resolveMetaKeyValue, resolvePackedMetaObjectValue, resolveTitleTemplate, tagDedupeKey, tagWeight, unpackMeta, whitelistSafeInput };
+export { type Arrayable, HasElementTags, IsBrowser, NetworkEvents, ScriptNetworkEvents, SelfClosingTags, SortModifiers, TAG_ALIASES, TAG_WEIGHTS, TagConfigKeys, TagEntityBits, TagsWithInnerContent, type Thenable, UniqueTags, ValidHeadTags, asArray, composableNames, defineHeadPlugin, hashCode, hashTag, normaliseEntryTags, normaliseProps, normaliseStyleClassProps, normaliseTag, packMeta, processTemplateParams, resolveMetaKeyType, resolveMetaKeyValue, resolvePackedMetaObjectValue, resolveTitleTemplate, tagDedupeKey, tagWeight, thenable, unpackMeta, whitelistSafeInput };

package/dist/index.d.mts

@@ -3,12 +3,12 @@ import { HeadPluginInput, HeadTag, BaseMeta, MetaFlatInput, Head, MaybeArray, He
 type Arrayable<T> = T | Array<T>;
 declare function asArray<T>(value: Arrayable<T>): T[];
 
-declare const SelfClosingTags: string[];
-declare const TagsWithInnerContent: string[];
-declare const HasElementTags: string[];
-declare const ValidHeadTags: string[];
-declare const UniqueTags: string[];
-declare const TagConfigKeys: string[];
+declare const SelfClosingTags: Set<string>;
+declare const TagsWithInnerContent: Set<string>;
+declare const HasElementTags: Set<string>;
+declare const ValidHeadTags: Set<string>;
+declare const UniqueTags: Set<string>;
+declare const TagConfigKeys: Set<string>;
 declare const IsBrowser: boolean;
 declare const composableNames: string[];
 
@@ -17,7 +17,7 @@ declare function defineHeadPlugin(plugin: HeadPluginInput): HeadPluginInput;
 declare function hashCode(s: string): string;
 declare function hashTag(tag: HeadTag): string;
 
-declare function tagDedupeKey<T extends HeadTag>(tag: T, fn?: (key: string) => boolean): string | false;
+declare function tagDedupeKey<T extends HeadTag>(tag: T): string | false;
 
 declare function resolveTitleTemplate(template: string | ((title?: string) => string | null) | null, title?: string): string | null;
 
@@ -37,11 +37,14 @@ declare function packMeta<T extends Required<Head>['meta']>(inputs: T): MetaFlat
 
 declare function whitelistSafeInput(input: Record<string, MaybeArray<Record<string, string>>>): HeadSafe;
 
-declare function normaliseTag<T extends HeadTag>(tagName: T['tag'], input: HeadTag['props'] | string, e: HeadEntry<T>): Promise<T | T[] | false>;
+type Thenable<T> = Promise<T> | T;
+declare function thenable<T, R>(val: T, thenFn: (val: Awaited<T>) => R): Promise<R> | R;
+
+declare function normaliseTag<T extends HeadTag>(tagName: T['tag'], input: HeadTag['props'] | string, e: HeadEntry<T>, normalizedProps?: HeadTag['props']): Thenable<T | T[]>;
 declare function normaliseStyleClassProps<T extends 'class' | 'style'>(key: T, v: Required<Required<Head>['htmlAttrs']['class']> | Required<Required<Head>['htmlAttrs']['style']>): string;
-declare function normaliseProps<T extends HeadTag>(props: T['props'], virtual?: boolean): Promise<T['props']>;
+declare function normaliseProps<T extends HeadTag>(props: T['props'], virtual?: boolean): Thenable<T['props']>;
 declare const TagEntityBits = 10;
-declare function normaliseEntryTags<T extends {} = Head>(e: HeadEntry<T>): Promise<HeadTag[]>;
+declare function normaliseEntryTags<T extends object = Head>(e: HeadEntry<T>): Thenable<HeadTag[]>;
 
 declare const TAG_WEIGHTS: {
     readonly base: -10;
@@ -52,15 +55,15 @@ declare const TAG_ALIASES: {
     readonly high: -10;
     readonly low: 20;
 };
-declare function tagWeight<T extends HeadTag>(tag: T): any;
+declare function tagWeight<T extends HeadTag>(tag: T): number;
 declare const SortModifiers: {
     prefix: string;
     offset: number;
 }[];
 
-declare const NetworkEvents: string[];
-declare const ScriptNetworkEvents: string[];
+declare const NetworkEvents: Set<string>;
+declare const ScriptNetworkEvents: Set<string>;
 
 declare function processTemplateParams(s: string, p: TemplateParams, sep: string): string;
 
-export { type Arrayable, HasElementTags, IsBrowser, NetworkEvents, ScriptNetworkEvents, SelfClosingTags, SortModifiers, TAG_ALIASES, TAG_WEIGHTS, TagConfigKeys, TagEntityBits, TagsWithInnerContent, UniqueTags, ValidHeadTags, asArray, composableNames, defineHeadPlugin, hashCode, hashTag, normaliseEntryTags, normaliseProps, normaliseStyleClassProps, normaliseTag, packMeta, processTemplateParams, resolveMetaKeyType, resolveMetaKeyValue, resolvePackedMetaObjectValue, resolveTitleTemplate, tagDedupeKey, tagWeight, unpackMeta, whitelistSafeInput };
+export { type Arrayable, HasElementTags, IsBrowser, NetworkEvents, ScriptNetworkEvents, SelfClosingTags, SortModifiers, TAG_ALIASES, TAG_WEIGHTS, TagConfigKeys, TagEntityBits, TagsWithInnerContent, type Thenable, UniqueTags, ValidHeadTags, asArray, composableNames, defineHeadPlugin, hashCode, hashTag, normaliseEntryTags, normaliseProps, normaliseStyleClassProps, normaliseTag, packMeta, processTemplateParams, resolveMetaKeyType, resolveMetaKeyValue, resolvePackedMetaObjectValue, resolveTitleTemplate, tagDedupeKey, tagWeight, thenable, unpackMeta, whitelistSafeInput };

package/dist/index.d.ts

@@ -3,12 +3,12 @@ import { HeadPluginInput, HeadTag, BaseMeta, MetaFlatInput, Head, MaybeArray, He
 type Arrayable<T> = T | Array<T>;
 declare function asArray<T>(value: Arrayable<T>): T[];
 
-declare const SelfClosingTags: string[];
-declare const TagsWithInnerContent: string[];
-declare const HasElementTags: string[];
-declare const ValidHeadTags: string[];
-declare const UniqueTags: string[];
-declare const TagConfigKeys: string[];
+declare const SelfClosingTags: Set<string>;
+declare const TagsWithInnerContent: Set<string>;
+declare const HasElementTags: Set<string>;
+declare const ValidHeadTags: Set<string>;
+declare const UniqueTags: Set<string>;
+declare const TagConfigKeys: Set<string>;
 declare const IsBrowser: boolean;
 declare const composableNames: string[];
 
@@ -17,7 +17,7 @@ declare function defineHeadPlugin(plugin: HeadPluginInput): HeadPluginInput;
 declare function hashCode(s: string): string;
 declare function hashTag(tag: HeadTag): string;
 
-declare function tagDedupeKey<T extends HeadTag>(tag: T, fn?: (key: string) => boolean): string | false;
+declare function tagDedupeKey<T extends HeadTag>(tag: T): string | false;
 
 declare function resolveTitleTemplate(template: string | ((title?: string) => string | null) | null, title?: string): string | null;
 
@@ -37,11 +37,14 @@ declare function packMeta<T extends Required<Head>['meta']>(inputs: T): MetaFlat
 
 declare function whitelistSafeInput(input: Record<string, MaybeArray<Record<string, string>>>): HeadSafe;
 
-declare function normaliseTag<T extends HeadTag>(tagName: T['tag'], input: HeadTag['props'] | string, e: HeadEntry<T>): Promise<T | T[] | false>;
+type Thenable<T> = Promise<T> | T;
+declare function thenable<T, R>(val: T, thenFn: (val: Awaited<T>) => R): Promise<R> | R;
+
+declare function normaliseTag<T extends HeadTag>(tagName: T['tag'], input: HeadTag['props'] | string, e: HeadEntry<T>, normalizedProps?: HeadTag['props']): Thenable<T | T[]>;
 declare function normaliseStyleClassProps<T extends 'class' | 'style'>(key: T, v: Required<Required<Head>['htmlAttrs']['class']> | Required<Required<Head>['htmlAttrs']['style']>): string;
-declare function normaliseProps<T extends HeadTag>(props: T['props'], virtual?: boolean): Promise<T['props']>;
+declare function normaliseProps<T extends HeadTag>(props: T['props'], virtual?: boolean): Thenable<T['props']>;
 declare const TagEntityBits = 10;
-declare function normaliseEntryTags<T extends {} = Head>(e: HeadEntry<T>): Promise<HeadTag[]>;
+declare function normaliseEntryTags<T extends object = Head>(e: HeadEntry<T>): Thenable<HeadTag[]>;
 
 declare const TAG_WEIGHTS: {
     readonly base: -10;
@@ -52,15 +55,15 @@ declare const TAG_ALIASES: {
     readonly high: -10;
     readonly low: 20;
 };
-declare function tagWeight<T extends HeadTag>(tag: T): any;
+declare function tagWeight<T extends HeadTag>(tag: T): number;
 declare const SortModifiers: {
     prefix: string;
     offset: number;
 }[];
 
-declare const NetworkEvents: string[];
-declare const ScriptNetworkEvents: string[];
+declare const NetworkEvents: Set<string>;
+declare const ScriptNetworkEvents: Set<string>;
 
 declare function processTemplateParams(s: string, p: TemplateParams, sep: string): string;
 
-export { type Arrayable, HasElementTags, IsBrowser, NetworkEvents, ScriptNetworkEvents, SelfClosingTags, SortModifiers, TAG_ALIASES, TAG_WEIGHTS, TagConfigKeys, TagEntityBits, TagsWithInnerContent, UniqueTags, ValidHeadTags, asArray, composableNames, defineHeadPlugin, hashCode, hashTag, normaliseEntryTags, normaliseProps, normaliseStyleClassProps, normaliseTag, packMeta, processTemplateParams, resolveMetaKeyType, resolveMetaKeyValue, resolvePackedMetaObjectValue, resolveTitleTemplate, tagDedupeKey, tagWeight, unpackMeta, whitelistSafeInput };
+export { type Arrayable, HasElementTags, IsBrowser, NetworkEvents, ScriptNetworkEvents, SelfClosingTags, SortModifiers, TAG_ALIASES, TAG_WEIGHTS, TagConfigKeys, TagEntityBits, TagsWithInnerContent, type Thenable, UniqueTags, ValidHeadTags, asArray, composableNames, defineHeadPlugin, hashCode, hashTag, normaliseEntryTags, normaliseProps, normaliseStyleClassProps, normaliseTag, packMeta, processTemplateParams, resolveMetaKeyType, resolveMetaKeyValue, resolvePackedMetaObjectValue, resolveTitleTemplate, tagDedupeKey, tagWeight, thenable, unpackMeta, whitelistSafeInput };

package/dist/index.mjs

@@ -2,17 +2,17 @@ function asArray$1(value) {
   return Array.isArray(value) ? value : [value];
 }
 
-const SelfClosingTags = ["meta", "link", "base"];
-const TagsWithInnerContent = ["title", "titleTemplate", "script", "style", "noscript"];
-const HasElementTags = [
+const SelfClosingTags = /* @__PURE__ */ new Set(["meta", "link", "base"]);
+const TagsWithInnerContent = /* @__PURE__ */ new Set(["title", "titleTemplate", "script", "style", "noscript"]);
+const HasElementTags = /* @__PURE__ */ new Set([
   "base",
   "meta",
   "link",
   "style",
   "script",
   "noscript"
-];
-const ValidHeadTags = [
+]);
+const ValidHeadTags = /* @__PURE__ */ new Set([
   "title",
   "titleTemplate",
   "templateParams",
@@ -24,9 +24,9 @@ const ValidHeadTags = [
   "style",
   "script",
   "noscript"
-];
-const UniqueTags = ["base", "title", "titleTemplate", "bodyAttrs", "htmlAttrs", "templateParams"];
-const TagConfigKeys = ["tagPosition", "tagPriority", "tagDuplicateStrategy", "children", "innerHTML", "textContent", "processTemplateParams"];
+]);
+const UniqueTags = /* @__PURE__ */ new Set(["base", "title", "titleTemplate", "bodyAttrs", "htmlAttrs", "templateParams"]);
+const TagConfigKeys = /* @__PURE__ */ new Set(["tagPosition", "tagPriority", "tagDuplicateStrategy", "children", "innerHTML", "textContent", "processTemplateParams"]);
 const IsBrowser = typeof window !== "undefined";
 const composableNames = [
   "getActiveHead",
@@ -49,26 +49,34 @@ function hashCode(s) {
   return ((h ^ h >>> 9) + 65536).toString(16).substring(1, 8).toLowerCase();
 }
 function hashTag(tag) {
-  return tag._h || hashCode(tag._d ? tag._d : `${tag.tag}:${tag.textContent || tag.innerHTML || ""}:${Object.entries(tag.props).map(([key, value]) => `${key}:${String(value)}`).join(",")}`);
+  if (tag._h) {
+    return tag._h;
+  }
+  if (tag._d) {
+    return hashCode(tag._d);
+  }
+  let content = `${tag.tag}:${tag.textContent || tag.innerHTML || ""}:`;
+  for (const key in tag.props) {
+    content += `${key}:${tag.props[key]},`;
+  }
+  return hashCode(content);
 }
 
-function tagDedupeKey(tag, fn) {
+const allowedMetaProperties = ["name", "property", "http-equiv"];
+function tagDedupeKey(tag) {
   const { props, tag: tagName } = tag;
-  if (UniqueTags.includes(tagName))
+  if (UniqueTags.has(tagName))
     return tagName;
   if (tagName === "link" && props.rel === "canonical")
     return "canonical";
   if (props.charset)
     return "charset";
-  const name = ["id"];
-  if (tagName === "meta")
-    name.push(...["name", "property", "http-equiv"]);
-  for (const n of name) {
-    if (typeof props[n] !== "undefined") {
-      const val = String(props[n]);
-      if (fn && !fn(val))
-        return false;
-      return `${tagName}:${n}:${val}`;
+  if (props.id) {
+    return `${tagName}:id:${props.id}`;
+  }
+  for (const n of allowedMetaProperties) {
+    if (props[n] !== void 0) {
+      return `${tagName}:${n}:${props[n]}`;
     }
   }
   return false;
@@ -250,15 +258,16 @@ const MetaPackingSchema = {
     metaKey: "http-equiv"
   }
 };
-const openGraphNamespaces = [
+const openGraphNamespaces = /* @__PURE__ */ new Set([
   "og",
   "book",
   "article",
   "profile"
-];
+]);
 function resolveMetaKeyType(key) {
-  const fKey = fixKeyCase(key).split(":")[0];
-  if (openGraphNamespaces.includes(fKey))
+  const fKey = fixKeyCase(key);
+  const prefixIndex = fKey.indexOf(":");
+  if (openGraphNamespaces.has(fKey.substring(0, prefixIndex)))
     return "property";
   return MetaPackingSchema[key]?.metaKey || "name";
 }
@@ -267,8 +276,9 @@ function resolveMetaKeyValue(key) {
 }
 function fixKeyCase(key) {
   const updated = key.replace(/([A-Z])/g, "-$1").toLowerCase();
-  const fKey = updated.split("-")[0];
-  if (openGraphNamespaces.includes(fKey) || fKey === "twitter")
+  const prefixIndex = updated.indexOf("-");
+  const fKey = updated.substring(0, prefixIndex);
+  if (fKey === "twitter" || openGraphNamespaces.has(fKey))
     return key.replace(/([A-Z])/g, ":$1").toLowerCase();
   return updated;
 }
@@ -279,8 +289,12 @@ function changeKeyCasingDeep(input) {
   if (typeof input !== "object" || Array.isArray(input))
     return input;
   const output = {};
-  for (const [key, value] of Object.entries(input))
-    output[fixKeyCase(key)] = changeKeyCasingDeep(value);
+  for (const key in input) {
+    if (!Object.prototype.hasOwnProperty.call(input, key)) {
+      continue;
+    }
+    output[fixKeyCase(key)] = changeKeyCasingDeep(input[key]);
+  }
   return output;
 }
 function resolvePackedMetaObjectValue(value, key) {
@@ -302,24 +316,31 @@ function resolvePackedMetaObjectValue(value, key) {
     }
   );
 }
-const ObjectArrayEntries = ["og:image", "og:video", "og:audio", "twitter:image"];
+const ObjectArrayEntries = /* @__PURE__ */ new Set(["og:image", "og:video", "og:audio", "twitter:image"]);
 function sanitize(input) {
   const out = {};
-  Object.entries(input).forEach(([k2, v]) => {
+  for (const k2 in input) {
+    if (!Object.prototype.hasOwnProperty.call(input, k2)) {
+      continue;
+    }
+    const v = input[k2];
     if (String(v) !== "false" && k2)
       out[k2] = v;
-  });
+  }
   return out;
 }
 function handleObjectEntry(key, v) {
   const value = sanitize(v);
   const fKey = fixKeyCase(key);
   const attr = resolveMetaKeyType(fKey);
-  if (ObjectArrayEntries.includes(fKey)) {
+  if (ObjectArrayEntries.has(fKey)) {
     const input = {};
-    Object.entries(value).forEach(([k2, v2]) => {
-      input[`${key}${k2 === "url" ? "" : `${k2.charAt(0).toUpperCase()}${k2.slice(1)}`}`] = v2;
-    });
+    for (const k2 in value) {
+      if (!Object.prototype.hasOwnProperty.call(value, k2)) {
+        continue;
+      }
+      input[`${key}${k2 === "url" ? "" : `${k2[0].toUpperCase()}${k2.slice(1)}`}`] = value[k2];
+    }
     return unpackMeta(input).sort((a, b) => (a[attr]?.length || 0) - (b[attr]?.length || 0));
   }
   return [{ [attr]: fKey, ...value }];
@@ -327,23 +348,27 @@ function handleObjectEntry(key, v) {
 function unpackMeta(input) {
   const extras = [];
   const primitives = {};
-  Object.entries(input).forEach(([key, value]) => {
+  for (const key in input) {
+    if (!Object.prototype.hasOwnProperty.call(input, key)) {
+      continue;
+    }
+    const value = input[key];
     if (!Array.isArray(value)) {
       if (typeof value === "object" && value) {
-        if (ObjectArrayEntries.includes(fixKeyCase(key))) {
+        if (ObjectArrayEntries.has(fixKeyCase(key))) {
           extras.push(...handleObjectEntry(key, value));
-          return;
+          continue;
         }
         primitives[key] = sanitize(value);
       } else {
         primitives[key] = value;
       }
-      return;
+      continue;
     }
-    value.forEach((v) => {
+    for (const v of value) {
       extras.push(...typeof v === "string" ? unpackMeta({ [key]: v }) : handleObjectEntry(key, v));
-    });
-  });
+    }
+  }
   const meta = unpackToArray(primitives, {
     key({ key }) {
       return resolveMetaKeyType(key);
@@ -435,7 +460,7 @@ function whitelistSafeInput(input) {
             const link = acceptDataAttrs(meta);
             WhitelistAttributes.link.forEach((key2) => {
               const val = meta[key2];
-              if (key2 === "rel" && ["stylesheet", "canonical", "modulepreload", "prerender", "preload", "prefetch"].includes(val))
+              if (key2 === "rel" && (val === "stylesheet" || val === "canonical" || val === "modulepreload" || val === "prerender" || val === "preload" || val === "prefetch"))
                 return;
               if (key2 === "href") {
                 if (val.includes("javascript:") || val.includes("data:"))
@@ -487,25 +512,36 @@ function whitelistSafeInput(input) {
   return filtered;
 }
 
-async function normaliseTag(tagName, input, e) {
+function thenable(val, thenFn) {
+  if (val instanceof Promise) {
+    return val.then(thenFn);
+  }
+  return thenFn(val);
+}
+
+function normaliseTag(tagName, input, e, normalizedProps) {
+  const props = normalizedProps || normaliseProps(
+    // explicitly check for an object
+    // @ts-expect-error untyped
+    typeof input === "object" && typeof input !== "function" && !(input instanceof Promise) ? { ...input } : { [tagName === "script" || tagName === "noscript" || tagName === "style" ? "innerHTML" : "textContent"]: input },
+    tagName === "templateParams" || tagName === "titleTemplate"
+  );
+  if (props instanceof Promise) {
+    return props.then((val) => normaliseTag(tagName, input, e, val));
+  }
   const tag = {
     tag: tagName,
-    props: await normaliseProps(
-      // explicitly check for an object
-      // @ts-expect-error untyped
-      typeof input === "object" && typeof input !== "function" && !(input instanceof Promise) ? { ...input } : { [["script", "noscript", "style"].includes(tagName) ? "innerHTML" : "textContent"]: input },
-      ["templateParams", "titleTemplate"].includes(tagName)
-    )
+    props
   };
-  TagConfigKeys.forEach((k) => {
-    const val = typeof tag.props[k] !== "undefined" ? tag.props[k] : e[k];
-    if (typeof val !== "undefined") {
-      if (!["innerHTML", "textContent", "children"].includes(k) || TagsWithInnerContent.includes(tag.tag)) {
+  for (const k of TagConfigKeys) {
+    const val = tag.props[k] !== void 0 ? tag.props[k] : e[k];
+    if (val !== void 0) {
+      if (!(k === "innerHTML" || k === "textContent" || k === "children") || TagsWithInnerContent.has(tag.tag)) {
         tag[k === "children" ? "innerHTML" : k] = val;
       }
       delete tag.props[k];
     }
-  });
+  }
   if (tag.props.body) {
     tag.tagPosition = "bodyClose";
     delete tag.props.body;
@@ -523,17 +559,22 @@ function normaliseStyleClassProps(key, v) {
   if (typeof v === "object" && !Array.isArray(v)) {
     v = Object.entries(v).filter(([, v2]) => v2).map(([k, v2]) => key === "style" ? `${k}:${v2}` : k);
   }
-  return String(Array.isArray(v) ? v.join(sep) : v)?.split(sep).filter((c) => c.trim()).filter(Boolean).join(sep);
+  return String(Array.isArray(v) ? v.join(sep) : v)?.split(sep).filter((c) => Boolean(c.trim())).join(sep);
 }
-async function normaliseProps(props, virtual) {
-  for (const k of Object.keys(props)) {
-    if (["class", "style"].includes(k)) {
+function nestedNormaliseProps(props, virtual, keys, startIndex) {
+  for (let i = startIndex; i < keys.length; i += 1) {
+    const k = keys[i];
+    if (k === "class" || k === "style") {
       props[k] = normaliseStyleClassProps(k, props[k]);
       continue;
     }
-    if (props[k] instanceof Promise)
-      props[k] = await props[k];
-    if (!virtual && !TagConfigKeys.includes(k)) {
+    if (props[k] instanceof Promise) {
+      return props[k].then((val) => {
+        props[k] = val;
+        return nestedNormaliseProps(props, virtual, keys, i);
+      });
+    }
+    if (!virtual && !TagConfigKeys.has(k)) {
       const v = String(props[k]);
       const isDataKey = k.startsWith("data-");
       if (v === "true" || v === "") {
@@ -546,21 +587,60 @@ async function normaliseProps(props, virtual) {
       }
     }
   }
+}
+function normaliseProps(props, virtual = false) {
+  const resolvedProps = nestedNormaliseProps(props, virtual, Object.keys(props), 0);
+  if (resolvedProps instanceof Promise) {
+    return resolvedProps.then(() => props);
+  }
   return props;
 }
 const TagEntityBits = 10;
-async function normaliseEntryTags(e) {
+function nestedNormaliseEntryTags(headTags, tagPromises, startIndex) {
+  for (let i = startIndex; i < tagPromises.length; i += 1) {
+    const tags = tagPromises[i];
+    if (tags instanceof Promise) {
+      return tags.then((val) => {
+        tagPromises[i] = val;
+        return nestedNormaliseEntryTags(headTags, tagPromises, i);
+      });
+    }
+    if (Array.isArray(tags)) {
+      headTags.push(...tags);
+    } else {
+      headTags.push(tags);
+    }
+  }
+}
+function normaliseEntryTags(e) {
   const tagPromises = [];
-  Object.entries(e.resolvedInput).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, e)).flat());
-  });
-  return (await Promise.all(tagPromises)).flat().filter(Boolean).map((t, i) => {
+  const input = e.resolvedInput;
+  for (const k in input) {
+    if (!Object.prototype.hasOwnProperty.call(input, k)) {
+      continue;
+    }
+    const v = input[k];
+    if (v === void 0 || !ValidHeadTags.has(k)) {
+      continue;
+    }
+    if (Array.isArray(v)) {
+      for (const props of v) {
+        tagPromises.push(normaliseTag(k, props, e));
+      }
+      continue;
+    }
+    tagPromises.push(normaliseTag(k, v, e));
+  }
+  if (tagPromises.length === 0) {
+    return [];
+  }
+  const headTags = [];
+  return thenable(nestedNormaliseEntryTags(headTags, tagPromises, 0), () => headTags.map((t, i) => {
     t._e = e._i;
     e.mode && (t._m = e.mode);
     t._p = (e._i << TagEntityBits) + i;
     return t;
-  });
+  }));
 }
 
 const TAG_WEIGHTS = {
@@ -575,68 +655,74 @@ const TAG_ALIASES = {
   low: 20
 };
 function tagWeight(tag) {
-  let weight = 100;
   const priority = tag.tagPriority;
   if (typeof priority === "number")
     return priority;
+  let weight = 100;
   if (tag.tag === "meta") {
     if (tag.props["http-equiv"] === "content-security-policy")
       weight = -30;
-    if (tag.props.charset)
+    else if (tag.props.charset)
       weight = -20;
-    if (tag.props.name === "viewport")
+    else if (tag.props.name === "viewport")
       weight = -15;
   } else if (tag.tag === "link" && tag.props.rel === "preconnect") {
     weight = 20;
   } else if (tag.tag in TAG_WEIGHTS) {
     weight = TAG_WEIGHTS[tag.tag];
   }
-  if (typeof priority === "string" && priority in TAG_ALIASES) {
+  if (priority && priority in TAG_ALIASES) {
     return weight + TAG_ALIASES[priority];
   }
   return weight;
 }
 const SortModifiers = [{ prefix: "before:", offset: -1 }, { prefix: "after:", offset: 1 }];
 
-const NetworkEvents = ["onload", "onerror", "onabort", "onprogress", "onloadstart"];
-const ScriptNetworkEvents = ["onload", "onerror"];
+const NetworkEvents = /* @__PURE__ */ new Set(["onload", "onerror", "onabort", "onprogress", "onloadstart"]);
+const ScriptNetworkEvents = /* @__PURE__ */ new Set(["onload", "onerror"]);
 
 const sepSub = "%separator";
+function sub(p, token) {
+  let val;
+  if (token === "s" || token === "pageTitle") {
+    val = p.pageTitle;
+  } else if (token.includes(".")) {
+    const dotIndex = token.indexOf(".");
+    val = p[token.substring(0, dotIndex)]?.[token.substring(dotIndex + 1)];
+  } else {
+    val = p[token];
+  }
+  return val !== void 0 ? (val || "").replace(/"/g, '\\"') : void 0;
+}
+const sepSubRe = new RegExp(`${sepSub}(?:\\s*${sepSub})*`, "g");
 function processTemplateParams(s, p, sep) {
   if (typeof s !== "string" || !s.includes("%"))
     return s;
-  function sub(token) {
-    let val;
-    if (["s", "pageTitle"].includes(token)) {
-      val = p.pageTitle;
-    } else if (token.includes(".")) {
-      val = token.split(".").reduce((acc, key) => acc ? acc[key] || void 0 : void 0, p);
-    } else {
-      val = p[token];
-    }
-    return typeof val !== "undefined" ? (val || "").replace(/"/g, '\\"') : false;
-  }
   let decoded = s;
   try {
     decoded = decodeURI(s);
   } catch {
   }
-  const tokens = (decoded.match(/%(\w+\.+\w+)|%(\w+)/g) || []).sort().reverse();
-  tokens.forEach((token) => {
-    const re = sub(token.slice(1));
-    if (typeof re === "string") {
-      s = s.replace(new RegExp(`\\${token}(\\W|$)`, "g"), (_, args) => `${re}${args}`).trim();
+  const tokens = decoded.match(/%\w+(?:\.\w+)?/g);
+  if (!tokens) {
+    return s;
+  }
+  const hasSepSub = s.includes(sepSub);
+  s = s.replace(/%\w+(?:\.\w+)?/g, (token) => {
+    if (token === sepSub || !tokens.includes(token)) {
+      return token;
     }
-  });
-  if (s.includes(sepSub)) {
+    const re = sub(p, token.slice(1));
+    return re !== void 0 ? re : token;
+  }).trim();
+  if (hasSepSub) {
     if (s.endsWith(sepSub))
-      s = s.slice(0, -sepSub.length).trim();
+      s = s.slice(0, -sepSub.length);
     if (s.startsWith(sepSub))
-      s = s.slice(sepSub.length).trim();
-    s = s.replace(new RegExp(`\\${sepSub}\\s*\\${sepSub}`, "g"), sepSub);
-    s = processTemplateParams(s, { separator: sep }, sep);
+      s = s.slice(sepSub.length);
+    s = s.replace(sepSubRe, sep).trim();
   }
   return s;
 }
 
-export { HasElementTags, IsBrowser, NetworkEvents, ScriptNetworkEvents, SelfClosingTags, SortModifiers, TAG_ALIASES, TAG_WEIGHTS, TagConfigKeys, TagEntityBits, TagsWithInnerContent, UniqueTags, ValidHeadTags, asArray$1 as asArray, composableNames, defineHeadPlugin, hashCode, hashTag, normaliseEntryTags, normaliseProps, normaliseStyleClassProps, normaliseTag, packMeta, processTemplateParams, resolveMetaKeyType, resolveMetaKeyValue, resolvePackedMetaObjectValue, resolveTitleTemplate, tagDedupeKey, tagWeight, unpackMeta, whitelistSafeInput };
+export { HasElementTags, IsBrowser, NetworkEvents, ScriptNetworkEvents, SelfClosingTags, SortModifiers, TAG_ALIASES, TAG_WEIGHTS, TagConfigKeys, TagEntityBits, TagsWithInnerContent, UniqueTags, ValidHeadTags, asArray$1 as asArray, composableNames, defineHeadPlugin, hashCode, hashTag, normaliseEntryTags, normaliseProps, normaliseStyleClassProps, normaliseTag, packMeta, processTemplateParams, resolveMetaKeyType, resolveMetaKeyValue, resolvePackedMetaObjectValue, resolveTitleTemplate, tagDedupeKey, tagWeight, thenable, unpackMeta, whitelistSafeInput };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unhead/shared",
   "type": "module",
-  "version": "1.9.16",
+  "version": "1.10.0-beta.1",
   "author": "Harlan Wilton <harlan@harlanzw.com>",
   "license": "MIT",
   "funding": "https://github.com/sponsors/harlan-zw",
@@ -34,7 +34,7 @@
     "dist"
   ],
   "dependencies": {
-    "@unhead/schema": "1.9.16"
+    "@unhead/schema": "1.10.0-beta.1"
   },
   "devDependencies": {
     "packrup": "^0.1.2"