src: handle empty value without newline at EOF

Author: ilyasShabiCS

src/node_dotenv.cc

@@ -1,5 +1,4 @@
 #include "node_dotenv.h"
-#include <regex>  // NOLINT(build/c++11)
 #include <unordered_set>
 #include "env-inl.h"
 #include "node_file.h"
@@ -104,7 +103,12 @@ std::string_view trim_spaces(std::string_view input) {
 }
 
 void Dotenv::ParseContent(const std::string_view input) {
-  std::string_view content = input;
+  std::string lines(input);
+
+  // Handle windows newlines "\r\n": remove "\r" and keep only "\n"
+  lines.erase(std::remove(lines.begin(), lines.end(), '\r'), lines.end());
+
+  std::string_view content = lines;
   content = trim_spaces(content);
 
   std::string_view key;
@@ -142,6 +146,9 @@ void Dotenv::ParseContent(const std::string_view input) {
 
     // SAFETY: Content is guaranteed to have at least one character
     if (content.empty()) {
+      // In case the last line is a single key without value
+      // Example: KEY= (without a newline at the EOF)
+      store_.insert_or_assign(std::string(key), "");
       break;
     }
 

test/fixtures/dotenv/eof-without-value.env

@@ -0,0 +1,2 @@
+BASIC=value
+EMPTY=

test/fixtures/dotenv/multiline.env

@@ -4,4 +4,4 @@ LgGJQwu9WqyzHKZ6WIA5T+7zPjO1L8l3S8k8YzBrfH4mqWOD1GBI8Yjq2L1ac3Y/
 bTdfHN8CmQr2iDJC0C6zY8YV93oZB3x0zC/LPbRYpF8f6OqX1lZj5vo2zJZy4fI/
 kKcI5jHYc8VJq+KCuRZrvn+3V+KuL9tF9v8ZgjF2PZbU+LsCy5Yqg1M8f5Jp5f6V
 u4QuUoobAgMBAAE=
------END PUBLIC KEY-----"
+-----END PUBLIC KEY-----"

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

@@ -81,4 +81,21 @@ describe('.env supports edge cases', () => {
     assert.strictEqual(child.stderr, '');
     assert.strictEqual(child.code, 0);
   });
+
+  it('should handle empty value without a newline at the EOF', async () => {
+    // Ref: https://github.com/nodejs/node/issues/52466
+    const code = `
+      process.loadEnvFile('./eof-without-value.env');
+      require('assert').strictEqual(process.env.BASIC, 'value');
+      require('assert').strictEqual(process.env.EMPTY, '');
+    `.trim();
+    const child = await common.spawnPromisified(
+      process.execPath,
+      [ '--eval', code ],
+      { cwd: fixtures.path('dotenv') },
+    );
+    assert.strictEqual(child.stdout, '');
+    assert.strictEqual(child.stderr, '');
+    assert.strictEqual(child.code, 0);
+  });
 });