@unhead/schema-org 1.11.11 → 1.11.12

package/dist/index.cjs

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

package/dist/index.mjs

@@ -1,5 +1,5 @@
-import { U as UnheadSchemaOrg } from './shared/schema-org.bd452034.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, f as dedupeNodes, d as defineSchemaOrgResolver, t as eventResolver, w as foodEstablishmentResolver, x as howToResolver, z as howToStepDirectionResolver, y as howToStepResolver, A as imageResolver, B 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, a as resolveNode, b as resolveNodeId, e as resolveRelation, T as reviewResolver, a0 as searchActionResolver, V as softwareAppResolver, W as videoResolver, v as virtualLocationResolver, Y as webPageResolver, $ as webSiteResolver } from './shared/schema-org.bd452034.mjs';
+import { U as UnheadSchemaOrg } from './shared/schema-org.ac0c24a5.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, f as dedupeNodes, d as defineSchemaOrgResolver, t as eventResolver, w as foodEstablishmentResolver, x as howToResolver, z as howToStepDirectionResolver, y as howToStepResolver, A as imageResolver, B 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, a as resolveNode, b as resolveNodeId, e as resolveRelation, T as reviewResolver, a0 as searchActionResolver, V as softwareAppResolver, W as videoResolver, v as virtualLocationResolver, Y as webPageResolver, $ as webSiteResolver } from './shared/schema-org.ac0c24a5.mjs';
 import { getActiveHead, useHead } from 'unhead';
 import 'ufo';
 import 'ohash';

package/dist/shared/{schema-org.bd452034.mjs → schema-org.ac0c24a5.mjs}

@@ -1430,6 +1430,7 @@ function createDefu(merger) {
     arguments_.reduce((p, c) => _defu(p, c, "", merger), {})
   );
 }
+const defu = createDefu();
 
 function groupBy(array, predicate) {
   return array.reduce((acc, value, index, array2) => {
@@ -1572,6 +1573,7 @@ function SchemaOrgUnheadPlugin(config, meta, options) {
       },
       "tag:normalise": async ({ tag }) => {
         if (tag.tag === "script" && tag.props.type === "application/ld+json" && tag.props.nodes) {
+          console.log("tag", tag);
           const { loadResolver } = await Promise.resolve().then(function () { return resolver; });
           const nodes = await tag.props.nodes;
           for (const node of Array.isArray(nodes) ? nodes : [nodes]) {
@@ -1616,6 +1618,7 @@ function SchemaOrgUnheadPlugin(config, meta, options) {
         for (const k in ctx.tags) {
           const tag = ctx.tags[k];
           if (tag.tag === "script" && tag.props.type === "application/ld+json" && tag.props.nodes) {
+            delete tag.props.nodes;
             const resolvedGraph = graph.resolveGraph({ ...await meta?.() || {}, ...config, ...resolvedMeta });
             if (!resolvedGraph.length) {
               tag.props = {};
@@ -1630,10 +1633,25 @@ function SchemaOrgUnheadPlugin(config, meta, options) {
                 return processTemplateParams(value, head._templateParams, head._separator);
               return value;
             }, minify ? 0 : 2);
-            delete tag.props.nodes;
             return;
           }
         }
+      },
+      "tags:afterResolve": (ctx) => {
+        let firstNodeKey;
+        for (const k in ctx.tags) {
+          const tag = ctx.tags[k];
+          if (tag.props.type === "application/ld+json" && tag.props.nodes || tag.key === "schema-org-graph") {
+            if (typeof firstNodeKey === "undefined") {
+              firstNodeKey = k;
+              continue;
+            }
+            ctx.tags[firstNodeKey].props = defu(ctx.tags[firstNodeKey].props, tag.props);
+            delete ctx.tags[firstNodeKey].props.nodes;
+            ctx.tags[k] = false;
+          }
+        }
+        ctx.tags = ctx.tags.filter(Boolean);
       }
     }
   }));

package/dist/shared/{schema-org.6b89a24a.cjs → schema-org.f5bc531c.cjs}

@@ -1432,6 +1432,7 @@ function createDefu(merger) {
     arguments_.reduce((p, c) => _defu(p, c, "", merger), {})
   );
 }
+const defu = createDefu();
 
 function groupBy(array, predicate) {
   return array.reduce((acc, value, index, array2) => {
@@ -1574,6 +1575,7 @@ function SchemaOrgUnheadPlugin(config, meta, options) {
       },
       "tag:normalise": async ({ tag }) => {
         if (tag.tag === "script" && tag.props.type === "application/ld+json" && tag.props.nodes) {
+          console.log("tag", tag);
           const { loadResolver } = await Promise.resolve().then(function () { return resolver; });
           const nodes = await tag.props.nodes;
           for (const node of Array.isArray(nodes) ? nodes : [nodes]) {
@@ -1618,6 +1620,7 @@ function SchemaOrgUnheadPlugin(config, meta, options) {
         for (const k in ctx.tags) {
           const tag = ctx.tags[k];
           if (tag.tag === "script" && tag.props.type === "application/ld+json" && tag.props.nodes) {
+            delete tag.props.nodes;
             const resolvedGraph = graph.resolveGraph({ ...await meta?.() || {}, ...config, ...resolvedMeta });
             if (!resolvedGraph.length) {
               tag.props = {};
@@ -1632,10 +1635,25 @@ function SchemaOrgUnheadPlugin(config, meta, options) {
                 return processTemplateParams(value, head._templateParams, head._separator);
               return value;
             }, minify ? 0 : 2);
-            delete tag.props.nodes;
             return;
           }
         }
+      },
+      "tags:afterResolve": (ctx) => {
+        let firstNodeKey;
+        for (const k in ctx.tags) {
+          const tag = ctx.tags[k];
+          if (tag.props.type === "application/ld+json" && tag.props.nodes || tag.key === "schema-org-graph") {
+            if (typeof firstNodeKey === "undefined") {
+              firstNodeKey = k;
+              continue;
+            }
+            ctx.tags[firstNodeKey].props = defu(ctx.tags[firstNodeKey].props, tag.props);
+            delete ctx.tags[firstNodeKey].props.nodes;
+            ctx.tags[k] = false;
+          }
+        }
+        ctx.tags = ctx.tags.filter(Boolean);
       }
     }
   }));

package/dist/vue.cjs

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

package/dist/vue.mjs

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unhead/schema-org",
   "type": "module",
-  "version": "1.11.11",
+  "version": "1.11.12",
   "description": "Unhead Schema.org for Simple and Automated Google Rich Results",
   "author": "Harlan Wilton <harlan@harlanzw.com>",
   "license": "MIT",
@@ -47,6 +47,15 @@
     "dist",
     "vue.d.ts"
   ],
+  "peerDependencies": {
+    "@unhead/vue": "^1.11.11",
+    "unhead": "^1.11.11"
+  },
+  "peerDependenciesMeta": {
+    "@unhead/vue": {
+      "optional": true
+    }
+  },
   "dependencies": {
     "ohash": "^1.1.4",
     "ufo": "^1.5.4"
@@ -58,10 +67,10 @@
   },
   "devDependencies": {
     "unplugin-vue-components": "^0.27.4",
-    "@unhead/schema": "1.11.11",
-    "@unhead/vue": "1.11.11",
-    "unhead": "1.11.11",
-    "@unhead/shared": "1.11.11"
+    "@unhead/schema": "1.11.12",
+    "@unhead/shared": "1.11.12",
+    "@unhead/vue": "1.11.12",
+    "unhead": "1.11.12"
   },
   "scripts": {
     "build": "unbuild .",