From 5748ce8d1ae7d499a7c2aaa9d00a867ccb044178 Mon Sep 17 00:00:00 2001
From: Rostislav Provodenko <rostislav.provodenko@deepcrawl.com>
Date: Wed, 2 Jun 2021 13:05:39 +0300
Subject: [PATCH 1/6] wip

---
 addon/result_iterator.cc                   |  23 ++++++++++++++++++++-
 src/tests/data-types.test.ts               |   7 +++++++
 src/tests/test-fixtures/crawl_urls.parquet | Bin 0 -> 56172 bytes
 3 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 src/tests/test-fixtures/crawl_urls.parquet

diff --git a/addon/result_iterator.cc b/addon/result_iterator.cc
index a0db6f3..c46f476 100644
--- a/addon/result_iterator.cc
+++ b/addon/result_iterator.cc
@@ -146,7 +146,6 @@ Napi::Value ResultIterator::getCellValue(Napi::Env env, duckdb::idx_t col_idx) {
   if (val.is_null) {
     return env.Null();
   }
-
   switch (result->types[col_idx].id()) {
   case duckdb::LogicalTypeId::BOOLEAN:
     return Napi::Boolean::New(env, val.GetValue<bool>());
@@ -210,7 +209,29 @@ Napi::Value ResultIterator::getCellValue(Napi::Env env, duckdb::idx_t col_idx) {
   case duckdb::LogicalTypeId::UINTEGER:
     // GetValue is not supported for uint32_t, so using the wider type
     return Napi::Number::New(env, val.GetValue<int64_t>());
+  case duckdb::LogicalTypeId::LIST: {
+    auto return_array = Napi::Array::New(env);
+    cout << "dsadsads" << endl;
+    cout << val.ToString() << endl;
+
+		for (size_t i = 0; i < val.list_value.size(); i++) {
+			auto &child = val.list_value[i];
+      if (child.type().id() ==  duckdb::LogicalTypeId::STRUCT) {
+        auto object = Napi::Object::New(env);
+        for (size_t t = 0; t < child.struct_value.size(); t++) {
+          auto &name = child.type().child_types()[t].first;
+          auto &subchild = child.struct_value[t];
+          object.Set(name, subchild.ToString());
+        }
+        return_array.Set(i, object);
+      }
+			cout << child.ToString() << endl;
+		}
+
+    return return_array;
+  }
   default:
+    cout << "321312321" << endl;
     // default to getting string representation
     return Napi::String::New(env, val.ToString());
   }
diff --git a/src/tests/data-types.test.ts b/src/tests/data-types.test.ts
index 6f07ac3..b97f6f9 100644
--- a/src/tests/data-types.test.ts
+++ b/src/tests/data-types.test.ts
@@ -220,4 +220,11 @@ describe("Data type mapping", () => {
 
     expect(result.fetchRow()).toMatchObject([1]);
   });
+
+
+  it.only("supports MAP", async () => {
+    const result = await connection.executeIterator<any[]>(`SELECT raw_header from parquet_scan('src/tests/test-fixtures/crawl_urls.parquet')`);
+    console.log(result.fetchRow());
+    expect(result.fetchRow()).toEqual(["2000-05-05"]);
+  });
 });
diff --git a/src/tests/test-fixtures/crawl_urls.parquet b/src/tests/test-fixtures/crawl_urls.parquet
new file mode 100644
index 0000000000000000000000000000000000000000..ccc37b197118405183bb62a22b00d36752cac4b0
GIT binary patch
literal 56172
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

literal 0
HcmV?d00001


From 41372da300c1429097990d9483f0277f45cd9a69 Mon Sep 17 00:00:00 2001
From: Rostislav Provodenko <rostislav.provodenko@deepcrawl.com>
Date: Wed, 2 Jun 2021 13:52:46 +0300
Subject: [PATCH 2/6] list and struct

---
 addon/result_iterator.cc     | 90 ++++++++++++++++++------------------
 addon/result_iterator.h      |  1 +
 src/tests/data-types.test.ts | 66 ++++++++++++++++++++++++--
 3 files changed, 109 insertions(+), 48 deletions(-)

