@unhead/shared 1.11.15 → 2.0.0-alpha.0

package/dist/index.cjs

@@ -2,11 +2,8 @@
 
 const packrup = require('packrup');
 
-function asArray(value) {
-  return Array.isArray(value) ? value : [value];
-}
-
 const SelfClosingTags = /* @__PURE__ */ new Set(["meta", "link", "base"]);
+const DupeableTags = /* @__PURE__ */ new Set(["link", "style", "script", "noscript"]);
 const TagsWithInnerContent = /* @__PURE__ */ new Set(["title", "titleTemplate", "script", "style", "noscript"]);
 const HasElementTags = /* @__PURE__ */ new Set([
   "base",
@@ -30,10 +27,9 @@ const ValidHeadTags = /* @__PURE__ */ new Set([
   "noscript"
 ]);
 const UniqueTags = /* @__PURE__ */ new Set(["base", "title", "titleTemplate", "bodyAttrs", "htmlAttrs", "templateParams"]);
-const TagConfigKeys = /* @__PURE__ */ new Set(["tagPosition", "tagPriority", "tagDuplicateStrategy", "children", "innerHTML", "textContent", "processTemplateParams"]);
+const TagConfigKeys = /* @__PURE__ */ new Set(["key", "tagPosition", "tagPriority", "tagDuplicateStrategy", "innerHTML", "textContent", "processTemplateParams"]);
 const IsBrowser = typeof window !== "undefined";
 const composableNames = [
-  "getActiveHead",
   "useHead",
   "useSeoMeta",
   "useHeadSafe",
@@ -41,6 +37,8 @@ const composableNames = [
   "useServerSeoMeta",
   "useServerHeadSafe"
 ];
+const NetworkEvents = /* @__PURE__ */ new Set(["onload", "onerror", "onabort", "onprogress", "onloadstart"]);
+const ScriptNetworkEvents = /* @__PURE__ */ new Set(["onload", "onerror"]);
 
 function defineHeadPlugin(plugin) {
   return plugin;
@@ -287,40 +285,55 @@ function packMeta(inputs) {
   });
 }
 
-function thenable(val, thenFn) {
-  if (val instanceof Promise) {
-    return val.then(thenFn);
+const allowedMetaProperties = ["name", "property", "http-equiv"];
+function tagDedupeKey(tag) {
+  const { props, tag: tagName } = tag;
+  if (UniqueTags.has(tagName))
+    return tagName;
+  if (tagName === "link" && props.rel === "canonical")
+    return "canonical";
+  if (props.charset)
+    return "charset";
+  if (props.id) {
+    return `${tagName}:id:${props.id}`;
   }
-  return thenFn(val);
+  for (const n of allowedMetaProperties) {
+    if (props[n] !== undefined) {
+      return `${tagName}:${n}:${props[n]}`;
+    }
+  }
+  return false;
 }
 
 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 },
+    typeof input === "object" && typeof input !== "function" ? { ...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
   };
   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;
+    const val = tag.props[k] !== undefined ? tag.props[k] : e[k];
+    if (val !== undefined) {
+      if (!(k === "innerHTML" || k === "textContent") || TagsWithInnerContent.has(tag.tag)) {
+        tag[k] = val;
       }
       delete tag.props[k];
     }
   }
-  if (tag.props.body) {
-    tag.tagPosition = "bodyClose";
-    delete tag.props.body;
+  if (tag.key && DupeableTags.has(tag.tag)) {
+    tag.props["data-hid"] = tag._h = hashCode(tag.key);
   }
+  const generatedKey = tagDedupeKey(tag);
+  if (generatedKey && !generatedKey.startsWith("meta:og:") && !generatedKey.startsWith("meta:twitter:")) {
+    delete tag.key;
+  }
+  const dedupe = generatedKey || (tag.key ? `${tag.tag}:${tag.key}` : false);
+  if (dedupe)
+    tag._d = dedupe;
   if (tag.tag === "script") {
     if (typeof tag.innerHTML === "object") {
       tag.innerHTML = JSON.stringify(tag.innerHTML);
@@ -336,20 +349,16 @@ function normaliseStyleClassProps(key, v) {
   }
   return String(Array.isArray(v) ? v.join(sep) : v)?.split(sep).filter((c) => Boolean(c.trim())).join(sep);
 }
-function nestedNormaliseProps(props, virtual, keys, startIndex) {
-  for (let i = startIndex; i < keys.length; i += 1) {
-    const k = keys[i];
+function normaliseProps(props, virtual = false) {
+  for (const k in props) {
     if (k === "class" || k === "style") {
       props[k] = normaliseStyleClassProps(k, props[k]);
       continue;
     }
-    if (props[k] instanceof Promise) {
-      return props[k].then((val) => {
-        props[k] = val;
-        return nestedNormaliseProps(props, virtual, keys, i);
-      });
-    }
     if (!virtual && !TagConfigKeys.has(k)) {
+      if (typeof props[k] === "function" && !String(k).startsWith("on")) {
+        props[k] = props[k]();
+      }
       const v = String(props[k]);
       const isDataKey = k.startsWith("data-");
       if (v === "true" || v === "") {
@@ -362,60 +371,37 @@ function nestedNormaliseProps(props, virtual, keys, startIndex) {
       }
     }
   }
-}
-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;
-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 = [];
+  const tags = [];
   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)) {
+    if (v === undefined || !ValidHeadTags.has(k)) {
       continue;
     }
     if (Array.isArray(v)) {
       for (const props of v) {
-        tagPromises.push(normaliseTag(k, props, e));
+        tags.push(normaliseTag(k, props, e));
       }
       continue;
+    } else if (typeof v === "function" && k !== "titleTemplate") {
+      input[k] = v();
+      continue;
     }
-    tagPromises.push(normaliseTag(k, v, e));
-  }
-  if (tagPromises.length === 0) {
-    return [];
+    tags.push(normaliseTag(k, v, e));
   }
-  const headTags = [];
-  return thenable(nestedNormaliseEntryTags(headTags, tagPromises, 0), () => headTags.map((t, i) => {
+  return tags.flat().map((t, i) => {
     t._e = e._i;
     e.mode && (t._m = e.mode);
     t._p = (e._i << TagEntityBits) + i;
     return t;
-  }));
+  });
 }
 
 const WhitelistAttributes = {
@@ -511,7 +497,7 @@ function whitelistSafeInput(input) {
                   try {
                     const jsonVal = typeof script[s] === "string" ? JSON.parse(script[s]) : script[s];
                     safeScript[s] = JSON.stringify(jsonVal, null, 0);
-                  } catch (e) {
+                  } catch {
                   }
                 } else {
                   safeScript[s] = script[s];
@@ -527,9 +513,6 @@ function whitelistSafeInput(input) {
   return filtered;
 }
 
-const NetworkEvents = /* @__PURE__ */ new Set(["onload", "onerror", "onabort", "onprogress", "onloadstart"]);
-const ScriptNetworkEvents = /* @__PURE__ */ new Set(["onload", "onerror"]);
-
 const TAG_WEIGHTS = {
   // tags
   base: -10,
@@ -541,10 +524,16 @@ const TAG_ALIASES = {
   high: -10,
   low: 20
 };
-function tagWeight(tag) {
+const SortModifiers = [{ prefix: "before:", offset: -1 }, { prefix: "after:", offset: 1 }];
+const importRe = /@import/;
+const isTruthy = (val) => val === "" || val === true;
+function tagWeight(head, tag) {
   const priority = tag.tagPriority;
   if (typeof priority === "number")
     return priority;
+  const isScript = tag.tag === "script";
+  const isLink = tag.tag === "link";
+  const isStyle = tag.tag === "style";
   let weight = 100;
   if (tag.tag === "meta") {
     if (tag.props["http-equiv"] === "content-security-policy")
@@ -553,7 +542,7 @@ function tagWeight(tag) {
       weight = -20;
     else if (tag.props.name === "viewport")
       weight = -15;
-  } else if (tag.tag === "link" && tag.props.rel === "preconnect") {
+  } else if (isLink && tag.props.rel === "preconnect") {
     weight = 20;
   } else if (tag.tag in TAG_WEIGHTS) {
     weight = TAG_WEIGHTS[tag.tag];
@@ -561,28 +550,28 @@ function tagWeight(tag) {
   if (priority && priority in TAG_ALIASES) {
     return weight + TAG_ALIASES[priority];
   }
-  return weight;
-}
-const SortModifiers = [{ prefix: "before:", offset: -1 }, { prefix: "after:", offset: 1 }];
-
-const allowedMetaProperties = ["name", "property", "http-equiv"];
-function tagDedupeKey(tag) {
-  const { props, tag: tagName } = tag;
-  if (UniqueTags.has(tagName))
-    return tagName;
-  if (tagName === "link" && props.rel === "canonical")
-    return "canonical";
-  if (props.charset)
-    return "charset";
-  if (props.id) {
-    return `${tagName}:id:${props.id}`;
+  if (tag.tagPosition && tag.tagPosition !== "head") {
+    return weight;
   }
-  for (const n of allowedMetaProperties) {
-    if (props[n] !== void 0) {
-      return `${tagName}:${n}:${props[n]}`;
-    }
+  if (!head.ssr || head.resolvedOptions.disableCapoSorting) {
+    return weight;
   }
-  return false;
+  if (isScript && isTruthy(tag.props.async)) {
+    weight = 30;
+  } else if (isStyle && tag.innerHTML && importRe.test(tag.innerHTML)) {
+    weight = 40;
+  } else if (isScript && tag.props.src && !isTruthy(tag.props.defer) && !isTruthy(tag.props.async) && tag.props.type !== "module" && !tag.props.type?.endsWith("json")) {
+    weight = 50;
+  } else if (isLink && tag.props.rel === "stylesheet" || tag.tag === "style") {
+    weight = 60;
+  } else if (isLink && (tag.props.rel === "preload" || tag.props.rel === "modulepreload")) {
+    weight = 70;
+  } else if (isScript && isTruthy(tag.props.defer) && tag.props.src && !isTruthy(tag.props.async)) {
+    weight = 80;
+  } else if (isLink && (tag.props.rel === "prefetch" || tag.props.rel === "dns-prefetch" || tag.props.rel === "prerender")) {
+    weight = 90;
+  }
+  return weight;
 }
 
 const sepSub = "%separator";
@@ -596,10 +585,10 @@ function sub(p, token, isJson = false) {
   } else {
     val = p[token];
   }
-  if (val !== void 0) {
+  if (val !== undefined) {
     return isJson ? (val || "").replace(/"/g, '\\"') : val || "";
   }
-  return void 0;
+  return undefined;
 }
 const sepSubRe = new RegExp(`${sepSub}(?:\\s*${sepSub})*`, "g");
 function processTemplateParams(s, p, sep, isJson = false) {
@@ -620,7 +609,7 @@ function processTemplateParams(s, p, sep, isJson = false) {
       return token;
     }
     const re = sub(p, token.slice(1), isJson);
-    return re !== void 0 ? re : token;
+    return re !== undefined ? re : token;
   }).trim();
   if (hasSepSub) {
     if (s.endsWith(sepSub))
@@ -640,6 +629,11 @@ function resolveTitleTemplate(template, title) {
   return template;
 }
 
+function asArray(value) {
+  return Array.isArray(value) ? value : [value];
+}
+
+exports.DupeableTags = DupeableTags;
 exports.HasElementTags = HasElementTags;
 exports.IsBrowser = IsBrowser;
 exports.NetworkEvents = NetworkEvents;
@@ -670,6 +664,5 @@ 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

@@ -1,9 +1,7 @@
-import { HeadPluginInput, HeadTag, BaseMeta, MetaFlatInput, Head, HeadEntry, MaybeArray, HeadSafe, TemplateParams } from '@unhead/schema';
-
-type Arrayable<T> = T | Array<T>;
-declare function asArray<T>(value: Arrayable<T>): T[];
+import { HeadPluginInput, HeadTag, BaseMeta, MetaFlatInput, Head, HeadEntry, MaybeArray, HeadSafe, Unhead, TemplateParams } from '@unhead/schema';
 
 declare const SelfClosingTags: Set<string>;
+declare const DupeableTags: Set<string>;
 declare const TagsWithInnerContent: Set<string>;
 declare const HasElementTags: Set<string>;
 declare const ValidHeadTags: Set<string>;
@@ -11,6 +9,8 @@ declare const UniqueTags: Set<string>;
 declare const TagConfigKeys: Set<string>;
 declare const IsBrowser: boolean;
 declare const composableNames: string[];
+declare const NetworkEvents: Set<string>;
+declare const ScriptNetworkEvents: Set<string>;
 
 declare function defineHeadPlugin(plugin: HeadPluginInput): HeadPluginInput;
 
@@ -31,20 +31,14 @@ declare function unpackMeta<T extends MetaFlatInput>(input: T): Required<Head>['
  */
 declare function packMeta<T extends Required<Head>['meta']>(inputs: T): MetaFlatInput;
 
-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 normaliseTag<T extends HeadTag>(tagName: T['tag'], input: HeadTag['props'] | string, e: HeadEntry<T>, normalizedProps?: HeadTag['props']): 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): Thenable<T['props']>;
+declare function normaliseProps<T extends HeadTag>(props: T['props'], virtual?: boolean): T["props"];
 declare const TagEntityBits = 10;
-declare function normaliseEntryTags<T extends object = Head>(e: HeadEntry<T>): Thenable<HeadTag[]>;
+declare function normaliseEntryTags<T extends object = Head>(e: HeadEntry<T>): HeadTag[];
 
 declare function whitelistSafeInput(input: Record<string, MaybeArray<Record<string, string>>>): HeadSafe;
 
-declare const NetworkEvents: Set<string>;
-declare const ScriptNetworkEvents: Set<string>;
-
 declare const TAG_WEIGHTS: {
     readonly base: -10;
     readonly title: 10;
@@ -54,11 +48,11 @@ declare const TAG_ALIASES: {
     readonly high: -10;
     readonly low: 20;
 };
-declare function tagWeight<T extends HeadTag>(tag: T): number;
 declare const SortModifiers: {
     prefix: string;
     offset: number;
 }[];
+declare function tagWeight<T extends HeadTag>(head: Unhead<any>, tag: T): number;
 
 declare function tagDedupeKey<T extends HeadTag>(tag: T): string | false;
 
@@ -66,4 +60,7 @@ declare function processTemplateParams(s: string, p: TemplateParams, sep: string
 
 declare function resolveTitleTemplate(template: string | ((title?: string) => string | null) | null, title?: string): string | null;
 
-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 };
+type Arrayable<T> = T | Array<T>;
+declare function asArray<T>(value: Arrayable<T>): T[];
+
+export { type Arrayable, DupeableTags, 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 };

package/dist/index.d.mts

@@ -1,9 +1,7 @@
-import { HeadPluginInput, HeadTag, BaseMeta, MetaFlatInput, Head, HeadEntry, MaybeArray, HeadSafe, TemplateParams } from '@unhead/schema';
-
-type Arrayable<T> = T | Array<T>;
-declare function asArray<T>(value: Arrayable<T>): T[];
+import { HeadPluginInput, HeadTag, BaseMeta, MetaFlatInput, Head, HeadEntry, MaybeArray, HeadSafe, Unhead, TemplateParams } from '@unhead/schema';
 
 declare const SelfClosingTags: Set<string>;
+declare const DupeableTags: Set<string>;
 declare const TagsWithInnerContent: Set<string>;
 declare const HasElementTags: Set<string>;
 declare const ValidHeadTags: Set<string>;
@@ -11,6 +9,8 @@ declare const UniqueTags: Set<string>;
 declare const TagConfigKeys: Set<string>;
 declare const IsBrowser: boolean;
 declare const composableNames: string[];
+declare const NetworkEvents: Set<string>;
+declare const ScriptNetworkEvents: Set<string>;
 
 declare function defineHeadPlugin(plugin: HeadPluginInput): HeadPluginInput;
 
@@ -31,20 +31,14 @@ declare function unpackMeta<T extends MetaFlatInput>(input: T): Required<Head>['
  */
 declare function packMeta<T extends Required<Head>['meta']>(inputs: T): MetaFlatInput;
 
-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 normaliseTag<T extends HeadTag>(tagName: T['tag'], input: HeadTag['props'] | string, e: HeadEntry<T>, normalizedProps?: HeadTag['props']): 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): Thenable<T['props']>;
+declare function normaliseProps<T extends HeadTag>(props: T['props'], virtual?: boolean): T["props"];
 declare const TagEntityBits = 10;
-declare function normaliseEntryTags<T extends object = Head>(e: HeadEntry<T>): Thenable<HeadTag[]>;
+declare function normaliseEntryTags<T extends object = Head>(e: HeadEntry<T>): HeadTag[];
 
 declare function whitelistSafeInput(input: Record<string, MaybeArray<Record<string, string>>>): HeadSafe;
 
-declare const NetworkEvents: Set<string>;
-declare const ScriptNetworkEvents: Set<string>;
-
 declare const TAG_WEIGHTS: {
     readonly base: -10;
     readonly title: 10;
@@ -54,11 +48,11 @@ declare const TAG_ALIASES: {
     readonly high: -10;
     readonly low: 20;
 };
-declare function tagWeight<T extends HeadTag>(tag: T): number;
 declare const SortModifiers: {
     prefix: string;
     offset: number;
 }[];
+declare function tagWeight<T extends HeadTag>(head: Unhead<any>, tag: T): number;
 
 declare function tagDedupeKey<T extends HeadTag>(tag: T): string | false;
 
@@ -66,4 +60,7 @@ declare function processTemplateParams(s: string, p: TemplateParams, sep: string
 
 declare function resolveTitleTemplate(template: string | ((title?: string) => string | null) | null, title?: string): string | null;
 
-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 };
+type Arrayable<T> = T | Array<T>;
+declare function asArray<T>(value: Arrayable<T>): T[];
+
+export { type Arrayable, DupeableTags, 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 };

package/dist/index.d.ts

@@ -1,9 +1,7 @@
-import { HeadPluginInput, HeadTag, BaseMeta, MetaFlatInput, Head, HeadEntry, MaybeArray, HeadSafe, TemplateParams } from '@unhead/schema';
-
-type Arrayable<T> = T | Array<T>;
-declare function asArray<T>(value: Arrayable<T>): T[];
+import { HeadPluginInput, HeadTag, BaseMeta, MetaFlatInput, Head, HeadEntry, MaybeArray, HeadSafe, Unhead, TemplateParams } from '@unhead/schema';
 
 declare const SelfClosingTags: Set<string>;
+declare const DupeableTags: Set<string>;
 declare const TagsWithInnerContent: Set<string>;
 declare const HasElementTags: Set<string>;
 declare const ValidHeadTags: Set<string>;
@@ -11,6 +9,8 @@ declare const UniqueTags: Set<string>;
 declare const TagConfigKeys: Set<string>;
 declare const IsBrowser: boolean;
 declare const composableNames: string[];
+declare const NetworkEvents: Set<string>;
+declare const ScriptNetworkEvents: Set<string>;
 
 declare function defineHeadPlugin(plugin: HeadPluginInput): HeadPluginInput;
 
@@ -31,20 +31,14 @@ declare function unpackMeta<T extends MetaFlatInput>(input: T): Required<Head>['
  */
 declare function packMeta<T extends Required<Head>['meta']>(inputs: T): MetaFlatInput;
 
-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 normaliseTag<T extends HeadTag>(tagName: T['tag'], input: HeadTag['props'] | string, e: HeadEntry<T>, normalizedProps?: HeadTag['props']): 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): Thenable<T['props']>;
+declare function normaliseProps<T extends HeadTag>(props: T['props'], virtual?: boolean): T["props"];
 declare const TagEntityBits = 10;
-declare function normaliseEntryTags<T extends object = Head>(e: HeadEntry<T>): Thenable<HeadTag[]>;
+declare function normaliseEntryTags<T extends object = Head>(e: HeadEntry<T>): HeadTag[];
 
 declare function whitelistSafeInput(input: Record<string, MaybeArray<Record<string, string>>>): HeadSafe;
 
-declare const NetworkEvents: Set<string>;
-declare const ScriptNetworkEvents: Set<string>;
-
 declare const TAG_WEIGHTS: {
     readonly base: -10;
     readonly title: 10;
@@ -54,11 +48,11 @@ declare const TAG_ALIASES: {
     readonly high: -10;
     readonly low: 20;
 };
-declare function tagWeight<T extends HeadTag>(tag: T): number;
 declare const SortModifiers: {
     prefix: string;
     offset: number;
 }[];
+declare function tagWeight<T extends HeadTag>(head: Unhead<any>, tag: T): number;
 
 declare function tagDedupeKey<T extends HeadTag>(tag: T): string | false;
 
@@ -66,4 +60,7 @@ declare function processTemplateParams(s: string, p: TemplateParams, sep: string
 
 declare function resolveTitleTemplate(template: string | ((title?: string) => string | null) | null, title?: string): string | null;
 
-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 };
+type Arrayable<T> = T | Array<T>;
+declare function asArray<T>(value: Arrayable<T>): T[];
+
+export { type Arrayable, DupeableTags, 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 };

package/dist/index.mjs

@@ -1,10 +1,7 @@
 import { unpackToString, unpackToArray, packArray } from 'packrup';
 
-function asArray(value) {
-  return Array.isArray(value) ? value : [value];
-}
-
 const SelfClosingTags = /* @__PURE__ */ new Set(["meta", "link", "base"]);
+const DupeableTags = /* @__PURE__ */ new Set(["link", "style", "script", "noscript"]);
 const TagsWithInnerContent = /* @__PURE__ */ new Set(["title", "titleTemplate", "script", "style", "noscript"]);
 const HasElementTags = /* @__PURE__ */ new Set([
   "base",
@@ -28,10 +25,9 @@ const ValidHeadTags = /* @__PURE__ */ new Set([
   "noscript"
 ]);
 const UniqueTags = /* @__PURE__ */ new Set(["base", "title", "titleTemplate", "bodyAttrs", "htmlAttrs", "templateParams"]);
-const TagConfigKeys = /* @__PURE__ */ new Set(["tagPosition", "tagPriority", "tagDuplicateStrategy", "children", "innerHTML", "textContent", "processTemplateParams"]);
+const TagConfigKeys = /* @__PURE__ */ new Set(["key", "tagPosition", "tagPriority", "tagDuplicateStrategy", "innerHTML", "textContent", "processTemplateParams"]);
 const IsBrowser = typeof window !== "undefined";
 const composableNames = [
-  "getActiveHead",
   "useHead",
   "useSeoMeta",
   "useHeadSafe",
@@ -39,6 +35,8 @@ const composableNames = [
   "useServerSeoMeta",
   "useServerHeadSafe"
 ];
+const NetworkEvents = /* @__PURE__ */ new Set(["onload", "onerror", "onabort", "onprogress", "onloadstart"]);
+const ScriptNetworkEvents = /* @__PURE__ */ new Set(["onload", "onerror"]);
 
 function defineHeadPlugin(plugin) {
   return plugin;
@@ -285,40 +283,55 @@ function packMeta(inputs) {
   });
 }
 
-function thenable(val, thenFn) {
-  if (val instanceof Promise) {
-    return val.then(thenFn);
+const allowedMetaProperties = ["name", "property", "http-equiv"];
+function tagDedupeKey(tag) {
+  const { props, tag: tagName } = tag;
+  if (UniqueTags.has(tagName))
+    return tagName;
+  if (tagName === "link" && props.rel === "canonical")
+    return "canonical";
+  if (props.charset)
+    return "charset";
+  if (props.id) {
+    return `${tagName}:id:${props.id}`;
   }
-  return thenFn(val);
+  for (const n of allowedMetaProperties) {
+    if (props[n] !== undefined) {
+      return `${tagName}:${n}:${props[n]}`;
+    }
+  }
+  return false;
 }
 
 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 },
+    typeof input === "object" && typeof input !== "function" ? { ...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
   };
   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;
+    const val = tag.props[k] !== undefined ? tag.props[k] : e[k];
+    if (val !== undefined) {
+      if (!(k === "innerHTML" || k === "textContent") || TagsWithInnerContent.has(tag.tag)) {
+        tag[k] = val;
       }
       delete tag.props[k];
     }
   }
-  if (tag.props.body) {
-    tag.tagPosition = "bodyClose";
-    delete tag.props.body;
+  if (tag.key && DupeableTags.has(tag.tag)) {
+    tag.props["data-hid"] = tag._h = hashCode(tag.key);
   }
+  const generatedKey = tagDedupeKey(tag);
+  if (generatedKey && !generatedKey.startsWith("meta:og:") && !generatedKey.startsWith("meta:twitter:")) {
+    delete tag.key;
+  }
+  const dedupe = generatedKey || (tag.key ? `${tag.tag}:${tag.key}` : false);
+  if (dedupe)
+    tag._d = dedupe;
   if (tag.tag === "script") {
     if (typeof tag.innerHTML === "object") {
       tag.innerHTML = JSON.stringify(tag.innerHTML);
@@ -334,20 +347,16 @@ function normaliseStyleClassProps(key, v) {
   }
   return String(Array.isArray(v) ? v.join(sep) : v)?.split(sep).filter((c) => Boolean(c.trim())).join(sep);
 }
-function nestedNormaliseProps(props, virtual, keys, startIndex) {
-  for (let i = startIndex; i < keys.length; i += 1) {
-    const k = keys[i];
+function normaliseProps(props, virtual = false) {
+  for (const k in props) {
     if (k === "class" || k === "style") {
       props[k] = normaliseStyleClassProps(k, props[k]);
       continue;
     }
-    if (props[k] instanceof Promise) {
-      return props[k].then((val) => {
-        props[k] = val;
-        return nestedNormaliseProps(props, virtual, keys, i);
-      });
-    }
     if (!virtual && !TagConfigKeys.has(k)) {
+      if (typeof props[k] === "function" && !String(k).startsWith("on")) {
+        props[k] = props[k]();
+      }
       const v = String(props[k]);
       const isDataKey = k.startsWith("data-");
       if (v === "true" || v === "") {
@@ -360,60 +369,37 @@ function nestedNormaliseProps(props, virtual, keys, startIndex) {
       }
     }
   }
-}
-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;
-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 = [];
+  const tags = [];
   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)) {
+    if (v === undefined || !ValidHeadTags.has(k)) {
       continue;
     }
     if (Array.isArray(v)) {
       for (const props of v) {
-        tagPromises.push(normaliseTag(k, props, e));
+        tags.push(normaliseTag(k, props, e));
       }
       continue;
+    } else if (typeof v === "function" && k !== "titleTemplate") {
+      input[k] = v();
+      continue;
     }
-    tagPromises.push(normaliseTag(k, v, e));
-  }
-  if (tagPromises.length === 0) {
-    return [];
+    tags.push(normaliseTag(k, v, e));
   }
-  const headTags = [];
-  return thenable(nestedNormaliseEntryTags(headTags, tagPromises, 0), () => headTags.map((t, i) => {
+  return tags.flat().map((t, i) => {
     t._e = e._i;
     e.mode && (t._m = e.mode);
     t._p = (e._i << TagEntityBits) + i;
     return t;
-  }));
+  });
 }
 
 const WhitelistAttributes = {
@@ -509,7 +495,7 @@ function whitelistSafeInput(input) {
                   try {
                     const jsonVal = typeof script[s] === "string" ? JSON.parse(script[s]) : script[s];
                     safeScript[s] = JSON.stringify(jsonVal, null, 0);
-                  } catch (e) {
+                  } catch {
                   }
                 } else {
                   safeScript[s] = script[s];
@@ -525,9 +511,6 @@ function whitelistSafeInput(input) {
   return filtered;
 }
 
-const NetworkEvents = /* @__PURE__ */ new Set(["onload", "onerror", "onabort", "onprogress", "onloadstart"]);
-const ScriptNetworkEvents = /* @__PURE__ */ new Set(["onload", "onerror"]);
-
 const TAG_WEIGHTS = {
   // tags
   base: -10,
@@ -539,10 +522,16 @@ const TAG_ALIASES = {
   high: -10,
   low: 20
 };
-function tagWeight(tag) {
+const SortModifiers = [{ prefix: "before:", offset: -1 }, { prefix: "after:", offset: 1 }];
+const importRe = /@import/;
+const isTruthy = (val) => val === "" || val === true;
+function tagWeight(head, tag) {
   const priority = tag.tagPriority;
   if (typeof priority === "number")
     return priority;
+  const isScript = tag.tag === "script";
+  const isLink = tag.tag === "link";
+  const isStyle = tag.tag === "style";
   let weight = 100;
   if (tag.tag === "meta") {
     if (tag.props["http-equiv"] === "content-security-policy")
@@ -551,7 +540,7 @@ function tagWeight(tag) {
       weight = -20;
     else if (tag.props.name === "viewport")
       weight = -15;
-  } else if (tag.tag === "link" && tag.props.rel === "preconnect") {
+  } else if (isLink && tag.props.rel === "preconnect") {
     weight = 20;
   } else if (tag.tag in TAG_WEIGHTS) {
     weight = TAG_WEIGHTS[tag.tag];
@@ -559,28 +548,28 @@ function tagWeight(tag) {
   if (priority && priority in TAG_ALIASES) {
     return weight + TAG_ALIASES[priority];
   }
-  return weight;
-}
-const SortModifiers = [{ prefix: "before:", offset: -1 }, { prefix: "after:", offset: 1 }];
-
-const allowedMetaProperties = ["name", "property", "http-equiv"];
-function tagDedupeKey(tag) {
-  const { props, tag: tagName } = tag;
-  if (UniqueTags.has(tagName))
-    return tagName;
-  if (tagName === "link" && props.rel === "canonical")
-    return "canonical";
-  if (props.charset)
-    return "charset";
-  if (props.id) {
-    return `${tagName}:id:${props.id}`;
+  if (tag.tagPosition && tag.tagPosition !== "head") {
+    return weight;
   }
-  for (const n of allowedMetaProperties) {
-    if (props[n] !== void 0) {
-      return `${tagName}:${n}:${props[n]}`;
-    }
+  if (!head.ssr || head.resolvedOptions.disableCapoSorting) {
+    return weight;
   }
-  return false;
+  if (isScript && isTruthy(tag.props.async)) {
+    weight = 30;
+  } else if (isStyle && tag.innerHTML && importRe.test(tag.innerHTML)) {
+    weight = 40;
+  } else if (isScript && tag.props.src && !isTruthy(tag.props.defer) && !isTruthy(tag.props.async) && tag.props.type !== "module" && !tag.props.type?.endsWith("json")) {
+    weight = 50;
+  } else if (isLink && tag.props.rel === "stylesheet" || tag.tag === "style") {
+    weight = 60;
+  } else if (isLink && (tag.props.rel === "preload" || tag.props.rel === "modulepreload")) {
+    weight = 70;
+  } else if (isScript && isTruthy(tag.props.defer) && tag.props.src && !isTruthy(tag.props.async)) {
+    weight = 80;
+  } else if (isLink && (tag.props.rel === "prefetch" || tag.props.rel === "dns-prefetch" || tag.props.rel === "prerender")) {
+    weight = 90;
+  }
+  return weight;
 }
 
 const sepSub = "%separator";
@@ -594,10 +583,10 @@ function sub(p, token, isJson = false) {
   } else {
     val = p[token];
   }
-  if (val !== void 0) {
+  if (val !== undefined) {
     return isJson ? (val || "").replace(/"/g, '\\"') : val || "";
   }
-  return void 0;
+  return undefined;
 }
 const sepSubRe = new RegExp(`${sepSub}(?:\\s*${sepSub})*`, "g");
 function processTemplateParams(s, p, sep, isJson = false) {
@@ -618,7 +607,7 @@ function processTemplateParams(s, p, sep, isJson = false) {
       return token;
     }
     const re = sub(p, token.slice(1), isJson);
-    return re !== void 0 ? re : token;
+    return re !== undefined ? re : token;
   }).trim();
   if (hasSepSub) {
     if (s.endsWith(sepSub))
@@ -638,4 +627,8 @@ function resolveTitleTemplate(template, title) {
   return template;
 }
 
-export { 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, thenable, unpackMeta, whitelistSafeInput };
+function asArray(value) {
+  return Array.isArray(value) ? value : [value];
+}
+
+export { DupeableTags, 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 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unhead/shared",
   "type": "module",
-  "version": "1.11.15",
+  "version": "2.0.0-alpha.0",
   "author": "Harlan Wilton <harlan@harlanzw.com>",
   "license": "MIT",
   "funding": "https://github.com/sponsors/harlan-zw",
@@ -35,11 +35,10 @@
   ],
   "dependencies": {
     "packrup": "^0.1.2",
-    "@unhead/schema": "1.11.15"
+    "@unhead/schema": "2.0.0-alpha.0"
   },
   "scripts": {
     "build": "unbuild .",
-    "stub": "unbuild . --stub",
-    "export:sizes": "npx export-size . -r"
+    "stub": "unbuild . --stub"
   }
 }