Skip to content

src: improve node::Dotenv declarations #52973

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 16, 2024
Merged

src: improve node::Dotenv declarations #52973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions src/node_dotenv.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,6 @@ std::vector<std::string> Dotenv::GetPathFromArgs(
}

void Dotenv::SetEnvironment(node::Environment* env) {
if (store_.empty()) {
return;
}

auto isolate = env->isolate();

for (const auto& entry : store_) {
Expand All @@ -67,7 +63,7 @@ void Dotenv::SetEnvironment(node::Environment* env) {
}
}

Local<Object> Dotenv::ToObject(Environment* env) {
Local<Object> Dotenv::ToObject(Environment* env) const {
Local<Object> result = Object::New(env->isolate());

for (const auto& entry : store_) {
Expand Down Expand Up @@ -263,7 +259,7 @@ Dotenv::ParseResult Dotenv::ParsePath(const std::string_view path) {
return ParseResult::Valid;
}

void Dotenv::AssignNodeOptionsIfAvailable(std::string* node_options) {
void Dotenv::AssignNodeOptionsIfAvailable(std::string* node_options) const {
auto match = store_.find("NODE_OPTIONS");

if (match != store_.end()) {
Expand Down
8 changes: 4 additions & 4 deletions src/node_dotenv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ class Dotenv {
enum ParseResult { Valid, FileError, InvalidContent };

Dotenv() = default;
Dotenv(const Dotenv& d) = default;
Dotenv(const Dotenv& d) = delete;
Dotenv(Dotenv&& d) noexcept = default;
Dotenv& operator=(Dotenv&& d) noexcept = default;
Dotenv& operator=(const Dotenv& d) = default;
Dotenv& operator=(const Dotenv& d) = delete;
~Dotenv() = default;

void ParseContent(const std::string_view content);
ParseResult ParsePath(const std::string_view path);
void AssignNodeOptionsIfAvailable(std::string* node_options);
void AssignNodeOptionsIfAvailable(std::string* node_options) const;
void SetEnvironment(Environment* env);
v8::Local<v8::Object> ToObject(Environment* env);
v8::Local<v8::Object> ToObject(Environment* env) const;

static std::vector<std::string> GetPathFromArgs(
const std::vector<std::string>& args);
Expand Down