@unhead/schema-org 1.9.15 → 1.10.0-beta.1

package/dist/index.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const plugin = require('./shared/schema-org.97103adc.cjs');
+const plugin = require('./shared/schema-org.74d623f8.cjs');
 const unhead = require('unhead');
 require('ufo');
 

package/dist/index.mjs

@@ -1,5 +1,5 @@
-import { U as UnheadSchemaOrg } from './shared/schema-org.2da2cd3d.mjs';
-export { H as HowToId, a1 as PluginSchemaOrg, P as PrimaryArticleId, k as PrimaryBookId, m as PrimaryBreadcrumbId, s as PrimaryEventId, X as PrimaryWebPageId, _ as PrimaryWebSiteId, M as ProductId, R as RecipeId, a2 as SchemaOrgUnheadPlugin, L as addressResolver, g as aggregateOfferResolver, h as aggregateRatingResolver, i as articleResolver, j as bookEditionResolver, l as bookResolver, o as breadcrumbResolver, p as commentResolver, q as courseResolver, c as createSchemaOrgGraph, a as dedupeNodes, d as defineSchemaOrgResolver, t as eventResolver, w as foodEstablishmentResolver, x as howToResolver, z as howToStepDirectionResolver, y as howToStepResolver, B as imageResolver, A as itemListResolver, C as jobPostingResolver, D as listItemResolver, E as localBusinessResolver, F as movieResolver, n as normaliseNodes, G as offerResolver, I as openingHoursResolver, J as organizationResolver, K as personResolver, u as placeResolver, N as productResolver, O as questionResolver, Q as ratingResolver, Z as readActionResolver, S as recipeResolver, r as resolveMeta, b as resolveNode, e as resolveNodeId, f as resolveRelation, V as reviewResolver, a0 as searchActionResolver, T as softwareAppResolver, W as videoResolver, v as virtualLocationResolver, Y as webPageResolver, $ as webSiteResolver } from './shared/schema-org.2da2cd3d.mjs';
+import { U as UnheadSchemaOrg } from './shared/schema-org.dfa583ec.mjs';
+export { H as HowToId, a1 as PluginSchemaOrg, P as PrimaryArticleId, k as PrimaryBookId, m as PrimaryBreadcrumbId, s as PrimaryEventId, X as PrimaryWebPageId, _ as PrimaryWebSiteId, M as ProductId, R as RecipeId, a2 as SchemaOrgUnheadPlugin, L as addressResolver, g as aggregateOfferResolver, h as aggregateRatingResolver, i as articleResolver, j as bookEditionResolver, l as bookResolver, o as breadcrumbResolver, p as commentResolver, q as courseResolver, c as createSchemaOrgGraph, a as dedupeNodes, d as defineSchemaOrgResolver, t as eventResolver, w as foodEstablishmentResolver, x as howToResolver, z as howToStepDirectionResolver, y as howToStepResolver, B as imageResolver, A as itemListResolver, C as jobPostingResolver, D as listItemResolver, E as localBusinessResolver, F as movieResolver, n as normaliseNodes, G as offerResolver, I as openingHoursResolver, J as organizationResolver, K as personResolver, u as placeResolver, N as productResolver, O as questionResolver, Q as ratingResolver, Z as readActionResolver, S as recipeResolver, r as resolveMeta, b as resolveNode, e as resolveNodeId, f as resolveRelation, V as reviewResolver, a0 as searchActionResolver, T as softwareAppResolver, W as videoResolver, v as virtualLocationResolver, Y as webPageResolver, $ as webSiteResolver } from './shared/schema-org.dfa583ec.mjs';
 import { getActiveHead, useHead } from 'unhead';
 import 'ufo';
 

package/dist/shared/{schema-org.97103adc.cjs → schema-org.74d623f8.cjs}

@@ -51,17 +51,14 @@ function asArray(input) {
   return Array.isArray(input) ? input : [input];
 }
 function dedupeMerge(node, field, value) {
-  const dedupeMerge2 = [];
-  const input = asArray(node[field]);
-  dedupeMerge2.push(...input);
-  const data = new Set(dedupeMerge2);
+  const data = new Set(asArray(node[field]));
   data.add(value);
-  node[field] = [...data.values()].filter(Boolean);
+  node[field] = [...data].filter(Boolean);
 }
 function prefixId(url, id) {
   if (ufo.hasProtocol(id))
     return id;
-  if (!id.startsWith("#"))
+  if (id[0] !== "#")
     id = `#${id}`;
   return ufo.withBase(id, url);
 }
