fix the case with escaped quote

danday74 · Jan 9, 2020 · 8212d44 · 8212d44
1 parent 33bf94a
commit 8212d44
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/js/DotEnvParser.js b/js/DotEnvParser.js
@@ -13,8 +13,13 @@ class DotEnvParser {
   }
 
   static removeComments(str) {
-    if (str.includes('="') && str.endsWith('"')) {
-      return str;
+    if (str.includes('="')) {
+      if(str.endsWith('"')) {
+        return str;
+      } else {
+        const values = /(.*="(?:[^"\\]|\\.)*").*/.exec(str);
+        return values[1].replace('\\"','"');
+      }
     } else  {
       return str.replace(/#.*/, '');
     }

diff --git a/test/envsub-global/envFile9.env b/test/envsub-global/envFile9.env
@@ -1 +1 @@
-NOT_A_COMMENT="Daniel#not_a_comment"
+NOT_A_COMMENT="Daniel#not_a_comment\"" #comment
diff --git a/test/envsub-global/templateFileNotAComment_E b/test/envsub-global/templateFileNotAComment_E
@@ -1,2 +1,2 @@
-xxxDaniel#not_a_commentxxx xxxDaniel#not_a_commentxxx
-xxxDaniel#not_a_commentxxx xxxDaniel#not_a_commentxxx
+xxxDaniel#not_a_comment"xxx xxxDaniel#not_a_comment"xxx
+xxxDaniel#not_a_comment"xxx xxxDaniel#not_a_comment"xxx