@unhead/schema-org 1.9.12 → 1.9.14

package/dist/index.cjs

@@ -1,8 +1,7 @@
 'use strict';
 
-const plugin = require('./shared/schema-org.05dca9f3.cjs');
+const plugin = require('./shared/schema-org.97103adc.cjs');
 const unhead = require('unhead');
-require('@unhead/shared');
 require('ufo');
 
 function provideResolver(input, resolver) {

package/dist/index.mjs

@@ -1,7 +1,6 @@
-import { U as UnheadSchemaOrg } from './shared/schema-org.e127cd72.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.e127cd72.mjs';
+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 { getActiveHead, useHead } from 'unhead';
-import '@unhead/shared';
 import 'ufo';
 
 function provideResolver(input, resolver) {

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

@@ -1,4 +1,3 @@
-import { hashCode, defineHeadPlugin, processTemplateParams } from '@unhead/shared';
 import { hasProtocol, withBase, withoutTrailingSlash, hasTrailingSlash, withTrailingSlash, joinURL } from 'ufo';
 
 function defineSchemaOrgResolver(schema) {
@@ -125,7 +124,8 @@ const monetaryAmountResolver = defineSchemaOrgResolver({
     "@type": "MonetaryAmount"
   },
   resolve(node, ctx) {
-    node.value = resolveRelation(node.value, ctx, quantitativeValueResolver);
+    if (typeof node.value !== "number")
+      node.value = resolveRelation(node.value, ctx, quantitativeValueResolver);
     return node;
   }
 });
@@ -1704,6 +1704,55 @@ const softwareAppResolver = defineSchemaOrgResolver({
   }
 });
 
+function defineHeadPlugin(plugin) {
+  return plugin;
+}
+
+function hashCode(s) {
+  let h = 9;
+  for (let i = 0; i < s.length; )
+    h = Math.imul(h ^ s.charCodeAt(i++), 9 ** 9);
+  return ((h ^ h >>> 9) + 65536).toString(16).substring(1, 8).toLowerCase();
+}
+
+const sepSub = "%separator";
+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();
+    }
+  });
+  if (s.includes(sepSub)) {
+    if (s.endsWith(sepSub))
+      s = s.slice(0, -sepSub.length).trim();
+    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);
+  }
+  return s;
+}
+
 function loadResolver(resolver) {
   switch (resolver) {
     case "address":

package/dist/shared/{schema-org.05dca9f3.cjs → schema-org.97103adc.cjs}

@@ -1,6 +1,5 @@
 'use strict';
 
-const shared = require('@unhead/shared');
 const ufo = require('ufo');
 
 function defineSchemaOrgResolver(schema) {
@@ -127,7 +126,8 @@ const monetaryAmountResolver = defineSchemaOrgResolver({
     "@type": "MonetaryAmount"
   },
   resolve(node, ctx) {
-    node.value = resolveRelation(node.value, ctx, quantitativeValueResolver);
+    if (typeof node.value !== "number")
+      node.value = resolveRelation(node.value, ctx, quantitativeValueResolver);
     return node;
   }
 });
@@ -1706,6 +1706,55 @@ const softwareAppResolver = defineSchemaOrgResolver({
   }
 });
 
+function defineHeadPlugin(plugin) {
+  return plugin;
+}
+
+function hashCode(s) {
+  let h = 9;
+  for (let i = 0; i < s.length; )
+    h = Math.imul(h ^ s.charCodeAt(i++), 9 ** 9);
+  return ((h ^ h >>> 9) + 65536).toString(16).substring(1, 8).toLowerCase();
+}
+
+const sepSub = "%separator";
+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();
+    }
+  });
+  if (s.includes(sepSub)) {
+    if (s.endsWith(sepSub))
+      s = s.slice(0, -sepSub.length).trim();
+    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);
+  }
+  return s;
+}
+
 function loadResolver(resolver) {
   switch (resolver) {
     case "address":
@@ -1873,7 +1922,7 @@ function resolveNodeId(node, ctx, resolver, resolveAsRoot = false) {
     if (!key.startsWith("_"))
       hashNodeData[key] = val;
   });
-  node["@id"] = prefixId(ctx.meta[prefix], `#/schema/${alias}/${node["@id"] || shared.hashCode(JSON.stringify(hashNodeData))}`);
+  node["@id"] = prefixId(ctx.meta[prefix], `#/schema/${alias}/${node["@id"] || hashCode(JSON.stringify(hashNodeData))}`);
   return node;
 }
 function resolveRelation(input, ctx, fallbackResolver, options = {}) {
@@ -2082,7 +2131,7 @@ function SchemaOrgUnheadPlugin(config, meta, options) {
   config = resolveMeta({ ...config });
   let graph;
   let resolvedMeta = {};
-  return shared.defineHeadPlugin((head) => ({
+  return defineHeadPlugin((head) => ({
     key: "schema-org",
     hooks: {
       "entries:resolve": function() {
@@ -2135,7 +2184,7 @@ function SchemaOrgUnheadPlugin(config, meta, options) {
               "@graph": graph.resolveGraph({ ...await meta?.() || {}, ...config, ...resolvedMeta })
             }, (_, value) => {
               if (typeof value !== "object")
-                return shared.processTemplateParams(value, head._templateParams, head._separator);
+                return processTemplateParams(value, head._templateParams, head._separator);
               return value;
             }, minify ? 0 : 2);
             delete tag.props.nodes;

package/dist/vue.cjs

@@ -1,9 +1,8 @@
 'use strict';
 
-const plugin = require('./shared/schema-org.05dca9f3.cjs');
+const plugin = require('./shared/schema-org.97103adc.cjs');
 const vue = require('@unhead/vue');
 const vue$1 = require('vue');
-require('@unhead/shared');
 require('ufo');
 
 const schemaAutoImports = [

package/dist/vue.mjs

@@ -1,8 +1,7 @@
-import { U as UnheadSchemaOrg } from './shared/schema-org.e127cd72.mjs';
-export { a1 as PluginSchemaOrg, a2 as SchemaOrgUnheadPlugin } from './shared/schema-org.e127cd72.mjs';
+import { U as UnheadSchemaOrg } from './shared/schema-org.2da2cd3d.mjs';
+export { a1 as PluginSchemaOrg, a2 as SchemaOrgUnheadPlugin } from './shared/schema-org.2da2cd3d.mjs';
 import { injectHead, useHead } from '@unhead/vue';
 import { defineComponent, ref, computed, unref, h } from 'vue';
-import '@unhead/shared';
 import 'ufo';
 
 const schemaAutoImports = [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unhead/schema-org",
-  "version": "1.9.12",
+  "version": "1.9.14",
   "description": "Unhead Schema.org for Simple and Automated Google Rich Results",
   "author": "Harlan Wilton <harlan@harlanzw.com>",
   "license": "MIT",
@@ -38,20 +38,16 @@
   "files": [
     "dist"
   ],
-  "peerDependencies": {
-    "unhead": ">=1.9.11",
-    "@unhead/shared": "1.9.12"
-  },
   "dependencies": {
     "ufo": "^1.5.3"
   },
   "devDependencies": {
     "unplugin-vue-components": "^0.27.0",
-    "vue": "^3.4.27",
-    "@unhead/shared": "1.9.12",
-    "@unhead/schema": "1.9.12",
-    "@unhead/vue": "1.9.12",
-    "unhead": "1.9.12"
+    "vue": "^3.4.29",
+    "@unhead/schema": "1.9.14",
+    "unhead": "1.9.14",
+    "@unhead/shared": "1.9.14",
+    "@unhead/vue": "1.9.14"
   },
   "scripts": {
     "build": "unbuild .",