fix: filtering of null and false nodes from a collection

Author: olexiyk

README.md

@@ -26,11 +26,11 @@ at http://schema.org/.
 
 ### Yarn
 
-`yarn add react-structured-data`
+`yarn add @researchgate/react-structured-data`
 
 ### NPM
 
-`npm install react-structured-data --save`
+`npm install @researchgate/react-structured-data --save`
 
 ## Code Example
 

src/JSONLDAbstractNode.js

@@ -11,7 +11,7 @@ class JSONLDAbstractNode extends React.Component {
   };
 
   getChildJSON(child) {
-    if (!child) return "";
+    if (!child) return null;
 
     const ChildClass = child.type;
     const { children, type, id, ...schema } = child.props;
@@ -34,7 +34,10 @@ class JSONLDAbstractNode extends React.Component {
      * If a component has multiple children, this.props.children is an array of Child objects.
      */
     if (this.props.children.length > 0) {
-      return this.props.children.map(child => this.getChildJSON(child));
+      // Children that are null will get filtered out
+      return this.props.children
+        .map(child => this.getChildJSON(child))
+        .filter(child => child);
     }
     return [this.getChildJSON(this.props.children)];
   }

src/core/__tests__/GenericNode.test.js

@@ -30,4 +30,31 @@ describe("GenerticNode", () => {
       )
     ).toMatchSnapshot();
   });
+  it("filters out null and false child nodes", () => {
+    expect(
+      renderer.create(
+        <JSONLD>
+          <GenericNode
+            type="review"
+            jsonldtype="Review"
+            name="It is awesome"
+            reviewBody="This is great!"
+          >
+            <GenericNode
+              type="itemReviewed"
+              jsonldtype="Product"
+              id="product-x"
+            />
+            {null}
+            {false}
+            <GenericNode
+              type="locationCreated"
+              jsonldtype="AdministrativeArea"
+              name="Chicago, IL"
+            />
+          </GenericNode>
+        </JSONLD>
+      )
+    ).toMatchSnapshot();
+  });
 });

src/core/__tests__/GenericNodeCollection.test.js

@@ -0,0 +1,22 @@
+import React from "react";
+import renderer from "react-test-renderer";
+import JSONLD from "../../JSONLD";
+import GenericNode from "../GenericNode";
+import GenericNodeCollection from "../GenericNodeCollection";
+
+describe("GenerticNodeCollection", () => {
+  it("filters out null and false nodes from a collection", () => {
+    expect(
+      renderer.create(
+        <JSONLD>
+          <GenericNodeCollection>
+            <GenericNode type="author" jsonldtype="Person" name="Cool Carl" />
+            {false}
+            {null}
+            <GenericNode jsonldtype="AdministrativeArea" name="Chicago, IL" />
+          </GenericNodeCollection>
+        </JSONLD>
+      )
+    ).toMatchSnapshot();
+  });
+});

src/core/__tests__/__snapshots__/GenericNode.test.js.snap

@@ -1,5 +1,13 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`GenerticNode filters out null and false child nodes 1`] = `
+<script
+  type="application/ld+json"
+>
+  {"@context":"https://schema.org/","@type":"Review","name":"It is awesome","reviewBody":"This is great!","itemReviewed":{"@type":"Product","@id":"product-x"},"locationCreated":{"@type":"AdministrativeArea","name":"Chicago, IL"}}
+</script>
+`;
+
 exports[`GenerticNode renders question to QAPage mainEntity as Question type 1`] = `
 <script
   type="application/ld+json"

src/core/__tests__/__snapshots__/GenericNodeCollection.test.js.snap

@@ -0,0 +1,9 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`GenerticNodeCollection filters out null and false nodes from a collection 1`] = `
+<script
+  type="application/ld+json"
+>
+  {"@context":"https://schema.org/","undefined":[{"author":{"@type":"Person","name":"Cool Carl"}},{"@type":"AdministrativeArea","name":"Chicago, IL"}]}
+</script>
+`;