@unhead/shared 1.11.13 → 1.11.15

package/dist/index.cjs

@@ -1,6 +1,8 @@
 'use strict';
 
-function asArray$1(value) {
+const packrup = require('packrup');
+
+function asArray(value) {
   return Array.isArray(value) ? value : [value];
 }
 
@@ -64,102 +66,6 @@ function hashTag(tag) {
   return hashCode(content);
 }
 
-function asArray(input) {
-  return Array.isArray(input) ? input : [input];
-}
-const InternalKeySymbol = "_$key";
-function packObject(input, options) {
-  const keys = Object.keys(input);
-  let [k, v] = keys;
-  options = options || {};
-  options.key = options.key || k;
-  options.value = options.value || v;
-  options.resolveKey = options.resolveKey || ((k2) => k2);
-  const resolveKey = (index) => {
-    const arr = asArray(options[index]);
-    return arr.find((k2) => {
-      if (typeof k2 === "string" && k2.includes(".")) {
-        return k2;
-      }
-      return k2 && keys.includes(k2);
-    });
-  };
-  const resolveValue = (k2, input2) => {
-    if (k2.includes(".")) {
-      const paths = k2.split(".");
-      let val = input2;
-      for (const path of paths)
-        val = val[path];
-      return val;
-    }
-    return input2[k2];
-  };
-  k = resolveKey("key") || k;
-  v = resolveKey("value") || v;
-  const dedupeKeyPrefix = input.key ? `${InternalKeySymbol}${input.key}-` : "";
-  let keyValue = resolveValue(k, input);
-  keyValue = options.resolveKey(keyValue);
-  return {
-    [`${dedupeKeyPrefix}${keyValue}`]: resolveValue(v, input)
-  };
-}
-
-function packArray(input, options) {
-  const packed = {};
-  for (const i of input) {
-    const packedObj = packObject(i, options);
-    const pKey = Object.keys(packedObj)[0];
-    const isDedupeKey = pKey.startsWith(InternalKeySymbol);
-    if (!isDedupeKey && packed[pKey]) {
-      packed[pKey] = Array.isArray(packed[pKey]) ? packed[pKey] : [packed[pKey]];
-      packed[pKey].push(Object.values(packedObj)[0]);
-    } else {
-      packed[isDedupeKey ? pKey.split("-").slice(1).join("-") || pKey : pKey] = packedObj[pKey];
-    }
-  }
-  return packed;
-}
-
-function unpackToArray(input, options) {
-  const unpacked = [];
-  const kFn = options.resolveKeyData || ((ctx) => ctx.key);
-  const vFn = options.resolveValueData || ((ctx) => ctx.value);
-  for (const [k, v] of Object.entries(input)) {
-    unpacked.push(...(Array.isArray(v) ? v : [v]).map((i) => {
-      const ctx = { key: k, value: i };
-      const val = vFn(ctx);
-      if (typeof val === "object")
-        return unpackToArray(val, options);
-      if (Array.isArray(val))
-        return val;
-      return {
-        [typeof options.key === "function" ? options.key(ctx) : options.key]: kFn(ctx),
-        [typeof options.value === "function" ? options.value(ctx) : options.value]: val
-      };
-    }).flat());
-  }
-  return unpacked;
-}
-
-function unpackToString(value, options) {
-  return Object.entries(value).map(([key, value2]) => {
-    if (typeof value2 === "object")
-      value2 = unpackToString(value2, options);
-    if (options.resolve) {
-      const resolved = options.resolve({ key, value: value2 });
-      if (typeof resolved !== "undefined")
-        return resolved;
-    }
-    if (typeof value2 === "number")
-      value2 = value2.toString();
-    if (typeof value2 === "string" && options.wrapValue) {
-      value2 = value2.replace(new RegExp(options.wrapValue, "g"), `\\${options.wrapValue}`);
-      value2 = `${options.wrapValue}${value2}${options.wrapValue}`;
-    }
-    return `${key}${options.keyValueSeparator || ""}${value2}`;
-  }).join(options.entrySeparator || "");
-}
-
 const p = (p2) => ({ keyValue: p2, metaKey: "property" });
 const k = (p2) => ({ keyValue: p2 });
 const MetaPackingSchema = {
@@ -275,7 +181,7 @@ function resolvePackedMetaObjectValue(value, key) {
   const definition = MetaPackingSchema[key];
   if (key === "refresh")
     return `${value.seconds};url=${value.url}`;
-  return unpackToString(
+  return packrup.unpackToString(
     changeKeyCasingDeep(value),
     {
       keyValueSeparator: "=",
@@ -343,7 +249,7 @@ function unpackMeta(input) {
       extras.push(...typeof v === "string" ? unpackMeta({ [key]: v }) : handleObjectEntry(key, v));
     }
   }
-  const meta = unpackToArray(primitives, {
+  const meta = packrup.unpackToArray(primitives, {
     key({ key }) {
       return resolveMetaKeyType(key);
     },
@@ -369,7 +275,7 @@ function unpackMeta(input) {
 }
 function packMeta(inputs) {
   const mappedPackingSchema = Object.entries(MetaPackingSchema).map(([key, value]) => [key, value.keyValue]);
-  return packArray(inputs, {
+  return packrup.packArray(inputs, {
     key: ["name", "property", "httpEquiv", "http-equiv", "charset"],
     value: ["content", "charset"],
     resolveKey(k2) {
@@ -534,6 +440,7 @@ function whitelistSafeInput(input) {
     if (!tagValue)
       return;
     switch (key) {
+      // always safe
       case "title":
       case "titleTemplate":
       case "templateParams":
@@ -547,6 +454,7 @@ function whitelistSafeInput(input) {
             filtered[key][a] = tagValue[a];
         });
         break;
+      // meta is safe, except for http-equiv
       case "meta":
         if (Array.isArray(tagValue)) {
           filtered[key] = tagValue.map((meta) => {
@@ -559,6 +467,7 @@ function whitelistSafeInput(input) {
           }).filter((meta) => Object.keys(meta).length > 0);
         }
         break;
+      // link tags we don't allow stylesheets, scripts, preloading, prerendering, prefetching, etc
       case "link":
         if (Array.isArray(tagValue)) {
           filtered[key] = tagValue.map((meta) => {
@@ -591,6 +500,7 @@ function whitelistSafeInput(input) {
           }).filter((meta) => Object.keys(meta).length > 0);
         }
         break;
+      // we only allow JSON in scripts
       case "script":
         if (Array.isArray(tagValue)) {
           filtered[key] = tagValue.map((script) => {
@@ -743,7 +653,7 @@ exports.TagEntityBits = TagEntityBits;
 exports.TagsWithInnerContent = TagsWithInnerContent;
 exports.UniqueTags = UniqueTags;
 exports.ValidHeadTags = ValidHeadTags;
-exports.asArray = asArray$1;
+exports.asArray = asArray;
 exports.composableNames = composableNames;
 exports.defineHeadPlugin = defineHeadPlugin;
 exports.hashCode = hashCode;

package/dist/index.mjs

@@ -1,4 +1,6 @@
-function asArray$1(value) {
+import { unpackToString, unpackToArray, packArray } from 'packrup';
+
+function asArray(value) {
   return Array.isArray(value) ? value : [value];
 }
 
@@ -62,102 +64,6 @@ function hashTag(tag) {
   return hashCode(content);
 }
 
-function asArray(input) {
-  return Array.isArray(input) ? input : [input];
-}
-const InternalKeySymbol = "_$key";
-function packObject(input, options) {
-  const keys = Object.keys(input);
-  let [k, v] = keys;
-  options = options || {};
-  options.key = options.key || k;
-  options.value = options.value || v;
-  options.resolveKey = options.resolveKey || ((k2) => k2);
-  const resolveKey = (index) => {
-    const arr = asArray(options[index]);
-    return arr.find((k2) => {
-      if (typeof k2 === "string" && k2.includes(".")) {
-        return k2;
-      }
-      return k2 && keys.includes(k2);
-    });
-  };
-  const resolveValue = (k2, input2) => {
-    if (k2.includes(".")) {
-      const paths = k2.split(".");
-      let val = input2;
-      for (const path of paths)
-        val = val[path];
-      return val;
-    }
-    return input2[k2];
-  };
-  k = resolveKey("key") || k;
-  v = resolveKey("value") || v;
-  const dedupeKeyPrefix = input.key ? `${InternalKeySymbol}${input.key}-` : "";
-  let keyValue = resolveValue(k, input);
-  keyValue = options.resolveKey(keyValue);
-  return {
-    [`${dedupeKeyPrefix}${keyValue}`]: resolveValue(v, input)
-  };
-}
-
-function packArray(input, options) {
-  const packed = {};
-  for (const i of input) {
-    const packedObj = packObject(i, options);
-    const pKey = Object.keys(packedObj)[0];
-    const isDedupeKey = pKey.startsWith(InternalKeySymbol);
-    if (!isDedupeKey && packed[pKey]) {
-      packed[pKey] = Array.isArray(packed[pKey]) ? packed[pKey] : [packed[pKey]];
-      packed[pKey].push(Object.values(packedObj)[0]);
-    } else {
-      packed[isDedupeKey ? pKey.split("-").slice(1).join("-") || pKey : pKey] = packedObj[pKey];
-    }
-  }
-  return packed;
-}
-
-function unpackToArray(input, options) {
-  const unpacked = [];
-  const kFn = options.resolveKeyData || ((ctx) => ctx.key);
-  const vFn = options.resolveValueData || ((ctx) => ctx.value);
-  for (const [k, v] of Object.entries(input)) {
-    unpacked.push(...(Array.isArray(v) ? v : [v]).map((i) => {
-      const ctx = { key: k, value: i };
-      const val = vFn(ctx);
-      if (typeof val === "object")
-        return unpackToArray(val, options);
-      if (Array.isArray(val))
-        return val;
-      return {
-        [typeof options.key === "function" ? options.key(ctx) : options.key]: kFn(ctx),
-        [typeof options.value === "function" ? options.value(ctx) : options.value]: val
-      };
-    }).flat());
-  }
-  return unpacked;
-}
-
-function unpackToString(value, options) {
-  return Object.entries(value).map(([key, value2]) => {
-    if (typeof value2 === "object")
-      value2 = unpackToString(value2, options);
-    if (options.resolve) {
-      const resolved = options.resolve({ key, value: value2 });
-      if (typeof resolved !== "undefined")
-        return resolved;
-    }
-    if (typeof value2 === "number")
-      value2 = value2.toString();
-    if (typeof value2 === "string" && options.wrapValue) {
-      value2 = value2.replace(new RegExp(options.wrapValue, "g"), `\\${options.wrapValue}`);
-      value2 = `${options.wrapValue}${value2}${options.wrapValue}`;
-    }
-    return `${key}${options.keyValueSeparator || ""}${value2}`;
-  }).join(options.entrySeparator || "");
-}
-
 const p = (p2) => ({ keyValue: p2, metaKey: "property" });
 const k = (p2) => ({ keyValue: p2 });
 const MetaPackingSchema = {
@@ -532,6 +438,7 @@ function whitelistSafeInput(input) {
     if (!tagValue)
       return;
     switch (key) {
+      // always safe
       case "title":
       case "titleTemplate":
       case "templateParams":
@@ -545,6 +452,7 @@ function whitelistSafeInput(input) {
             filtered[key][a] = tagValue[a];
         });
         break;
+      // meta is safe, except for http-equiv
       case "meta":
         if (Array.isArray(tagValue)) {
           filtered[key] = tagValue.map((meta) => {
@@ -557,6 +465,7 @@ function whitelistSafeInput(input) {
           }).filter((meta) => Object.keys(meta).length > 0);
         }
         break;
+      // link tags we don't allow stylesheets, scripts, preloading, prerendering, prefetching, etc
       case "link":
         if (Array.isArray(tagValue)) {
           filtered[key] = tagValue.map((meta) => {
@@ -589,6 +498,7 @@ function whitelistSafeInput(input) {
           }).filter((meta) => Object.keys(meta).length > 0);
         }
         break;
+      // we only allow JSON in scripts
       case "script":
         if (Array.isArray(tagValue)) {
           filtered[key] = tagValue.map((script) => {
@@ -728,4 +638,4 @@ function resolveTitleTemplate(template, title) {
   return template;
 }
 
-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 };
+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 };

package/package.json

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