From dd0d13d425facb80e86ead215b678808a7a84edb Mon Sep 17 00:00:00 2001
From: Daniel Roe <daniel@roe.dev>
Date: Wed, 26 Apr 2023 14:30:05 +0100
Subject: [PATCH] fix(nuxt): improved typing support for app config (#20526)

---
 packages/nuxt/src/core/templates.ts | 18 ++++++++++--------
 packages/schema/src/types/config.ts |  8 ++++++--
 test/fixtures/basic/nuxt.config.ts  | 14 ++++++++++++++
 test/fixtures/basic/types.ts        |  4 ++++
 4 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/packages/nuxt/src/core/templates.ts b/packages/nuxt/src/core/templates.ts
index a7578a5bec..f1d941aa13 100644
--- a/packages/nuxt/src/core/templates.ts
+++ b/packages/nuxt/src/core/templates.ts
@@ -222,15 +222,17 @@ declare const inlineConfig = ${JSON.stringify(nuxt.options.appConfig, null, 2)}
 type ResolvedAppConfig = Defu<typeof inlineConfig, [${app.configs.map((_id: string, index: number) => `typeof cfg${index}`).join(', ')}]>
 type IsAny<T> = 0 extends 1 & T ? true : false
 
-type MergedAppConfig<Resolved extends Record<string, any>, Custom extends Record<string, any>> = {
-  [K in keyof Resolved]: K extends keyof Custom
-    ? IsAny<Custom[K]> extends true
+type MergedAppConfig<Resolved extends Record<string, unknown>, Custom extends Record<string, unknown>> = {
+  [K in keyof (Resolved & Custom)]: K extends keyof Custom
+    ? unknown extends Custom[K]
       ? Resolved[K]
-      : Custom[K] extends Record<string, any>
-        ? Resolved[K] extends Record<string, any>
-          ? MergedAppConfig<Resolved[K], Custom[K]>
-          : Exclude<Custom[K], undefined>
-        : Exclude<Custom[K], undefined>
+      : IsAny<Custom[K]> extends true
+        ? Resolved[K]
+        : Custom[K] extends Record<string, any>
+            ? Resolved[K] extends Record<string, any>
+              ? MergedAppConfig<Resolved[K], Custom[K]>
+              : Exclude<Custom[K], undefined>
+            : Exclude<Custom[K], undefined>
     : Resolved[K]
 }
 
diff --git a/packages/schema/src/types/config.ts b/packages/schema/src/types/config.ts
index b1e96219e6..f12cf8de76 100644
--- a/packages/schema/src/types/config.ts
+++ b/packages/schema/src/types/config.ts
@@ -138,7 +138,9 @@ export interface RuntimeConfig extends RuntimeConfigNamespace {
 
 // -- App Config --
 
-export interface CustomAppConfig { }
+export interface CustomAppConfig {
+  [key: string]: unknown
+}
 
 export interface AppConfigInput extends CustomAppConfig {
   /** @deprecated reserved */
@@ -158,4 +160,6 @@ export interface NuxtAppConfig {
   keepalive: boolean | KeepAliveProps
 }
 
-export interface AppConfig { }
+export interface AppConfig {
+  [key: string]: unknown
+}
diff --git a/test/fixtures/basic/nuxt.config.ts b/test/fixtures/basic/nuxt.config.ts
index cda954f1ae..8377002374 100644
--- a/test/fixtures/basic/nuxt.config.ts
+++ b/test/fixtures/basic/nuxt.config.ts
@@ -145,6 +145,20 @@ export default defineNuxtConfig({
   },
   telemetry: false, // for testing telemetry types - it is auto-disabled in tests
   hooks: {
+    'schema:extend' (schemas) {
+      schemas.push({
+        appConfig: {
+          someThing: {
+            value: {
+              $default: 'default',
+              $schema: {
+                tsType: 'string | false'
+              }
+            }
+          }
+        }
+      })
+    },
     'prepare:types' ({ tsConfig }) {
       tsConfig.include = tsConfig.include!.filter(i => i !== '../../../../**/*')
     },
diff --git a/test/fixtures/basic/types.ts b/test/fixtures/basic/types.ts
index 15985c7496..20ee6a1bbc 100644
--- a/test/fixtures/basic/types.ts
+++ b/test/fixtures/basic/types.ts
@@ -295,6 +295,10 @@ describe('app config', () => {
         val: number
       }
       userConfig: 123 | 456
+      someThing?: {
+        value?: string | false,
+      }
+      [key: string]: unknown
     }
     expectTypeOf<AppConfig>().toEqualTypeOf<ExpectedMergedAppConfig>()
   })