@unhead/shared 1.7.3 → 1.7.4

package/dist/index.cjs

@@ -191,16 +191,10 @@ const MetaPackingSchema = {
       }
     }
   },
-  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"
   },
@@ -224,32 +218,13 @@ const MetaPackingSchema = {
   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: {
@@ -274,51 +249,31 @@ const MetaPackingSchema = {
       }
     }
   },
-  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 openGraphNamespaces = [
+  "og",
+  "book",
+  "article",
+  "profile"
+];
 function resolveMetaKeyType(key) {
+  const fKey = fixKeyCase(key).split(":")[0];
+  if (openGraphNamespaces.includes(fKey))
+    return "property";
   return MetaPackingSchema[key]?.metaKey || "name";
 }
 function resolveMetaKeyValue(key) {
   return MetaPackingSchema[key]?.keyValue || fixKeyCase(key);
 }
 function fixKeyCase(key) {
-  return key.replace(/([A-Z])/g, "-$1").toLowerCase();
+  const updated = key.replace(/([A-Z])/g, "-$1").toLowerCase();
+  const fKey = updated.split("-")[0];
+  if (openGraphNamespaces.includes(fKey) || fKey === "twitter")
+    return key.replace(/([A-Z])/g, ":$1").toLowerCase();
+  return updated;
 }
 function changeKeyCasingDeep(input) {
   if (Array.isArray(input)) {
@@ -349,82 +304,55 @@ function resolvePackedMetaObjectValue(value, key) {
     }
   );
 }
-const SimpleArrayUnpackMetas = ["themeColor"];
-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;
+const ObjectArrayEntries = ["og:image", "og:video", "og:audio", "twitter:image"];
+function sanitize(input) {
+  const out = {};
+  Object.entries(input).forEach(([k2, v]) => {
+    if (String(v) !== "false" && k2)
+      out[k2] = v;
+  });
+  return out;
 }
-function flattenMetaObjects(input, prefix = "") {
-  const extras = [];
-  for (const [k2, v] of Object.entries(input)) {
-    const key = k2;
-    const value = v;
-    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 (!value) {
-      extras.push(getMeta(fullkey, value));
-      delete input[key];
-      continue;
-    }
-    if (typeof value === "object") {
-      const children = Array.isArray(value) ? value : [value];
-      for (const child of children) {
-        if (!child)
-          extras.push(getMeta(fullkey, child));
-        else 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];
-    }
+function handleObjectEntry(key, v) {
+  const value = sanitize(v);
+  const fKey = fixKeyCase(key);
+  const attr = resolveMetaKeyType(fKey);
+  if (ObjectArrayEntries.includes(fKey)) {
+    const input = {};
+    Object.entries(value).forEach(([k2, v2]) => {
+      input[`${key}${k2 === "url" ? "" : `${k2.charAt(0).toUpperCase()}${k2.slice(1)}`}`] = v2;
+    });
+    const unpacked = unpackMeta(input).sort(
+      (a, b) => (
+        // @ts-expect-error untyped
+        (a[attr]?.length || 0) - (b[attr]?.length || 0)
+      )
+    );
+    return unpacked;
   }
-  return extras;
+  return [{ [attr]: fKey, ...value }];
 }
 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]];
-      delete input[meta2];
-      val.forEach((entry) => {
-        extras.push({
-          name: fixKeyCase(meta2),
-          ...entry
-        });
-      });
+  const primitives = {};
+  Object.entries(input).forEach(([key, value]) => {
+    if (!Array.isArray(value)) {
+      if (typeof value === "object" && value) {
+        if (ObjectArrayEntries.includes(fixKeyCase(key))) {
+          extras.push(...handleObjectEntry(key, value));
+          return;
+        }
+        primitives[key] = sanitize(value);
+      } else {
+        primitives[key] = value;
+      }
+      return;
     }
+    value.forEach((v) => {
+      extras.push(...typeof v === "string" ? unpackMeta({ [key]: v }) : handleObjectEntry(key, v));
+    });
   });
-  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, {
+  const meta = unpackToArray(primitives, {
     key({ key }) {
       return resolveMetaKeyType(key);
     },
@@ -442,7 +370,11 @@ function unpackMeta(input) {
       return typeof value === "number" ? value.toString() : value;
     }
   });
-  return [...extras, ...meta];
+  return [...extras, ...meta].map((m) => {
+    if (m.content === "_null")
+      m.content = null;
+    return m;
+  });
 }
 function packMeta(inputs) {
   const mappedPackingSchema = Object.entries(MetaPackingSchema).map(([key, value]) => [key, value.keyValue]);

package/dist/index.mjs

@@ -189,16 +189,10 @@ const MetaPackingSchema = {
       }
     }
   },
