@rocicorp/zero-sqlite3 1.0.8 → 1.0.10

package/lib/index.d.ts

@@ -5,6 +5,17 @@ type VariableArgFunction = (...params: any[]) => unknown;
 type ArgumentTypes<F extends VariableArgFunction> = F extends (...args: infer A) => unknown ? A : never;
 type ElementOf<T> = T extends Array<infer E> ? E : T;
 
+declare const enum ScanStatOpcode {
+    SQLITE_SCANSTAT_NLOOP = 0,
+    SQLITE_SCANSTAT_NVISIT = 1,
+    SQLITE_SCANSTAT_EST = 2,
+    SQLITE_SCANSTAT_NAME = 3,
+    SQLITE_SCANSTAT_EXPLAIN = 4,
+    SQLITE_SCANSTAT_SELECTID = 5,
+    SQLITE_SCANSTAT_PARENTID = 6,
+    SQLITE_SCANSTAT_NCYCLE = 7,
+}
+
 declare namespace BetterSqlite3 {
     interface Statement<BindParameters extends unknown[], Result = unknown> {
         database: Database;
@@ -23,6 +34,15 @@ declare namespace BetterSqlite3 {
         bind(...params: BindParameters): this;
         columns(): ColumnDefinition[];
         safeIntegers(toggleState?: boolean): this;
+        scanStatusV2(idx: number, opcode: ScanStatOpcode.SQLITE_SCANSTAT_NAME, resetFlag: number): string | undefined;
+        scanStatusV2(idx: number, opcode: ScanStatOpcode.SQLITE_SCANSTAT_EXPLAIN, resetFlag: number): string | undefined;
+        scanStatusV2(idx: number, opcode: ScanStatOpcode.SQLITE_SCANSTAT_NLOOP, resetFlag: number): number | undefined;
+        scanStatusV2(idx: number, opcode: ScanStatOpcode.SQLITE_SCANSTAT_NVISIT, resetFlag: number): number | undefined;
+        scanStatusV2(idx: number, opcode: ScanStatOpcode.SQLITE_SCANSTAT_EST, resetFlag: number): number | undefined;
+        scanStatusV2(idx: number, opcode: ScanStatOpcode.SQLITE_SCANSTAT_SELECTID, resetFlag: number): number | undefined;
+        scanStatusV2(idx: number, opcode: ScanStatOpcode.SQLITE_SCANSTAT_PARENTID, resetFlag: number): number | undefined;
+        scanStatusV2(idx: number, opcode: ScanStatOpcode.SQLITE_SCANSTAT_NCYCLE, resetFlag: number): number | undefined;
+        scanStatusV2(idx: number, opcode: ScanStatOpcode, resetFlag: number): number | string | undefined;
     }
 
     interface ColumnDefinition {
@@ -89,6 +109,16 @@ declare namespace BetterSqlite3 {
         prototype: Database;
 
         SqliteError: typeof SqliteError;
+
+        // scanstatus constants
+        SQLITE_SCANSTAT_NLOOP: ScanStatOpcode.SQLITE_SCANSTAT_NLOOP;
+        SQLITE_SCANSTAT_NVISIT: ScanStatOpcode.SQLITE_SCANSTAT_NVISIT;
+        SQLITE_SCANSTAT_EST: ScanStatOpcode.SQLITE_SCANSTAT_EST;
+        SQLITE_SCANSTAT_NAME: ScanStatOpcode.SQLITE_SCANSTAT_NAME;
+        SQLITE_SCANSTAT_EXPLAIN: ScanStatOpcode.SQLITE_SCANSTAT_EXPLAIN;
+        SQLITE_SCANSTAT_SELECTID: ScanStatOpcode.SQLITE_SCANSTAT_SELECTID;
+        SQLITE_SCANSTAT_PARENTID: ScanStatOpcode.SQLITE_SCANSTAT_PARENTID;
+        SQLITE_SCANSTAT_NCYCLE: ScanStatOpcode.SQLITE_SCANSTAT_NCYCLE;
     }
 }
 

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.8",
+  "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;
+};