chore(gatsby): Migrate type-builders to TypeScript

packages/gatsby/src/redux/actions/restricted.ts

@@ -204,8 +204,8 @@ export const actions = {
     types:
       | string
       | GraphQLOutputType
-      | GatsbyGraphQLType
-      | Array<string | GraphQLOutputType | GatsbyGraphQLType>,
+      | GatsbyGraphQLType<any, any>
+      | Array<string | GraphQLOutputType | GatsbyGraphQLType<any, any>>,
     plugin: IGatsbyPlugin,
     traceId?: string
   ): ICreateTypes => {

packages/gatsby/src/schema/__tests__/build-schema.js

@@ -13,11 +13,11 @@ jest.mock(`../../utils/api-runner-node`)
 const { store } = require(`../../redux`)
 const { actions } = require(`../../redux/actions`)
 const { build } = require(`..`)
-const {
+import {
   buildObjectType,
   buildUnionType,
   buildInterfaceType,
-} = require(`../types/type-builders`)
+} from "../types/type-builders"
 const withResolverContext = require(`../context`)
 
 const nodes = require(`./fixtures/node-model`)

packages/gatsby/src/schema/__tests__/context.js

@@ -1,7 +1,7 @@
 const { graphql } = require(`graphql`)
 const { build } = require(`..`)
 const withResolverContext = require(`../context`)
-const { buildObjectType } = require(`../types/type-builders`)
+import { buildObjectType } from "../types/type-builders"
 const { store } = require(`../../redux`)
 const { dispatch } = store
 const { actions } = require(`../../redux/actions/restricted`)

packages/gatsby/src/schema/__tests__/print.js

@@ -1,5 +1,5 @@
 const { build } = require(`..`)
-const { buildObjectType } = require(`../types/type-builders`)
+import { buildObjectType } from "../types/type-builders"
 const { store } = require(`../../redux`)
 const { actions } = require(`../../redux/actions/restricted`)
 const { printTypeDefinitions } = actions

packages/gatsby/src/schema/__tests__/rebuild-schema.js

@@ -10,7 +10,7 @@ const {
 const { store } = require(`../../redux`)
 const { actions } = require(`../../redux/actions`)
 const { build, rebuild } = require(`..`)
-const { buildObjectType } = require(`../types/type-builders`)
+import { buildObjectType } from "../types/type-builders"
 
 jest.mock(`../../utils/api-runner-node`)
 

packages/gatsby/src/schema/extensions/__tests__/child-relations.js

@@ -1,7 +1,7 @@
 const { graphql } = require(`graphql`)
 const { build } = require(`../..`)
 const withResolverContext = require(`../../context`)
-const { buildObjectType } = require(`../../types/type-builders`)
+import { buildObjectType } from "../../types/type-builders"
 const { store } = require(`../../../redux`)
 const { dispatch } = store
 const { actions } = require(`../../../redux/actions`)

packages/gatsby/src/schema/extensions/__tests__/field-extensions.js

@@ -1,7 +1,7 @@
 const { GraphQLString, graphql } = require(`graphql`)
 const { build } = require(`../..`)
 const withResolverContext = require(`../../context`)
-const { buildObjectType } = require(`../../types/type-builders`)
+import { buildObjectType } from "../../types/type-builders"
 const { store } = require(`../../../redux`)
 const { actions } = require(`../../../redux/actions`)
 const { dispatch } = store

packages/gatsby/src/schema/extensions/__tests__/interfaces.js

@@ -1,10 +1,7 @@
 const { graphql } = require(`graphql`)
 const { build } = require(`../..`)
 const withResolverContext = require(`../../context`)
-const {
-  buildInterfaceType,
-  buildObjectType,
-} = require(`../../types/type-builders`)
+import { buildInterfaceType, buildObjectType } from "../../types/type-builders"
 const { store } = require(`../../../redux`)
 const { dispatch } = store
 const { actions } = require(`../../../redux/actions`)

packages/gatsby/src/schema/infer/__tests__/infer.js

@@ -7,7 +7,7 @@ const { store } = require(`../../../redux`)
 const { actions } = require(`../../../redux/actions`)
 const { buildSchema } = require(`../../schema`)
 const { createSchemaComposer } = require(`../../schema-composer`)
-const { buildObjectType } = require(`../../types/type-builders`)
+import { buildObjectType } from "../../types/type-builders"
 const { hasNodes } = require(`../inference-metadata`)
 const { TypeConflictReporter } = require(`../type-conflict-reporter`)
 const withResolverContext = require(`../../context`)
@@ -1007,7 +1007,7 @@ Object {
         },
       ].concat(getFileNodes())
 
-      let result = await getQueryResult(
+      const result = await getQueryResult(
         nodes,
         `
           file {
@@ -1032,7 +1032,7 @@ Object {
         },
       ].concat(getFileNodes())
 
-      let result = await getQueryResult(
+      const result = await getQueryResult(
         nodes,
         `
           files {

packages/gatsby/src/schema/infer/__tests__/merge-types.js

@@ -1,4 +1,4 @@
-const { buildObjectType } = require(`../../types/type-builders`)
+import { buildObjectType } from "../../types/type-builders"
 const { store } = require(`../../../redux`)
 const { build } = require(`../..`)
 const { actions } = require(`../../../redux/actions`)
@@ -133,7 +133,7 @@ describe(`merges explicit and inferred type definitions`, () => {
     infer,
     addDefaultResolvers,
   }) => {
-    let extensions = {}
+    const extensions = {}
     if (infer != null) {
       extensions.infer = infer
       if (addDefaultResolvers != null) {

packages/gatsby/src/schema/schema.js

@@ -37,7 +37,7 @@ const {
 import { getPagination } from "./types/pagination"
 const { getSortInput, SORTABLE_ENUM } = require(`./types/sort`)
 const { getFilterInput, SEARCHABLE_ENUM } = require(`./types/filter`)
-const { isGatsbyType, GatsbyGraphQLTypeKind } = require(`./types/type-builders`)
+import { isGatsbyType, GatsbyGraphQLTypeKind } from "./types/type-builders"
 const {
   isASTDocument,
   parseTypeDef,

packages/gatsby/src/schema/types/type-builders.ts

@@ -0,0 +1,116 @@
+import {
+  ComposeObjectTypeConfig,
+  ComposeInputObjectTypeConfig,
+  ComposeInterfaceTypeConfig,
+  ComposeUnionTypeConfig,
+  ComposeEnumTypeConfig,
+  ComposeScalarTypeConfig,
+} from "graphql-compose"
+
+enum GatsbyGraphQLTypeKind {
+  OBJECT = `OBJECT`,
+  INPUT_OBJECT = `INPUT_OBJECT`,
+  UNION = `UNION`,
+  INTERFACE = `INTERFACE`,
+  ENUM = `ENUM`,
+  SCALAR = `SCALAR`,
+}
+
+export type GatsbyGraphQLType<TSource, TContext> =
+  | {
+      kind: GatsbyGraphQLTypeKind.OBJECT
+      config: ComposeObjectTypeConfig<TSource, TContext>
+    }
+  | {
+      kind: GatsbyGraphQLTypeKind.INPUT_OBJECT
+      config: ComposeInputObjectTypeConfig
+    }
+  | {
+      kind: GatsbyGraphQLTypeKind.UNION
+      config: ComposeUnionTypeConfig<TSource, TContext>
+    }
+  | {
+      kind: GatsbyGraphQLTypeKind.INTERFACE
+      config: ComposeInterfaceTypeConfig<TSource, TContext>
+    }
+  | {
+      kind: GatsbyGraphQLTypeKind.ENUM
+      config: ComposeEnumTypeConfig
+    }
+  | {
+      kind: GatsbyGraphQLTypeKind.SCALAR
+      config: ComposeScalarTypeConfig
+    }
+
+function buildObjectType<TSource, TContext>(
+  config: ComposeObjectTypeConfig<TSource, TContext>
+): GatsbyGraphQLType<TSource, TContext> {
+  return {
+    kind: GatsbyGraphQLTypeKind.OBJECT,
+    config,
+  }
+}
+
+function buildUnionType<TSource, TContext>(
+  config: ComposeUnionTypeConfig<TSource, TContext>
+): GatsbyGraphQLType<TSource, TContext> {
+  return {
+    kind: GatsbyGraphQLTypeKind.UNION,
+    config,
+  }
+}
+
+function buildInterfaceType<TSource, TContext>(
+  config: ComposeInterfaceTypeConfig<TSource, TContext>
+): GatsbyGraphQLType<TSource, TContext> {
+  return {
+    kind: GatsbyGraphQLTypeKind.INTERFACE,
+    config,
+  }
+}
+
+function buildInputObjectType<TSource, TContext>(
+  config: ComposeInputObjectTypeConfig
+): GatsbyGraphQLType<TSource, TContext> {
+  return {
+    kind: GatsbyGraphQLTypeKind.INPUT_OBJECT,
+    config,
+  }
+}
+
+function buildEnumType<TSource, TContext>(
+  config: ComposeEnumTypeConfig
+): GatsbyGraphQLType<TSource, TContext> {
+  return {
+    kind: GatsbyGraphQLTypeKind.ENUM,
+    config,
+  }
+}
+
+function buildScalarType<TSource, TContext>(
+  config: ComposeScalarTypeConfig
+): GatsbyGraphQLType<TSource, TContext> {
+  return {
+    kind: GatsbyGraphQLTypeKind.SCALAR,
+    config,
+  }
+}
+
+function isGatsbyType(something: any): something is GatsbyGraphQLTypeKind {
+  return (
+    typeof something === `object` &&
+    something.kind &&
+    GatsbyGraphQLTypeKind[something.kind]
+  )
+}
+
+export {
+  GatsbyGraphQLTypeKind,
+  buildObjectType,
+  buildUnionType,
+  buildInterfaceType,
+  buildInputObjectType,
+  buildEnumType,
+  buildScalarType,
+  isGatsbyType,
+}

packages/gatsby/src/schema/types/type-defs.js

@@ -1,5 +1,5 @@
 const { parse, Kind: GraphQLASTNodeKind } = require(`graphql`)
-const { isGatsbyType } = require(`./type-builders`)
+import { isGatsbyType } from "./type-builders"
 const { inferExtensionName, dontInferExtensionName } = require(`../extensions`)
 const report = require(`gatsby-cli/lib/reporter`)
 

packages/gatsby/src/utils/api-runner-node.js

@@ -11,14 +11,14 @@ const fs = require(`fs-extra`)
 const { getCache } = require(`./get-cache`)
 import { createNodeId } from "./create-node-id"
 const { createContentDigest } = require(`gatsby-core-utils`)
-const {
+import {
   buildObjectType,
   buildUnionType,
   buildInterfaceType,
   buildInputObjectType,
   buildEnumType,
   buildScalarType,
-} = require(`../schema/types/type-builders`)
+} from "../schema/types/type-builders"
 const { emitter, store } = require(`../redux`)
 const {
   getNodes,