Fixed runtimeEnvStrict type infer for empty client config (#121)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
t3-oss · Oct 5, 2023 · c77c240 · c77c240 · vercel · Oct 5, 2023
1 parent 86ea798
commit c77c240
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 13 deletions.
diff --git a/.changeset/cold-birds-allow.md b/.changeset/cold-birds-allow.md
@@ -0,0 +1,5 @@
+---
+"@t3-oss/env-core": patch
+---
+
+Fixed type infer for empty client config
diff --git a/packages/core/index.ts b/packages/core/index.ts
@@ -56,7 +56,7 @@ export interface LooseOptions<TShared extends Record<string, ZodType>>
 }
 
 export interface StrictOptions<
-  TPrefix extends string,
+  TPrefix extends string | undefined,
   TServer extends Record<string, ZodType>,
   TClient extends Record<string, ZodType>,
   TShared extends Record<string, ZodType>
@@ -67,12 +67,16 @@ export interface StrictOptions<
    */
   runtimeEnvStrict: Record<
     | {
-        [TKey in keyof TClient]: TKey extends `${TPrefix}${string}`
+        [TKey in keyof TClient]: TPrefix extends undefined
+          ? never
+          : TKey extends `${TPrefix}${string}`
           ? TKey
           : never;
       }[keyof TClient]
     | {
-        [TKey in keyof TServer]: TKey extends `${TPrefix}${string}`
+        [TKey in keyof TServer]: TPrefix extends undefined
+          ? TKey
+          : TKey extends `${TPrefix}${string}`
           ? never
           : TKey;
       }[keyof TServer]
@@ -85,7 +89,7 @@ export interface StrictOptions<
 }
 
 export interface ClientOptions<
-  TPrefix extends string,
+  TPrefix extends string | undefined,
   TClient extends Record<string, ZodType>
 > {
   /**
@@ -108,7 +112,7 @@ export interface ClientOptions<
 }
 
 export interface ServerOptions<
-  TPrefix extends string,
+  TPrefix extends string | undefined,
   TServer extends Record<string, ZodType>
 > {
   /**
@@ -142,7 +146,7 @@ export interface ServerOptions<
 }
 
 export type ServerClientOptions<
-  TPrefix extends string,
+  TPrefix extends string | undefined,
   TServer extends Record<string, ZodType>,
   TClient extends Record<string, ZodType>
 > =
@@ -151,7 +155,7 @@ export type ServerClientOptions<
   | (ClientOptions<TPrefix, TClient> & Impossible<ServerOptions<never, never>>);
 
 export type EnvOptions<
-  TPrefix extends string,
+  TPrefix extends string | undefined,
   TServer extends Record<string, ZodType>,
   TClient extends Record<string, ZodType>,
   TShared extends Record<string, ZodType>
@@ -161,7 +165,7 @@ export type EnvOptions<
       ServerClientOptions<TPrefix, TServer, TClient>);
 
 export function createEnv<
-  TPrefix extends string = "",
+  TPrefix extends string | undefined,
   TServer extends Record<string, ZodType> = NonNullable<unknown>,
   TClient extends Record<string, ZodType> = NonNullable<unknown>,
   TShared extends Record<string, ZodType> = NonNullable<unknown>

diff --git a/packages/core/test/smoke.test.ts b/packages/core/test/smoke.test.ts
@@ -306,12 +306,14 @@ describe("client/server only mode", () => {
 
   test("config with missing client", () => {
     ignoreErrors(() => {
-      createEnv({
+      createEnv(
         // @ts-expect-error - incomplete client config - client not present
-        clientPrefix: "FOO_",
-        server: {},
-        runtimeEnv: {},
-      });
+        {
+          clientPrefix: "FOO_",
+          server: {},
+          runtimeEnv: {},
+        }
+      );
     });
   });