Merge update

Author: NorOldBurden

graphql/codegen/src/codegen.ts

@@ -33,7 +33,7 @@ function addDocumentNodeImport(code: string): string {
   return output.code
 }
 
-function getFilename(key: string, convention: LaunchQLGenOptions['documents']['convention']) {
+function getFilename(key: string, convention: GraphQLCodegenOptions['documents']['convention']) {
   if (convention === 'underscore') return inflection.underscore(key)
   if (convention === 'dashed') return inflection.underscore(key).replace(/_/g, '-')
   if (convention === 'camelUpper') return inflection.camelize(key, false)
@@ -118,15 +118,15 @@ async function writeOperationsDocuments(docs: Record<string, string>, dir: strin
   if (format === 'ts') await writeFileUTF8(join(dir, 'index.ts'), index.sort().join('\n'))
 }
 
-export async function runCodegen(opts: LaunchQLGenOptions, cwd: string) {
-  const options: LaunchQLGenOptions = {
-    input: { ...(defaultLaunchQLGenOptions.input), ...(opts.input || {}) },
-    output: { ...(defaultLaunchQLGenOptions.output), ...(opts.output || {}) },
-    documents: { ...(defaultLaunchQLGenOptions.documents), ...(opts.documents || {}) },
-    features: { ...(defaultLaunchQLGenOptions.features), ...(opts.features || {}) },
-    selection: { ...(defaultLaunchQLGenOptions.selection), ...(opts.selection || {}) },
-    scalars: { ...(defaultLaunchQLGenOptions.scalars || {}), ...(opts.scalars || {}) },
-    typeNameOverrides: { ...(defaultLaunchQLGenOptions.typeNameOverrides || {}), ...(opts.typeNameOverrides || {}) }
+export async function runCodegen(opts: GraphQLCodegenOptions, cwd: string) {
+  const options: GraphQLCodegenOptions = {
+    input: { ...(defaultGraphQLCodegenOptions.input), ...(opts.input || {}) },
+    output: { ...(defaultGraphQLCodegenOptions.output), ...(opts.output || {}) },
+    documents: { ...(defaultGraphQLCodegenOptions.documents), ...(opts.documents || {}) },
+    features: { ...(defaultGraphQLCodegenOptions.features), ...(opts.features || {}) },
+    selection: { ...(defaultGraphQLCodegenOptions.selection), ...(opts.selection || {}) },
+    scalars: { ...(defaultGraphQLCodegenOptions.scalars || {}), ...(opts.scalars || {}) },
+    typeNameOverrides: { ...(defaultGraphQLCodegenOptions.typeNameOverrides || {}), ...(opts.typeNameOverrides || {}) }
   }
 
   const root = join(cwd, options.output.root)
@@ -246,8 +246,8 @@ export async function runCodegenFromJSONConfig(configPath: string, cwd: string)
   } catch (e) {
     throw new Error('Invalid JSON config: ' + e)
   }
-  const merged = mergeLaunchQLGenOptions(defaultLaunchQLGenOptions, overrides as any)
-  return runCodegen(merged as LaunchQLGenOptions, cwd)
+  const merged = mergeGraphQLCodegenOptions(defaultGraphQLCodegenOptions, overrides as any)
+  return runCodegen(merged as GraphQLCodegenOptions, cwd)
 }
 
 function buildTypeIndex(introspection: any) {