Fix oneOf logic case

Author: Jskobos

gatsby-node.js

@@ -7,7 +7,7 @@ const specs = require("./static/api/docs/v4/spec.json");
 const crypto = require("crypto");
 const parser = new JsonSchemaRefParser();
 
-const { rawQuery } = require("./generateQuery.js");
+const { rawQuery, recursiveQuery } = require("./generateQuery.js");
 
 exports.sourceNodes = async ({ actions }) => {
   const { createNode, createTypes } = actions;
@@ -516,7 +516,7 @@ exports.createPages = async ({ actions, graphql }) => {
       const props = result.data.__type.fields;
       const file = fs.createWriteStream(fileName);
 
-      const query = rawQuery(props)
+      const query = recursiveQuery(props)
         .toString()
         .replace(/\,/g, "");
 

generateQuery.js

@@ -3,10 +3,31 @@ const printName = (name) => {
 }
 
 const _query = property => {
+  // Special cases (nested values)
   if (property.name === 'allOf') {
-    return 'allOf { ' + recursiveQuery(property.type.ofType.fields) + ' }'
+    if (property.type.ofType) {
+      const fields = recursiveQuery(property.type.ofType.fields);
+      return fields 
+        ?' allOf { ' + fields + ' }'
+        : '';
+    }
+    const fields = recursiveQuery(property.type.fields);
+    return fields
+      ? ' allOf { ' + fields + ' }'
+      : ''
   }
 
+  if (property.name === 'oneOf') {
+    if (property.type.ofType) {
+      const fields = recursiveQuery(property.type.ofType.fields);
+      return fields ? ' oneOf { ' + fields + ' }' : '';
+    }
+    const fields = recursiveQuery(property.type.fields);
+    return fields ? ' oneOf { ' + fields + ' }' : '';
+  }
+
+  // Base cases
+
   if (!property.type) {
     return printName(property.name);
   }
@@ -16,18 +37,22 @@ const _query = property => {
     return printName(property.name);
   }
 
+  // Normal recursion
+
   if (property.type && property.type.fields) {
     return `${printName(property.name)} { ${recursiveQuery(property.type.fields)} }`;
   }
 
   if (property.type && property.type.typeOf && property.type.typeOf.fields) {
     return `${printName(property.name)} { ${recursiveQuery(property.type.typeOf.fields)} }`;
   }
-  console.log('no cases matched', property);
-  return;
+  
+  // If we reach this point, there's a problem.
+  throw new Error('No cases matched.');
 }
 
 const recursiveQuery = properties => {
+  if (properties === null) { return; }
   return properties.map(property => _query(property));
 }