Skip to content

Commit de0d0de

Browse files
committed
Use forked better-sqlite3
1 parent 648202e commit de0d0de

File tree

5 files changed

+787
-435
lines changed

5 files changed

+787
-435
lines changed

package.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,5 @@
4040
"prettier": "^3.2.5",
4141
"typescript": "^5.7.2",
4242
"vitest": "^3.0.5"
43-
},
44-
"pnpm": {
45-
"overrides": {
46-
"better-sqlite3": "github:spinda/better-sqlite3#flexwash",
47-
"@types/better-sqlite3": "github:spinda/DefinitelyTyped#flexwash&path:/types/better-sqlite3"
48-
}
4943
}
5044
}

packages/node/package.json

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"build:prod": "tsc -b --sourceMap false",
2121
"clean": "rm -rf lib dist tsconfig.tsbuildinfo dist",
2222
"watch": "tsc -b -w",
23-
"_test": "vitest"
23+
"test": "vitest"
2424
},
2525
"type": "module",
2626
"repository": {
@@ -35,12 +35,7 @@
3535
"homepage": "https://docs.powersync.com/",
3636
"peerDependencies": {
3737
"@powersync/common": "workspace:^1.22.0",
38-
"better-sqlite3": "github:spinda/better-sqlite3#flexwash"
39-
},
40-
"peerDependenciesMeta": {
41-
"better-sqlite3": {
42-
"optional": true
43-
}
38+
"@powersync/better-sqlite3": "^0.1.0"
4439
},
4540
"dependencies": {
4641
"@powersync/common": "workspace:*",

packages/node/src/db/SqliteWorker.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import BetterSQLite3Database, { Database } from 'better-sqlite3';
1+
import BetterSQLite3Database, { Database } from '@powersync/better-sqlite3';
22
import * as Comlink from 'comlink';
3-
import { MessagePort, parentPort, threadId } from 'node:worker_threads';
3+
import { parentPort, threadId } from 'node:worker_threads';
44
import OS from 'node:os';
55
import url from 'node:url';
66
import { AsyncDatabase, AsyncDatabaseOpener } from './AsyncDatabase.js';
@@ -24,19 +24,19 @@ class BlockingAsyncDatabase implements AsyncDatabase {
2424
}
2525

2626
installUpdateHooks() {
27-
this.db.updateHook((_op: string, _dbName: string, tableName: string, _rowid: bigint) => {
27+
(this.db as any).updateHook((_op: string, _dbName: string, tableName: string, _rowid: bigint) => {
2828
this.uncommittedUpdatedTables.add(tableName);
2929
});
3030

31-
this.db.commitHook(() => {
31+
(this.db as any).commitHook(() => {
3232
for (const tableName of this.uncommittedUpdatedTables) {
3333
this.committedUpdatedTables.add(tableName);
3434
}
3535
this.uncommittedUpdatedTables.clear();
3636
return true;
3737
});
3838

39-
this.db.rollbackHook(() => {
39+
(this.db as any).rollbackHook(() => {
4040
this.uncommittedUpdatedTables.clear();
4141
});
4242
}
@@ -110,7 +110,7 @@ const loadExtension = (db: Database) => {
110110
}
111111

112112
const resolved = url.fileURLToPath(new URL(`../${extensionPath}`, import.meta.url));
113-
db.loadExtension(resolved, 'sqlite3_powersync_init');
113+
(db as any).loadExtension(resolved, 'sqlite3_powersync_init');
114114
};
115115

116116
Comlink.expose(new BetterSqliteWorker(), parentPort! as Comlink.Endpoint);

packages/node/tests/PowerSyncDatabase.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { vi, expect } from 'vitest';
1+
import { vi, expect, test } from 'vitest';
22
import { databaseTest } from './utils';
33

44
databaseTest('links powersync', async ({ database }) => {

0 commit comments

Comments
 (0)