Move 'children' key from xml parser to xmlChildren so it doesn't brea…

…k Gatsby fixes #2083 (#2108)
gatsbyjs · Sep 14, 2017 · 9f79b78 · 9f79b78
1 parent 97c82a9
commit 9f79b78
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 37 deletions.
diff --git a/packages/gatsby-transformer-xml/src/__tests__/__snapshots__/gatsby-node.js.snap b/packages/gatsby-transformer-xml/src/__tests__/__snapshots__/gatsby-node.js.snap
@@ -7,7 +7,16 @@ Array [
       "attributes": Object {
         "id": "bk101",
       },
-      "children": Array [
+      "children": Array [],
+      "content": "",
+      "id": "bk101",
+      "internal": Object {
+        "contentDigest": "446732570969e52599dded1ba4941b65",
+        "type": "NodeNameXml",
+      },
+      "name": "book",
+      "parent": "whatever",
+      "xmlChildren": Array [
         Object {
           "attributes": Object {},
           "children": Array [],
@@ -46,22 +55,23 @@ Array [
           "name": "description",
         },
       ],
-      "content": "",
-      "id": "bk101",
-      "internal": Object {
-        "contentDigest": "446732570969e52599dded1ba4941b65",
-        "type": "NodeNameXml",
-      },
-      "name": "book",
-      "parent": "whatever",
     },
   ],
   Array [
     Object {
       "attributes": Object {
         "id": "bk102",
       },
-      "children": Array [
+      "children": Array [],
+      "content": "",
+      "id": "bk102",
+      "internal": Object {
+        "contentDigest": "f1aadb72f7fc4e80a8b0f44899a4c30c",
+        "type": "NodeNameXml",
+      },
+      "name": "book",
+      "parent": "whatever",
+      "xmlChildren": Array [
         Object {
           "attributes": Object {},
           "children": Array [],
@@ -101,14 +111,6 @@ Array [
           "name": "description",
         },
       ],
-      "content": "",
-      "id": "bk102",
-      "internal": Object {
-        "contentDigest": "f1aadb72f7fc4e80a8b0f44899a4c30c",
-        "type": "NodeNameXml",
-      },
-      "name": "book",
-      "parent": "whatever",
     },
   ],
 ]
@@ -122,7 +124,16 @@ Array [
         "attributes": Object {
           "id": "bk101",
         },
-        "children": Array [
+        "children": Array [],
+        "content": "",
+        "id": "bk101",
+        "internal": Object {
+          "contentDigest": "446732570969e52599dded1ba4941b65",
+          "type": "NodeNameXml",
+        },
+        "name": "book",
+        "parent": "whatever",
+        "xmlChildren": Array [
           Object {
             "attributes": Object {},
             "children": Array [],
@@ -161,14 +172,6 @@ Array [
             "name": "description",
           },
         ],
-        "content": "",
-        "id": "bk101",
-        "internal": Object {
-          "contentDigest": "446732570969e52599dded1ba4941b65",
-          "type": "NodeNameXml",
-        },
-        "name": "book",
-        "parent": "whatever",
       },
       "parent": Object {
         "children": Array [],
@@ -213,7 +216,16 @@ Array [
         "attributes": Object {
           "id": "bk102",
         },
-        "children": Array [
+        "children": Array [],
+        "content": "",
+        "id": "bk102",
+        "internal": Object {
+          "contentDigest": "f1aadb72f7fc4e80a8b0f44899a4c30c",
+          "type": "NodeNameXml",
+        },
+        "name": "book",
+        "parent": "whatever",
+        "xmlChildren": Array [
           Object {
             "attributes": Object {},
             "children": Array [],
@@ -253,14 +265,6 @@ Array [
             "name": "description",
           },
         ],
-        "content": "",
-        "id": "bk102",
-        "internal": Object {
-          "contentDigest": "f1aadb72f7fc4e80a8b0f44899a4c30c",
-          "type": "NodeNameXml",
-        },
-        "name": "book",
-        "parent": "whatever",
       },
       "parent": Object {
         "children": Array [],

diff --git a/packages/gatsby-transformer-xml/src/gatsby-node.js b/packages/gatsby-transformer-xml/src/gatsby-node.js
@@ -17,10 +17,15 @@ async function onCreateNode({ node, boundActionCreators, loadNodeContent }) {
       .createHash(`md5`)
       .update(objStr)
       .digest(`hex`)
+    if (obj.children) {
+      obj.xmlChildren = obj.children
+      delete obj.children
+    }
     return {
       ...obj,
       id: obj.attributes.id ? obj.attributes.id : `${node.id} [${i}] >>> XML`,
       parent: node.id,
+      children: [],
       internal: {
         contentDigest,
         type: _.upperFirst(_.camelCase(`${node.name} xml`)),

diff --git a/packages/gatsby/src/joi-schemas/joi.js b/packages/gatsby/src/joi-schemas/joi.js
@@ -49,7 +49,7 @@ export const nodeSchema = Joi.object()
       type: Joi.string().required(),
       owner: Joi.string().required(),
       fieldOwners: Joi.array(),
-      content: Joi.string().allow(""),
+      content: Joi.string().allow(``),
     }),
   })
   .unknown()