Merge pull request #84 from powersync-ja/update-tooling

Update tooling

Author: rkistner

.prettierignore

@@ -0,0 +1,5 @@
+**/.git
+**/node_modules
+dist
+lib
+pnpm-lock.yaml

README.md

@@ -11,6 +11,7 @@ _[PowerSync](https://www.powersync.com) is a Postgres-SQLite sync engine, which
 The service can be started using the public Docker image. See the image [notes](./service/README.md)
 
 # Monorepo Structure:
+
 ## Packages
 
 - [packages/service-core](./packages/service-core/README.md)
@@ -52,13 +53,13 @@ Contains the PowerSync service code. This project is used to build the `journeya
 
 - [docs](./docs/README.md)
 
-Technical documentation regarding the implementation of PowerSync. 
+Technical documentation regarding the implementation of PowerSync.
 
 ## Test Client
 
 - [test-client](./test-client/README.md)
 
-Contains a minimal client demonstrating direct usage of the HTTP stream sync API. This can be used to test sync rules in contexts such as automated testing. 
+Contains a minimal client demonstrating direct usage of the HTTP stream sync API. This can be used to test sync rules in contexts such as automated testing.
 
 # Developing
 

libs/lib-services/package.json

@@ -33,6 +33,6 @@
   "devDependencies": {
     "@types/lodash": "^4.17.5",
     "@types/uuid": "^9.0.4",
-    "vitest": "^0.34.6"
+    "vitest": "^2.1.1"
   }
 }

modules/module-postgres/package.json

@@ -13,7 +13,7 @@
     "build": "tsc -b",
     "build:tests": "tsc -b test/tsconfig.json",
     "clean": "rm -rf ./lib && tsc -b --clean",
-    "test": "vitest --no-threads"
+    "test": "vitest"
   },
   "exports": {
     ".": {
@@ -42,8 +42,8 @@
   },
   "devDependencies": {
     "@types/uuid": "^9.0.4",
-    "typescript": "^5.2.2",
-    "vitest": "^0.34.6",
+    "typescript": "^5.6.2",
+    "vitest": "^2.1.1",
     "vite-tsconfig-paths": "^4.3.2"
   }
 }

modules/module-postgres/src/replication/PgManager.ts

@@ -9,7 +9,10 @@ export class PgManager {
 
   private connectionPromises: Promise<pgwire.PgConnection>[] = [];
 
-  constructor(public options: NormalizedPostgresConnectionConfig, public poolOptions: pgwire.PgPoolOptions) {
+  constructor(
+    public options: NormalizedPostgresConnectionConfig,
+    public poolOptions: pgwire.PgPoolOptions
+  ) {
     // The pool is lazy - no connections are opened until a query is performed.
     this.pool = pgwire.connectPgWirePool(this.options, poolOptions);
   }

modules/module-postgres/src/replication/PgRelation.ts

@@ -9,7 +9,7 @@ export function getReplicaIdColumns(relation: PgoutputRelation): storage.ColumnD
   } else {
     return relation.columns
       .filter((c) => (c.flags & 0b1) != 0)
-      .map((c) => ({ name: c.name, typeId: c.typeOid } satisfies storage.ColumnDescriptor));
+      .map((c) => ({ name: c.name, typeId: c.typeOid }) satisfies storage.ColumnDescriptor);
   }
 }
 export function getRelId(source: PgoutputRelation): number {

modules/module-postgres/src/utils/populate_test_data.ts

@@ -1,5 +1,4 @@
-import * as crypto from 'crypto';
-import { Worker, isMainThread, parentPort, workerData } from 'node:worker_threads';
+import { Worker } from 'node:worker_threads';
 
 import * as pgwire from '@powersync/service-jpgwire';
 
@@ -12,49 +11,10 @@ export interface PopulateDataOptions {
   size: number;
 }
 
-if (isMainThread || parentPort == null) {
-  // Not a worker - ignore
-} else {
-  try {
-    const options = workerData as PopulateDataOptions;
-
-    const result = await populateDataInner(options);
-    parentPort.postMessage(result);
-    process.exit(0);
-  } catch (e) {
-    // This is a bug, not a connection issue
-    console.error(e);
-    // Only closes the Worker thread
-    process.exit(2);
-  }
-}
-
-async function populateDataInner(options: PopulateDataOptions) {
-  // Dedicated connection so we can release the memory easily
-  const initialDb = await pgwire.connectPgWire(options.connection, { type: 'standard' });
-  const largeDescription = crypto.randomBytes(options.size / 2).toString('hex');
-  let operation_count = 0;
-  for (let i = 0; i < options.num_transactions; i++) {
-    const prefix = `test${i}K`;
-
-    await initialDb.query({
-      statement: `INSERT INTO test_data(id, description, other) SELECT $1 || i, $2, 'foo' FROM generate_series(1, $3) i`,
-      params: [
-        { type: 'varchar', value: prefix },
-        { type: 'varchar', value: largeDescription },
-        { type: 'int4', value: options.per_transaction }
-      ]
-    });
-    operation_count += options.per_transaction;
-  }
-  await initialDb.end();
-  return operation_count;
-}
-
 export async function populateData(options: PopulateDataOptions) {
   const WORKER_TIMEOUT = 30_000;
 
-  const worker = new Worker(new URL('./populate_test_data.js', import.meta.url), {
+  const worker = new Worker(new URL('./populate_test_data_worker.js', import.meta.url), {
     workerData: options
   });
   const timeout = setTimeout(() => {

modules/module-postgres/src/utils/populate_test_data_worker.ts

@@ -0,0 +1,50 @@
+import * as crypto from 'crypto';
+import { isMainThread, parentPort, workerData } from 'node:worker_threads';
+
+import * as pgwire from '@powersync/service-jpgwire';
+import type { PopulateDataOptions } from './populate_test_data.js';
+
+// This util is actually for tests only, but we need it compiled to JS for the service to work, so it's placed in the service.
+
+if (isMainThread || parentPort == null) {
+  // Must not be imported - only expected to run in a worker
+  throw new Error('Do not import this file');
+} else {
+  try {
+    const options = workerData as PopulateDataOptions;
+    if (options == null) {
+      throw new Error('loaded worker without options');
+    }
+
+    const result = await populateDataInner(options);
+    parentPort.postMessage(result);
+    process.exit(0);
+  } catch (e) {
+    // This is a bug, not a connection issue
+    console.error(e);
+    // Only closes the Worker thread
+    process.exit(2);
+  }
+}
+
+async function populateDataInner(options: PopulateDataOptions) {
+  // Dedicated connection so we can release the memory easily
+  const initialDb = await pgwire.connectPgWire(options.connection, { type: 'standard' });
+  const largeDescription = crypto.randomBytes(options.size / 2).toString('hex');
+  let operation_count = 0;
+  for (let i = 0; i < options.num_transactions; i++) {
+    const prefix = `test${i}K`;
+
+    await initialDb.query({
+      statement: `INSERT INTO test_data(id, description, other) SELECT $1 || i, $2, 'foo' FROM generate_series(1, $3) i`,
+      params: [
+        { type: 'varchar', value: prefix },
+        { type: 'varchar', value: largeDescription },
+        { type: 'int4', value: options.per_transaction }
+      ]
+    });
+    operation_count += options.per_transaction;
+  }
+  await initialDb.end();
+  return operation_count;
+}

modules/module-postgres/test/src/wal_stream_utils.ts

@@ -36,7 +36,10 @@ export class WalStreamTestContext {
   public storage?: SyncRulesBucketStorage;
   private replicationConnection?: pgwire.PgConnection;
 
-  constructor(public factory: BucketStorageFactory, public connectionManager: PgManager) {}
+  constructor(
+    public factory: BucketStorageFactory,
+    public connectionManager: PgManager
+  ) {}
 
   async dispose() {
     this.abortController.abort();

modules/module-postgres/vitest.config.ts

@@ -4,6 +4,12 @@ import tsconfigPaths from 'vite-tsconfig-paths';
 export default defineConfig({
   plugins: [tsconfigPaths()],
   test: {
-    setupFiles: './test/src/setup.ts'
+    setupFiles: './test/src/setup.ts',
+    poolOptions: {
+      threads: {
+        singleThread: true
+      }
+    },
+    pool: 'threads'
   }
 });