Merge pull request #393 from toddbluhm/fix-strip-comments

fix(parse-env-file): fix strip comments per PR #333
toddbluhm · Dec 3, 2024 · 4790a82 · 4790a82
2 parents e51b320 + 8f5a956
commit 4790a82
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 16 deletions.
diff --git a/dist/parse-env-file.js b/dist/parse-env-file.js
@@ -85,14 +85,8 @@ export function parseEnvVars(envString) {
  * Strips out comments from env file string
  */
 export function stripComments(envString) {
-    const commentsRegex = /(^#.*$)/gim;
-    let match = commentsRegex.exec(envString);
-    let newString = envString;
-    while (match != null) {
-        newString = newString.replace(match[1], '');
-        match = commentsRegex.exec(envString);
-    }
-    return newString;
+    const commentsRegex = /(^\s*#.*$)/gim;
+    return envString.replace(commentsRegex, '');
 }
 /**
  * Strips out newlines from env file string

diff --git a/src/parse-env-file.ts b/src/parse-env-file.ts
@@ -94,14 +94,8 @@ export function parseEnvVars(envString: string): Environment {
  * Strips out comments from env file string
  */
 export function stripComments(envString: string): string {
-  const commentsRegex = /(^#.*$)/gim
-  let match = commentsRegex.exec(envString)
-  let newString = envString
-  while (match != null) {
-    newString = newString.replace(match[1], '')
-    match = commentsRegex.exec(envString)
-  }
-  return newString
+  const commentsRegex = /(^\s*#.*$)/gim
+  return envString.replace(commentsRegex, '')
 }
 
 /**

diff --git a/test/parse-env-file.spec.ts b/test/parse-env-file.spec.ts
@@ -16,6 +16,11 @@ describe('stripComments', (): void => {
     const envString = stripComments('#BOB=COOL\nNODE_ENV=dev\nANSWER=42 AND COUNTING\n#AnotherComment\n')
     assert(envString === '\nNODE_ENV=dev\nANSWER=42 AND COUNTING\n\n')
   })
+
+  it('should not strip out #s from values', (): void => {
+    const envString = stripComments('#\nBOB=COMMENT#ELL\n#\nNODE_ENV=dev\nANSWER=42 AND COUNTING\n#AnotherComment\n')
+    assert(envString === '\nBOB=COMMENT#ELL\n\nNODE_ENV=dev\nANSWER=42 AND COUNTING\n\n', envString)
+  })
 })
 
 describe('parseEnvVars', (): void => {