Fix regex when parsing and preserving newline characters in env values

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 9.0.3
+
+- **Fix**: Use global flag on regex when parsing and preserving newline characters in env values (thanks to MaximTovstashev)
+
 ## 9.0.2
 
 - **Fix**: CLI will now exit with non-zero error code when an error is encountered (thanks to blagh)

dist/parse-env-file.js

@@ -62,7 +62,7 @@ function parseEnvVars(envString) {
         // remove any surrounding quotes
         matches[key] = value
             .replace(/(^['"]|['"]$)/g, '')
-            .replace(`\\n`, `\n`);
+            .replace(/\\n/g, `\n`);
     }
     return matches;
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "env-cmd",
-  "version": "9.0.2",
+  "version": "9.0.3",
   "description": "Executes a command using the environment variables in an env file",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

src/parse-env-file.ts

@@ -55,7 +55,7 @@ export function parseEnvVars (envString: string): { [key: string]: string } {
     // remove any surrounding quotes
     matches[key] = value
       .replace(/(^['"]|['"]$)/g, '')
-      .replace(`\\n`, `\n`)
+      .replace(/\\n/g, `\n`)
   }
   return matches
 }

test/parse-env-file.spec.ts

@@ -62,6 +62,13 @@ describe('parseEnvVars', (): void => {
     assert(envVars.DOUBLE_TWO === '"double_two"')
   })
 
+  it('should preserve newlines when surrounded in quotes', (): void => {
+    const envVars = parseEnvVars(`ONE_NEWLINE="ONE\\n"\nTWO_NEWLINES="HELLO\\nWORLD\\n"\nTHREE_NEWLINES="HELLO\\n\\nWOR\\nLD"\n`)
+    assert(envVars.ONE_NEWLINE === 'ONE\n')
+    assert(envVars.TWO_NEWLINES === 'HELLO\nWORLD\n')
+    assert(envVars.THREE_NEWLINES === 'HELLO\n\nWOR\nLD')
+  })
+
   it('should preserve embedded single quotes', (): void => {
     const envVars = parseEnvVars('SINGLE=\'\'\'\'\nSINGLE_ONE=\'\'single_one\'\'\nSINGLE_TWO="\'single_two\'"\n')
     assert(envVars.SINGLE === '\'\'')
@@ -104,6 +111,16 @@ describe('getEnvFileVars', (): void => {
     })
   })
 
+  it('should parse a json file keeping all newlines intact', async (): Promise<void> => {
+    const env = await getEnvFileVars('./test/test-files/test-newlines.json')
+    assert.deepEqual(env, {
+      'THANKS': 'FOR WHAT?!',
+      'ANSWER': 42,
+      'ONLY': 'IN\n PRODUCTION',
+      'GALAXY': 'hitch\nhiking\n\n'
+    })
+  })
+
   it('should parse a js file', async (): Promise<void> => {
     const env = await getEnvFileVars('./test/test-files/test.js')
     assert.deepEqual(env, {

test/test-files/test-newlines.json

@@ -0,0 +1,6 @@
+{
+  "THANKS": "FOR WHAT?!",
+  "ANSWER": 42,
+  "ONLY": "IN\n PRODUCTION",
+  "GALAXY": "hitch\nhiking\n\n" 
+}