@unhead/shared 1.5.5 → 1.6.1

package/dist/index.cjs

@@ -180,72 +180,145 @@ function unpackToString(value, options) {
   }).join(options.entrySeparator || "");
 }
 
+const p = (p2) => ({ keyValue: p2, metaKey: "property" });
+const k = (p2) => ({ keyValue: p2 });
 const MetaPackingSchema = {
-  robots: {
+  appleItunesApp: {
     unpack: {
-      keyValueSeparator: ":"
+      entrySeparator: ", ",
+      resolve({ key, value }) {
+        return `${fixKeyCase(key)}=${value}`;
+      }
     }
   },
-  // Pragma directives
+  articleAuthor: p("article:author"),
+  articleExpirationTime: p("article:expiration_time"),
+  articleModifiedTime: p("article:modified_time"),
+  articlePublishedTime: p("article:published_time"),
+  articleSection: p("article:section"),
+  articleTag: p("article:tag"),
+  bookAuthor: p("book:author"),
+  bookIsbn: p("book:isbn"),
+  bookReleaseDate: p("book:release_date"),
+  bookTag: p("book:tag"),
+  charset: {
+    metaKey: "charset"
+  },
   contentSecurityPolicy: {
     unpack: {
-      keyValueSeparator: " ",
-      entrySeparator: "; "
+      entrySeparator: "; ",
+      resolve({ key, value }) {
+        return `${fixKeyCase(key)} ${value}`;
+      }
     },
     metaKey: "http-equiv"
   },
-  fbAppId: {
-    keyValue: "fb:app_id",
-    metaKey: "property"
-  },
-  ogSiteName: {
-    keyValue: "og:site_name"
-  },
-  msapplicationTileImage: {
-    keyValue: "msapplication-TileImage"
-  },
-  /**
-   * Tile colour for windows
-   */
-  msapplicationTileColor: {
-    keyValue: "msapplication-TileColor"
-  },
-  /**
-   * URL of a config for windows tile.
-   */
-  msapplicationConfig: {
-    keyValue: "msapplication-Config"
-  },
-  charset: {
-    metaKey: "charset"
-  },
   contentType: {
     metaKey: "http-equiv"
   },
   defaultStyle: {
     metaKey: "http-equiv"
   },
-  xUaCompatible: {
-    metaKey: "http-equiv"
-  },
+  fbAppId: p("fb:app_id"),
+  msapplicationConfig: k("msapplication-Config"),
+  msapplicationTileColor: k("msapplication-TileColor"),
+  msapplicationTileImage: k("msapplication-TileImage"),
+  ogAudioSecureUrl: p("og:audio:secure_url"),
+  ogAudioType: p("og:audio:type"),
+  ogAudioUrl: p("og:audio"),
+  ogDescription: p("og:description"),
+  ogDeterminer: p("og:determiner"),
+  ogImage: p("og:image"),
+  ogImageAlt: p("og:image:alt"),
+  ogImageHeight: p("og:image:height"),
+  ogImageSecureUrl: p("og:image:secure_url"),
+  ogImageType: p("og:image:type"),
+  ogImageUrl: p("og:image"),
+  ogImageWidth: p("og:image:width"),
+  ogLocale: p("og:locale"),
+  ogLocaleAlternate: p("og:locale:alternate"),
+  ogSiteName: p("og:site_name"),
+  ogTitle: p("og:title"),
+  ogType: p("og:type"),
+  ogUrl: p("og:url"),
+  ogVideo: p("og:video"),
+  ogVideoAlt: p("og:video:alt"),
+  ogVideoHeight: p("og:video:height"),
+  ogVideoSecureUrl: p("og:video:secure_url"),
+  ogVideoType: p("og:video:type"),
+  ogVideoUrl: p("og:video"),
+  ogVideoWidth: p("og:video:width"),
+  profileFirstName: p("profile:first_name"),
+  profileGender: p("profile:gender"),
+  profileLastName: p("profile:last_name"),
+  profileUsername: p("profile:username"),
   refresh: {
+    metaKey: "http-equiv",
+    unpack: {
+      entrySeparator: ";",
+      keyValueSeparator: "=",
+      resolve({ key, value }) {
+        if (key === "seconds")
+          return `${value}`;
+      }
+    }
+  },
+  robots: {
+    unpack: {
+      entrySeparator: ", ",
+      resolve({ key, value }) {
+        if (typeof value === "boolean")
+          return `${fixKeyCase(key)}`;
+        else
+          return `${fixKeyCase(key)}:${value}`;
+      }
+    }
+  },
+  twitterAppIdGoogleplay: k("twitter:app:id:googleplay"),
+  twitterAppIdIpad: k("twitter:app:id:ipad"),
+  twitterAppIdIphone: k("twitter:app:id:iphone"),
+  twitterAppNameGoogleplay: k("twitter:app:name:googleplay"),
+  twitterAppNameIpad: k("twitter:app:name:ipad"),
+  twitterAppNameIphone: k("twitter:app:name:iphone"),
+  twitterAppUrlGoogleplay: k("twitter:app:url:googleplay"),
+  twitterAppUrlIpad: k("twitter:app:url:ipad"),
+  twitterAppUrlIphone: k("twitter:app:url:iphone"),
+  twitterCard: k("twitter:card"),
+  twitterCreator: k("twitter:creator"),
+  twitterCreatorId: k("twitter:creator:id"),
+  twitterData1: k("twitter:data1"),
+  twitterData2: k("twitter:data2"),
+  twitterDescription: k("twitter:description"),
+  twitterImage: k("twitter:image"),
+  twitterImageAlt: k("twitter:image:alt"),
+  /*************************************************/
+  // not part of Twitter's card specification anymore
+  twitterImageHeight: k("twitter:image:height"),
+  twitterImageType: k("twitter:image:type"),
+  twitterImageUrl: k("twitter:image"),
+  twitterImageWidth: k("twitter:image:width"),
+  /**************************************************/
+  twitterLabel1: k("twitter:label1"),
+  twitterLabel2: k("twitter:label2"),
+  twitterPlayer: k("twitter:player"),
+  twitterPlayerHeight: k("twitter:player:height"),
+  twitterPlayerStream: k("twitter:player:stream"),
+  twitterPlayerWidth: k("twitter:player:width"),
+  twitterSite: k("twitter:site"),
+  twitterSiteId: k("twitter:site:id"),
+  twitterTitle: k("twitter:title"),
+  xUaCompatible: {
     metaKey: "http-equiv"
   }
 };
-const ColonPrefixKeys = /^(og|twitter|fb)/;
-const PropertyPrefixKeys = /^(og|fb)/;
 function resolveMetaKeyType(key) {
-  return PropertyPrefixKeys.test(key) ? "property" : MetaPackingSchema[key]?.metaKey || "name";
+  return MetaPackingSchema[key]?.metaKey || "name";
 }
 function resolveMetaKeyValue(key) {
   return MetaPackingSchema[key]?.keyValue || fixKeyCase(key);
 }
 function fixKeyCase(key) {
-  key = key.replace(/([A-Z])/g, "-$1").toLowerCase();
-  if (ColonPrefixKeys.test(key)) {
-    key = key.replace("secure-url", "secure_url").replace(/-/g, ":");
-  }
-  return key;
+  return key.replace(/([A-Z])/g, "-$1").toLowerCase();
 }
 function changeKeyCasingDeep(input) {
   if (Array.isArray(input)) {
@@ -266,7 +339,6 @@ function resolvePackedMetaObjectValue(value, key) {
     changeKeyCasingDeep(value),
     {
       entrySeparator: ", ",
-      keyValueSeparator: "=",
       resolve({ value: value2, key: key2 }) {
         if (value2 === null)
           return "";
@@ -277,35 +349,47 @@ function resolvePackedMetaObjectValue(value, key) {
     }
   );
 }
-const OpenGraphInputs = ["og:Image", "og:Video", "og:Audio", "twitter:Image"];
 const SimpleArrayUnpackMetas = ["themeColor"];
-function unpackMeta(input) {
+function getMeta(key, value) {
+  const meta = {};
+  const metaKeyType = resolveMetaKeyType(key);
+  if (metaKeyType === "charset") {
+    meta[metaKeyType] = value;
+  } else {
+    meta[metaKeyType] = resolveMetaKeyValue(key);
+    meta.content = value;
+  }
+  return meta;
+}
+function flattenMetaObjects(input, prefix = "") {
   const extras = [];
-  OpenGraphInputs.forEach((key) => {
-    const propKey = key.toLowerCase();
-    const inputKey = `${key.replace(":", "")}`;
-    const val = input[inputKey];
-    if (typeof val === "object") {
-      (Array.isArray(val) ? val : [val]).forEach((entry) => {
-        if (!entry)
-          return;
-        const unpackedEntry = unpackToArray(entry, {
-          key: key.startsWith("og") ? "property" : "name",
-          value: "content",
-          resolveKeyData({ key: key2 }) {
-            return fixKeyCase(`${propKey}${key2 !== "url" ? `:${key2}` : ""}`);
-          },
-          resolveValueData({ value }) {
-            return typeof value === "number" ? value.toString() : value;
-          }
-        });
-        extras.push(
-          ...unpackedEntry.sort((a, b) => a.property === propKey ? -1 : b.property === propKey ? 1 : 0)
-        );
-      });
-      delete input[inputKey];
+  for (const [key, value] of Object.entries(input)) {
+    const fullkey = `${prefix}${prefix === "" ? key : key.charAt(0).toUpperCase() + key.slice(1)}`;
+    const unpacker = MetaPackingSchema[key]?.unpack;
+    if (unpacker) {
+      extras.push(getMeta(fullkey, unpackToString(value, unpacker)));
+      delete input[key];
+      continue;
     }
-  });
+    if (typeof value === "object") {
+      const children = Array.isArray(value) ? value : [value];
+      for (const child of children) {
+        if (typeof child === "object")
+          extras.push(...flattenMetaObjects(child, fullkey));
+        else
+          extras.push(getMeta(fullkey, child));
+      }
+      delete input[key];
+    } else {
+      extras.push(getMeta(fullkey, value));
+      if (typeof input === "object")
+        delete input[key];
+    }
+  }
+  return extras;
+}
+function unpackMeta(input) {
+  const extras = [];
   SimpleArrayUnpackMetas.forEach((meta2) => {
     if (input[meta2] && typeof input[meta2] !== "string") {
       const val = Array.isArray(input[meta2]) ? input[meta2] : [input[meta2]];
@@ -318,6 +402,19 @@ function unpackMeta(input) {
       });
     }
   });
+  extras.push(
+    ...flattenMetaObjects(input).sort((a, b) => {
+      if (a.property?.startsWith("og:image")) {
+        if (b.property?.startsWith("og:image"))
+          return 0;
+        else
+          return -1;
+      }
+      if (b.property?.startsWith("og:image"))
+        return 1;
+      return 0;
+    })
+  );
   const meta = unpackToArray(input, {
     key({ key }) {
       return resolveMetaKeyType(key);
@@ -343,8 +440,8 @@ function packMeta(inputs) {
   return packArray(inputs, {
     key: ["name", "property", "httpEquiv", "http-equiv", "charset"],
     value: ["content", "charset"],
-    resolveKey(k) {
-      let key = mappedPackingSchema.filter((sk) => sk[1] === k)?.[0]?.[0] || k;
+    resolveKey(k2) {
+      let key = mappedPackingSchema.filter((sk) => sk[1] === k2)?.[0]?.[0] || k2;
       const replacer = (_, letter) => letter?.toUpperCase();
       key = key.replace(/:([a-z])/g, replacer).replace(/-([a-z])/g, replacer);
       return key;
@@ -554,27 +651,27 @@ async function normaliseEntryTags(e) {
 
 const TAG_WEIGHTS = {
   // tags
-  base: -1,
-  title: 1
+  base: -10,
+  title: 10
 };
 const TAG_ALIASES = {
   // relative scores to their default values
-  critical: -8,
-  high: -1,
-  low: 2
+  critical: -80,
+  high: -10,
+  low: 20
 };
 function tagWeight(tag) {
-  let weight = 10;
+  let weight = 100;
   const priority = tag.tagPriority;
   if (typeof priority === "number")
     return priority;
   if (tag.tag === "meta") {
     if (tag.props.charset)
-      weight = -2;
+      weight = -20;
     if (tag.props["http-equiv"] === "content-security-policy")
       weight = 0;
   } else if (tag.tag === "link" && tag.props.rel === "preconnect") {
-    weight = 2;
+    weight = 20;
   } else if (tag.tag in TAG_WEIGHTS) {
     weight = TAG_WEIGHTS[tag.tag];
   }

package/dist/index.d.cts

@@ -45,13 +45,13 @@ declare const TagEntityBits = 10;
 declare function normaliseEntryTags<T extends {} = Head>(e: HeadEntry<T>): Promise<HeadTag[]>;
 
 declare const TAG_WEIGHTS: {
-    readonly base: -1;
-    readonly title: 1;
+    readonly base: -10;
+    readonly title: 10;
 };
 declare const TAG_ALIASES: {
-    readonly critical: -8;
-    readonly high: -1;
-    readonly low: 2;
+    readonly critical: -80;
+    readonly high: -10;
+    readonly low: 20;
 };
 declare function tagWeight<T extends HeadTag>(tag: T): any;
 declare const SortModifiers: {

package/dist/index.d.mts

@@ -45,13 +45,13 @@ declare const TagEntityBits = 10;
 declare function normaliseEntryTags<T extends {} = Head>(e: HeadEntry<T>): Promise<HeadTag[]>;
 
 declare const TAG_WEIGHTS: {
-    readonly base: -1;
-    readonly title: 1;
+    readonly base: -10;
+    readonly title: 10;
 };
 declare const TAG_ALIASES: {
-    readonly critical: -8;
-    readonly high: -1;
-    readonly low: 2;
+    readonly critical: -80;
+    readonly high: -10;
+    readonly low: 20;
 };
 declare function tagWeight<T extends HeadTag>(tag: T): any;
 declare const SortModifiers: {

package/dist/index.d.ts

@@ -45,13 +45,13 @@ declare const TagEntityBits = 10;
 declare function normaliseEntryTags<T extends {} = Head>(e: HeadEntry<T>): Promise<HeadTag[]>;
 
 declare const TAG_WEIGHTS: {
-    readonly base: -1;
-    readonly title: 1;
+    readonly base: -10;
+    readonly title: 10;
 };
 declare const TAG_ALIASES: {
-    readonly critical: -8;
-    readonly high: -1;
-    readonly low: 2;
+    readonly critical: -80;
+    readonly high: -10;
+    readonly low: 20;
 };
 declare function tagWeight<T extends HeadTag>(tag: T): any;
 declare const SortModifiers: {

package/dist/index.mjs

@@ -178,72 +178,145 @@ function unpackToString(value, options) {
   }).join(options.entrySeparator || "");
 }
 
+const p = (p2) => ({ keyValue: p2, metaKey: "property" });
+const k = (p2) => ({ keyValue: p2 });
 const MetaPackingSchema = {
-  robots: {
+  appleItunesApp: {
     unpack: {
-      keyValueSeparator: ":"
+      entrySeparator: ", ",
+      resolve({ key, value }) {
+        return `${fixKeyCase(key)}=${value}`;
+      }
     }
   },
-  // Pragma directives
+  articleAuthor: p("article:author"),
+  articleExpirationTime: p("article:expiration_time"),
+  articleModifiedTime: p("article:modified_time"),
+  articlePublishedTime: p("article:published_time"),
+  articleSection: p("article:section"),
+  articleTag: p("article:tag"),
+  bookAuthor: p("book:author"),
+  bookIsbn: p("book:isbn"),
+  bookReleaseDate: p("book:release_date"),
+  bookTag: p("book:tag"),
+  charset: {
+    metaKey: "charset"
+  },
   contentSecurityPolicy: {
     unpack: {
-      keyValueSeparator: " ",
-      entrySeparator: "; "
+      entrySeparator: "; ",
+      resolve({ key, value }) {
+        return `${fixKeyCase(key)} ${value}`;
+      }
     },
     metaKey: "http-equiv"
   },
-  fbAppId: {
-    keyValue: "fb:app_id",
-    metaKey: "property"
-  },
-  ogSiteName: {
-    keyValue: "og:site_name"
-  },
-  msapplicationTileImage: {
-    keyValue: "msapplication-TileImage"
-  },
-  /**
-   * Tile colour for windows
-   */
-  msapplicationTileColor: {
-    keyValue: "msapplication-TileColor"
-  },
-  /**
-   * URL of a config for windows tile.
-   */
-  msapplicationConfig: {
-    keyValue: "msapplication-Config"
-  },
-  charset: {
-    metaKey: "charset"
-  },
   contentType: {
     metaKey: "http-equiv"
   },
   defaultStyle: {
     metaKey: "http-equiv"
   },
-  xUaCompatible: {
-    metaKey: "http-equiv"
-  },
+  fbAppId: p("fb:app_id"),
+  msapplicationConfig: k("msapplication-Config"),
+  msapplicationTileColor: k("msapplication-TileColor"),
+  msapplicationTileImage: k("msapplication-TileImage"),
+  ogAudioSecureUrl: p("og:audio:secure_url"),
+  ogAudioType: p("og:audio:type"),
+  ogAudioUrl: p("og:audio"),
+  ogDescription: p("og:description"),
+  ogDeterminer: p("og:determiner"),
+  ogImage: p("og:image"),
+  ogImageAlt: p("og:image:alt"),
+  ogImageHeight: p("og:image:height"),
+  ogImageSecureUrl: p("og:image:secure_url"),
+  ogImageType: p("og:image:type"),
+  ogImageUrl: p("og:image"),
+  ogImageWidth: p("og:image:width"),
+  ogLocale: p("og:locale"),
+  ogLocaleAlternate: p("og:locale:alternate"),
+  ogSiteName: p("og:site_name"),
+  ogTitle: p("og:title"),
+  ogType: p("og:type"),
+  ogUrl: p("og:url"),
+  ogVideo: p("og:video"),
+  ogVideoAlt: p("og:video:alt"),
+  ogVideoHeight: p("og:video:height"),
+  ogVideoSecureUrl: p("og:video:secure_url"),
+  ogVideoType: p("og:video:type"),
+  ogVideoUrl: p("og:video"),
+  ogVideoWidth: p("og:video:width"),
+  profileFirstName: p("profile:first_name"),
+  profileGender: p("profile:gender"),
+  profileLastName: p("profile:last_name"),
+  profileUsername: p("profile:username"),
   refresh: {
+    metaKey: "http-equiv",
+    unpack: {
+      entrySeparator: ";",
+      keyValueSeparator: "=",
+      resolve({ key, value }) {
+        if (key === "seconds")
+          return `${value}`;
+      }
+    }
+  },
+  robots: {
+    unpack: {
+      entrySeparator: ", ",
+      resolve({ key, value }) {
+        if (typeof value === "boolean")
+          return `${fixKeyCase(key)}`;
+        else
+          return `${fixKeyCase(key)}:${value}`;
+      }
+    }
+  },
+  twitterAppIdGoogleplay: k("twitter:app:id:googleplay"),
+  twitterAppIdIpad: k("twitter:app:id:ipad"),
+  twitterAppIdIphone: k("twitter:app:id:iphone"),
+  twitterAppNameGoogleplay: k("twitter:app:name:googleplay"),
+  twitterAppNameIpad: k("twitter:app:name:ipad"),
+  twitterAppNameIphone: k("twitter:app:name:iphone"),
+  twitterAppUrlGoogleplay: k("twitter:app:url:googleplay"),
+  twitterAppUrlIpad: k("twitter:app:url:ipad"),
+  twitterAppUrlIphone: k("twitter:app:url:iphone"),
+  twitterCard: k("twitter:card"),
+  twitterCreator: k("twitter:creator"),
+  twitterCreatorId: k("twitter:creator:id"),
+  twitterData1: k("twitter:data1"),
+  twitterData2: k("twitter:data2"),
+  twitterDescription: k("twitter:description"),
+  twitterImage: k("twitter:image"),
+  twitterImageAlt: k("twitter:image:alt"),
+  /*************************************************/
+  // not part of Twitter's card specification anymore
+  twitterImageHeight: k("twitter:image:height"),
+  twitterImageType: k("twitter:image:type"),
+  twitterImageUrl: k("twitter:image"),
+  twitterImageWidth: k("twitter:image:width"),
+  /**************************************************/
+  twitterLabel1: k("twitter:label1"),
+  twitterLabel2: k("twitter:label2"),
+  twitterPlayer: k("twitter:player"),
+  twitterPlayerHeight: k("twitter:player:height"),
+  twitterPlayerStream: k("twitter:player:stream"),
+  twitterPlayerWidth: k("twitter:player:width"),
+  twitterSite: k("twitter:site"),
+  twitterSiteId: k("twitter:site:id"),
+  twitterTitle: k("twitter:title"),
+  xUaCompatible: {
     metaKey: "http-equiv"
   }
 };
-const ColonPrefixKeys = /^(og|twitter|fb)/;
-const PropertyPrefixKeys = /^(og|fb)/;
 function resolveMetaKeyType(key) {
-  return PropertyPrefixKeys.test(key) ? "property" : MetaPackingSchema[key]?.metaKey || "name";
+  return MetaPackingSchema[key]?.metaKey || "name";
 }
 function resolveMetaKeyValue(key) {
   return MetaPackingSchema[key]?.keyValue || fixKeyCase(key);
 }
 function fixKeyCase(key) {
-  key = key.replace(/([A-Z])/g, "-$1").toLowerCase();
-  if (ColonPrefixKeys.test(key)) {
-    key = key.replace("secure-url", "secure_url").replace(/-/g, ":");
-  }
-  return key;
+  return key.replace(/([A-Z])/g, "-$1").toLowerCase();
 }
 function changeKeyCasingDeep(input) {
   if (Array.isArray(input)) {
@@ -264,7 +337,6 @@ function resolvePackedMetaObjectValue(value, key) {
     changeKeyCasingDeep(value),
     {
       entrySeparator: ", ",
-      keyValueSeparator: "=",
       resolve({ value: value2, key: key2 }) {
         if (value2 === null)
           return "";
@@ -275,35 +347,47 @@ function resolvePackedMetaObjectValue(value, key) {
     }
   );
 }
-const OpenGraphInputs = ["og:Image", "og:Video", "og:Audio", "twitter:Image"];
 const SimpleArrayUnpackMetas = ["themeColor"];
-function unpackMeta(input) {
+function getMeta(key, value) {
+  const meta = {};
+  const metaKeyType = resolveMetaKeyType(key);
+  if (metaKeyType === "charset") {
+    meta[metaKeyType] = value;
+  } else {
+    meta[metaKeyType] = resolveMetaKeyValue(key);
+    meta.content = value;
+  }
+  return meta;
+}
+function flattenMetaObjects(input, prefix = "") {
   const extras = [];
-  OpenGraphInputs.forEach((key) => {
-    const propKey = key.toLowerCase();
-    const inputKey = `${key.replace(":", "")}`;
-    const val = input[inputKey];
-    if (typeof val === "object") {
-      (Array.isArray(val) ? val : [val]).forEach((entry) => {
-        if (!entry)
-          return;
-        const unpackedEntry = unpackToArray(entry, {
-          key: key.startsWith("og") ? "property" : "name",
-          value: "content",
-          resolveKeyData({ key: key2 }) {
-            return fixKeyCase(`${propKey}${key2 !== "url" ? `:${key2}` : ""}`);
-          },
-          resolveValueData({ value }) {
-            return typeof value === "number" ? value.toString() : value;
-          }
-        });
-        extras.push(
-          ...unpackedEntry.sort((a, b) => a.property === propKey ? -1 : b.property === propKey ? 1 : 0)
-        );
-      });
-      delete input[inputKey];
+  for (const [key, value] of Object.entries(input)) {
+    const fullkey = `${prefix}${prefix === "" ? key : key.charAt(0).toUpperCase() + key.slice(1)}`;
+    const unpacker = MetaPackingSchema[key]?.unpack;
+    if (unpacker) {
+      extras.push(getMeta(fullkey, unpackToString(value, unpacker)));
+      delete input[key];
+      continue;
     }
-  });
+    if (typeof value === "object") {
+      const children = Array.isArray(value) ? value : [value];
+      for (const child of children) {
+        if (typeof child === "object")
+          extras.push(...flattenMetaObjects(child, fullkey));
+        else
+          extras.push(getMeta(fullkey, child));
+      }
+      delete input[key];
+    } else {
+      extras.push(getMeta(fullkey, value));
+      if (typeof input === "object")
+        delete input[key];
+    }
+  }
+  return extras;
+}
+function unpackMeta(input) {
+  const extras = [];
   SimpleArrayUnpackMetas.forEach((meta2) => {
     if (input[meta2] && typeof input[meta2] !== "string") {
       const val = Array.isArray(input[meta2]) ? input[meta2] : [input[meta2]];
@@ -316,6 +400,19 @@ function unpackMeta(input) {
       });
     }
   });
+  extras.push(
+    ...flattenMetaObjects(input).sort((a, b) => {
+      if (a.property?.startsWith("og:image")) {
+        if (b.property?.startsWith("og:image"))
+          return 0;
+        else
+          return -1;
+      }
+      if (b.property?.startsWith("og:image"))
+        return 1;
+      return 0;
+    })
+  );
   const meta = unpackToArray(input, {
     key({ key }) {
       return resolveMetaKeyType(key);
@@ -341,8 +438,8 @@ function packMeta(inputs) {
   return packArray(inputs, {
     key: ["name", "property", "httpEquiv", "http-equiv", "charset"],
     value: ["content", "charset"],
-    resolveKey(k) {
-      let key = mappedPackingSchema.filter((sk) => sk[1] === k)?.[0]?.[0] || k;
+    resolveKey(k2) {
+      let key = mappedPackingSchema.filter((sk) => sk[1] === k2)?.[0]?.[0] || k2;
       const replacer = (_, letter) => letter?.toUpperCase();
       key = key.replace(/:([a-z])/g, replacer).replace(/-([a-z])/g, replacer);
       return key;
@@ -552,27 +649,27 @@ async function normaliseEntryTags(e) {
 
 const TAG_WEIGHTS = {
   // tags
-  base: -1,
-  title: 1
+  base: -10,
+  title: 10
 };
 const TAG_ALIASES = {
   // relative scores to their default values
-  critical: -8,
-  high: -1,
-  low: 2
+  critical: -80,
+  high: -10,
+  low: 20
 };
 function tagWeight(tag) {
-  let weight = 10;
+  let weight = 100;
   const priority = tag.tagPriority;
   if (typeof priority === "number")
     return priority;
   if (tag.tag === "meta") {
     if (tag.props.charset)
-      weight = -2;
+      weight = -20;
     if (tag.props["http-equiv"] === "content-security-policy")
       weight = 0;
   } else if (tag.tag === "link" && tag.props.rel === "preconnect") {
-    weight = 2;
+    weight = 20;
   } else if (tag.tag in TAG_WEIGHTS) {
     weight = TAG_WEIGHTS[tag.tag];
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unhead/shared",
   "type": "module",
-  "version": "1.5.5",
+  "version": "1.6.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.5.5"
+    "@unhead/schema": "1.6.1"
   },
   "devDependencies": {
     "packrup": "^0.1.0"