feat(schema): Inference controls and improvements

packages/gatsby/package.json

@@ -1,7 +1,7 @@
 {
  "name": "gatsby",
  "description": "Blazing fast modern site generator for React",
- "version": "2.3.5",
+ "version": "2.4.0-alpha.1",
  "author": "Kyle Mathews <mathews.kyle@gmail.com>",
  "bin": {
  "gatsby": "./dist/bin/gatsby.js"
@@ -71,7 +71,7 @@
  "gatsby-telemetry": "^1.0.4",
  "glob": "^7.1.1",
  "graphql": "^14.1.1",
- "graphql-compose": "^6.0.3",
+ "graphql-compose": "^6.1.4",
  "graphql-playground-middleware-express": "^1.7.10",
  "graphql-relay": "^0.6.0",
  "graphql-tools": "^3.0.4",

packages/gatsby/src/schema/__tests__/__snapshots__/kitchen-sink.js.snap

@@ -43,6 +43,7 @@ Object {
  "_3invalidKey": null,
  "code": "BShF_8qhtEv",
  "comment": 0,
+ "defaultTime": "05 huhtikuu",
  "id": "1486495736706552111",
  "idWithDecoration": "decoration-1486495736706552111",
  "image": Object {
@@ -51,6 +52,8 @@ Object {
  },
  },
  "likes": 8,
+ "localeFormat": "05 huhtikuu 2017",
+ "localeString": "05 апреля",
  "time": "05.04.2017",
  },
  },
@@ -59,6 +62,7 @@ Object {
  "_3invalidKey": null,
  "code": "BY6B8z5lR1F",
  "comment": 0,
+ "defaultTime": "11 syyskuu",
  "id": "1601601194425654597",
  "idWithDecoration": "decoration-1601601194425654597",
  "image": Object {
@@ -67,6 +71,8 @@ Object {
  },
  },
  "likes": 9,
+ "localeFormat": "11 syyskuu 2017",
+ "localeString": "11 сентября",
  "time": "11.09.2017",
  },
  },

packages/gatsby/src/schema/__tests__/kitchen-sink.js

@@ -47,10 +47,11 @@ describe(`Kichen sink schema test`, () => {
  store.dispatch({
  type: `CREATE_TYPES`,
  payload: `
- type PostsJson implements Node {
+ type PostsJson implements Node @infer {
  id: String!
- time: Date
+ time: Date @addResolver(type: "date", options: { defaultLocale: "fi", defaultFormat: "DD MMMM"})
  code: String
+ image: File @addResolver(type: "relativeFile")
  }
  `,
  })
@@ -72,6 +73,9 @@ describe(`Kichen sink schema test`, () => {
  id
  idWithDecoration
  time(formatString: "DD.MM.YYYY")
+ localeString: time(locale: "ru")
+ localeFormat: time(formatString: "DD MMMM YYYY")
+ defaultTime: time
  code
  likes
  comment

packages/gatsby/src/schema/add-field-resolvers.js

@@ -0,0 +1,84 @@
+const _ = require(`lodash`)
+const { defaultFieldResolver } = require(`graphql`)
+const { dateResolver } = require(`./types/date`)
+const { link, fileByPath } = require(`./resolvers`)
+
+export const addFieldResolvers = ({
+ schemaComposer,
+ typeComposer,
+ parentSpan,
+}) => {
+ typeComposer.getFieldNames().forEach(fieldName => {
+ let field = typeComposer.getField(fieldName)
+
+ const extensions = typeComposer.getFieldExtensions(fieldName)
+ if (
+ !field.resolve &&
+ extensions.addResolver &&
+ _.isObject(extensions.addResolver)
+ ) {
+ const options = extensions.addResolver.options || {}
+ switch (extensions.addResolver.type) {
+ case `date`: {
+ addDateResolver({
+ typeComposer,
+ fieldName,
+ options,
+ })
+ break
+ }
+ case `link`: {
+ typeComposer.extendField(fieldName, {
+ resolve: link({ from: options.from, by: options.by }),
+ })
+ break
+ }
+ case `relativeFile`: {
+ typeComposer.extendField(fieldName, {
+ resolve: fileByPath({ from: options.from }),
+ })
+ break
+ }
+ }
+ }
+
+ if (extensions.proxyFrom) {
+ // XXX(freiksenet): get field again cause it will be changed because of above
+ field = typeComposer.getField(fieldName)
+ const resolver = field.resolve || defaultFieldResolver
+ typeComposer.extendField(fieldName, {
+ resolve: (source, args, context, info) =>
+ resolver(source, args, context, {
+ ...info,
+ fieldName: extensions.proxyFrom,
+ }),
+ })
+ }
+ })
+ return typeComposer
+}
+
+const addDateResolver = ({
+ typeComposer,
+ fieldName,
+ options: { defaultFormat, defaultLocale },
+}) => {
+ const field = typeComposer.getField(fieldName)
+
+ let fieldConfig = {
+ resolve: dateResolver.resolve,
+ }
+ if (!field.args || _.isEmpty(field.args)) {
+ fieldConfig.args = {
+ ...dateResolver.args,
+ }
+ if (defaultFormat) {
+ fieldConfig.args.formatString.defaultValue = defaultFormat
+ }
+ if (defaultLocale) {
+ fieldConfig.args.locale.defaultValue = defaultLocale
+ }
+ }
+
+ typeComposer.extendField(fieldName, fieldConfig)
+}