fix: correct order of arguments in defu for merged configuration in client and server code generation

productdevbook · productdevbook · commit 246d7ce5f441 · 2025-07-21T19:53:06.000+03:00
diff --git a/src/utils/client-codegen.ts b/src/utils/client-codegen.ts
@@ -127,7 +127,7 @@ export async function generateClientTypes(
     },
   }
 
-  const mergedConfig = defu(config, defaultConfig)
+  const mergedConfig = defu(defaultConfig, config)
 
   const defaultSdkConfig: GenericSdkConfig = {
     documentMode: 'string',
@@ -146,7 +146,7 @@ export async function generateClientTypes(
     },
   }
 
-  const mergedSdkConfig = defu(sdkConfig, defaultSdkConfig)
+  const mergedSdkConfig = defu(defaultSdkConfig, sdkConfig)
 
   try {
     const output = await codegen({
diff --git a/src/utils/server-codegen.ts b/src/utils/server-codegen.ts
@@ -60,7 +60,7 @@ export async function generateTypes(
     enumsAsTypes: true,
   }
 
-  const mergedConfig = defu(config, defaultConfig)
+  const mergedConfig = defu(defaultConfig, config)
 
   const output = await codegen({
     filename: outputPath || 'types.generated.ts',

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ export async function generateClientTypes(`
`127`	`127`	`},`
`128`	`128`	`}`
`129`	`129`
`130`		`- const mergedConfig = defu(config, defaultConfig)`
	`130`	`+ const mergedConfig = defu(defaultConfig, config)`
`131`	`131`
`132`	`132`	`const defaultSdkConfig: GenericSdkConfig = {`
`133`	`133`	`documentMode: 'string',`
`@@ -146,7 +146,7 @@ export async function generateClientTypes(`
`146`	`146`	`},`
`147`	`147`	`}`
`148`	`148`
`149`		`- const mergedSdkConfig = defu(sdkConfig, defaultSdkConfig)`
	`149`	`+ const mergedSdkConfig = defu(defaultSdkConfig, sdkConfig)`
`150`	`150`
`151`	`151`	`try {`
`152`	`152`	`const output = await codegen({`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ export async function generateTypes(`
`60`	`60`	`enumsAsTypes: true,`
`61`	`61`	`}`
`62`	`62`
`63`		`- const mergedConfig = defu(config, defaultConfig)`
	`63`	`+ const mergedConfig = defu(defaultConfig, config)`
`64`	`64`
`65`	`65`	`const output = await codegen({`
`66`	`66`	`filename: outputPath \|\| 'types.generated.ts',`