-  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"
   },
@@ -222,32 +216,13 @@ const MetaPackingSchema = {
   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: {
@@ -272,51 +247,31 @@ const MetaPackingSchema = {
       }
     }
   },
-  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 openGraphNamespaces = [
+  "og",
+  "book",
+  "article",
+  "profile"
+];
 function resolveMetaKeyType(key) {
+  const fKey = fixKeyCase(key).split(":")[0];
+  if (openGraphNamespaces.includes(fKey))
+    return "property";
   return MetaPackingSchema[key]?.metaKey || "name";
 }
 function resolveMetaKeyValue(key) {
   return MetaPackingSchema[key]?.keyValue || fixKeyCase(key);
 }
 function fixKeyCase(key) {
-  return key.replace(/([A-Z])/g, "-$1").toLowerCase();
+  const updated = key.replace(/([A-Z])/g, "-$1").toLowerCase();
+  const fKey = updated.split("-")[0];
+  if (openGraphNamespaces.includes(fKey) || fKey === "twitter")
+    return key.replace(/([A-Z])/g, ":$1").toLowerCase();
+  return updated;
 }
 function changeKeyCasingDeep(input) {
   if (Array.isArray(input)) {
@@ -347,82 +302,55 @@ function resolvePackedMetaObjectValue(value, key) {
     }
   );
 }
-const SimpleArrayUnpackMetas = ["themeColor"];
-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;
+const ObjectArrayEntries = ["og:image", "og:video", "og:audio", "twitter:image"];
+function sanitize(input) {
+  const out = {};
+  Object.entries(input).forEach(([k2, v]) => {
+    if (String(v) !== "false" && k2)
+      out[k2] = v;
+  });
+  return out;
 }
-function flattenMetaObjects(input, prefix = "") {
-  const extras = [];
-  for (const [k2, v] of Object.entries(input)) {
-    const key = k2;
-    const value = v;
-    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 (!value) {
-      extras.push(getMeta(fullkey, value));
-      delete input[key];
-      continue;
-    }
-    if (typeof value === "object") {
-      const children = Array.isArray(value) ? value : [value];
-      for (const child of children) {
-        if (!child)
-          extras.push(getMeta(fullkey, child));
-        else 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];
-    }
+function handleObjectEntry(key, v) {
+  const value = sanitize(v);
+  const fKey = fixKeyCase(key);
+  const attr = resolveMetaKeyType(fKey);
+  if (ObjectArrayEntries.includes(fKey)) {
+    const input = {};
+    Object.entries(value).forEach(([k2, v2]) => {
+      input[`${key}${k2 === "url" ? "" : `${k2.charAt(0).toUpperCase()}${k2.slice(1)}`}`] = v2;
+    });
+    const unpacked = unpackMeta(input).sort(
+      (a, b) => (
+        // @ts-expect-error untyped
+        (a[attr]?.length || 0) - (b[attr]?.length || 0)
+      )
+    );
+    return unpacked;
   }
-  return extras;
+  return [{ [attr]: fKey, ...value }];
 }
 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]];
-      delete input[meta2];
-      val.forEach((entry) => {
-        extras.push({
-          name: fixKeyCase(meta2),
-          ...entry
-        });
-      });
+  const primitives = {};
+  Object.entries(input).forEach(([key, value]) => {
+    if (!Array.isArray(value)) {
+      if (typeof value === "object" && value) {
+        if (ObjectArrayEntries.includes(fixKeyCase(key))) {
+          extras.push(...handleObjectEntry(key, value));
+          return;
+        }
+        primitives[key] = sanitize(value);
+      } else {
+        primitives[key] = value;
+      }
+      return;
     }
+    value.forEach((v) => {
+      extras.push(...typeof v === "string" ? unpackMeta({ [key]: v }) : handleObjectEntry(key, v));
+    });
   });
-  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, {
+  const meta = unpackToArray(primitives, {
     key({ key }) {
       return resolveMetaKeyType(key);
     },
@@ -440,7 +368,11 @@ function unpackMeta(input) {
       return typeof value === "number" ? value.toString() : value;
     }
   });
-  return [...extras, ...meta];
+  return [...extras, ...meta].map((m) => {
+    if (m.content === "_null")
+      m.content = null;
+    return m;
+  });
 }
 function packMeta(inputs) {
   const mappedPackingSchema = Object.entries(MetaPackingSchema).map(([key, value]) => [key, value.keyValue]);

package/package.json

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