From 4a497ecf0d07e86f0a83bd110b29a88b876940b3 Mon Sep 17 00:00:00 2001
From: Eyas Sharaiha <eyas@google.com>
Date: Mon, 20 Jul 2020 14:32:35 -0400
Subject: [PATCH 1/2] Support using <script> tags directly.

Fixes #23. Some tools such as `next/head` rely on a script tag existing
directly under the `<Head>` component. Allowing a react-schemaorg user
just pass the props opaquely to a `<script>` tag gives us both
encapsulation while getting the library to work.

Our public API surface area is now effectivley 3 pieces: the original
JSON-LD component, a function generating Helmet-style props, and this
function, which generates plain JSX-style props for `<script>`.
---
 README.md       | 33 +++++++++++++++++++++++++++++++++
 src/index.ts    |  2 +-
 src/json-ld.tsx | 44 ++++++++++++++++++++++++++++++++------------
 3 files changed, 66 insertions(+), 13 deletions(-)
diff --git a/README.md b/README.md
index 927cbf7..9099d7c 100644
--- a/README.md
+++ b/README.md
@@ -50,6 +50,39 @@ export function GraceHopper() {
 }
 ```
 
+### Directly creating `<script>` tags (for `next/head` and elsewhere)
+
+Certain `<head>` management libraries require `<script>` tags to be directly
+included, rather than wrapped in a component. This includes NextJS's
+`next/head`, and `react-helmet`. With these, we can use the `jsonLdScriptProps`
+export to do the same thing:
+
+```tsx
+import { Person } from "schema-dts";
+import { helmetJsonLdProp } from "react-schemaorg";
+import Head from "next/head";
+
+export default function MyPage() {
+  return (
+    <Head>
+      <script
+        {...jsonLdScriptProps<Person>({
+          "@context": "https://schema.org",
+          "@type": "Person",
+          name: "Grace Hopper",
+          alternateName: "Grace Brewster Murray Hopper",
+          alumniOf: {
+            "@type": "CollegeOrUniversity",
+            name: ["Yale University", "Vassar College"],
+          },
+          knowsAbout: ["Compilers", "Computer Science"],
+        })}
+      />
+    </Head>
+  );
+}
+```
+
 ### [React Helmet](https://github.com/nfl/react-helmet) Usage
 
 To set JSON-LD in React Helmet, you need to pass it to the `script={[...]}` prop
diff --git a/src/index.ts b/src/index.ts
index a04e1b7..2fc31c2 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export { helmetJsonLdProp, JsonLd } from "./json-ld";
+export { helmetJsonLdProp, JsonLd, jsonLdScriptProps } from "./json-ld";
diff --git a/src/json-ld.tsx b/src/json-ld.tsx
index fcec73c..47ac99e 100644
--- a/src/json-ld.tsx
+++ b/src/json-ld.tsx
@@ -50,21 +50,41 @@ export class JsonLd<T extends Thing> extends React.Component<
   }
 > {
   render() {
-    return (
-      <script
-        type="application/ld+json"
-        dangerouslySetInnerHTML={{
-          __html: JSON.stringify(
-            this.props.item,
-            safeJsonLdReplacer,
-            this.props.space
-          ),
-        }}
-      />
-    );
+    return <script {...jsonLdScriptProps<T>(this.props.item, this.props)} />;
   }
 }
 
+/**
+ * Produces necessary props for a JSX <script> tag that includes JSON-LD.
+ *
+ * Can be used by spreading the props into a <script> JSX tag:
+ *
+ * ```tsx
+ * <script {...jsonLdScriptProps<Person>({
+ *   "@context": "https://schema.org",
+ *   "@type": "Person",
+ *   name: "Grace Hopper",
+ *   alternateName: "Grace Brewster Murray Hopper",
+ *   alumniOf: {
+ *     "@type": "CollegeOrUniversity",
+ *     name: ["Yale University", "Vassar College"]
+ *   },
+ *   knowsAbout: ["Compilers", "Computer Science"]
+ * })} />
+ * ```
+ */
+export function jsonLdScriptProps<T extends Thing>(
+  item: WithContext<T>,
+  options: JsonLdOptions = {}
+): JSX.IntrinsicElements["script"] {
+  return {
+    type: "application/ld+json",
+    dangerouslySetInnerHTML: {
+      __html: JSON.stringify(item, safeJsonLdReplacer, options.space),
+    },
+  };
+}
+
 /**
  * Produces a Helmet-style <script> prop for a given JSON-LD datum.
  *

From a048a6ccb78d9dca0cfbf13449597cbc0209973d Mon Sep 17 00:00:00 2001
From: Eyas Sharaiha <eyas@google.com>
Date: Mon, 20 Jul 2020 14:42:47 -0400
Subject: [PATCH 2/2] Add tests for jsonLdScriptProps.

---
 test/jsonld_func_test.ts | 166 ++++++++++++++++++++++++++++++++-------
 1 file changed, 138 insertions(+), 28 deletions(-)

diff --git a/test/jsonld_func_test.ts b/test/jsonld_func_test.ts
index 5f3477c..e7f8161 100644
--- a/test/jsonld_func_test.ts
+++ b/test/jsonld_func_test.ts
@@ -1,47 +1,119 @@
-import {Person} from 'schema-dts';
+import { Person } from "schema-dts";
 
-import {helmetJsonLdProp} from '../src';
+import { helmetJsonLdProp, jsonLdScriptProps } from "../src";
 
-test('works', () => {
-  expect(helmetJsonLdProp<Person>({
-    '@context': 'https://schema.org',
-    '@type': 'Person',
-  })).toMatchInlineSnapshot(`
+test("works", () => {
+  expect(
+    helmetJsonLdProp<Person>({
+      "@context": "https://schema.org",
+      "@type": "Person",
+    })
+  ).toMatchInlineSnapshot(`
     Object {
       "innerHTML": "{\\"@context\\":\\"https://schema.org\\",\\"@type\\":\\"Person\\"}",
       "type": "application/ld+json",
     }
   `);
+
+  expect(
+    jsonLdScriptProps<Person>({
+      "@context": "https://schema.org",
+      "@type": "Person",
+    })
+  ).toMatchInlineSnapshot(`
+    Object {
+      "dangerouslySetInnerHTML": Object {
+        "__html": "{\\"@context\\":\\"https://schema.org\\",\\"@type\\":\\"Person\\"}",
+      },
+      "type": "application/ld+json",
+    }
+  `);
+
+  expect(
+    jsonLdScriptProps<Person>(
+      {
+        "@context": "https://schema.org",
+        "@type": "Person",
+      },
+      /* options=*/ {}
+    )
+  ).toMatchInlineSnapshot(`
+    Object {
+      "dangerouslySetInnerHTML": Object {
+        "__html": "{\\"@context\\":\\"https://schema.org\\",\\"@type\\":\\"Person\\"}",
+      },
+      "type": "application/ld+json",
+    }
+  `);
+
+  expect(
+    jsonLdScriptProps<Person>(
+      {
+        "@context": "https://schema.org",
+        "@type": "Person",
+      },
+      /* options=*/ { space: 2 }
+    )
+  ).toMatchInlineSnapshot(`
+    Object {
+      "dangerouslySetInnerHTML": Object {
+        "__html": "{
+      \\"@context\\": \\"https://schema.org\\",
+      \\"@type\\": \\"Person\\"
+    }",
+      },
+      "type": "application/ld+json",
+    }
+  `);
 });
 
