1 files changed, 11 insertions, 13 deletions
diff --git a/u/process/env.ts b/u/process/env.ts
index 88fb490..f59fadf 100644
--- a/u/process/env.ts
+++ b/u/process/env.ts
@@ -1,27 +1,25 @@
-import { IOptional, Either, Optional, type IEither } from '@emprespresso/pengueno';
+import { IOptional, Either, Optional, type IEither, type ObjectFromList } from '@emprespresso/pengueno';
 
-export const getEnv = <V extends string>(name: string): IOptional<V> => Optional.from(<V>process.env[name]);
+// type safe environment variables
 
-export const getRequiredEnv = <V extends string>(name: string): IEither<Error, V> =>
-    Either.fromFailable(() => getEnv<V>(name).get()).mapLeft(
+export const getEnv = (name: string): IOptional<string> => Optional.from(process.env[name]);
+
+export const getRequiredEnv = <V extends string>(name: V): IEither<Error, string> =>
+    Either.fromFailable(() => getEnv(name).get()).mapLeft(
         () => new Error(`environment variable "${name}" is required D:`),
     );
 
-type ObjectFromList<T extends ReadonlyArray<string>, V = string> = {
-    [K in T extends ReadonlyArray<infer U> ? U : never]: V;
-};
-
-export const getRequiredEnvVars = <V extends string>(vars: Array<V>) => {
+export const getRequiredEnvVars = <V extends string>(vars: Array<V>): IEither<Error, ObjectFromList<typeof vars>> => {
     type Environment = ObjectFromList<typeof vars>;
     const emptyEnvironment = Either.right<Error, Environment>(<Environment>{});
-    const addTo = (env: Environment, key: V) => (val: string) =>
+    const addTo = (env: Environment, key: V, val: string) =>
         <Environment>{
             ...env,
             [key]: val,
         };
-    return Either.joinRight<V, Error, Environment>(
-        vars,
-        (envVar: V, environment: Environment) => getRequiredEnv(envVar).mapRight(addTo(environment, envVar)),
+    return vars.reduce(
+        (environment, key) =>
+            environment.joinRight(getRequiredEnv(key), (value, environment) => addTo(environment, key, value)),
         emptyEnvironment,
     );
 };