@rocicorp/zero-sqlite3 1.0.9 → 1.0.10

package/README.md

@@ -4,5 +4,6 @@ So far the changes are:
 
 * Build the [bedrock](https://sqlite.org/src/timeline?r=bedrock) branch of SQLite to enable [`begin concurrent`](https://www.sqlite.org/src/doc/begin-concurrent/doc/begin_concurrent.md).
 * Create a shell too, so we can debug db files created
+* Supports both Node.js (20.x, 22.x, 23.x, 24.x) and Bun (>=1.1.0) runtimes
 
 Other changes will be likely be made over time.

package/binding.gyp

@@ -1,5 +1,5 @@
 # ===
-# This is the main GYP file, which builds better-sqlite3 with SQLite3 itself.
+# This is the main GYP file, which builds better-sqlite3 with SQLite itself.
 # ===
 
 {

package/deps/download.sh

@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
 
 # ===
-# This script defines and generates the bundled SQLite3 unit (sqlite3.c).
+# This script defines and generates the bundled SQLite unit (sqlite3.c).
 #
 # The following steps are taken:
 # 1. populate the shell environment with the defined compile-time options.
-# 2. download and extract the SQLite3 source code into a temporary directory.
+# 2. download and extract the SQLite source code into a temporary directory.
 # 3. run "sh configure" and "make sqlite3.c" within the source directory.
 # 4. copy the generated amalgamation into the output directory (./sqlite3).
 # 5. export the defined compile-time options to a gyp file (./defines.gypi).
@@ -74,7 +74,7 @@ mkdir -p "$OUTPUT"
 export CFLAGS=`echo $(echo "$DEFINES" | sed -e "/^\s*$/d" -e "s/^/-D/")`
 
 echo "downloading source..."
-curl -#f "https://sqlite.org/src/zip/$CHECKIN/SQLite-$CHECKIN.zip" > "$TEMP/source.zip" || exit 1
+curl -#f "https://www.sqlite.org/src/zip/$CHECKIN/SQLite-$CHECKIN.zip" > "$TEMP/source.zip" || exit 1
 
 echo "extracting source..."
 unzip "$TEMP/source.zip" -d "$TEMP" > /dev/null || exit 1
@@ -84,7 +84,7 @@ echo "configuring amalgamation..."
 sh configure > /dev/null || exit 1
 
 echo "building amalgamation..."
-make sqlite3.c > /dev/null || exit 1
+make OPTIONS="$CFLAGS" sqlite3.c > /dev/null || exit 1
 
 echo "copying amalgamation..."
 cp sqlite3.c sqlite3.h sqlite3ext.h shell.c "$OUTPUT/" || exit 1

package/deps/sqlite3.gyp

@@ -1,5 +1,5 @@
 # ===
-# This configuration defines options specific to compiling SQLite3 itself.
+# This configuration defines options specific to compiling SQLite itself.
 # Compile-time options are loaded by the auto-generated file "defines.gypi".
 # The --sqlite3 option can be provided to use a custom amalgamation instead.
 # ===

package/deps/test_extension.c

@@ -2,7 +2,7 @@
 SQLITE_EXTENSION_INIT1
 
 /*
-	This SQLite3 extension is used only for testing purposes (npm test).
+	This SQLite extension is used only for testing purposes (npm test).
  */
 
 static void TestExtensionFunction(sqlite3_context* pCtx, int nVal, sqlite3_value** _) {

package/lib/database.js

@@ -61,7 +61,7 @@ function Database(filenameGiven, options) {
 	}
 
 	// Make sure the specified directory exists
-	if (!anonymous && !fs.existsSync(path.dirname(filename))) {
+	if (!anonymous && !filename.startsWith('file:') && !fs.existsSync(path.dirname(filename))) {
 		throw new TypeError('Cannot open database because the directory does not exist');
 	}
 

package/lib/methods/transaction.js

@@ -63,6 +63,9 @@ const wrapTransaction = (apply, fn, db, { begin, commit, rollback, savepoint, re
 	before.run();
 	try {
 		const result = apply.call(fn, this, arguments);
+		if (result && typeof result.then === 'function') {
+			throw new TypeError('Transaction function cannot return a promise');
+		}
 		after.run();
 		return result;
 	} catch (ex) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rocicorp/zero-sqlite3",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "better-sqlite3 on bedrock",
   "homepage": "https://github.com/rocicorp/zero-sqlite3",
   "author": "Rocicorp",
@@ -14,11 +14,15 @@
   },
   "files": [
     "binding.gyp",
-    "src/*.[ch]pp",
+    "src/**/*.[ch]pp",
     "lib/**",
     "deps/**",
     "shell.sh"
   ],
+  "engines": {
+    "node": "20.x || 22.x || 23.x || 24.x",
+    "bun": ">=1.1.0"
+  },
   "types": "lib/index.d.ts",
   "dependencies": {
     "bindings": "^1.5.0",
@@ -26,7 +30,7 @@
   },
   "overrides": {
     "prebuild": {
-      "node-abi": "4.11.0"
+      "node-abi": "4.13.1"
     }
   },
   "devDependencies": {
@@ -35,7 +39,7 @@
     "fs-extra": "^11.1.1",
     "mocha": "^10.2.0",
     "nodemark": "^0.3.0",
-    "prebuild": "^13.0.0",
+    "prebuild": "^13.0.1",
     "sqlite": "^5.0.1",
     "sqlite3": "^5.1.6"
   },
@@ -43,12 +47,9 @@
     "install": "prebuild-install || node-gyp rebuild --release",
     "build-release": "node-gyp rebuild --release",
     "build-debug": "node-gyp rebuild --debug",
-    "rebuild-release": "npm run lzz && npm run build-release",
-    "rebuild-debug": "npm run lzz && npm run build-debug",
     "test": "mocha --exit --slow=75 --timeout=5000",
     "benchmark": "node benchmark",
-    "download": "bash ./deps/download.sh",
-    "lzz": "lzz -hx hpp -sx cpp -k BETTER_SQLITE3 -d -hl -sl -e ./src/better_sqlite3.lzz"
+    "download": "bash ./deps/download.sh"
   },
   "license": "MIT",
   "keywords": [

package/src/addon.cpp

@@ -0,0 +1,47 @@
+struct Addon {
+	explicit Addon(v8::Isolate* isolate) :
+		privileged_info(NULL),
+		next_id(0),
+		cs(isolate) {}
+
+	static void Cleanup(void* ptr) {
+		Addon* addon = static_cast<Addon*>(ptr);
+		for (Database* db : addon->dbs) db->CloseHandles();
+		addon->dbs.clear();
+		delete addon;
+	}
+
+	inline sqlite3_uint64 NextId() {
+		return next_id++;
+	}
+
+	static void ConfigureURI() {
+		static std::once_flag init_flag;
+		std::call_once(init_flag, [](){
+			const char* env = getenv("SQLITE_USE_URI");
+			if (env != NULL) {
+				if (strcmp(env, "1") == 0) {
+					int status = sqlite3_config(SQLITE_CONFIG_URI, 1);
+					assert(status == SQLITE_OK); ((void)status);
+				} else if (strcmp(env, "0") == 0) {
+					int status = sqlite3_config(SQLITE_CONFIG_URI, 0);
+					assert(status == SQLITE_OK); ((void)status);
+				}
+			}
+		});
+	}
+
+	static NODE_METHOD(JS_setErrorConstructor) {
+		REQUIRE_ARGUMENT_FUNCTION(first, v8::Local<v8::Function> SqliteError);
+		OnlyAddon->SqliteError.Reset(OnlyIsolate, SqliteError);
+	}
+
+	v8::Global<v8::Function> Statement;
+	v8::Global<v8::Function> StatementIterator;
+	v8::Global<v8::Function> Backup;
+	v8::Global<v8::Function> SqliteError;
+	NODE_ARGUMENTS_POINTER privileged_info;
+	sqlite3_uint64 next_id;
+	CS cs;
+	std::set<Database*, Database::CompareDatabase> dbs;
+};