-test('escapes JSON-LD-illegal chars', () => {
-  expect(helmetJsonLdProp<Person>({
-    '@context': 'https://schema.org',
-    '@type': 'Person',
-    name: 'Foo</script>',
-  })).toMatchInlineSnapshot(`
+test("escapes JSON-LD-illegal chars", () => {
+  expect(
+    helmetJsonLdProp<Person>({
+      "@context": "https://schema.org",
+      "@type": "Person",
+      name: "Foo</script>",
+    })
+  ).toMatchInlineSnapshot(`
     Object {
       "innerHTML": "{\\"@context\\":\\"https://schema.org\\",\\"@type\\":\\"Person\\",\\"name\\":\\"Foo&lt;/script&gt;\\"}",
       "type": "application/ld+json",
     }
   `);
+
+  expect(
+    jsonLdScriptProps<Person>({
+      "@context": "https://schema.org",
+      "@type": "Person",
+      name: "Foo</script>",
+    })
+  ).toMatchInlineSnapshot(`
+    Object {
+      "dangerouslySetInnerHTML": Object {
+        "__html": "{\\"@context\\":\\"https://schema.org\\",\\"@type\\":\\"Person\\",\\"name\\":\\"Foo&lt;/script&gt;\\"}",
+      },
+      "type": "application/ld+json",
+    }
+  `);
 });
 
-test('escapes JSON-LD-illegal chars', () => {
-  expect(helmetJsonLdProp<Person>(
-             {
-               '@context': 'https://schema.org',
-               '@type': 'Person',
-               name: ['Foo</script>', null!, undefined!],
-               knows: [],
-               knowsAbout: {
-                 '@type': 'CreativeWork',
-                 name: 'Foo',
-                 copyrightYear: 2020,
-               },
-             },
-             {space: 2}))
-      .toMatchInlineSnapshot(`
+test("escapes JSON-LD-illegal chars", () => {
+  expect(
+    helmetJsonLdProp<Person>(
+      {
+        "@context": "https://schema.org",
+        "@type": "Person",
+        name: ["Foo</script>", null!, undefined!],
+        knows: [],
+        knowsAbout: {
+          "@type": "CreativeWork",
+          name: "Foo",
+          copyrightYear: 2020,
+        },
+      },
+      { space: 2 }
+    )
+  ).toMatchInlineSnapshot(`
     Object {
       "innerHTML": "{
       \\"@context\\": \\"https://schema.org\\",
@@ -61,4 +133,42 @@ test('escapes JSON-LD-illegal chars', () => {
       "type": "application/ld+json",
     }
   `);
+
+  expect(
+    jsonLdScriptProps<Person>(
+      {
+        "@context": "https://schema.org",
+        "@type": "Person",
+        name: ["Foo</script>", null!, undefined!],
+        knows: [],
+        knowsAbout: {
+          "@type": "CreativeWork",
+          name: "Foo",
+          copyrightYear: 2020,
+        },
+      },
+      { space: 2 }
+    )
+  ).toMatchInlineSnapshot(`
+    Object {
+      "dangerouslySetInnerHTML": Object {
+        "__html": "{
+      \\"@context\\": \\"https://schema.org\\",
+      \\"@type\\": \\"Person\\",
+      \\"name\\": [
+        \\"Foo&lt;/script&gt;\\",
+        null,
+        null
+      ],
+      \\"knows\\": [],
+      \\"knowsAbout\\": {
+        \\"@type\\": \\"CreativeWork\\",
+        \\"name\\": \\"Foo\\",
+        \\"copyrightYear\\": 2020
+      }
+    }",
+      },
+      "type": "application/ld+json",
+    }
+  `);
 });