@@ -85,7 +82,7 @@ function resolveDefaultType(node, defaultType) {
   node["@type"] = types.size === 1 ? val : [...types.values()];
 }
 function resolveWithBase(base, urlOrPath) {
-  if (!urlOrPath || ufo.hasProtocol(urlOrPath) || !urlOrPath.startsWith("/") && !urlOrPath.startsWith("#"))
+  if (!urlOrPath || ufo.hasProtocol(urlOrPath) || urlOrPath[0] !== "/" && urlOrPath[0] !== "#")
     return urlOrPath;
   return ufo.withBase(urlOrPath, base);
 }
@@ -95,16 +92,19 @@ function resolveAsGraphKey(key) {
   return key.substring(key.lastIndexOf("#"));
 }
 function stripEmptyProperties(obj) {
-  Object.keys(obj).forEach((k) => {
+  for (const k in obj) {
+    if (!Object.prototype.hasOwnProperty.call(obj, k)) {
+      continue;
+    }
     if (obj[k] && typeof obj[k] === "object") {
       if (obj[k].__v_isReadonly || obj[k].__v_isRef)
         return;
       stripEmptyProperties(obj[k]);
       return;
     }
-    if (obj[k] === "" || obj[k] === null || typeof obj[k] === "undefined")
+    if (obj[k] === "" || obj[k] === null || obj[k] === void 0)
       delete obj[k];
-  });
+  }
   return obj;
 }
 
@@ -1718,39 +1718,45 @@ function hashCode(s) {
 }
 
 const sepSub = "%separator";
