@unhead/schema-org 0.4.0 → 0.5.0

package/dist/index.cjs

@@ -6,10 +6,17 @@ function defineSchemaOrgResolver(schema) {
   return schema;
 }
 
-const PROTOCOL_REGEX = /^\w{2,}:(\/\/)?/;
-const PROTOCOL_RELATIVE_REGEX = /^\/\/[^/]+/;
-function hasProtocol(inputString, acceptProtocolRelative = false) {
-  return PROTOCOL_REGEX.test(inputString) || acceptProtocolRelative && PROTOCOL_RELATIVE_REGEX.test(inputString);
+const PROTOCOL_STRICT_REGEX = /^\w{2,}:([/\\]{1,2})/;
+const PROTOCOL_REGEX = /^\w{2,}:([/\\]{2})?/;
+const PROTOCOL_RELATIVE_REGEX = /^[/\\]{2}[^/\\]+/;
+function hasProtocol(inputString, opts = {}) {
+  if (typeof opts === "boolean") {
+    opts = { acceptRelative: opts };
+  }
+  if (opts.strict) {
+    return PROTOCOL_STRICT_REGEX.test(inputString);
+  }
+  return PROTOCOL_REGEX.test(inputString) || (opts.acceptRelative ? PROTOCOL_RELATIVE_REGEX.test(inputString) : false);
 }
 const TRAILING_SLASH_RE = /\/$|\/\?/;
 function hasTrailingSlash(input = "", queryParameters = false) {
@@ -176,7 +183,7 @@ const offerResolver = defineSchemaOrgResolver({
   },
   resolve(node, ctx) {
     setIfEmpty(node, "priceCurrency", ctx.meta.currency);
-    setIfEmpty(node, "priceValidUntil", new Date(Date.UTC(new Date().getFullYear() + 1, 12, -1, 0, 0, 0)));
+    setIfEmpty(node, "priceValidUntil", new Date(Date.UTC((/* @__PURE__ */ new Date()).getFullYear() + 1, 12, -1, 0, 0, 0)));
     if (node.url)
       resolveWithBase(ctx.meta.host, node.url);
     if (node.availability)
@@ -321,6 +328,7 @@ const imageResolver = defineSchemaOrgResolver({
     "@type": "ImageObject"
   },
   inheritMeta: [
+    // @todo possibly only do if there's a caption
     "inLanguage"
   ],
   idPrefix: "host",
@@ -1821,7 +1829,7 @@ function SchemaOrgUnheadPlugin(config, meta) {
           tag.tagPosition = config.tagPosition === "head" ? "head" : "bodyClose";
         }
         if (tag.tag === "title")
-          resolvedMeta.title = tag.children;
+          resolvedMeta.title = tag.textContent;
         else if (tag.tag === "meta" && tag.props.name === "description")
           resolvedMeta.description = tag.props.content;
         else if (tag.tag === "link" && tag.props.rel === "canonical")
@@ -1832,7 +1840,7 @@ function SchemaOrgUnheadPlugin(config, meta) {
       "tags:resolve": async function(ctx) {
         for (const tag of ctx.tags) {
           if (tag.tag === "script" && tag.key === "schema-org-graph") {
-            tag.children = JSON.stringify({
+            tag.innerHTML = JSON.stringify({
               "@context": "https://schema.org",
               "@graph": graph.resolveGraph({ ...config, ...resolvedMeta, ...await meta() })
             }, null, 2);

package/dist/index.d.ts

@@ -990,7 +990,7 @@ interface JobPostingSimple extends Thing {
     /**
      * Type of employment
      */
-    employmentType?: 'FULL_TIME' | 'PART_TIME' | 'CONTRACTOR' | 'TEMPORARY' | 'INTERN' | 'VOLUNTEER' | 'PER_DIEM' | 'OTHER';
+    employmentType?: EmploymentType | EmploymentType[];
     /**
      * The date when the job posting will expire in ISO 8601 format. For example, "2017-02-24"
      * or "2017-02-24T19:33:17+00:00".
@@ -1008,6 +1008,7 @@ interface JobPostingSimple extends Thing {
 interface JobPosting extends JobPostingSimple {
 }
 declare const jobPostingResolver: SchemaOrgNodeDefinition<JobPosting>;
+type EmploymentType = 'FULL_TIME' | 'PART_TIME' | 'CONTRACTOR' | 'TEMPORARY' | 'INTERN' | 'VOLUNTEER' | 'PER_DIEM' | 'OTHER';
 
 type DayOfWeek = 'Friday' | 'Monday' | 'PublicHolidays' | 'Saturday' | 'Sunday' | 'Thursday' | 'Tuesday' | 'Wednesday';
 type Time = `${number}${number}:${number}${number}`;

package/dist/index.mjs

@@ -4,10 +4,17 @@ function defineSchemaOrgResolver(schema) {
   return schema;
 }
 
-const PROTOCOL_REGEX = /^\w{2,}:(\/\/)?/;
-const PROTOCOL_RELATIVE_REGEX = /^\/\/[^/]+/;
-function hasProtocol(inputString, acceptProtocolRelative = false) {
-  return PROTOCOL_REGEX.test(inputString) || acceptProtocolRelative && PROTOCOL_RELATIVE_REGEX.test(inputString);
+const PROTOCOL_STRICT_REGEX = /^\w{2,}:([/\\]{1,2})/;
+const PROTOCOL_REGEX = /^\w{2,}:([/\\]{2})?/;
+const PROTOCOL_RELATIVE_REGEX = /^[/\\]{2}[^/\\]+/;
+function hasProtocol(inputString, opts = {}) {
+  if (typeof opts === "boolean") {
+    opts = { acceptRelative: opts };
+  }
+  if (opts.strict) {
+    return PROTOCOL_STRICT_REGEX.test(inputString);
+  }
+  return PROTOCOL_REGEX.test(inputString) || (opts.acceptRelative ? PROTOCOL_RELATIVE_REGEX.test(inputString) : false);
 }
 const TRAILING_SLASH_RE = /\/$|\/\?/;
 function hasTrailingSlash(input = "", queryParameters = false) {
@@ -174,7 +181,7 @@ const offerResolver = defineSchemaOrgResolver({
   },
   resolve(node, ctx) {
     setIfEmpty(node, "priceCurrency", ctx.meta.currency);
-    setIfEmpty(node, "priceValidUntil", new Date(Date.UTC(new Date().getFullYear() + 1, 12, -1, 0, 0, 0)));
+    setIfEmpty(node, "priceValidUntil", new Date(Date.UTC((/* @__PURE__ */ new Date()).getFullYear() + 1, 12, -1, 0, 0, 0)));
     if (node.url)
       resolveWithBase(ctx.meta.host, node.url);
     if (node.availability)
@@ -319,6 +326,7 @@ const imageResolver = defineSchemaOrgResolver({
     "@type": "ImageObject"
   },
   inheritMeta: [
+    // @todo possibly only do if there's a caption
     "inLanguage"
   ],
   idPrefix: "host",
@@ -1819,7 +1827,7 @@ function SchemaOrgUnheadPlugin(config, meta) {
           tag.tagPosition = config.tagPosition === "head" ? "head" : "bodyClose";
         }
         if (tag.tag === "title")
-          resolvedMeta.title = tag.children;
+          resolvedMeta.title = tag.textContent;
         else if (tag.tag === "meta" && tag.props.name === "description")
           resolvedMeta.description = tag.props.content;
         else if (tag.tag === "link" && tag.props.rel === "canonical")
@@ -1830,7 +1838,7 @@ function SchemaOrgUnheadPlugin(config, meta) {
       "tags:resolve": async function(ctx) {
         for (const tag of ctx.tags) {
           if (tag.tag === "script" && tag.key === "schema-org-graph") {
-            tag.children = JSON.stringify({
+            tag.innerHTML = JSON.stringify({
               "@context": "https://schema.org",
               "@graph": graph.resolveGraph({ ...config, ...resolvedMeta, ...await meta() })
             }, null, 2);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unhead/schema-org",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "packageManager": "pnpm@7.8.0",
   "description": "Node Schema.org for Simple and Automated Google Rich Results",
   "author": "Harlan Wilton <harlan@harlanzw.com>",
@@ -34,11 +34,11 @@
     "dist"
   ],
   "peerDependencies": {
-    "unhead": ">=1.0.10"
+    "unhead": ">=1.1.9"
   },
   "devDependencies": {
-    "ufo": "^1.0.1",
-    "unhead": "^1.0.14"
+    "ufo": "^1.1.0",
+    "unhead": "^1.1.9"
   },
   "scripts": {
     "build": "unbuild .",