diff --git a/addon/result_iterator.cc b/addon/result_iterator.cc
index c46f476..b59c23c 100644
--- a/addon/result_iterator.cc
+++ b/addon/result_iterator.cc
@@ -141,28 +141,32 @@ Napi::Value ResultIterator::getRowObject(Napi::Env env) {
 }
 
 Napi::Value ResultIterator::getCellValue(Napi::Env env, duckdb::idx_t col_idx) {
-  auto val = current_chunk->data[col_idx].GetValue(chunk_offset);
+  auto value = current_chunk->data[col_idx].GetValue(chunk_offset);
+  return getMappedValue(env, value);
+}
 
-  if (val.is_null) {
+Napi::Value ResultIterator::getMappedValue(Napi::Env env, duckdb::Value value) {
+  if (value.is_null) {
     return env.Null();
   }
-  switch (result->types[col_idx].id()) {
+
+  switch (value.type().id()) {
   case duckdb::LogicalTypeId::BOOLEAN:
-    return Napi::Boolean::New(env, val.GetValue<bool>());
+    return Napi::Boolean::New(env, value.GetValue<bool>());
   case duckdb::LogicalTypeId::TINYINT:
-    return Napi::Number::New(env, val.GetValue<int8_t>());
+    return Napi::Number::New(env, value.GetValue<int8_t>());
   case duckdb::LogicalTypeId::SMALLINT:
-    return Napi::Number::New(env, val.GetValue<int16_t>());
+    return Napi::Number::New(env, value.GetValue<int16_t>());
   case duckdb::LogicalTypeId::INTEGER:
-    return Napi::Number::New(env, val.GetValue<int32_t>());
+    return Napi::Number::New(env, value.GetValue<int32_t>());
   case duckdb::LogicalTypeId::BIGINT:
-    return Napi::BigInt::New(env, val.GetValue<int64_t>());
+    return Napi::BigInt::New(env, value.GetValue<int64_t>());
   case duckdb::LogicalTypeId::HUGEINT: {
     // hugeint_t represents a signed 128 bit integer in two's complement
     // notation napi's BigInt is basically a regular signed integer (MSB) so we
     // want to make sure we pass the absolute value of the huge int into napi
     // plus the sign bit
-    auto huge_int = val.GetValue<duckdb::hugeint_t>();
+    auto huge_int = value.GetValue<duckdb::hugeint_t>();
     int is_negative = huge_int.upper < 0;
     duckdb::hugeint_t positive_huge_int =
         is_negative ? huge_int * duckdb::hugeint_t(-1) : huge_int;
@@ -170,72 +174,70 @@ Napi::Value ResultIterator::getCellValue(Napi::Env env, duckdb::idx_t col_idx) {
     return Napi::BigInt::New(env, is_negative, 2, &arr[0]);
   }
   case duckdb::LogicalTypeId::FLOAT:
-    return Napi::Number::New(env, val.GetValue<float>());
+    return Napi::Number::New(env, value.GetValue<float>());
   case duckdb::LogicalTypeId::DOUBLE:
-    return Napi::Number::New(env, val.GetValue<double>());
+    return Napi::Number::New(env, value.GetValue<double>());
   case duckdb::LogicalTypeId::DECIMAL:
     return Napi::Number::New(
-        env, val.CastAs(duckdb::LogicalType::DOUBLE).GetValue<double>());
+        env, value.CastAs(duckdb::LogicalType::DOUBLE).GetValue<double>());
   case duckdb::LogicalTypeId::VARCHAR:
-    return Napi::String::New(env, val.GetValue<string>());
+    return Napi::String::New(env, value.GetValue<string>());
   case duckdb::LogicalTypeId::BLOB: {
-    int array_length = val.str_value.length();
+    int array_length = value.str_value.length();
     char char_array[array_length + 1];
     // TODO: multiple copies, improve
-    strcpy(char_array, val.str_value.c_str());
+    strcpy(char_array, value.str_value.c_str());
     return Napi::Buffer<char>::Copy(env, char_array, array_length);
   }
   case duckdb::LogicalTypeId::TIMESTAMP: {
-    if (result->types[col_idx].InternalType() != duckdb::PhysicalType::INT64) {
+    if (value.type().InternalType() != duckdb::PhysicalType::INT64) {
       throw runtime_error("expected int64 for timestamp");
     }
-    int64_t tval = val.GetValue<int64_t>();
+    int64_t tval = value.GetValue<int64_t>();
     return Napi::Number::New(env, tval / 1000);
   }
   case duckdb::LogicalTypeId::TIME: {
-    if (result->types[col_idx].InternalType() != duckdb::PhysicalType::INT64) {
+    if (value.type().InternalType() != duckdb::PhysicalType::INT64) {
       throw runtime_error("expected int64 for time");
     }
-    int64_t tval = val.GetValue<int64_t>();
+    int64_t tval = value.GetValue<int64_t>();
     return Napi::Number::New(env, GetTime(tval));
   }
   case duckdb::LogicalTypeId::INTERVAL: {
-    return Napi::String::New(env, val.ToString());
+    return Napi::String::New(env, value.ToString());
   }
   case duckdb::LogicalTypeId::UTINYINT:
-    return Napi::Number::New(env, val.GetValue<uint8_t>());
+    return Napi::Number::New(env, value.GetValue<uint8_t>());
   case duckdb::LogicalTypeId::USMALLINT:
-    return Napi::Number::New(env, val.GetValue<uint16_t>());
+    return Napi::Number::New(env, value.GetValue<uint16_t>());
   case duckdb::LogicalTypeId::UINTEGER:
     // GetValue is not supported for uint32_t, so using the wider type
-    return Napi::Number::New(env, val.GetValue<int64_t>());
+    return Napi::Number::New(env, value.GetValue<int64_t>());
   case duckdb::LogicalTypeId::LIST: {
-    auto return_array = Napi::Array::New(env);
-    cout << "dsadsads" << endl;
-    cout << val.ToString() << endl;
-
-		for (size_t i = 0; i < val.list_value.size(); i++) {
-			auto &child = val.list_value[i];
-      if (child.type().id() ==  duckdb::LogicalTypeId::STRUCT) {
-        auto object = Napi::Object::New(env);
-        for (size_t t = 0; t < child.struct_value.size(); t++) {
-          auto &name = child.type().child_types()[t].first;
-          auto &subchild = child.struct_value[t];
-          object.Set(name, subchild.ToString());
-        }
-        return_array.Set(i, object);
-      }
-			cout << child.ToString() << endl;
-		}
-
-    return return_array;
+    auto array = Napi::Array::New(env);
+    for (size_t i = 0; i < value.list_value.size(); i++) {
+      auto &element = value.list_value[i];
+      auto mapped_value = getMappedValue(env, element);
+      array.Set(i, mapped_value);
+    }
+    return array;
+  }
+  case duckdb::LogicalTypeId::STRUCT: {
+    auto object = Napi::Object::New(env);
+    for (size_t t = 0; t < value.struct_value.size(); t++) {
+      auto &key = value.type().child_types()[t].first;
+      auto &element = value.struct_value[t];
+      auto child_value = getMappedValue(env, element);
+      object.Set(key, child_value);
+    }
+    return object;
   }
   default:
-    cout << "321312321" << endl;
     // default to getting string representation
-    return Napi::String::New(env, val.ToString());
+    return Napi::String::New(env, value.ToString());
   }
 }
+
 Napi::Value ResultIterator::Close(const Napi::CallbackInfo &info) {
   result.reset();
   return info.Env().Undefined();
diff --git a/addon/result_iterator.h b/addon/result_iterator.h
index b168138..821ce85 100644
--- a/addon/result_iterator.h
+++ b/addon/result_iterator.h
@@ -26,6 +26,7 @@ class ResultIterator : public Napi::ObjectWrap<ResultIterator> {
   duckdb::unique_ptr<duckdb::DataChunk> current_chunk;
   uint64_t chunk_offset = 0;
   Napi::Value getCellValue(Napi::Env env, duckdb::idx_t col_idx);
+  Napi::Value getMappedValue(Napi::Env env, duckdb::Value duckdb_value);
   Napi::Value getRowArray(Napi::Env env);
   Napi::Value getRowObject(Napi::Env env);
 };
diff --git a/src/tests/data-types.test.ts b/src/tests/data-types.test.ts
index b97f6f9..f795c68 100644
--- a/src/tests/data-types.test.ts
+++ b/src/tests/data-types.test.ts
@@ -221,10 +221,68 @@ describe("Data type mapping", () => {
     expect(result.fetchRow()).toMatchObject([1]);
   });
 
+  it("supports LIST - integers", async () => {
+    const result = await connection.executeIterator<any[]>(`SELECT array_slice([1,2,3], 1, NULL)`);
+    expect(result.fetchRow()).toMatchObject({"array_slice(list_value(1, 2, 3), 1, NULL)": [2, 3]});
+  });
 
-  it.only("supports MAP", async () => {
-    const result = await connection.executeIterator<any[]>(`SELECT raw_header from parquet_scan('src/tests/test-fixtures/crawl_urls.parquet')`);
-    console.log(result.fetchRow());
-    expect(result.fetchRow()).toEqual(["2000-05-05"]);
+  it("supports LIST - strings", async () => {
+    const result = await connection.executeIterator<any[]>(`SELECT array_slice(['a','b','c'], 1, NULL)`);
+    expect(result.fetchRow()).toEqual({"array_slice(list_value(a, b, c), 1, NULL)": ["b", "c"]});
+  });
+
+  it("supports LIST - STRUCTs", async () => {
+    const result = await connection.executeIterator<any[]>(
+      `SELECT raw_header from parquet_scan('src/tests/test-fixtures/crawl_urls.parquet')`,
+    );
+    expect(result.fetchRow()).toEqual({
+      "raw_header": [
+        {
+          "key": "Content-Encoding",
+          "value": "gzip",
+        },
+        {
+          "key": "X-Frame-Options",
+          "value": "SAMEORIGIN",
+        },
+        {
+          "key": "Connection",
+          "value": "keep-alive",
+        },
+        {
+          "key": "X-Xss-Protection",
+          "value": "1; mode=block",
+        },
+        {
+          "key": "Content-Type",
+          "value": "text/html;charset=utf-8",
+        },
+        {
+          "key": "Date",
+          "value": "Tue, 18 Aug 2020 13:46:36 GMT",
+        },
+        {
+          "key": "Vary",
+          "value": "User-agent,Accept-Encoding",
+        },
+        {
+          "key": "Server",
+          "value": "nginx/1.10.3",
+        },
+        {
+          "key": "X-Content-Type-Options",
+          "value": "nosniff",
+        },
+        {
+          "key": "Content-Length",
+          "value": "1180",
+        },
+      ],
+    });
+  });
+
+  it("supports STRUCT", async () => {
+    const result = await connection.executeIterator<any[]>(`SELECT struct_pack(i := 4, s := 'string')`);
+    expect(result.fetchRow()).toEqual({"struct_pack(4, string)": {"i": 4, "s": "string"}});
   });
 });

From 18bb2a39aec601e49db8f1303d38576903ae7499 Mon Sep 17 00:00:00 2001
From: Rostislav Provodenko <rostislav.provodenko@deepcrawl.com>
Date: Wed, 2 Jun 2021 13:53:28 +0300
Subject: [PATCH 3/6] ver

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2617bb4..27f9c6b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-duckdb",
-  "version": "0.0.70",
+  "version": "0.0.71",
   "private": false,
   "description": "DuckDB for Node.JS",
   "keywords": [

From e3911dc916b3ef2e3dfd6184317faa8155b9618f Mon Sep 17 00:00:00 2001
From: Rostislav Provodenko <rostislav.provodenko@deepcrawl.com>
Date: Wed, 2 Jun 2021 13:57:57 +0300
Subject: [PATCH 4/6] rename

---
 addon/result_iterator.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addon/result_iterator.cc b/addon/result_iterator.cc
index b59c23c..55116b1 100644
--- a/addon/result_iterator.cc
+++ b/addon/result_iterator.cc
@@ -224,9 +224,9 @@ Napi::Value ResultIterator::getMappedValue(Napi::Env env, duckdb::Value value) {
   }
   case duckdb::LogicalTypeId::STRUCT: {
     auto object = Napi::Object::New(env);
-    for (size_t t = 0; t < value.struct_value.size(); t++) {
-      auto &key = value.type().child_types()[t].first;
-      auto &element = value.struct_value[t];
+    for (size_t i = 0; i < value.struct_value.size(); i++) {
+      auto &key = value.type().child_types()[i].first;
+      auto &element = value.struct_value[i];
       auto child_value = getMappedValue(env, element);
       object.Set(key, child_value);
     }

From f51d92850dd4197d1e1658daced55a7d8183c6b0 Mon Sep 17 00:00:00 2001
From: Rostislav Provodenko <rostislav.provodenko@deepcrawl.com>
Date: Wed, 2 Jun 2021 14:27:26 +0300
Subject: [PATCH 5/6] fix

---
 src/tests/data-types.test.ts | 48 ++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/tests/data-types.test.ts b/src/tests/data-types.test.ts
index f795c68..9f114c5 100644
--- a/src/tests/data-types.test.ts
+++ b/src/tests/data-types.test.ts
@@ -223,12 +223,12 @@ describe("Data type mapping", () => {
 
   it("supports LIST - integers", async () => {
     const result = await connection.executeIterator<any[]>(`SELECT array_slice([1,2,3], 1, NULL)`);
-    expect(result.fetchRow()).toMatchObject({"array_slice(list_value(1, 2, 3), 1, NULL)": [2, 3]});
+    expect(result.fetchRow()).toMatchObject({ "array_slice(list_value(1, 2, 3), 1, NULL)": [2, 3] });
   });
 
   it("supports LIST - strings", async () => {
     const result = await connection.executeIterator<any[]>(`SELECT array_slice(['a','b','c'], 1, NULL)`);
-    expect(result.fetchRow()).toEqual({"array_slice(list_value(a, b, c), 1, NULL)": ["b", "c"]});
+    expect(result.fetchRow()).toEqual({ "array_slice(list_value(a, b, c), 1, NULL)": ["b", "c"] });
   });
 
   it("supports LIST - STRUCTs", async () => {
@@ -236,46 +236,46 @@ describe("Data type mapping", () => {
       `SELECT raw_header from parquet_scan('src/tests/test-fixtures/crawl_urls.parquet')`,
     );
     expect(result.fetchRow()).toEqual({
-      "raw_header": [
+      raw_header: [
         {
-          "key": "Content-Encoding",
-          "value": "gzip",
+          key: "Content-Encoding",
+          value: "gzip",
         },
         {
-          "key": "X-Frame-Options",
-          "value": "SAMEORIGIN",
+          key: "X-Frame-Options",
+          value: "SAMEORIGIN",
         },
         {
-          "key": "Connection",
-          "value": "keep-alive",
+          key: "Connection",
+          value: "keep-alive",
         },
         {
-          "key": "X-Xss-Protection",
-          "value": "1; mode=block",
+          key: "X-Xss-Protection",
+          value: "1; mode=block",
         },
         {
-          "key": "Content-Type",
-          "value": "text/html;charset=utf-8",
+          key: "Content-Type",
+          value: "text/html;charset=utf-8",
         },
         {
-          "key": "Date",
-          "value": "Tue, 18 Aug 2020 13:46:36 GMT",
+          key: "Date",
+          value: "Tue, 18 Aug 2020 13:46:36 GMT",
         },
         {
-          "key": "Vary",
-          "value": "User-agent,Accept-Encoding",
+          key: "Vary",
+          value: "User-agent,Accept-Encoding",
         },
         {
-          "key": "Server",
-          "value": "nginx/1.10.3",
+          key: "Server",
+          value: "nginx/1.10.3",
         },
         {
-          "key": "X-Content-Type-Options",
-          "value": "nosniff",
+          key: "X-Content-Type-Options",
+          value: "nosniff",
         },
         {
-          "key": "Content-Length",
-          "value": "1180",
+          key: "Content-Length",
+          value: "1180",
         },
       ],
     });
@@ -283,6 +283,6 @@ describe("Data type mapping", () => {
 
   it("supports STRUCT", async () => {
     const result = await connection.executeIterator<any[]>(`SELECT struct_pack(i := 4, s := 'string')`);
-    expect(result.fetchRow()).toEqual({"struct_pack(4, string)": {"i": 4, "s": "string"}});
+    expect(result.fetchRow()).toEqual({ "struct_pack(4, string)": { i: 4, s: "string" } });
   });
 });

From 205f3b9160b9d1ed317d52a6006c7ec9d50287a2 Mon Sep 17 00:00:00 2001
From: Rostislav Provodenko <rostislav.provodenko@deepcrawl.com>
Date: Wed, 2 Jun 2021 14:48:05 +0300
Subject: [PATCH 6/6] lock

---
 yarn.lock | 55 +++++++++++++++++++++++++------------------------------
 1 file changed, 25 insertions(+), 30 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 41ab08a..668f933 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -612,9 +612,9 @@
     fastq "^1.6.0"
 
 "@npmcli/arborist@^2.3.0", "@npmcli/arborist@^2.5.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/arborist/-/arborist-2.5.0.tgz#3a2bf74e47b4cbe20e0983291f291a2ec2c3d06f"
-  integrity sha512-YPSkV/8vofpbAJyeu52J12YnC5VTkYIcfcNkRoSW6qjfQG+QybgbJtCbcdx+M0YxfdzDKS6iDTjpNMoETZ8HOA==
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/arborist/-/arborist-2.6.1.tgz#bdbd1311cc857583ffc85f4d3f24a50683303dda"
+  integrity "sha1-vb0TEcyFdYP/yF9NPySlBoMwPdo= sha512-OOlntFIOAo7RplEQaYXlA5U5NXE+EwZtnTCsit4Wtme5+llGiea6GBytuV8dOzdPMPlNx3fQQjBUE9E8k76yjQ=="
   dependencies:
     "@npmcli/installed-package-contents" "^1.0.7"
     "@npmcli/map-workspaces" "^1.0.2"
@@ -1815,9 +1815,9 @@ byte-size@^7.0.1:
   integrity sha512-crQdqyCwhokxwV1UyDzLZanhkugAgft7vt0qbbdt60C6Zf3CAiGmtUCylbtYwrU6loOUw3euGrNtW1J651ot1A==
 
 cacache@^15.0.3, cacache@^15.0.5, cacache@^15.0.6:
-  version "15.0.6"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.0.6.tgz#65a8c580fda15b59150fb76bf3f3a8e45d583099"
-  integrity sha512-g1WYDMct/jzW+JdWEyjaX2zoBkZ6ZT9VpOyp2I/VMtDsNLffNat3kqPFfi1eDRSK9/SuKGyORDHcQMcPF8sQ/w==
+  version "15.2.0"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.2.0.tgz#73af75f77c58e72d8c630a7a2858cb18ef523389"
+  integrity "sha1-c69193xY5y2MYwp6KFjLGO9SM4k= sha512-uKoJSHmnrqXgthDFx/IU6ED/5xd+NNGe+Bb+kLZy7Ku4P+BaiWEUflAKPZ7eAzsYGcsAGASJZsybXp+quEcHTw=="
   dependencies:
     "@npmcli/move-file" "^1.0.1"
     chownr "^2.0.0"
@@ -3602,9 +3602,9 @@ fs.realpath@^1.0.0:
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
 fsevents@^2.1.2:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.1.tgz#b209ab14c61012636c8863507edf7fb68cc54e9f"
-  integrity sha512-YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw==
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
+  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
 
 fsevents@~2.1.2:
   version "2.1.3"
@@ -4109,9 +4109,9 @@ iconv-lite@0.4.24:
     safer-buffer ">= 2.1.2 < 3"
 
 iconv-lite@^0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.2.tgz#ce13d1875b0c3a674bd6a04b7f76b01b1b6ded01"
-  integrity sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
+  integrity "sha1-pS+AvzjaGVLrXGgXkHGYcaGnJQE= sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="
   dependencies:
     safer-buffer ">= 2.1.2 < 3.0.0"
 
@@ -5360,9 +5360,9 @@ libnpmdiff@^2.0.4:
     tar "^6.1.0"
 
 libnpmexec@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/libnpmexec/-/libnpmexec-1.1.1.tgz#aa510cc74612cac3945f7e2fd2ac4c650fa7ef66"
-  integrity sha512-uw6H2dzC6F6fdq7lAxfzXPimHCJ3/g6ycFKcv2Q2QXuNZ94EDmNPpMO6f4mwiC5F6Lyy/WK0IL7AZwRhmSvUdQ==
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/libnpmexec/-/libnpmexec-1.2.0.tgz#ab0294ab63bb599b3ac6921129b7a706d4d56da2"
+  integrity "sha1-qwKUq2O7WZs6xpIRKbenBtTVbaI= sha512-LkxnH2wsMUI4thsgUK0r+EFZ5iCjKlp21J68dFY7AzD5uaaIPqO3lqVvYbyl1Umz1R4rY9t3vFa1fF3hzo6Y2Q=="
   dependencies:
     "@npmcli/arborist" "^2.3.0"
     "@npmcli/ci-detect" "^1.3.0"
@@ -6183,9 +6183,9 @@ normalize-url@^4.1.0:
   integrity sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==
 
 npm-audit-report@^2.1.4:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/npm-audit-report/-/npm-audit-report-2.1.4.tgz#b14c4625131fb7bcacc4b1c83842af1f58c92c98"
-  integrity sha512-Tz7rnfskSdZ0msTzt2mENC/B+H2QI8u0jN0ck7o3zDsQYIQrek/l3MjEc+CARer+64LsVTU6ZIqNuh0X55QPhw==
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/npm-audit-report/-/npm-audit-report-2.1.5.tgz#a5b8850abe2e8452fce976c8960dd432981737b5"
+  integrity "sha1-pbiFCr4uhFL86XbIlg3UMpgXN7U= sha512-YB8qOoEmBhUH1UJgh1xFAv7Jg1d+xoNhsDYiFQlEFThEBui0W1vIz2ZK6FVg4WZjwEdl7uBQlm1jy3MUfyHeEw=="
   dependencies:
     chalk "^4.0.0"
 
@@ -6252,9 +6252,9 @@ npm-profile@^5.0.3:
     npm-registry-fetch "^10.0.0"
 
 npm-registry-fetch@^10.0.0, npm-registry-fetch@^10.1.1:
-  version "10.1.1"
-  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-10.1.1.tgz#97bc7a0fca5e8f76cc5162185b8de8caa8bea639"
-  integrity sha512-F6a3l+ffCQ7hvvN16YG5bpm1rPZntCg66PLHDQ1apWJPOCUVHoKnL2w5fqEaTVhp42dmossTyXeR7hTGirfXrg==
+  version "10.1.2"
+  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-10.1.2.tgz#11ffe03d813c653e768bdf762cfc5f1afe91b8bd"
+  integrity "sha1-Ef/gPYE8ZT52i992LPxfGv6RuL0= sha512-KsM/TdPmntqgBFlfsbkOLkkE9ovZo7VpVcd+/eTdYszCrgy5zFl5JzWm+OxavFaEWlbkirpkou+ZYI00RmOBFA=="
   dependencies:
     lru-cache "^6.0.0"
     make-fetch-happen "^8.0.9"
@@ -8962,15 +8962,10 @@ write@1.0.3:
   dependencies:
     mkdirp "^0.5.1"
 
-"ws@>= 2.2.3":
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.4.tgz#383bc9742cb202292c9077ceab6f6047b17f2d59"
-  integrity sha512-Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw==
-
-ws@^7.2.3:
-  version "7.4.2"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.2.tgz#782100048e54eb36fe9843363ab1c68672b261dd"
-  integrity sha512-T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA==
+"ws@>= 2.2.3", ws@^7.2.3:
+  version "7.4.6"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"
+  integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==
 
 xdg-basedir@^4.0.0:
   version "4.0.0"