feat!: pickFor now every time returns EnvPicker

allohamora · Apr 11, 2023 · e688443 · e688443
1 parent 8ee3e0d
commit e688443
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/__tests__/unit/env.manager.spec.ts b/__tests__/unit/env.manager.spec.ts
@@ -37,15 +37,15 @@ describe('EnvManager', () => {
 
   describe('pickFor', () => {
     it('returns values', () => {
-      expect(env.pickFor({ test: 'EMAIL' })?.value()).toBe(envStub.EMAIL);
-      expect(env.pickFor({ test: 'INTEGER' })?.value()).toBe(envStub.INTEGER);
+      expect(env.pickFor({ test: 'EMAIL' }).value()).toBe(envStub.EMAIL);
+      expect(env.pickFor({ test: 'INTEGER' }).value()).toBe(envStub.INTEGER);
 
-      expect(env.pickFor({ production: 'EMAIL' })?.value()).toEqual(undefined);
-      expect(env.pickFor({ production: 'INTEGER' })?.value()).toEqual(undefined);
+      expect(env.pickFor({ production: 'EMAIL' }).value()).toEqual(undefined);
+      expect(env.pickFor({ production: 'INTEGER' }).value()).toEqual(undefined);
 
-      expect(env.pickFor({ test: 'EMPTY_STRING' })?.value()).toEqual(undefined);
-      expect(env.pickFor({ test: 'SPACE_STRING' })?.value()).toEqual(undefined);
-      expect(env.pickFor({ test: 'OPTIONAL' })?.value()).toEqual(undefined);
+      expect(env.pickFor({ test: 'EMPTY_STRING' }).value()).toEqual(undefined);
+      expect(env.pickFor({ test: 'SPACE_STRING' }).value()).toEqual(undefined);
+      expect(env.pickFor({ test: 'OPTIONAL' }).value()).toEqual(undefined);
     });
   });
 

diff --git a/src/env/env.manager.ts b/src/env/env.manager.ts
@@ -57,11 +57,11 @@ export class EnvManager<E extends string, C extends BaseConfig = BaseConfig> ext
     return this.pick(key) as EnvPicker<E, C[K]>;
   }
 
-  public pickFor<K extends keyof C>(envRecord: AtLeastOne<Record<E, K>>): undefined | EnvPicker<E, C[K] | undefined> {
+  public pickFor<K extends keyof C>(envRecord: AtLeastOne<Record<E, K>>): EnvPicker<E, C[K] | undefined> {
     const key = envRecord[this.nodeEnv as E] as string | undefined;
 
     if (!key) {
-      return;
+      return new EnvPicker(undefined, this.nodeEnv) as EnvPicker<E, undefined>;
     }
 
     return this.pick(key) as EnvPicker<E, C[K] | undefined>;