Skip to content

fix(codegen): use deepmerge for CLI config merging #722

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pyramation merged 2 commits into from
Feb 15, 2026
Merged

fix(codegen): use deepmerge for CLI config merging #722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c6279f
fix(codegen): use deepmerge for CLI config merging
pyramation Feb 15, 2026
1eab89e
Merge branch 'main' into devin/1771130267-codegen-deepmerge-config
pyramation Feb 15, 2026
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
10 changes: 4 additions & 6 deletions graphql/codegen/src/cli/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { CLI, CLIOptions, getPackageJson, Inquirerer } from 'inquirerer';

import { findConfigFile, loadConfigFile } from '../core/config';
import { generate } from '../core/generate';
import type { GraphQLSDKConfigTarget } from '../types/config';
import { mergeConfig, type GraphQLSDKConfigTarget } from '../types/config';
import {
buildDbConfig,
buildGenerateOptions,
Expand Down Expand Up @@ -114,11 +114,9 @@ export const commands = async (
let hasError = false;
for (const name of names) {
console.log(`\n[${name}]`);
const targetConfig = { ...targets[name], ...cliOptions } as GraphQLSDKConfigTarget;
if (targets[name].db && targetConfig.db) {
targetConfig.db = { ...targets[name].db, ...targetConfig.db };
}
const result = await generate(targetConfig);
const result = await generate(
mergeConfig(targets[name], cliOptions as GraphQLSDKConfigTarget),
);
printResult(result);
if (!result.success) hasError = true;
}
Expand Down
8 changes: 2 additions & 6 deletions graphql/codegen/src/cli/shared.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { inflektTree } from 'inflekt/transform-keys';
import type { Question } from 'inquirerer';

import type { GenerateResult } from '../core/generate';
import type { GraphQLSDKConfigTarget } from '../types/config';
import { mergeConfig, type GraphQLSDKConfigTarget } from '../types/config';

export const splitCommas = (
input: string | undefined,
Expand Down Expand Up @@ -262,9 +262,5 @@ export function buildGenerateOptions(
const camelized = camelizeArgv(answers);
const normalized = normalizeCodegenListOptions(camelized);
const withDb = buildDbConfig(normalized);
const merged = { ...fileConfig, ...withDb } as GraphQLSDKConfigTarget;
if (fileConfig.db && merged.db) {
merged.db = { ...fileConfig.db, ...merged.db };
}
return merged;
return mergeConfig(fileConfig, withDb as GraphQLSDKConfigTarget);
}