refactor: apply comment

rayark1 · rayark1 · commit 12105d97e5f9 · 2025-03-13T21:28:56.000-07:00
diff --git a/benchmark/fixtures/valid.env b/benchmark/fixtures/valid.env
@@ -6,7 +6,7 @@ BASIC=basic
 
 # previous line intentionally left blank
 AFTER_LINE=after_line
-A=B=C
+A="B=C"
 EMPTY=
 EMPTY_SINGLE_QUOTES=''
 EMPTY_DOUBLE_QUOTES=""
diff --git a/src/node_dotenv.cc b/src/node_dotenv.cc
@@ -149,7 +149,7 @@ void Dotenv::ParseContent(const std::string_view input) {
       if (newline != std::string_view::npos) {
         content.remove_prefix(newline + 1);
       } else {
-        content.remove_prefix(content.size());
+        content = {};
       }
       continue;
     }
@@ -203,7 +203,7 @@ void Dotenv::ParseContent(const std::string_view input) {
         if (newline != std::string_view::npos) {
           content.remove_prefix(newline + 1);
         } else {
-          content.remove_prefix(content.size());
+          content = {};
         }
         continue;
       }
@@ -236,7 +236,7 @@ void Dotenv::ParseContent(const std::string_view input) {
         if (newline != std::string_view::npos) {
           content.remove_prefix(newline + 1);
         } else {
-          content.remove_prefix(content.size());
+          content = {};
         }
         continue;
       }
@@ -254,8 +254,7 @@ void Dotenv::ParseContent(const std::string_view input) {
         if (hash_character != std::string_view::npos) {
           value = content.substr(0, hash_character);
         }
-        value = trim_spaces(value);
-        store_.insert_or_assign(std::string(key), value);
+        store_.insert_or_assign(std::string(key), trim_spaces(value));
         content.remove_prefix(newline + 1);
       } else {
         // In case the last line is a single key/value pair
@@ -265,14 +264,11 @@ void Dotenv::ParseContent(const std::string_view input) {
         if (hash_char != std::string_view::npos) {
           value = content.substr(0, hash_char);
         }
-        value = trim_spaces(value);
-
-        store_.insert_or_assign(std::string(key), value);
-        content.remove_prefix(content.size());
+        store_.insert_or_assign(std::string(key), trim_spaces(value));
+        content = {};
       }
 
-      value = trim_spaces(value);
-      store_.insert_or_assign(std::string(key), value);
+      store_.insert_or_assign(std::string(key), trim_spaces(value));
     }
   }
 }
diff --git a/test/fixtures/dotenv/valid.env b/test/fixtures/dotenv/valid.env
@@ -6,7 +6,7 @@ BASIC=basic
 
 # previous line intentionally left blank
 AFTER_LINE=after_line
-A=B=C
+A="B=C"
 EMPTY=
 EMPTY_SINGLE_QUOTES=''
 EMPTY_DOUBLE_QUOTES=""

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ void Dotenv::ParseContent(const std::string_view input) {`
`149`	`149`	`if (newline != std::string_view::npos) {`
`150`	`150`	`content.remove_prefix(newline + 1);`
`151`	`151`	`} else {`
`152`		`- content.remove_prefix(content.size());`
	`152`	`+ content = {};`
`153`	`153`	`}`
`154`	`154`	`continue;`
`155`	`155`	`}`
`@@ -203,7 +203,7 @@ void Dotenv::ParseContent(const std::string_view input) {`
`203`	`203`	`if (newline != std::string_view::npos) {`
`204`	`204`	`content.remove_prefix(newline + 1);`
`205`	`205`	`} else {`
`206`		`- content.remove_prefix(content.size());`
	`206`	`+ content = {};`
`207`	`207`	`}`
`208`	`208`	`continue;`
`209`	`209`	`}`
`@@ -236,7 +236,7 @@ void Dotenv::ParseContent(const std::string_view input) {`
`236`	`236`	`if (newline != std::string_view::npos) {`
`237`	`237`	`content.remove_prefix(newline + 1);`
`238`	`238`	`} else {`
`239`		`- content.remove_prefix(content.size());`
	`239`	`+ content = {};`
`240`	`240`	`}`
`241`	`241`	`continue;`
`242`	`242`	`}`
`@@ -254,8 +254,7 @@ void Dotenv::ParseContent(const std::string_view input) {`
`254`	`254`	`if (hash_character != std::string_view::npos) {`
`255`	`255`	`value = content.substr(0, hash_character);`
`256`	`256`	`}`
`257`		`- value = trim_spaces(value);`
`258`		`- store_.insert_or_assign(std::string(key), value);`
	`257`	`+ store_.insert_or_assign(std::string(key), trim_spaces(value));`
`259`	`258`	`content.remove_prefix(newline + 1);`
`260`	`259`	`} else {`
`261`	`260`	`// In case the last line is a single key/value pair`
`@@ -265,14 +264,11 @@ void Dotenv::ParseContent(const std::string_view input) {`
`265`	`264`	`if (hash_char != std::string_view::npos) {`
`266`	`265`	`value = content.substr(0, hash_char);`
`267`	`266`	`}`
`268`		`- value = trim_spaces(value);`
`269`		`-`
`270`		`- store_.insert_or_assign(std::string(key), value);`
`271`		`- content.remove_prefix(content.size());`
	`267`	`+ store_.insert_or_assign(std::string(key), trim_spaces(value));`
	`268`	`+ content = {};`
`272`	`269`	`}`
`273`	`270`
`274`		`- value = trim_spaces(value);`
`275`		`- store_.insert_or_assign(std::string(key), value);`
	`271`	`+ store_.insert_or_assign(std::string(key), trim_spaces(value));`
`276`	`272`	`}`
`277`	`273`	`}`
`278`	`274`	`}`