feat(gatsby): allow schema customization

examples/gatsbygram/package.json

@@ -18,6 +18,7 @@
     "gatsby-transformer-json": "^2.1.1",
     "gatsby-transformer-sharp": "^2.1.1",
     "glamor": "^2.20.40",
+    "graphql-compose": "^5.10.1",
     "instagram-screen-scrape": "^2.0.0",
     "lodash": "^4.17.10",
     "mkdirp": "^0.5.1",

packages/gatsby-transformer-remark/src/__tests__/extend-node.js

@@ -1,26 +1,13 @@
-const {
-  graphql,
-  GraphQLObjectType,
-  GraphQLList,
-  GraphQLSchema,
-} = require(`gatsby/graphql`)
+const { graphql } = require(`gatsby/graphql`)
 const { onCreateNode } = require(`../gatsby-node`)
-const {
-  inferObjectStructureFromNodes,
-} = require(`../../../gatsby/src/schema/infer-graphql-type`)
 const extendNodeType = require(`../extend-node-type`)
 
 // given a set of nodes and a query, return the result of the query
 async function queryResult(
   nodes,
   fragment,
-  { types = [] } = {},
   { additionalParameters = {}, pluginOptions = {} }
 ) {
-  const inferredFields = inferObjectStructureFromNodes({
-    nodes,
-    types: [...types],
-  })
   const extendNodeTypeFields = await extendNodeType(
     {
       type: { name: `MarkdownRemark` },
@@ -37,32 +24,27 @@ async function queryResult(
     }
   )
 
-  const markdownRemarkFields = {
-    ...inferredFields,
-    ...extendNodeTypeFields,
-  }
-
-  const schema = new GraphQLSchema({
-    query: new GraphQLObjectType({
-      name: `RootQueryType`,
-      fields: () => {
-        return {
-          listNode: {
-            name: `LISTNODE`,
-            type: new GraphQLList(
-              new GraphQLObjectType({
-                name: `MarkdownRemark`,
-                fields: markdownRemarkFields,
-              })
-            ),
-            resolve() {
-              return nodes
-            },
-          },
-        }
-      },
-    }),
+  const { SchemaComposer } = require(`graphql-compose`)
+  const {
+    addInferredFields,
+  } = require(`../../../gatsby/src/schema/infer/infer`)
+  const {
+    getExampleValue,
+  } = require(`../../../gatsby/src/schema/infer/example-value`)
+
+  const sc = new SchemaComposer()
+  const typeName = `MarkdownRemark`
+  const tc = sc.createTC(typeName)
+  addInferredFields({
+    schemaComposer: sc,
+    typeComposer: tc,
+    exampleValue: getExampleValue({ nodes, typeName }),
+  })
+  tc.addFields(extendNodeTypeFields)
+  sc.Query.addFields({
+    listNode: { type: [tc], resolve: () => nodes },
   })
+  const schema = sc.buildSchema()
 
   const result = await graphql(
     schema,
@@ -97,14 +79,10 @@ const bootstrapTest = (
   it(label, async done => {
     node.content = content
     const createNode = markdownNode => {
-      queryResult(
-        [markdownNode],
-        query,
-        {
-          types: [{ name: `MarkdownRemark` }],
-        },
-        { additionalParameters, pluginOptions }
-      ).then(result => {
+      queryResult([markdownNode], query, {
+        additionalParameters,
+        pluginOptions,
+      }).then(result => {
         try {
           test(result.data.listNode[0])
           done()

packages/gatsby-transformer-remark/src/__tests__/gatsby-node.js

@@ -1,18 +1,8 @@
-const Promise = require(`bluebird`)
 const _ = require(`lodash`)
+const { graphql } = require(`gatsby/graphql`)
 
 const { onCreateNode } = require(`../gatsby-node`)
 
-const {
-  graphql,
-  GraphQLObjectType,
-  GraphQLList,
-  GraphQLSchema,
-} = require(`gatsby/graphql`)
-const {
-  inferObjectStructureFromNodes,
-} = require(`../../../gatsby/src/schema/infer-graphql-type`)
-
 describe(`Process markdown content correctly`, () => {
   const node = {
     id: `whatever`,
@@ -105,31 +95,27 @@ Sed bibendum sem iaculis, pellentesque leo sed, imperdiet ante. Sed consequat ma
 
   describe(`process graphql correctly`, () => {
     // given a set of nodes and a query, return the result of the query
-    async function queryResult(nodes, fragment, { types = [] } = {}) {
-      const schema = new GraphQLSchema({
-        query: new GraphQLObjectType({
-          name: `RootQueryType`,
-          fields: () => {
-            return {
-              listNode: {
-                name: `LISTNODE`,
-                type: new GraphQLList(
-                  new GraphQLObjectType({
-                    name: `MarkdownRemark`,
-                    fields: inferObjectStructureFromNodes({
-                      nodes,
-                      types: [...types],
-                    }),
-                  })
-                ),
-                resolve() {
-                  return nodes
-                },
-              },
-            }
-          },
-        }),
+    async function queryResult(nodes, fragment) {
+      const { SchemaComposer } = require(`graphql-compose`)
+      const {
+        addInferredFields,
+      } = require(`../../../gatsby/src/schema/infer/infer`)
+      const {
+        getExampleValue,
+      } = require(`../../../gatsby/src/schema/infer/example-value`)
+
+      const sc = new SchemaComposer()
+      const typeName = `MarkdownRemark`
+      const tc = sc.createTC(typeName)
+      addInferredFields({
+        schemaComposer: sc,
+        typeComposer: tc,
+        exampleValue: getExampleValue({ nodes, typeName }),
+      })
+      sc.Query.addFields({
+        listNode: { type: [tc], resolve: () => nodes },
       })
+      const schema = sc.buildSchema()
 
       const result = await graphql(
         schema,
@@ -172,8 +158,7 @@ Sed bibendum sem iaculis, pellentesque leo sed, imperdiet ante. Sed consequat ma
                     frontmatter {
                         title
                     }
-                `,
-          { types: [{ name: `MarkdownRemark` }] }
+                `
         ).then(result => {
           try {
             createdNode = result.data.listNode[0]
@@ -233,8 +218,7 @@ Sed bibendum sem iaculis, pellentesque leo sed, imperdiet ante. Sed consequat ma
                     frontmatter {
                         title
                     }
-                `,
-          { types: [{ name: `MarkdownRemark` }] }
+                `
         ).then(result => {
           try {
             createdNode = result.data.listNode[0]

packages/gatsby/package.json

@@ -72,7 +72,7 @@
     "graphql-playground-middleware-express": "^1.7.10",
     "graphql-relay": "^0.6.0",
     "graphql-skip-limit": "^2.0.5",
-    "graphql-compose": "^5.7.0",
+    "graphql-compose": "^5.10.1",
     "graphql-tools": "^3.0.4",
     "graphql-type-json": "^0.2.1",
     "hash-mod": "^0.0.5",

packages/gatsby/src/bootstrap/index.js

@@ -21,7 +21,7 @@ const getConfigFile = require(`./get-config-file`)
 const tracer = require(`opentracing`).globalTracer()
 const preferDefault = require(`./prefer-default`)
 const nodeTracking = require(`../db/node-tracking`)
-const nodeStore = require(`../db/nodes`)
+const withResolverContext = require(`../schema/context`)
 require(`../db`).startAutosave()
 
 // Show stack trace on unhandled promises.
@@ -390,10 +390,7 @@ module.exports = async (args: BootstrapArgs) => {
       schema,
       query,
       context,
-      {
-        ...context,
-        nodeModel: nodeStore,
-      },
+      withResolverContext(context),
       context
     )
   }

packages/gatsby/src/commands/develop.js

@@ -23,7 +23,7 @@ const launchEditor = require(`react-dev-utils/launchEditor`)
 const formatWebpackMessages = require(`react-dev-utils/formatWebpackMessages`)
 const chalk = require(`chalk`)
 const address = require(`address`)
-const nodeStore = require(`../db/nodes`)
+const withResolverContext = require(`../schema/context`)
 const sourceNodes = require(`../utils/source-nodes`)
 const websocketManager = require(`../utils/websocket-manager`)
 const getSslCert = require(`../utils/get-ssl-cert`)
@@ -109,9 +109,7 @@ async function startServer(program) {
     graphqlHTTP({
       schema: store.getState().schema,
       graphiql: process.env.GATSBY_GRAPHQL_IDE === `playground` ? false : true,
-      context: {
-        nodeModel: nodeStore,
-      },
+      context: withResolverContext(),
     })
   )
 

packages/gatsby/src/db/__tests__/node-tracking-test.js

@@ -4,7 +4,6 @@ const {
 } = require(`../../redux/actions`)
 const { getNode } = require(`../../db/nodes`)
 const { findRootNodeAncestor, trackDbNodes } = require(`../node-tracking`)
-const nodeTypes = require(`../../schema/build-node-types`)
 const { run: runQuery } = require(`../nodes-query`)
 require(`./fixtures/ensure-loki`)()
 
@@ -18,7 +17,7 @@ function makeNode() {
     },
     inlineArray: [1, 2, 3],
     internal: {
-      type: `TestNode`,
+      type: `Test`,
       contentDigest: `digest1`,
       owner: `test`,
     },
@@ -43,7 +42,7 @@ describe(`track root nodes`, () => {
         },
         inlineArray: [1, 2, 3],
         internal: {
-          type: `TestNode`,
+          type: `Test`,
           contentDigest: `digest2`,
         },
       },
@@ -89,7 +88,19 @@ describe(`track root nodes`, () => {
     let type
 
     beforeAll(async () => {
-      type = (await nodeTypes.buildAll({})).testNode.nodeObjectType
+      const { SchemaComposer } = require(`graphql-compose`)
+      const { addInferredFields } = require(`../../schema/infer/infer`)
+      const { getExampleValue } = require(`../../schema/infer/example-value`)
+
+      const sc = new SchemaComposer()
+      const typeName = `Test`
+      const tc = sc.createTC(typeName)
+      addInferredFields({
+        schemaComposer: sc,
+        typeComposer: tc,
+        exampleValue: getExampleValue({ nodes: [makeNode()], typeName }),
+      })
+      type = tc.getType()
     })
 
     it(`Tracks objects when running query without filter`, async () => {

packages/gatsby/src/db/loki/__tests__/nodes-query-test.js

@@ -1,6 +1,6 @@
 if (process.env.GATSBY_DB_NODES === `loki`) {
   const _ = require(`lodash`)
-  const nodeTypes = require(`../../../schema/build-node-types`)
+  const { GraphQLObjectType } = require(`graphql`)
   const { store } = require(`../../../redux`)
   const runQuery = require(`../nodes-query`)
   const { getNodeTypeCollection } = require(`../nodes`)
@@ -21,11 +21,11 @@ if (process.env.GATSBY_DB_NODES === `loki`) {
     for (const node of nodes) {
       store.dispatch({ type: `CREATE_NODE`, payload: node })
     }
-    const gqlType = nodeTypes.buildNodeObjectType({
-      typeName: `Test`,
-      nodes,
-      pluginFields: [],
-      processedTypes: {},
+    const gqlType = new GraphQLObjectType({
+      name: `Test`,
+      fields: {
+        foo: { type: `String` },
+      },
     })
     const queryArgs = { filter: { foo: { eq: `bar` } } }
     const args = { gqlType, queryArgs }

packages/gatsby/src/db/loki/nodes-query.js

@@ -280,7 +280,7 @@ function ensureFieldIndexes(coll, lokiArgs) {
  * @returns {promise} A promise that will eventually be resolved with
  * a collection of matching objects (even if `firstOnly` is true)
  */
-async function runQuery({ gqlType, queryArgs, context = {}, firstOnly }) {
+async function runQuery({ gqlType, queryArgs, firstOnly }) {
   // Clone args as for some reason graphql-js removes the constructor
   // from nested objects which breaks a check in sift.js.
   const gqlArgs = JSON.parse(JSON.stringify(queryArgs))

packages/gatsby/src/db/loki/nodes.js

@@ -142,7 +142,7 @@ function getNodesByType(typeName) {
  */
 function getNodes() {
   const nodeTypes = getTypes()
-  return _.flatMap(nodeTypes, nodeType => getNodesByType(nodeType.type))
+  return _.flatMap(nodeTypes, nodeType => getNodesByType(nodeType))
 }
 
 /**