fix(loadEnv): support compounded namespace names

ngryman · Nov 20, 2020 · 4b2f55a · 4b2f55a
1 parent a15db00
commit 4b2f55a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/loaders/loadEnv.test.ts b/src/loaders/loadEnv.test.ts
@@ -4,18 +4,18 @@ import { loadFromEnv } from './loadEnv'
 const TEST_CASES: [string, NodeJS.ProcessEnv, JsonObject][] = [
   [
     'map name to camelcase without namespace',
-    { PASTA_FOO: 'bar' },
+    { MY_APP_FOO: 'bar' },
     { foo: 'bar' }
   ],
   [
     'parse an array value',
-    { PASTA_FOO: '["bar", 1337]' },
+    { MY_APP_FOO: '["bar", 1337]' },
     { foo: ['bar', 1337] }
   ],
-  ['trim the value', { PASTA_FOO: '  1337  ' }, { foo: '1337' }],
+  ['trim the value', { MY_APP_FOO: '  1337  ' }, { foo: '1337' }],
   ['remove variables without namespace', { FOO: '1337' }, {}]
 ]
 
 test.each(TEST_CASES)('%s', (_title, env, expected) => {
-  expect(loadFromEnv('pasta', env)).toEqual(expected)
+  expect(loadFromEnv('my-app', env)).toEqual(expected)
 })
diff --git a/src/loaders/loadEnv.ts b/src/loaders/loadEnv.ts
@@ -1,12 +1,12 @@
-import { camelCase, chain, replace, trim, upperCase } from 'lodash'
+import { camelCase, chain, replace, snakeCase, trim } from 'lodash'
 import { JsonObject } from 'type-fest'
 import { parseArray } from './utils'
 
 export function loadFromEnv(
   namespace: string,
   env: NodeJS.ProcessEnv
 ): JsonObject {
-  const prefix = `${upperCase(namespace)}_`
+  const prefix = `${snakeCase(namespace).toUpperCase()}_`
   return chain(env)
     .pickBy((_v, k) => k.startsWith(prefix))
     .mapKeys((_v, k) => replace(k, prefix, ''))