@unhead/schema-org 1.10.4 → 1.11.0-beta.2

package/dist/shared/{schema-org.b49caaf3.cjs → schema-org.99ac1ebf.cjs}

@@ -58,7 +58,7 @@ function dedupeMerge(node, field, value) {
 function prefixId(url, id) {
   if (ufo.hasProtocol(id))
     return id;
-  if (id[0] !== "#")
+  if (!id.includes("#"))
     id = `#${id}`;
   return ufo.withBase(id, url);
 }
@@ -228,59 +228,6 @@ const aggregateRatingResolver = defineSchemaOrgResolver({
   }
 });
 
-const searchActionResolver = defineSchemaOrgResolver({
-  defaults: {
-    "@type": "SearchAction",
-    "target": {
-      "@type": "EntryPoint"
-    },
-    "query-input": {
-      "@type": "PropertyValueSpecification",
-      "valueRequired": true,
-      "valueName": "search_term_string"
-    }
-  },
-  resolve(node, ctx) {
-    if (typeof node.target === "string") {
-      node.target = {
-        "@type": "EntryPoint",
-        "urlTemplate": resolveWithBase(ctx.meta.host, node.target)
-      };
-    }
-    return node;
-  }
-});
-
-const PrimaryWebSiteId = "#website";
-const webSiteResolver = defineSchemaOrgResolver({
-  defaults: {
-    "@type": "WebSite"
-  },
-  inheritMeta: [
-    "inLanguage",
-    { meta: "host", key: "url" }
-  ],
-  idPrefix: ["host", PrimaryWebSiteId],
-  resolve(node, ctx) {
-    node.potentialAction = resolveRelation(node.potentialAction, ctx, searchActionResolver, {
-      array: true
-    });
-    node.publisher = resolveRelation(node.publisher, ctx);
-    return node;
-  },
-  resolveRootNode(node, { find }) {
-    if (resolveAsGraphKey(node["@id"]) === PrimaryWebSiteId) {
-      const identity = find(IdentityId);
-      if (identity)
-        setIfEmpty(node, "publisher", idReference(identity));
-      const webPage = find(PrimaryWebPageId);
-      if (webPage)
-        setIfEmpty(webPage, "isPartOf", idReference(node));
-    }
-    return node;
-  }
-});
-
 const listItemResolver = defineSchemaOrgResolver({
   cast(node) {
     if (typeof node === "string") {
@@ -362,6 +309,59 @@ const addressResolver = defineSchemaOrgResolver({
   }
 });
 
+const searchActionResolver = defineSchemaOrgResolver({
+  defaults: {
+    "@type": "SearchAction",
+    "target": {
+      "@type": "EntryPoint"
+    },
+    "query-input": {
+      "@type": "PropertyValueSpecification",
+      "valueRequired": true,
+      "valueName": "search_term_string"
+    }
+  },
+  resolve(node, ctx) {
+    if (typeof node.target === "string") {
+      node.target = {
+        "@type": "EntryPoint",
+        "urlTemplate": resolveWithBase(ctx.meta.host, node.target)
+      };
+    }
+    return node;
+  }
+});
+
+const PrimaryWebSiteId = "#website";
+const webSiteResolver = defineSchemaOrgResolver({
+  defaults: {
+    "@type": "WebSite"
+  },
+  inheritMeta: [
+    "inLanguage",
+    { meta: "host", key: "url" }
+  ],
+  idPrefix: ["host", PrimaryWebSiteId],
+  resolve(node, ctx) {
+    node.potentialAction = resolveRelation(node.potentialAction, ctx, searchActionResolver, {
+      array: true
+    });
+    node.publisher = resolveRelation(node.publisher, ctx);
+    return node;
+  },
+  resolveRootNode(node, { find }) {
+    if (resolveAsGraphKey(node["@id"]) === PrimaryWebSiteId) {
+      const identity = find(IdentityId);
+      if (identity)
+        setIfEmpty(node, "publisher", idReference(identity));
+      const webPage = find(PrimaryWebPageId);
+      if (webPage)
+        setIfEmpty(webPage, "isPartOf", idReference(node));
+    }
+    return node;
+  }
+});
+
 const organizationResolver = defineSchemaOrgResolver({
   defaults: {
     "@type": "Organization"
@@ -415,40 +415,6 @@ const organizationResolver = defineSchemaOrgResolver({
   }
 });
 
-const personResolver = defineSchemaOrgResolver({
-  cast(node) {
-    if (typeof node === "string") {
-      return {
-        name: node
-      };
-    }
-    return node;
-  },
-  defaults: {
-    "@type": "Person"
-  },
-  idPrefix: ["host", IdentityId],
-  resolve(node, ctx) {
-    if (node.url)
-      node.url = resolveWithBase(ctx.meta.host, node.url);
-    return node;
-  },
-  resolveRootNode(node, { find, meta }) {
-    if (resolveAsGraphKey(node["@id"]) === IdentityId) {
-      setIfEmpty(node, "url", meta.host);
-      const webPage = find(PrimaryWebPageId);
-      if (webPage)
-        setIfEmpty(webPage, "about", idReference(node));
-      const webSite = find(PrimaryWebSiteId);
-      if (webSite)
-        setIfEmpty(webSite, "publisher", idReference(node));
-    }
-    const article = find(PrimaryArticleId);
-    if (article)
-      setIfEmpty(article, "author", idReference(node));
-  }
-});
-
 const readActionResolver = defineSchemaOrgResolver({
   defaults: {
     "@type": "ReadAction"
@@ -534,6 +500,40 @@ const webPageResolver = defineSchemaOrgResolver({
   }
 });
 
+const personResolver = defineSchemaOrgResolver({
+  cast(node) {
+    if (typeof node === "string") {
+      return {
+        name: node
+      };
+    }
+    return node;
+  },
+  defaults: {
+    "@type": "Person"
+  },
+  idPrefix: ["host", IdentityId],
+  resolve(node, ctx) {
+    if (node.url)
+      node.url = resolveWithBase(ctx.meta.host, node.url);
+    return node;
+  },
+  resolveRootNode(node, { find, meta }) {
+    if (resolveAsGraphKey(node["@id"]) === IdentityId) {
+      setIfEmpty(node, "url", meta.host);
+      const webPage = find(PrimaryWebPageId);
+      if (webPage)
+        setIfEmpty(webPage, "about", idReference(node));
+      const webSite = find(PrimaryWebSiteId);
+      if (webSite)
+        setIfEmpty(webSite, "publisher", idReference(node));
+    }
+    const article = find(PrimaryArticleId);
+    if (article)
+      setIfEmpty(article, "author", idReference(node));
+  }
+});
+
 const PrimaryArticleId = "#article";
 const articleResolver = defineSchemaOrgResolver({
   defaults: {
@@ -746,22 +746,6 @@ const eventResolver = defineSchemaOrgResolver({
   }
 });
 
-const ratingResolver = defineSchemaOrgResolver({
-  cast(node) {
-    if (node === "number") {
-      return {
-        ratingValue: node
-      };
-    }
-    return node;
-  },
-  defaults: {
-    "@type": "Rating",
-    "bestRating": 5,
-    "worstRating": 1
-  }
-});
-
 const openingHoursResolver = defineSchemaOrgResolver({
   defaults: {
     "@type": "OpeningHoursSpecification",
@@ -792,6 +776,22 @@ const localBusinessResolver = defineSchemaOrgResolver({
   }
 });
 
+const ratingResolver = defineSchemaOrgResolver({
+  cast(node) {
+    if (node === "number") {
+      return {
+        ratingValue: node
+      };
+    }
+    return node;
+  },
+  defaults: {
+    "@type": "Rating",
+    "bestRating": 5,
+    "worstRating": 1
+  }
+});
+
 const foodEstablishmentResolver = defineSchemaOrgResolver({
   defaults: {
     "@type": ["Organization", "LocalBusiness", "FoodEstablishment"]
@@ -1912,13 +1912,13 @@ function resolveNode(node, ctx, resolver) {
 function resolveNodeId(node, ctx, resolver, resolveAsRoot = false) {
   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);
+  const prefix = resolver ? (Array.isArray(resolver.idPrefix) ? resolver.idPrefix[0] : resolver.idPrefix) || "url" : "url";
+  const rootId = node["@id"] || (resolver ? Array.isArray(resolver.idPrefix) ? resolver.idPrefix?.[1] : void 0 : "");
   if (!node["@id"] && resolveAsRoot && rootId) {
     node["@id"] = prefixId(ctx.meta[prefix], rootId);
     return node;
   }
-  if (node["@id"]?.startsWith("#/schema/")) {
+  if (node["@id"]?.startsWith("#/schema/") || node["@id"]?.startsWith("/")) {
     node["@id"] = prefixId(ctx.meta[prefix], node["@id"]);
     return node;
   }
@@ -1946,10 +1946,10 @@ function resolveRelation(input, ctx, fallbackResolver, options = {}) {
   const ids = asArray(input).map((a) => {
     const keys = Object.keys(a).length;
     if (keys === 1 && a["@id"] || keys === 2 && a["@id"] && a["@type"]) {
-      return {
+      return resolveNodeId({
         // we drop @type
         "@id": ctx.find(a["@id"])?.["@id"] || a["@id"]
-      };
+      }, ctx);
     }
     let resolver = fallbackResolver;
     if (a._resolver) {
@@ -2094,6 +2094,10 @@ function normaliseNodes(nodes) {
   return Object.values(dedupedNodes);
 }
 
+const baseRelationNodes = [
+  "translationOfWork",
+  "workTranslation"
+];
 function createSchemaOrgGraph() {
   const ctx = {
     find(id) {
@@ -2123,6 +2127,9 @@ function createSchemaOrgGraph() {
             root: true
           });
         }
+        baseRelationNodes.forEach((k) => {
+          node[k] = resolveRelation(node[k], ctx);
+        });
         if (node._resolver?.resolveRootNode)
           node._resolver.resolveRootNode(node, ctx);
         delete node._resolver;
@@ -2153,7 +2160,7 @@ function SchemaOrgUnheadPlugin(config, meta, options) {
         graph = createSchemaOrgGraph();
       },
       "tag:normalise": async ({ tag }) => {
-        if (tag.key === "schema-org-graph") {
+        if (tag.key === "schema-org-graph" || tag.props.id === "schema-org-graph") {
           const { loadResolver } = await Promise.resolve().then(function () { return resolver; });
           const nodes = await tag.props.nodes;
           for (const node of Array.isArray(nodes) ? nodes : [nodes]) {