duckdb 0.8.2-dev87.0 → 0.9.1-dev0.0

package/README.md

@@ -100,6 +100,13 @@ var stmt = con.prepare('select ?::INTEGER as fortytwo', function(err, stmt) {
 });
 ```
 
+## Supported Node versions
+We actively support only LTS and In-Support Node versions, as per July 2023, they are: Node 16, Node 18 and Node 20.
+Release schedule for Node.js can be checked here: https://github.com/nodejs/release#release-schedule.
+
+We currently bundle and test DuckDB also for Node 10, 12, 14, 17 and 19. We plan of going so going forward as long as the tooling supports it.
+As per July 2023, Node 15 has been removed from the supported versions.
+
 ## Development
 
 ### First install:

package/binding.gyp

@@ -13,7 +13,9 @@
                 "src/duckdb/ub_src_catalog_catalog_entry.cpp", 
                 "src/duckdb/ub_src_catalog_default.cpp", 
                 "src/duckdb/ub_src_common_adbc.cpp", 
+                "src/duckdb/ub_src_common_adbc_nanoarrow.cpp", 
                 "src/duckdb/ub_src_common.cpp", 
+                "src/duckdb/ub_src_common_arrow_appender.cpp", 
                 "src/duckdb/ub_src_common_arrow.cpp", 
                 "src/duckdb/ub_src_common_crypto.cpp", 
                 "src/duckdb/ub_src_common_enums.cpp", 
@@ -45,6 +47,7 @@
                 "src/duckdb/ub_src_core_functions_scalar_bit.cpp", 
                 "src/duckdb/ub_src_core_functions_scalar_blob.cpp", 
                 "src/duckdb/ub_src_core_functions_scalar_date.cpp", 
+                "src/duckdb/ub_src_core_functions_scalar_debug.cpp", 
                 "src/duckdb/ub_src_core_functions_scalar_enum.cpp", 
                 "src/duckdb/ub_src_core_functions_scalar_generic.cpp", 
                 "src/duckdb/ub_src_core_functions_scalar_list.cpp", 
@@ -58,8 +61,11 @@
                 "src/duckdb/ub_src_execution.cpp", 
                 "src/duckdb/ub_src_execution_expression_executor.cpp", 
                 "src/duckdb/ub_src_execution_index_art.cpp", 
+                "src/duckdb/ub_src_execution_index.cpp", 
                 "src/duckdb/ub_src_execution_nested_loop_join.cpp", 
                 "src/duckdb/ub_src_execution_operator_aggregate.cpp", 
+                "src/duckdb/ub_src_execution_operator_csv_scanner.cpp", 
+                "src/duckdb/ub_src_execution_operator_csv_scanner_sniffer.cpp", 
                 "src/duckdb/ub_src_execution_operator_filter.cpp", 
                 "src/duckdb/ub_src_execution_operator_helper.cpp", 
                 "src/duckdb/ub_src_execution_operator_join.cpp", 
@@ -74,9 +80,11 @@
                 "src/duckdb/ub_src_function_aggregate.cpp", 
                 "src/duckdb/ub_src_function.cpp", 
                 "src/duckdb/ub_src_function_cast.cpp", 
+                "src/duckdb/ub_src_function_cast_union.cpp", 
                 "src/duckdb/ub_src_function_pragma.cpp", 
-                "src/duckdb/ub_src_function_scalar_generic.cpp", 
+                "src/duckdb/ub_src_function_scalar_compressed_materialization.cpp", 
                 "src/duckdb/ub_src_function_scalar.cpp", 
+                "src/duckdb/ub_src_function_scalar_generic.cpp", 
                 "src/duckdb/ub_src_function_scalar_list.cpp", 
                 "src/duckdb/ub_src_function_scalar_operators.cpp", 
                 "src/duckdb/ub_src_function_scalar_sequence.cpp", 
@@ -84,16 +92,19 @@
                 "src/duckdb/ub_src_function_scalar_string_regexp.cpp", 
                 "src/duckdb/ub_src_function_scalar_struct.cpp", 
                 "src/duckdb/ub_src_function_scalar_system.cpp", 
+                "src/duckdb/ub_src_function_table_arrow.cpp", 
                 "src/duckdb/ub_src_function_table.cpp", 
                 "src/duckdb/ub_src_function_table_system.cpp", 
                 "src/duckdb/ub_src_function_table_version.cpp", 
                 "src/duckdb/ub_src_main.cpp", 
                 "src/duckdb/ub_src_main_capi.cpp", 
                 "src/duckdb/ub_src_main_capi_cast.cpp", 
+                "src/duckdb/ub_src_main_chunk_scan_state.cpp", 
                 "src/duckdb/ub_src_main_extension.cpp", 
                 "src/duckdb/ub_src_main_relation.cpp", 
                 "src/duckdb/ub_src_main_settings.cpp", 
                 "src/duckdb/ub_src_optimizer.cpp", 
+                "src/duckdb/ub_src_optimizer_compressed_materialization.cpp", 
                 "src/duckdb/ub_src_optimizer_join_order.cpp", 
                 "src/duckdb/ub_src_optimizer_matcher.cpp", 
                 "src/duckdb/ub_src_optimizer_pullup.cpp", 
@@ -123,19 +134,19 @@
                 "src/duckdb/ub_src_planner_expression_binder.cpp", 
                 "src/duckdb/ub_src_planner_filter.cpp", 
                 "src/duckdb/ub_src_planner_operator.cpp", 
-                "src/duckdb/ub_src_planner_parsed_data.cpp", 
                 "src/duckdb/ub_src_planner_subquery.cpp", 
                 "src/duckdb/ub_src_storage.cpp", 
                 "src/duckdb/ub_src_storage_buffer.cpp", 
                 "src/duckdb/ub_src_storage_checkpoint.cpp", 
                 "src/duckdb/ub_src_storage_compression.cpp", 
                 "src/duckdb/ub_src_storage_compression_chimp.cpp", 
+                "src/duckdb/ub_src_storage_metadata.cpp", 
+                "src/duckdb/ub_src_storage_serialization.cpp", 
                 "src/duckdb/ub_src_storage_statistics.cpp", 
                 "src/duckdb/ub_src_storage_table.cpp", 
                 "src/duckdb/ub_src_transaction.cpp", 
                 "src/duckdb/src/verification/copied_statement_verifier.cpp", 
                 "src/duckdb/src/verification/deserialized_statement_verifier.cpp", 
-                "src/duckdb/src/verification/deserialized_statement_verifier_v2.cpp", 
                 "src/duckdb/src/verification/external_statement_verifier.cpp", 
                 "src/duckdb/src/verification/no_operator_caching_verifier.cpp", 
                 "src/duckdb/src/verification/parsed_statement_verifier.cpp", 
@@ -202,6 +213,7 @@
                 "src/duckdb/third_party/mbedtls/mbedtls_wrapper.cpp", 
                 "src/duckdb/extension/parquet/parquet_extension.cpp", 
                 "src/duckdb/extension/parquet/column_writer.cpp", 
+                "src/duckdb/extension/parquet/serialize_parquet.cpp", 
                 "src/duckdb/extension/parquet/parquet_reader.cpp", 
                 "src/duckdb/extension/parquet/parquet_timestamp.cpp", 
                 "src/duckdb/extension/parquet/parquet_writer.cpp", 
@@ -237,28 +249,30 @@
                 "src/duckdb/third_party/zstd/compress/zstd_lazy.cpp", 
                 "src/duckdb/third_party/zstd/compress/zstd_ldm.cpp", 
                 "src/duckdb/third_party/zstd/compress/zstd_opt.cpp", 
-                "src/duckdb/extension/icu/./icu-datepart.cpp", 
                 "src/duckdb/extension/icu/./icu-timezone.cpp", 
+                "src/duckdb/extension/icu/./icu-datepart.cpp", 
+                "src/duckdb/extension/icu/./icu-timebucket.cpp", 
+                "src/duckdb/extension/icu/./icu-datesub.cpp", 
+                "src/duckdb/extension/icu/./icu-list-range.cpp", 
                 "src/duckdb/extension/icu/./icu-makedate.cpp", 
-                "src/duckdb/extension/icu/./icu-table-range.cpp", 
                 "src/duckdb/extension/icu/./icu-datefunc.cpp", 
-                "src/duckdb/extension/icu/./icu-list-range.cpp", 
+                "src/duckdb/extension/icu/./icu-datetrunc.cpp", 
                 "src/duckdb/extension/icu/./icu-dateadd.cpp", 
-                "src/duckdb/extension/icu/./icu-datesub.cpp", 
-                "src/duckdb/extension/icu/./icu-timebucket.cpp", 
-                "src/duckdb/extension/icu/./icu-strptime.cpp", 
+                "src/duckdb/extension/icu/./icu-table-range.cpp", 
                 "src/duckdb/extension/icu/./icu_extension.cpp", 
-                "src/duckdb/extension/icu/./icu-datetrunc.cpp", 
+                "src/duckdb/extension/icu/./icu-strptime.cpp", 
                 "src/duckdb/ub_extension_icu_third_party_icu_common.cpp", 
                 "src/duckdb/ub_extension_icu_third_party_icu_i18n.cpp", 
                 "src/duckdb/extension/icu/third_party/icu/stubdata/stubdata.cpp", 
                 "src/duckdb/extension/json/buffered_json_reader.cpp", 
+                "src/duckdb/extension/json/json_enums.cpp", 
                 "src/duckdb/extension/json/json_extension.cpp", 
                 "src/duckdb/extension/json/json_common.cpp", 
                 "src/duckdb/extension/json/json_functions.cpp", 
                 "src/duckdb/extension/json/json_scan.cpp", 
                 "src/duckdb/extension/json/json_serializer.cpp", 
                 "src/duckdb/extension/json/json_deserializer.cpp", 
+                "src/duckdb/extension/json/serialize_json.cpp", 
                 "src/duckdb/ub_extension_json_json_functions.cpp", 
                 "src/duckdb/extension/json/yyjson/yyjson.cpp"
             ], 
@@ -297,11 +311,12 @@
                 "src/duckdb/extension/json/yyjson/include"
             ], 
             "defines": [
-                "NAPI_DISABLE_CPP_EXCEPTIONS=1", 
-                "NAPI_VERSION=5", 
-                "BUILD_PARQUET_EXTENSION", 
-                "BUILD_ICU_EXTENSION", 
-                "BUILD_JSON_EXTENSION"
+                "NAPI_VERSION=6", 
+                "DUCKDB_EXTENSION_PARQUET_LINKED", 
+                "DUCKDB_EXTENSION_ICU_LINKED", 
+                "DUCKDB_EXTENSION_JSON_LINKED", 
+                "DUCKDB_EXTENSION_AUTOLOAD_DEFAULT=1", 
+                "DUCKDB_EXTENSION_AUTOINSTALL_DEFAULT=1"
             ], 
             "cflags_cc": [
                 "-frtti", 

package/binding.gyp.in

@@ -16,8 +16,7 @@
                 "${INCLUDE_FILES}"
             ],
             "defines": [
-                "NAPI_DISABLE_CPP_EXCEPTIONS=1",
-                "NAPI_VERSION=5",
+                "NAPI_VERSION=6",
                 "${DEFINES}"
             ],
             "cflags_cc": [

package/configure.py

@@ -20,7 +20,10 @@ scripts_dir = 'scripts'
 sys.path.append(scripts_dir)
 import package_build
 
-defines = ['BUILD_{}_EXTENSION'.format(ext.upper()) for ext in extensions]
+defines = ['DUCKDB_EXTENSION_{}_LINKED'.format(ext.upper()) for ext in extensions]
+
+# Autoloading is on by default for node distributions
+defines.extend(['DUCKDB_EXTENSION_AUTOLOAD_DEFAULT=1', 'DUCKDB_EXTENSION_AUTOINSTALL_DEFAULT=1'])
 
 if os.environ.get('DUCKDB_NODE_BUILD_CACHE') == '1' and os.path.isfile(cache_file):
     with open(cache_file, 'rb') as f:
@@ -31,6 +34,7 @@ if os.environ.get('DUCKDB_NODE_BUILD_CACHE') == '1' and os.path.isfile(cache_fil
     windows_options = cache['windows_options']
     cflags = cache['cflags']
 elif 'DUCKDB_NODE_BINDIR' in os.environ:
+
     def find_library_path(libdir, libname):
         flist = os.listdir(libdir)
         for fname in flist:
@@ -38,6 +42,7 @@ elif 'DUCKDB_NODE_BINDIR' in os.environ:
             if os.path.isfile(fpath) and package_build.file_is_lib(fname, libname):
                 return fpath
         raise Exception(f"Failed to find library {libname} in {libdir}")
+
     # existing build
     existing_duckdb_dir = os.environ['DUCKDB_NODE_BINDIR']
     cflags = os.environ['DUCKDB_NODE_CFLAGS']
@@ -48,7 +53,7 @@ elif 'DUCKDB_NODE_BINDIR' in os.environ:
 
     result_libraries = package_build.get_libraries(existing_duckdb_dir, libraries, extensions)
     libraries = []
-    for (libdir, libname) in result_libraries:
+    for libdir, libname in result_libraries:
         if libdir is None:
             continue
         libraries.append(find_library_path(libdir, libname))
@@ -72,7 +77,7 @@ elif 'DUCKDB_NODE_BINDIR' in os.environ:
             'include_list': include_list,
             'libraries': libraries,
             'cflags': cflags,
-            'windows_options': windows_options
+            'windows_options': windows_options,
         }
         with open(cache_file, 'wb+') as f:
             pickle.dump(cache, f)
@@ -90,9 +95,11 @@ else:
     windows_options = ['/GR']
     cflags = ['-frtti']
 
+
 def sanitize_path(x):
     return x.replace('\\', '/')
 
+
 source_list = [sanitize_path(x) for x in source_list]
 include_list = [sanitize_path(x) for x in include_list]
 libraries = [sanitize_path(x) for x in libraries]
@@ -100,6 +107,7 @@ libraries = [sanitize_path(x) for x in libraries]
 with open(gyp_in, 'r') as f:
     input_json = json.load(f)
 
+
 def replace_entries(node, replacement_map):
     if type(node) == type([]):
         for key in replacement_map.keys():

package/duckdb_extension_config.cmake

@@ -0,0 +1,10 @@
+################################################################################
+# NodeJS DuckDB extension config
+################################################################################
+#
+# This is the default extension configuration for NodeJS builds. Basically it means that all these extensions are
+# "baked in" to the NodeJS binaries Note that the configuration here is only when building Node using the main
+# CMakeLists.txt file with the `BUILD_NODE` variable.
+# TODO: unify this by making setup.py also use this configuration, making this the config for all Node builds
+duckdb_extension_load(json)
+duckdb_extension_load(icu)

package/lib/duckdb.js

@@ -1,6 +1,6 @@
 /**
  * @module duckdb
- * @summary these jsdoc annotations are still a work in progress - feedback and suggestions are welcome!
+ * @summary DuckDB is an embeddable SQL OLAP Database Management System
  */
 
 var duckdb = require('./duckdb-binding.js');
@@ -412,6 +412,13 @@ Connection.prototype.register_buffer;
  */
 Connection.prototype.unregister_buffer;
 
+/**
+ * Closes connection
+ * @method
+ * @param callback
+ * @return {void}
+ */
+Connection.prototype.close;
 
 /**
  * Closes database instance
@@ -420,7 +427,10 @@ Connection.prototype.unregister_buffer;
  * @return {void}
  */
 Database.prototype.close = function() {
-    this.default_connection = null
+    if (this.default_connection) {
+        this.default_connection.close(); // this queues up a job in the internals, which blocks the below close call
+        this.default_connection = null;
+    }
     this.close_internal.apply(this, arguments);
 };
 
@@ -441,7 +451,7 @@ Database.prototype.close_internal;
 Database.prototype.wait;
 
 /**
- * TODO: what does this do?
+ * Currently a no-op. Provided for SQLite compatibility
  * @method
  * @param callback
  * @return {void}
@@ -449,7 +459,7 @@ Database.prototype.wait;
 Database.prototype.serialize;
 
 /**
- * TODO: what does this do?
+ * Currently a no-op. Provided for SQLite compatibility
  * @method
  * @param callback
  * @return {void}

package/package.json

@@ -2,7 +2,7 @@
   "name": "duckdb",
   "main": "./lib/duckdb.js",
   "types": "./lib/duckdb.d.ts",
-  "version": "0.8.2-dev87.0",
+  "version": "0.9.1-dev0.0",
   "description": "DuckDB node.js API",
   "gypfile": true,
   "dependencies": {
@@ -29,12 +29,14 @@
   "devDependencies": {
     "@types/chai": "^4.3.4",
     "@types/chai-as-promised": "^7.1.5",
+    "@types/fs-extra": "^11.0.1",
     "@types/mocha": "^10.0.0",
     "@types/node": "^18.11.0",
     "apache-arrow": "^9.0.0",
     "aws-sdk": "^2.790.0",
     "chai": "^4.3.6",
     "chai-as-promised": "^7.1.1",
+    "fs-extra": "^11.1.1",
     "jsdoc3-parser": "^2.0.0",
     "mocha": "^8.3.0",
     "ts-node": "^10.9.1",

package/src/connection.cpp

@@ -9,24 +9,20 @@
 
 namespace node_duckdb {
 
-Napi::FunctionReference Connection::constructor;
-
-Napi::Object Connection::Init(Napi::Env env, Napi::Object exports) {
+Napi::FunctionReference Connection::Init(Napi::Env env, Napi::Object exports) {
 	Napi::HandleScope scope(env);
 
-	Napi::Function t =
-	    DefineClass(env, "Connection",
-	                {InstanceMethod("prepare", &Connection::Prepare), InstanceMethod("exec", &Connection::Exec),
-	                 InstanceMethod("register_udf_bulk", &Connection::RegisterUdf),
-	                 InstanceMethod("register_buffer", &Connection::RegisterBuffer),
-	                 InstanceMethod("unregister_udf", &Connection::UnregisterUdf),
-	                 InstanceMethod("unregister_buffer", &Connection::UnRegisterBuffer)});
-
-	constructor = Napi::Persistent(t);
-	constructor.SuppressDestruct();
+	Napi::Function t = DefineClass(
+	    env, "Connection",
+	    {InstanceMethod("prepare", &Connection::Prepare), InstanceMethod("exec", &Connection::Exec),
+	     InstanceMethod("register_udf_bulk", &Connection::RegisterUdf),
+	     InstanceMethod("register_buffer", &Connection::RegisterBuffer),
+	     InstanceMethod("unregister_udf", &Connection::UnregisterUdf), InstanceMethod("close", &Connection::Close),
+	     InstanceMethod("unregister_buffer", &Connection::UnRegisterBuffer)});
 
 	exports.Set("Connection", t);
-	return exports;
+
+	return Napi::Persistent(t);
 }
 
 struct ConnectTask : public Task {
@@ -70,8 +66,7 @@ Connection::Connection(const Napi::CallbackInfo &info) : Napi::ObjectWrap<Connec
 	int length = info.Length();
 
 	if (length <= 0 || !Database::HasInstance(info[0])) {
-		Napi::TypeError::New(env, "Database object expected").ThrowAsJavaScriptException();
-		return;
+		throw Napi::TypeError::New(env, "Database object expected");
 	}
 
 	database_ref = Napi::ObjectWrap<Database>::Unwrap(info[0].As<Napi::Object>());
@@ -103,7 +98,8 @@ Napi::Value Connection::Prepare(const Napi::CallbackInfo &info) {
 	for (size_t i = 0; i < info.Length(); i++) {
 		args.push_back(info[i]);
 	}
-	auto res = Utils::NewUnwrap<Statement>(args);
+	auto obj = Statement::NewInstance(info.Env(), args);
+	auto res = Statement::Unwrap(obj);
 	res->SetProcessFirstParam();
 	return res->Value();
 }
@@ -280,8 +276,7 @@ struct RegisterUdfTask : public Task {
 Napi::Value Connection::RegisterUdf(const Napi::CallbackInfo &info) {
 	auto env = info.Env();
 	if (info.Length() < 3 || !info[0].IsString() || !info[1].IsString() || !info[2].IsFunction()) {
-		Napi::TypeError::New(env, "Holding it wrong").ThrowAsJavaScriptException();
-		return env.Null();
+		throw Napi::TypeError::New(env, "Holding it wrong");
 	}
 
 	std::string name = info[0].As<Napi::String>();
@@ -293,8 +288,7 @@ Napi::Value Connection::RegisterUdf(const Napi::CallbackInfo &info) {
 	}
 
 	if (udfs.find(name) != udfs.end()) {
-		Napi::TypeError::New(env, "UDF with this name already exists").ThrowAsJavaScriptException();
-		return env.Null();
+		throw Napi::TypeError::New(env, "UDF with this name already exists");
 	}
 
 	auto udf = duckdb_node_udf_function_t::New(env, udf_callback, "duckdb_node_udf" + name, 0, 1, nullptr,
@@ -341,8 +335,7 @@ struct UnregisterUdfTask : public Task {
 Napi::Value Connection::UnregisterUdf(const Napi::CallbackInfo &info) {
 	auto env = info.Env();
 	if (info.Length() < 1 || !info[0].IsString()) {
-		Napi::TypeError::New(env, "Holding it wrong").ThrowAsJavaScriptException();
-		return env.Null();
+		throw Napi::TypeError::New(env, "Holding it wrong");
 	}
 	std::string name = info[0].As<Napi::String>();
 
@@ -410,12 +403,41 @@ struct ExecTaskWithCallback : public ExecTask {
 	std::function<void(void)> cpp_callback;
 };
 
+struct CloseConnectionTask : public Task {
+	CloseConnectionTask(Connection &connection, Napi::Function callback) : Task(connection, callback) {
+	}
+
+	void DoWork() override {
+		auto &connection = Get<Connection>();
+		if (connection.connection) {
+			connection.connection.reset();
+			success = true;
+		} else {
+			success = false;
+		}
+	}
+
+	void Callback() override {
+		auto &connection = Get<Connection>();
+		auto env = connection.Env();
+		Napi::HandleScope scope(env);
+
+		auto cb = callback.Value();
+		if (!success) {
+			cb.MakeCallback(connection.Value(), {Utils::CreateError(env, "Connection was already closed")});
+			return;
+		}
+		cb.MakeCallback(connection.Value(), {env.Null(), connection.Value()});
+	}
+
+	bool success = false;
+};
+
 Napi::Value Connection::Exec(const Napi::CallbackInfo &info) {
 	auto env = info.Env();
 
 	if (info.Length() < 1 || !info[0].IsString()) {
-		Napi::TypeError::New(env, "SQL query expected").ThrowAsJavaScriptException();
-		return env.Null();
+		throw Napi::TypeError::New(env, "SQL query expected");
 	}
 
 	std::string sql = info[0].As<Napi::String>();
@@ -434,8 +456,7 @@ Napi::Value Connection::RegisterBuffer(const Napi::CallbackInfo &info) {
 	auto env = info.Env();
 
 	if (info.Length() < 2 || !info[0].IsString() || !info[1].IsObject()) {
-		Napi::TypeError::New(env, "Incorrect params").ThrowAsJavaScriptException();
-		return env.Null();
+		throw Napi::TypeError::New(env, "Incorrect params");
 	}
 
 	std::string name = info[0].As<Napi::String>();
@@ -444,17 +465,13 @@ Napi::Value Connection::RegisterBuffer(const Napi::CallbackInfo &info) {
 
 	if (info.Length() > 2) {
 		if (!info[2].IsBoolean()) {
-			Napi::TypeError::New(env, "Parameter 3 is of unexpected type. Expected boolean")
-			    .ThrowAsJavaScriptException();
-			return env.Null();
+			throw Napi::TypeError::New(env, "Parameter 3 is of unexpected type. Expected boolean");
 		}
 		force_register = info[2].As<Napi::Boolean>().Value();
 	}
 
 	if (!force_register && array_references.find(name) != array_references.end()) {
-		Napi::TypeError::New(env, "Buffer with this name already exists and force_register is not enabled")
-		    .ThrowAsJavaScriptException();
-		return env.Null();
+		throw Napi::TypeError::New(env, "Buffer with this name already exists and force_register is not enabled");
 	}
 
 	array_references[name] = Napi::Persistent(array);
@@ -464,9 +481,7 @@ Napi::Value Connection::RegisterBuffer(const Napi::CallbackInfo &info) {
 	for (uint64_t ipc_idx = 0; ipc_idx < array.Length(); ipc_idx++) {
 		Napi::Value v = array[ipc_idx];
 		if (!v.IsObject()) {
-			Napi::TypeError::New(env, "Parameter 2 contains unexpected type at index " + std::to_string(ipc_idx))
-			    .ThrowAsJavaScriptException();
-			return env.Null();
+			throw Napi::TypeError::New(env, "Parameter 2 contains unexpected type at index " + std::to_string(ipc_idx));
 		}
 		Napi::Uint8Array arr = v.As<Napi::Uint8Array>();
 		auto raw_ptr = reinterpret_cast<uint64_t>(arr.ArrayBuffer().Data());
@@ -492,8 +507,7 @@ Napi::Value Connection::UnRegisterBuffer(const Napi::CallbackInfo &info) {
 	auto env = info.Env();
 
 	if (info.Length() < 1 || !info[0].IsString()) {
-		Napi::TypeError::New(env, "Incorrect params").ThrowAsJavaScriptException();
-		return env.Null();
+		throw Napi::TypeError::New(env, "Incorrect params");
 	}
 	std::string name = info[0].As<Napi::String>();
 
@@ -515,4 +529,19 @@ Napi::Value Connection::UnRegisterBuffer(const Napi::CallbackInfo &info) {
 	return Value();
 }
 
+Napi::Value Connection::Close(const Napi::CallbackInfo &info) {
+	Napi::Function callback;
+	if (info.Length() > 0 && info[0].IsFunction()) {
+		callback = info[0].As<Napi::Function>();
+	}
+
+	database_ref->Schedule(info.Env(), duckdb::make_uniq<CloseConnectionTask>(*this, callback));
+
+	return info.Env().Undefined();
+}
+
+Napi::Object Connection::NewInstance(const Napi::Value &db) {
+	return NodeDuckDB::GetData(db.Env())->connection_constructor.New({db});
+}
+
 } // namespace node_duckdb

package/src/data_chunk.cpp

@@ -184,9 +184,7 @@ Napi::Array EncodeDataChunk(Napi::Env env, duckdb::DataChunk &chunk, bool with_t
 				break;
 			}
 			default:
-				Napi::TypeError::New(env, "Unsupported UDF argument type " + vec->GetType().ToString())
-				    .ThrowAsJavaScriptException();
-				break;
+				throw Napi::TypeError::New(env, "Unsupported UDF argument type " + vec->GetType().ToString());
 			}
 		}
 		col_descs.Set(col_idx, col_desc);

package/src/database.cpp

@@ -10,9 +10,7 @@
 
 namespace node_duckdb {
 
-Napi::FunctionReference Database::constructor;
-
-Napi::Object Database::Init(Napi::Env env, Napi::Object exports) {
+Napi::FunctionReference Database::Init(Napi::Env env, Napi::Object exports) {
 	Napi::HandleScope scope(env);
 
 	Napi::Function t = DefineClass(
@@ -22,11 +20,9 @@ Napi::Object Database::Init(Napi::Env env, Napi::Object exports) {
 	     InstanceMethod("connect", &Database::Connect), InstanceMethod("interrupt", &Database::Interrupt),
 	     InstanceMethod("registerReplacementScan", &Database::RegisterReplacementScan)});
 
-	constructor = Napi::Persistent(t);
-	constructor.SuppressDestruct();
-
 	exports.Set("Database", t);
-	return exports;
+
+	return Napi::Persistent(t);
 }
 
 struct OpenTask : public Task {
@@ -47,9 +43,7 @@ struct OpenTask : public Task {
 				try {
 					duckdb_config.SetOptionByName(key, duckdb::Value(val));
 				} catch (std::exception &e) {
-					Napi::TypeError::New(env, "Failed to set configuration option " + key + ": " + e.what())
-					    .ThrowAsJavaScriptException();
-					return;
+					throw Napi::TypeError::New(env, "Failed to set configuration option " + key + ": " + e.what());
 				}
 			}
 		}
@@ -94,8 +88,7 @@ Database::Database(const Napi::CallbackInfo &info)
 	auto env = info.Env();
 
 	if (info.Length() < 1 || !info[0].IsString()) {
-		Napi::TypeError::New(env, "Database location expected").ThrowAsJavaScriptException();
-		return;
+		throw Napi::TypeError::New(env, "Database location expected");
 	}
 	std::string filename = info[0].As<Napi::String>();
 	unsigned int pos = 1;
@@ -197,8 +190,7 @@ Napi::Value Database::Serialize(const Napi::CallbackInfo &info) {
 		return info.This();
 	}
 	if (info.Length() < 1 || !info[0].IsFunction()) {
-		Napi::TypeError::New(env, "Callback expected").ThrowAsJavaScriptException();
-		return env.Null();
+		throw Napi::TypeError::New(env, "Callback expected");
 	}
 	Napi::HandleScope scope(env);
 	info[0].As<Napi::Function>().MakeCallback(info.This(), {});
@@ -266,7 +258,8 @@ Napi::Value Database::Interrupt(const Napi::CallbackInfo &info) {
 }
 
 Napi::Value Database::Connect(const Napi::CallbackInfo &info) {
-	return Connection::constructor.New({Value()});
+	Napi::HandleScope scope(env);
+	return Connection::NewInstance(Value());
 }
 
 struct JSRSArgs {
@@ -358,8 +351,7 @@ Napi::Value Database::RegisterReplacementScan(const Napi::CallbackInfo &info) {
 	auto env = info.Env();
 	auto deferred = Napi::Promise::Deferred::New(info.Env());
 	if (info.Length() < 1) {
-		Napi::TypeError::New(env, "Replacement scan callback expected").ThrowAsJavaScriptException();
-		return env.Null();
+		throw Napi::TypeError::New(env, "Replacement scan callback expected");
 	}
 	Napi::Function rs_callback = info[0].As<Napi::Function>();
 	auto rs =