fix(next-utils): use z.extend() for robust type inference in validateMintelEnv

packages/next-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mintel/next-utils",
-  "version": "1.7.2",
+  "version": "1.7.3",
   "publishConfig": {
     "access": "public",
     "registry": "https://npm.infra.mintel.me"

packages/next-utils/src/env.ts

@@ -50,16 +50,10 @@ export const mintelEnvSchema = {
   INTERNAL_DIRECTUS_URL: z.string().url().optional(),
 };
 
-export type MintelEnv<T extends z.ZodRawShape = Record<string, never>> =
-  z.infer<z.ZodObject<typeof mintelEnvSchema & T>>;
-
 export function validateMintelEnv<
   T extends z.ZodRawShape = Record<string, never>,
->(schemaExtension: T = {} as T): MintelEnv<T> {
+>(schemaExtension: T = {} as T) {
-  const fullSchema = z.object({
+  const fullSchema = z.object(mintelEnvSchema).extend(schemaExtension);
-    ...mintelEnvSchema,
-    ...schemaExtension,
-  });
 
   const isBuildTime =
     process.env.NEXT_PHASE === "phase-production-build" ||
@@ -73,7 +67,7 @@ export function validateMintelEnv<
         "⚠️ Some environment variables are missing during build, but skipping strict validation.",
       );
       // Return process.env casted to the full schema type to unblock builds
-      return process.env as unknown as MintelEnv<T>;
+      return process.env as unknown as z.infer<typeof fullSchema>;
     }
 
     console.error(
@@ -83,5 +77,5 @@ export function validateMintelEnv<
     throw new Error("Invalid environment variables");
   }
 
-  return result.data as MintelEnv<T>;
+  return result.data;
 }