chore(gatsby): migrate derived-types to TypeScript

gatsbyjs · Jul 15, 2020 · 3272f3e · 3272f3e
1 parent f1b3a66
commit 3272f3e
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 15 deletions.
diff --git a/packages/gatsby/src/schema/infer/add-inferred-fields.js b/packages/gatsby/src/schema/infer/add-inferred-fields.js
@@ -6,7 +6,7 @@ const report = require(`gatsby-cli/lib/reporter`)
 
 import { isFile } from "./is-file"
 import { isDate } from "../types/date"
-const { addDerivedType } = require(`../types/derived-types`)
+import { addDerivedType } from "../types/derived-types"
 import { is32BitInteger } from "../../utils/is-32-bit-integer"
 const { getNode, getNodes } = require(`../../redux/nodes`)
 

diff --git a/packages/gatsby/src/schema/schema.js b/packages/gatsby/src/schema/schema.js
@@ -43,7 +43,7 @@ const {
   parseTypeDef,
   reportParsingError,
 } = require(`./types/type-defs`)
-const { clearDerivedTypes } = require(`./types/derived-types`)
+import { clearDerivedTypes } from "./types/derived-types"
 const { printTypeDefinitions } = require(`./print`)
 
 const buildSchema = async ({

diff --git a/.../gatsby/src/schema/types/derived-types.js → .../gatsby/src/schema/types/derived-types.ts b/.../gatsby/src/schema/types/derived-types.js → .../gatsby/src/schema/types/derived-types.ts
@@ -29,9 +29,37 @@
  *   user explicitly defines `FooFields` type (via `createTypes` call) it won't be considered
  *   a derived type
  */
-const { ObjectTypeComposer, InterfaceTypeComposer } = require(`graphql-compose`)
+import {
+  ObjectTypeComposer,
+  InterfaceTypeComposer,
+  ScalarTypeComposer,
+  SchemaComposer,
+  InputTypeComposer,
+  EnumTypeComposer,
+  UnionTypeComposer,
+} from "graphql-compose"
 
-const clearDerivedTypes = ({ schemaComposer, typeComposer }) => {
+type AllTypeComposer =
+  | ObjectTypeComposer
+  | InputTypeComposer
+  | EnumTypeComposer
+  | InterfaceTypeComposer
+  | UnionTypeComposer
+  | ScalarTypeComposer
+
+const getDerivedTypes = ({
+  typeComposer,
+}: {
+  typeComposer: AllTypeComposer
+}): any => typeComposer.getExtension(`derivedTypes`) || new Set()
+
+export const clearDerivedTypes = ({
+  schemaComposer,
+  typeComposer,
+}: {
+  schemaComposer: SchemaComposer<any>
+  typeComposer: AllTypeComposer
+}): void => {
   const derivedTypes = getDerivedTypes({ typeComposer })
 
   for (const typeName of derivedTypes.values()) {
@@ -50,15 +78,13 @@ const clearDerivedTypes = ({ schemaComposer, typeComposer }) => {
   typeComposer.setExtension(`derivedTypes`, new Set())
 }
 
-const addDerivedType = ({ typeComposer, derivedTypeName }) => {
+export const addDerivedType = ({
+  typeComposer,
+  derivedTypeName,
+}: {
+  typeComposer: AllTypeComposer
+  derivedTypeName: string
+}): void => {
   const derivedTypes = getDerivedTypes({ typeComposer })
   typeComposer.setExtension(`derivedTypes`, derivedTypes.add(derivedTypeName))
 }
-
-const getDerivedTypes = ({ typeComposer }) =>
-  typeComposer.getExtension(`derivedTypes`) || new Set()
-
-module.exports = {
-  clearDerivedTypes,
-  addDerivedType,
-}
diff --git a/packages/gatsby/src/schema/types/filter.js b/packages/gatsby/src/schema/types/filter.js
@@ -6,7 +6,7 @@ const {
   GraphQLList,
   isSpecifiedScalarType,
 } = require(`graphql`)
-const { addDerivedType } = require(`./derived-types`)
+import { addDerivedType } from "./derived-types"
 const { InputTypeComposer } = require(`graphql-compose`)
 const { GraphQLJSON } = require(`graphql-compose`)
 import { GraphQLDate } from "./date"

diff --git a/packages/gatsby/src/schema/types/sort.js b/packages/gatsby/src/schema/types/sort.js
@@ -6,7 +6,7 @@ const {
   GraphQLInputObjectType,
   GraphQLList,
 } = require(`graphql`)
-const { addDerivedType } = require(`./derived-types`)
+import { addDerivedType } from "./derived-types"
 
 const SORTABLE_ENUM = {
   SORTABLE: `SORTABLE`,