util(parseEnv): add more test cases

Author: AugustinMauroy

src/node_dotenv.cc

@@ -137,21 +137,15 @@ void Dotenv::ParseContent(const std::string_view input) {
 
   while (!content.empty()) {
     // Skip empty lines and comments
-    // Example:
-    //   # This is a comment
     if (content.front() == '\n' || content.front() == '#') {
       // Check if the first character of the content is a newline or a hash
-      if (content.front() == '\n') {
-        // If the first character is a newline, remove it
-        content.remove_prefix(1);
+      auto newline = content.find('\n');
+      if (newline != std::string_view::npos) {
+        // Remove everything up to and including the newline character
+        content.remove_prefix(newline + 1);
       } else {
-        // If the first character is a hash, find the next newline character
-        auto newline = content.find('\n');
-        if (newline != std::string_view::npos) {
-          // If a newline is found, remove the comment line including the
-          // newline character.
-          content.remove_prefix(newline + 1);
-        }
+        // If no newline is found, clear the content
+        content = {};
       }
 
       // Skip the remaining code in the loop and continue with the next
@@ -231,6 +225,8 @@ void Dotenv::ParseContent(const std::string_view input) {
         if (newline != std::string_view::npos) {
           content.remove_prefix(newline + 1);
         } else {
+          // In case the last line is a single key/value pair
+          // Example: KEY=VALUE (without a newline at the EOF
           content = {};
         }
         continue;

test/parallel/test-dotenv-edge-cases.js

@@ -220,4 +220,42 @@ describe('.env supports edge cases', () => {
       ANOTHER_VALID: 'value',
     });
   });
+
+  it('should handle trimming of keys and values correctly', () => {
+    const result = parseEnv([
+      '   KEY_WITH_SPACES_BEFORE=   value_with_spaces_before_and_after   ',
+      'KEY_WITH_TABS_BEFORE\t=\tvalue_with_tabs_before_and_after\t',
+      'KEY_WITH_SPACES_AND_TABS\t = \t value_with_spaces_and_tabs \t',
+      '   KEY_WITH_SPACES_ONLY   =value',
+      'KEY_WITH_NO_VALUE=',
+      'KEY_WITH_SPACES_AFTER=   value   ',
+      'KEY_WITH_SPACES_AND_COMMENT=value   # this is a comment',
+      'KEY_WITH_ONLY_COMMENT=# this is a comment',
+      'KEY_WITH_EXPORT=export value',
+      '   export   KEY_WITH_EXPORT_AND_SPACES   =   value   ',
+    ].join('\n'));
+
+    assert.deepStrictEqual(result, {
+      KEY_WITH_SPACES_BEFORE: 'value_with_spaces_before_and_after',
+      KEY_WITH_TABS_BEFORE: 'value_with_tabs_before_and_after',
+      KEY_WITH_SPACES_AND_TABS: 'value_with_spaces_and_tabs',
+      KEY_WITH_SPACES_ONLY: 'value',
+      KEY_WITH_NO_VALUE: '',
+      KEY_WITH_ONLY_COMMENT: '',
+      KEY_WITH_SPACES_AFTER: 'value',
+      KEY_WITH_SPACES_AND_COMMENT: 'value',
+      KEY_WITH_EXPORT: 'export value',
+      KEY_WITH_EXPORT_AND_SPACES: 'value',
+    });
+  });
+
+  it('should handle a comment in a valid value', () => {
+    const result = parseEnv([
+      'KEY_WITH_COMMENT_IN_VALUE="value # this is a comment"',
+    ].join('\n'));
+
+    assert.deepStrictEqual(result, {
+      KEY_WITH_COMMENT_IN_VALUE: 'value # this is a comment',
+    });
+  });
 });