fixup! src: fixup lint issues after dictionary template change

Author: jasnell

src/node_sqlite.cc

@@ -124,7 +124,7 @@ namespace {
 Local<DictionaryTemplate> getLazyIterTemplate(Environment* env) {
  auto iter_template = env->iter_template();
  if (iter_template.IsEmpty()) {
- std::string_view iter_keys[] = {"done", "value"};
+ static constexpr std::string_view iter_keys[] = {"done", "value"};
  iter_template = DictionaryTemplate::New(env->isolate(), iter_keys);
  env->set_iter_template(iter_template);
  }
@@ -2254,7 +2254,7 @@ void StatementSync::Columns(const FunctionCallbackInfo<Value>& args) {
  LocalVector<Value> cols(isolate);
  auto sqlite_column_template = env->sqlite_column_template();
  if (sqlite_column_template.IsEmpty()) {
- std::string_view col_keys[] = {
+ static constexpr std::string_view col_keys[] = {
  "column", "database", "name", "table", "type"};
  sqlite_column_template = DictionaryTemplate::New(isolate, col_keys);
  env->set_sqlite_column_template(sqlite_column_template);

src/node_url_pattern.cc

@@ -399,7 +399,7 @@ MaybeLocal<Value> URLPattern::URLPatternResult::ToJSValue(
 
  auto tmpl = env->urlpatternresult_template();
  if (tmpl.IsEmpty()) {
- std::string_view namesVec[] = {
+ static constexpr std::string_view namesVec[] = {
  "inputs",
  "protocol",
  "username",
@@ -417,29 +417,59 @@ MaybeLocal<Value> URLPattern::URLPatternResult::ToJSValue(
  size_t index = 0;
  auto context = isolate->GetCurrentContext();
 
+ // We are using a DictionaryTemplate to create the URLPatternResult
+ // object. We want to make sure that the properties are created without
+ // errors before we call NewInstance, and bail out early if any fail.
+
+ v8::Local<v8::Array> inputs;
+ if (!Array::New(context,
+ result.inputs.size(),
+ [&index, &inputs = result.inputs, env]() {
+ auto& input = inputs[index++];
+ if (std::holds_alternative<std::string_view>(input)) {
+ auto input_str = std::get<std::string_view>(input);
+ return ToV8Value(env->context(), input_str);
+ } else {
+ DCHECK(
+ std::holds_alternative<ada::url_pattern_init>(input));
+ auto init = std::get<ada::url_pattern_init>(input);
+ return URLPatternInit::ToJsObject(env, init);
+ }
+ })
+ .ToLocal(&inputs)) {
+ return {};
+ }
+
+ Local<Object> results[8];
+ if (!URLPatternComponentResult::ToJSObject(env, result.protocol)
+ .ToLocal(&results[0]) ||
+ !URLPatternComponentResult::ToJSObject(env, result.username)
+ .ToLocal(&results[1]) ||
+ !URLPatternComponentResult::ToJSObject(env, result.password)
+ .ToLocal(&results[2]) ||
+ !URLPatternComponentResult::ToJSObject(env, result.hostname)
+ .ToLocal(&results[3]) ||
+ !URLPatternComponentResult::ToJSObject(env, result.port)
+ .ToLocal(&results[4]) ||
+ !URLPatternComponentResult::ToJSObject(env, result.pathname)
+ .ToLocal(&results[5]) ||
+ !URLPatternComponentResult::ToJSObject(env, result.search)
+ .ToLocal(&results[6]) ||
+ !URLPatternComponentResult::ToJSObject(env, result.hash)
+ .ToLocal(&results[7])) {
+ return {};
+ }
+
  MaybeLocal<Value> vals[] = {
- Array::New(context,
- result.inputs.size(),
- [&index, &inputs = result.inputs, env]() {
- auto& input = inputs[index++];
- if (std::holds_alternative<std::string_view>(input)) {
- auto input_str = std::get<std::string_view>(input);
- return ToV8Value(env->context(), input_str);
- } else {
- DCHECK(
- std::holds_alternative<ada::url_pattern_init>(input));
- auto init = std::get<ada::url_pattern_init>(input);
- return URLPatternInit::ToJsObject(env, init);
- }
- }),
- URLPatternComponentResult::ToJSObject(env, result.protocol),
- URLPatternComponentResult::ToJSObject(env, result.username),
- URLPatternComponentResult::ToJSObject(env, result.password),
- URLPatternComponentResult::ToJSObject(env, result.hostname),
- URLPatternComponentResult::ToJSObject(env, result.port),
- URLPatternComponentResult::ToJSObject(env, result.pathname),
- URLPatternComponentResult::ToJSObject(env, result.search),
- URLPatternComponentResult::ToJSObject(env, result.hash),
+ inputs,
+ results[0], /** protocol */
+ results[1], /** username */
+ results[2], /** password */
+ results[3], /** hostname */
+ results[4], /** port */
+ results[5], /** pathname */
+ results[6], /** search */
+ results[7], /** hash */
  };
  return tmpl->NewInstance(env->context(), vals);
 }

src/node_util.cc

@@ -267,13 +267,14 @@ static void GetCallSites(const FunctionCallbackInfo<Value>& args) {
 
  auto callsite_template = env->callsite_template();
  if (callsite_template.IsEmpty()) {
- std::string_view names[] = {"functionName",
- "scriptId",
- "scriptName",
- "lineNumber",
- "columnNumber",
- // TODO(legendecas): deprecate CallSite.column.
- "column"};
+ static constexpr std::string_view names[] = {
+ "functionName",
+ "scriptId",
+ "scriptName",
+ "lineNumber",
+ "columnNumber",
+ // TODO(legendecas): deprecate CallSite.column.
+ "column"};
  callsite_template = DictionaryTemplate::New(isolate, names);
  env->set_callsite_template(callsite_template);
  }

src/node_v8.cc

@@ -337,16 +337,18 @@ static MaybeLocal<Object> ConvertHeapStatsToJSObject(
  auto space_stats_tmpl = env->space_stats_template();
  auto heap_stats_tmpl = env->v8_heap_statistics_template();
  if (object_stats_template.IsEmpty()) {
- std::string_view object_stats_names[] = {"allocated_bytes", "object_count"};
+ static constexpr std::string_view object_stats_names[] = {"allocated_bytes",
+ "object_count"};
  object_stats_template =
  DictionaryTemplate::New(isolate, object_stats_names);
  env->set_object_stats_template(object_stats_template);
  }
  if (page_stats_tmpl.IsEmpty()) {
- std::string_view page_stats_names[] = {"committed_size_bytes",
- "resident_size_bytes",
- "used_size_bytes",
- "object_statistics"};
+ static constexpr std::string_view page_stats_names[] = {
+ "committed_size_bytes",
+ "resident_size_bytes",
+ "used_size_bytes",
+ "object_statistics"};
  page_stats_tmpl = DictionaryTemplate::New(isolate, page_stats_names);
  env->set_page_stats_template(page_stats_tmpl);
  }
@@ -358,21 +360,23 @@ static MaybeLocal<Object> ConvertHeapStatsToJSObject(
  env->set_free_list_statistics_template(free_list_statistics_template);
  }
  if (space_stats_tmpl.IsEmpty()) {
- std::string_view space_stats_names[] = {"name",
- "committed_size_bytes",
- "resident_size_bytes",
- "used_size_bytes",
- "page_stats",
- "free_list_stats"};
+ static constexpr std::string_view space_stats_names[] = {
+ "name",
+ "committed_size_bytes",
+ "resident_size_bytes",
+ "used_size_bytes",
+ "page_stats",
+ "free_list_stats"};
  space_stats_tmpl = DictionaryTemplate::New(isolate, space_stats_names);
  env->set_space_stats_template(space_stats_tmpl);
  }
  if (heap_stats_tmpl.IsEmpty()) {
- std::string_view heap_statistics_names[] = {"committed_size_bytes",
- "resident_size_bytes",
- "used_size_bytes",
- "space_statistics",
- "type_names"};
+ static constexpr std::string_view heap_statistics_names[] = {
+ "committed_size_bytes",
+ "resident_size_bytes",
+ "used_size_bytes",
+ "space_statistics",
+ "type_names"};
  heap_stats_tmpl = DictionaryTemplate::New(isolate, heap_statistics_names);
  env->set_v8_heap_statistics_template(heap_stats_tmpl);
  }

src/node_worker.cc

@@ -32,6 +32,7 @@ using v8::Float64Array;
 using v8::FunctionCallbackInfo;
 using v8::FunctionTemplate;
 using v8::HandleScope;
+using v8::HeapStatistics;
 using v8::Integer;
 using v8::Isolate;
 using v8::Local;
@@ -877,7 +878,7 @@ void Worker::CpuUsage(const FunctionCallbackInfo<Value>& args) {
  } else {
  auto tmpl = env->cpu_usage_template();
  if (tmpl.IsEmpty()) {
- std::string_view names[] = {
+ static constexpr std::string_view names[] = {
  "user",
  "system",
  };
@@ -1062,7 +1063,7 @@ void Worker::GetHeapStatistics(const FunctionCallbackInfo<Value>& args) {
  env](Environment* worker_env) mutable {
  // We create a unique pointer to HeapStatistics so that the actual object
  // it's not copied in the lambda, but only the pointer is.
- auto heap_stats = std::make_unique<v8::HeapStatistics>();
+ auto heap_stats = std::make_unique<HeapStatistics>();
  worker_env->isolate()->GetHeapStatistics(heap_stats.get());
 
  // Here, the worker thread temporarily owns the WorkerHeapStatisticsTaker
@@ -1095,7 +1096,7 @@ void Worker::GetHeapStatistics(const FunctionCallbackInfo<Value>& args) {
  "used_global_handles_size",
  "external_memory",
  };
- tmpl = v8::DictionaryTemplate::New(isolate, heap_stats_names);
+ tmpl = DictionaryTemplate::New(isolate, heap_stats_names);
  env->set_heap_statistics_template(tmpl);
  }