Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 17 additions & 10 deletions packages/gatsby/src/utils/graphql-typegen/ts-codegen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@ import type { TypeScriptDocumentsPluginConfig } from "@graphql-codegen/typescrip
import { CodeFileLoader } from "@graphql-tools/code-file-loader"
import { loadDocuments } from "@graphql-tools/load"
import { IDefinitionMeta, IStateProgram } from "../../redux/types"
import { filterTargetDefinitions, stabilizeSchema } from "./utils"
import {
filterTargetDefinitions,
sortDefinitions,
stabilizeSchema,
} from "./utils"

const OUTPUT_PATH = `src/gatsby-types.d.ts`
const NAMESPACE = `Queries`
Expand Down Expand Up @@ -104,6 +108,7 @@ export async function writeTypeScriptTypes(
},
}),
],
sort: true,
}
)
} catch (e) {
Expand All @@ -112,15 +117,17 @@ export async function writeTypeScriptTypes(

const documents: Array<Types.DocumentFile> = [
...filterTargetDefinitions(definitions).values(),
].map(definitionMeta => {
return {
document: {
kind: Kind.DOCUMENT,
definitions: [definitionMeta.def],
},
hash: definitionMeta.hash.toString(),
}
})
]
.sort(sortDefinitions)
.map(definitionMeta => {
return {
document: {
kind: Kind.DOCUMENT,
definitions: [definitionMeta.def],
},
hash: definitionMeta.hash.toString(),
}
})

const codegenOptions: Omit<Types.GenerateOptions, "plugins" | "pluginMap"> = {
// @ts-ignore - Incorrect types
Expand Down
7 changes: 7 additions & 0 deletions packages/gatsby/src/utils/graphql-typegen/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@ export function stabilizeSchema(schema: GraphQLSchema): GraphQLSchema {
return lexicographicSortSchema(schema)
}

export function sortDefinitions(
a: IDefinitionMeta,
b: IDefinitionMeta
): number {
return a.name.localeCompare(b.name)
}

/**
* Internally in Gatsby we use the function generateQueryName:
* packages/gatsby/src/query/file-parser.js
Expand Down