+function sub(p, token) {
+  let val;
+  if (token === "s" || token === "pageTitle") {
+    val = p.pageTitle;
+  } else if (token.includes(".")) {
+    const dotIndex = token.indexOf(".");
+    val = p[token.substring(0, dotIndex)]?.[token.substring(dotIndex + 1)];
+  } else {
+    val = p[token];
+  }
+  return val !== void 0 ? (val || "").replace(/"/g, '\\"') : void 0;
+}
+const sepSubRe = new RegExp(`${sepSub}(?:\\s*${sepSub})*`, "g");
 function processTemplateParams(s, p, sep) {
   if (typeof s !== "string" || !s.includes("%"))
     return s;
-  function sub(token) {
-    let val;
-    if (["s", "pageTitle"].includes(token)) {
-      val = p.pageTitle;
-    } else if (token.includes(".")) {
-      val = token.split(".").reduce((acc, key) => acc ? acc[key] || void 0 : void 0, p);
-    } else {
-      val = p[token];
-    }
-    return typeof val !== "undefined" ? (val || "").replace(/"/g, '\\"') : false;
-  }
   let decoded = s;
   try {
     decoded = decodeURI(s);
   } catch {
   }
-  const tokens = (decoded.match(/%(\w+\.+\w+)|%(\w+)/g) || []).sort().reverse();
-  tokens.forEach((token) => {
-    const re = sub(token.slice(1));
-    if (typeof re === "string") {
-      s = s.replace(new RegExp(`\\${token}(\\W|$)`, "g"), (_, args) => `${re}${args}`).trim();
+  const tokens = decoded.match(/%\w+(?:\.\w+)?/g);
+  if (!tokens) {
+    return s;
+  }
+  const hasSepSub = s.includes(sepSub);
+  s = s.replace(/%\w+(?:\.\w+)?/g, (token) => {
+    if (token === sepSub || !tokens.includes(token)) {
+      return token;
     }
-  });
-  if (s.includes(sepSub)) {
+    const re = sub(p, token.slice(1));
+    return re !== void 0 ? re : token;
+  }).trim();
+  if (hasSepSub) {
     if (s.endsWith(sepSub))
-      s = s.slice(0, -sepSub.length).trim();
+      s = s.slice(0, -sepSub.length);
     if (s.startsWith(sepSub))
-      s = s.slice(sepSub.length).trim();
-    s = s.replace(new RegExp(`\\${sepSub}\\s*\\${sepSub}`, "g"), sepSub);
-    s = processTemplateParams(s, { separator: sep }, sep);
+      s = s.slice(sepSub.length);
+    s = s.replace(sepSubRe, sep).trim();
   }
   return s;
 }
@@ -1918,10 +1924,15 @@ function resolveNodeId(node, ctx, resolver, resolveAsRoot = false) {
     alias = type.replace(/([a-z])([A-Z])/g, "$1-$2").toLowerCase();
   }
   const hashNodeData = {};
-  Object.entries(node).forEach(([key, val]) => {
-    if (!key.startsWith("_"))
-      hashNodeData[key] = val;
-  });
+  for (const key in node) {
+    if (key[0] === "_") {
+      continue;
+    }
+    if (!Object.prototype.hasOwnProperty.call(node, key)) {
+      continue;
+    }
+    hashNodeData[key] = node[key];
+  }
   node["@id"] = prefixId(ctx.meta[prefix], `#/schema/${alias}/${node["@id"] || hashCode(JSON.stringify(hashNodeData))}`);
   return node;
 }
@@ -2059,7 +2070,7 @@ function normaliseNodes(nodes) {
     const nodeKey = resolveAsGraphKey(n["@id"] || hash(n));
     const groupedKeys = groupBy(Object.keys(n), (key2) => {
       const val = n[key2];
-      if (key2.startsWith("_"))
+      if (key2[0] === "_")
         return "ignored";
       if (Array.isArray(val) || typeof val === "object")
         return "relations";
@@ -2134,10 +2145,10 @@ function SchemaOrgUnheadPlugin(config, meta, options) {
   return defineHeadPlugin((head) => ({
     key: "schema-org",
     hooks: {
-      "entries:resolve": function() {
+      "entries:resolve": () => {
         graph = createSchemaOrgGraph();
       },
-      "tag:normalise": async function({ tag }) {
+      "tag:normalise": async ({ tag }) => {
         if (tag.key === "schema-org-graph") {
           const { loadResolver } = await Promise.resolve().then(function () { return resolver; });
           const nodes = await tag.props.nodes;
@@ -2175,7 +2186,7 @@ function SchemaOrgUnheadPlugin(config, meta, options) {
           delete tag.props.schemaOrg;
         }
       },
-      "tags:resolve": async function(ctx) {
+      "tags:resolve": async (ctx) => {
         for (const tag of ctx.tags) {
           if (tag.tag === "script" && tag.key === "schema-org-graph") {
             const minify = options?.minify || process.env.NODE_ENV === "production";

package/dist/shared/{schema-org.2da2cd3d.mjs → schema-org.dfa583ec.mjs}

@@ -49,17 +49,14 @@ function asArray(input) {
   return Array.isArray(input) ? input : [input];
 }
 function dedupeMerge(node, field, value) {
-  const dedupeMerge2 = [];
-  const input = asArray(node[field]);
-  dedupeMerge2.push(...input);
-  const data = new Set(dedupeMerge2);
+  const data = new Set(asArray(node[field]));
   data.add(value);
-  node[field] = [...data.values()].filter(Boolean);
+  node[field] = [...data].filter(Boolean);
 }
 function prefixId(url, id) {
   if (hasProtocol(id))
     return id;
-  if (!id.startsWith("#"))
+  if (id[0] !== "#")
     id = `#${id}`;
   return withBase(id, url);
 }
@@ -83,7 +80,7 @@ function resolveDefaultType(node, defaultType) {
   node["@type"] = types.size === 1 ? val : [...types.values()];
 }
 function resolveWithBase(base, urlOrPath) {
-  if (!urlOrPath || hasProtocol(urlOrPath) || !urlOrPath.startsWith("/") && !urlOrPath.startsWith("#"))
+  if (!urlOrPath || hasProtocol(urlOrPath) || urlOrPath[0] !== "/" && urlOrPath[0] !== "#")
     return urlOrPath;
   return withBase(urlOrPath, base);
 }
@@ -93,16 +90,19 @@ function resolveAsGraphKey(key) {
   return key.substring(key.lastIndexOf("#"));
 }
 function stripEmptyProperties(obj) {
-  Object.keys(obj).forEach((k) => {
+  for (const k in obj) {
+    if (!Object.prototype.hasOwnProperty.call(obj, k)) {
+      continue;
+    }
     if (obj[k] && typeof obj[k] === "object") {
       if (obj[k].__v_isReadonly || obj[k].__v_isRef)
         return;
       stripEmptyProperties(obj[k]);
       return;
     }
-    if (obj[k] === "" || obj[k] === null || typeof obj[k] === "undefined")
+    if (obj[k] === "" || obj[k] === null || obj[k] === void 0)
       delete obj[k];
-  });
+  }
   return obj;
 }
 
@@ -1716,39 +1716,45 @@ function hashCode(s) {
 }
 
 const sepSub = "%separator";
+function sub(p, token) {
+  let val;
+  if (token === "s" || token === "pageTitle") {
+    val = p.pageTitle;
+  } else if (token.includes(".")) {
+    const dotIndex = token.indexOf(".");
+    val = p[token.substring(0, dotIndex)]?.[token.substring(dotIndex + 1)];
+  } else {
+    val = p[token];
+  }
+  return val !== void 0 ? (val || "").replace(/"/g, '\\"') : void 0;
+}
+const sepSubRe = new RegExp(`${sepSub}(?:\\s*${sepSub})*`, "g");
 function processTemplateParams(s, p, sep) {
   if (typeof s !== "string" || !s.includes("%"))
     return s;
-  function sub(token) {
-    let val;
-    if (["s", "pageTitle"].includes(token)) {
-      val = p.pageTitle;
-    } else if (token.includes(".")) {
-      val = token.split(".").reduce((acc, key) => acc ? acc[key] || void 0 : void 0, p);
-    } else {
-      val = p[token];
-    }
-    return typeof val !== "undefined" ? (val || "").replace(/"/g, '\\"') : false;
-  }
   let decoded = s;
   try {
     decoded = decodeURI(s);
   } catch {
   }
-  const tokens = (decoded.match(/%(\w+\.+\w+)|%(\w+)/g) || []).sort().reverse();
-  tokens.forEach((token) => {
-    const re = sub(token.slice(1));
-    if (typeof re === "string") {
-      s = s.replace(new RegExp(`\\${token}(\\W|$)`, "g"), (_, args) => `${re}${args}`).trim();
+  const tokens = decoded.match(/%\w+(?:\.\w+)?/g);
+  if (!tokens) {
+    return s;
+  }
+  const hasSepSub = s.includes(sepSub);
+  s = s.replace(/%\w+(?:\.\w+)?/g, (token) => {
+    if (token === sepSub || !tokens.includes(token)) {
+      return token;
     }
-  });
-  if (s.includes(sepSub)) {
+    const re = sub(p, token.slice(1));
+    return re !== void 0 ? re : token;
+  }).trim();
+  if (hasSepSub) {
     if (s.endsWith(sepSub))
-      s = s.slice(0, -sepSub.length).trim();
+      s = s.slice(0, -sepSub.length);
     if (s.startsWith(sepSub))
-      s = s.slice(sepSub.length).trim();
-    s = s.replace(new RegExp(`\\${sepSub}\\s*\\${sepSub}`, "g"), sepSub);
-    s = processTemplateParams(s, { separator: sep }, sep);
+      s = s.slice(sepSub.length);
+    s = s.replace(sepSubRe, sep).trim();
   }
   return s;
 }
@@ -1916,10 +1922,15 @@ function resolveNodeId(node, ctx, resolver, resolveAsRoot = false) {
     alias = type.replace(/([a-z])([A-Z])/g, "$1-$2").toLowerCase();
   }
   const hashNodeData = {};
-  Object.entries(node).forEach(([key, val]) => {
-    if (!key.startsWith("_"))
-      hashNodeData[key] = val;
-  });
+  for (const key in node) {
+    if (key[0] === "_") {
+      continue;
+    }
+    if (!Object.prototype.hasOwnProperty.call(node, key)) {
+      continue;
+    }
+    hashNodeData[key] = node[key];
+  }
   node["@id"] = prefixId(ctx.meta[prefix], `#/schema/${alias}/${node["@id"] || hashCode(JSON.stringify(hashNodeData))}`);
   return node;
 }
@@ -2057,7 +2068,7 @@ function normaliseNodes(nodes) {
     const nodeKey = resolveAsGraphKey(n["@id"] || hash(n));
     const groupedKeys = groupBy(Object.keys(n), (key2) => {
       const val = n[key2];
-      if (key2.startsWith("_"))
+      if (key2[0] === "_")
         return "ignored";
       if (Array.isArray(val) || typeof val === "object")
         return "relations";
@@ -2132,10 +2143,10 @@ function SchemaOrgUnheadPlugin(config, meta, options) {
   return defineHeadPlugin((head) => ({
     key: "schema-org",
     hooks: {
-      "entries:resolve": function() {
+      "entries:resolve": () => {
         graph = createSchemaOrgGraph();
       },
-      "tag:normalise": async function({ tag }) {
+      "tag:normalise": async ({ tag }) => {
         if (tag.key === "schema-org-graph") {
           const { loadResolver } = await Promise.resolve().then(function () { return resolver; });
           const nodes = await tag.props.nodes;
@@ -2173,7 +2184,7 @@ function SchemaOrgUnheadPlugin(config, meta, options) {
           delete tag.props.schemaOrg;
         }
       },
-      "tags:resolve": async function(ctx) {
+      "tags:resolve": async (ctx) => {
         for (const tag of ctx.tags) {
           if (tag.tag === "script" && tag.key === "schema-org-graph") {
             const minify = options?.minify || process.env.NODE_ENV === "production";

package/dist/vue.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const plugin = require('./shared/schema-org.97103adc.cjs');
+const plugin = require('./shared/schema-org.74d623f8.cjs');
 const vue = require('@unhead/vue');
 const vue$1 = require('vue');
 require('ufo');
@@ -236,7 +236,7 @@ function fixKey(s) {
 function ignoreKey(s) {
   if (s.startsWith("aria-") || s.startsWith("data-"))
     return false;
-  return ["class", "style"].includes(s);
+  return s === "class" || s === "style";
 }
 function defineSchemaOrgComponent(name, defineFn) {
   return vue$1.defineComponent({

package/dist/vue.mjs

@@ -1,5 +1,5 @@
-import { U as UnheadSchemaOrg } from './shared/schema-org.2da2cd3d.mjs';
-export { a1 as PluginSchemaOrg, a2 as SchemaOrgUnheadPlugin } from './shared/schema-org.2da2cd3d.mjs';
+import { U as UnheadSchemaOrg } from './shared/schema-org.dfa583ec.mjs';
+export { a1 as PluginSchemaOrg, a2 as SchemaOrgUnheadPlugin } from './shared/schema-org.dfa583ec.mjs';
 import { injectHead, useHead } from '@unhead/vue';
 import { defineComponent, ref, computed, unref, h } from 'vue';
 import 'ufo';
@@ -235,7 +235,7 @@ function fixKey(s) {
 function ignoreKey(s) {
   if (s.startsWith("aria-") || s.startsWith("data-"))
     return false;
-  return ["class", "style"].includes(s);
+  return s === "class" || s === "style";
 }
 function defineSchemaOrgComponent(name, defineFn) {
   return defineComponent({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unhead/schema-org",
-  "version": "1.9.15",
+  "version": "1.10.0-beta.1",
   "description": "Unhead Schema.org for Simple and Automated Google Rich Results",
   "author": "Harlan Wilton <harlan@harlanzw.com>",
   "license": "MIT",
@@ -39,15 +39,19 @@
     "dist"
   ],
   "dependencies": {
-    "ufo": "^1.5.3"
+    "ufo": "^1.5.4"
+  },
+  "build": {
+    "external": [
+      "vue"
+    ]
   },
   "devDependencies": {
-    "unplugin-vue-components": "^0.27.2",
-    "vue": "^3.4.31",
-    "@unhead/schema": "1.9.15",
-    "@unhead/vue": "1.9.15",
-    "@unhead/shared": "1.9.15",
-    "unhead": "1.9.15"
+    "unplugin-vue-components": "^0.27.3",
+    "@unhead/schema": "1.10.0-beta.1",
+    "@unhead/shared": "1.10.0-beta.1",
+    "@unhead/vue": "1.10.0-beta.1",
+    "unhead": "1.10.0-beta.1"
   },
   "scripts": {
     "build": "unbuild .",