@unhead/schema-org 1.8.7 → 1.8.9

package/README.md

@@ -1,4 +1,4 @@
-# 
+#
 
 Schema.org for Vue. Supports typed and automated Google Rich Results
 

package/dist/index.cjs

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

package/dist/index.mjs

@@ -1,5 +1,5 @@
-import { U as UnheadSchemaOrg } from './shared/schema-org.cefa8818.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.cefa8818.mjs';
+import { U as UnheadSchemaOrg } from './shared/schema-org.bb03b192.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.bb03b192.mjs';
 import { getActiveHead, useHead } from 'unhead';
 import '@unhead/shared';
 import 'ufo';

package/dist/shared/{schema-org.cefa8818.mjs → schema-org.bb03b192.mjs}

@@ -1,5 +1,5 @@
 import { hashCode, defineHeadPlugin, processTemplateParams } from '@unhead/shared';
-import { hasProtocol, joinURL, withBase, withoutTrailingSlash, hasTrailingSlash, withTrailingSlash } from 'ufo';
+import { hasProtocol, withBase, withoutTrailingSlash, hasTrailingSlash, withTrailingSlash, joinURL } from 'ufo';
 
 function defineSchemaOrgResolver(schema) {
   return schema;
@@ -51,7 +51,7 @@ function prefixId(url, id) {
     return id;
   if (!id.startsWith("#"))
     id = `#${id}`;
-  return joinURL(url, id);
+  return withBase(id, url);
 }
 function trimLength(val, length) {
   if (!val)
@@ -293,13 +293,12 @@ const organizationResolver = defineSchemaOrgResolver({
   resolveRootNode(node, ctx) {
     const isIdentity = resolveAsGraphKey(node["@id"]) === IdentityId;
     const webPage = ctx.find(PrimaryWebPageId);
-    if (node.logo) {
+    if (node.logo && isIdentity) {
       if (!ctx.find("#organization")) {
         const logoNode = resolveRelation(node.logo, ctx, imageResolver, {
           root: true,
           afterResolve(logo) {
-            if (isIdentity)
-              logo["@id"] = prefixId(ctx.meta.host, "#logo");
+            logo["@id"] = prefixId(ctx.meta.host, "#logo");
             setIfEmpty(logo, "caption", node.name);
           }
         });
@@ -700,6 +699,9 @@ const localBusinessResolver = defineSchemaOrgResolver({
     node.address = resolveRelation(node.address, ctx, addressResolver);
     node.openingHoursSpecification = resolveRelation(node.openingHoursSpecification, ctx, openingHoursResolver);
     node = resolveNode({ ...node }, ctx, organizationResolver);
+    return node;
+  },
+  resolveRootNode(node, ctx) {
     organizationResolver.resolveRootNode(node, ctx);
     return node;
   }
@@ -719,6 +721,10 @@ const foodEstablishmentResolver = defineSchemaOrgResolver({
     node.starRating = resolveRelation(node.starRating, ctx, ratingResolver);
     node = resolveNode(node, ctx, localBusinessResolver);
     return node;
+  },
+  resolveRootNode(node, ctx) {
+    localBusinessResolver.resolveRootNode(node, ctx);
+    return node;
   }
 });
 
@@ -1775,30 +1781,29 @@ function resolveNode(node, ctx, resolver) {
   return node;
 }
 function resolveNodeId(node, ctx, resolver, resolveAsRoot = false) {
-  const prefix = Array.isArray(resolver.idPrefix) ? resolver.idPrefix[0] : resolver.idPrefix;
-  if (!prefix)
-    return node;
-  if (node["@id"] && !node["@id"].startsWith(ctx.meta.host)) {
-    node["@id"] = prefixId(ctx.meta[prefix], node["@id"]);
+  if (node["@id"] && node["@id"].startsWith("http"))
     return node;
-  }
+  const prefix = (Array.isArray(resolver.idPrefix) ? resolver.idPrefix[0] : resolver.idPrefix) || "url";
   const rootId = node["@id"] || (Array.isArray(resolver.idPrefix) ? resolver.idPrefix?.[1] : void 0);
-  if (resolveAsRoot && rootId) {
+  if (!node["@id"] && resolveAsRoot && rootId) {
     node["@id"] = prefixId(ctx.meta[prefix], rootId);
+    return node;
   }
-  if (!node["@id"]) {
-    let alias = resolver?.alias;
-    if (!alias) {
-      const type = asArray(node["@type"])?.[0] || "";
-      alias = type.toLowerCase();
-    }
-    const hashNodeData = {};
-    Object.entries(node).forEach(([key, val]) => {
-      if (!key.startsWith("_"))
-        hashNodeData[key] = val;
-    });
-    node["@id"] = prefixId(ctx.meta[prefix], `#/schema/${alias}/${hashCode(JSON.stringify(hashNodeData))}`);
+  if (node["@id"]?.startsWith("#/schema/")) {
+    node["@id"] = prefixId(ctx.meta[prefix], node["@id"]);
+    return node;
   }
+  let alias = resolver?.alias;
+  if (!alias) {
+    const type = asArray(node["@type"])?.[0] || "";
+    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;
+  });
+  node["@id"] = prefixId(ctx.meta[prefix], `#/schema/${alias}/${node["@id"] || hashCode(JSON.stringify(hashNodeData))}`);
   return node;
 }
 function resolveRelation(input, ctx, fallbackResolver, options = {}) {

package/dist/shared/{schema-org.f81cbd4d.cjs → schema-org.da628d24.cjs}

@@ -53,7 +53,7 @@ function prefixId(url, id) {
     return id;
   if (!id.startsWith("#"))
     id = `#${id}`;
-  return ufo.joinURL(url, id);
+  return ufo.withBase(id, url);
 }
 function trimLength(val, length) {
   if (!val)
@@ -295,13 +295,12 @@ const organizationResolver = defineSchemaOrgResolver({
   resolveRootNode(node, ctx) {
     const isIdentity = resolveAsGraphKey(node["@id"]) === IdentityId;
     const webPage = ctx.find(PrimaryWebPageId);
-    if (node.logo) {
+    if (node.logo && isIdentity) {
       if (!ctx.find("#organization")) {
         const logoNode = resolveRelation(node.logo, ctx, imageResolver, {
           root: true,
           afterResolve(logo) {
-            if (isIdentity)
-              logo["@id"] = prefixId(ctx.meta.host, "#logo");
+            logo["@id"] = prefixId(ctx.meta.host, "#logo");
             setIfEmpty(logo, "caption", node.name);
           }
         });
@@ -702,6 +701,9 @@ const localBusinessResolver = defineSchemaOrgResolver({
     node.address = resolveRelation(node.address, ctx, addressResolver);
     node.openingHoursSpecification = resolveRelation(node.openingHoursSpecification, ctx, openingHoursResolver);
     node = resolveNode({ ...node }, ctx, organizationResolver);
+    return node;
+  },
+  resolveRootNode(node, ctx) {
     organizationResolver.resolveRootNode(node, ctx);
     return node;
   }
@@ -721,6 +723,10 @@ const foodEstablishmentResolver = defineSchemaOrgResolver({
     node.starRating = resolveRelation(node.starRating, ctx, ratingResolver);
     node = resolveNode(node, ctx, localBusinessResolver);
     return node;
+  },
+  resolveRootNode(node, ctx) {
+    localBusinessResolver.resolveRootNode(node, ctx);
+    return node;
   }
 });
 
@@ -1777,30 +1783,29 @@ function resolveNode(node, ctx, resolver) {
   return node;
 }
 function resolveNodeId(node, ctx, resolver, resolveAsRoot = false) {
-  const prefix = Array.isArray(resolver.idPrefix) ? resolver.idPrefix[0] : resolver.idPrefix;
-  if (!prefix)
-    return node;
-  if (node["@id"] && !node["@id"].startsWith(ctx.meta.host)) {
-    node["@id"] = prefixId(ctx.meta[prefix], node["@id"]);
+  if (node["@id"] && node["@id"].startsWith("http"))
     return node;
-  }
+  const prefix = (Array.isArray(resolver.idPrefix) ? resolver.idPrefix[0] : resolver.idPrefix) || "url";
   const rootId = node["@id"] || (Array.isArray(resolver.idPrefix) ? resolver.idPrefix?.[1] : void 0);
-  if (resolveAsRoot && rootId) {
+  if (!node["@id"] && resolveAsRoot && rootId) {
     node["@id"] = prefixId(ctx.meta[prefix], rootId);
+    return node;
   }
-  if (!node["@id"]) {
-    let alias = resolver?.alias;
-    if (!alias) {
-      const type = asArray(node["@type"])?.[0] || "";
-      alias = type.toLowerCase();
-    }
-    const hashNodeData = {};
-    Object.entries(node).forEach(([key, val]) => {
-      if (!key.startsWith("_"))
-        hashNodeData[key] = val;
-    });
-    node["@id"] = prefixId(ctx.meta[prefix], `#/schema/${alias}/${shared.hashCode(JSON.stringify(hashNodeData))}`);
+  if (node["@id"]?.startsWith("#/schema/")) {
+    node["@id"] = prefixId(ctx.meta[prefix], node["@id"]);
+    return node;
   }
+  let alias = resolver?.alias;
+  if (!alias) {
+    const type = asArray(node["@type"])?.[0] || "";
+    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;
+  });
+  node["@id"] = prefixId(ctx.meta[prefix], `#/schema/${alias}/${node["@id"] || shared.hashCode(JSON.stringify(hashNodeData))}`);
   return node;
 }
 function resolveRelation(input, ctx, fallbackResolver, options = {}) {

package/dist/vue.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const plugin = require('./shared/schema-org.f81cbd4d.cjs');
+const plugin = require('./shared/schema-org.da628d24.cjs');
 const vue = require('@unhead/vue');
 const vue$1 = require('vue');
 require('@unhead/shared');

package/dist/vue.mjs

@@ -1,5 +1,5 @@
-import { U as UnheadSchemaOrg } from './shared/schema-org.cefa8818.mjs';
-export { a1 as PluginSchemaOrg, a2 as SchemaOrgUnheadPlugin } from './shared/schema-org.cefa8818.mjs';
+import { U as UnheadSchemaOrg } from './shared/schema-org.bb03b192.mjs';
+export { a1 as PluginSchemaOrg, a2 as SchemaOrgUnheadPlugin } from './shared/schema-org.bb03b192.mjs';
 import { injectHead, useHead } from '@unhead/vue';
 import { defineComponent, ref, computed, unref, h } from 'vue';
 import '@unhead/shared';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unhead/schema-org",
-  "version": "1.8.7",
+  "version": "1.8.9",
   "description": "Unhead Schema.org for Simple and Automated Google Rich Results",
   "author": "Harlan Wilton <harlan@harlanzw.com>",
   "license": "MIT",
@@ -39,19 +39,19 @@
     "dist"
   ],
   "peerDependencies": {
-    "unhead": ">=1.8.3",
-    "@unhead/shared": "1.8.7"
+    "unhead": ">=1.8.8",
+    "@unhead/shared": "1.8.9"
   },
   "dependencies": {
     "ufo": "^1.3.2"
   },
   "devDependencies": {
-    "unplugin-vue-components": "^0.25.2",
-    "vue": "^3.3.8",
-    "@unhead/schema": "1.8.7",
-    "@unhead/vue": "1.8.7",
-    "@unhead/shared": "1.8.7",
-    "unhead": "1.8.7"
+    "unplugin-vue-components": "^0.26.0",
+    "vue": "^3.3.11",
+    "@unhead/schema": "1.8.9",
+    "@unhead/shared": "1.8.9",
+    "unhead": "1.8.9",
+    "@unhead/vue": "1.8.9"
   },
   "scripts": {
     "build": "unbuild .",