From 2e1443d0dfce08591d8622a30de8e7e6011a5457 Mon Sep 17 00:00:00 2001 From: Sergey Vohmyanin Date: Tue, 30 Jun 2026 13:45:49 +0300 Subject: [PATCH] fix(ts): some types polyshing, shorten filenames in web package dist/worker folder, shorten worker chunks names in dist folder --- .../common/src/client/sync/stream/AbstractRemote.ts | 2 +- packages/common/src/utils/Logger.ts | 10 +++++++++- packages/node/tests/sync.test.ts | 8 ++++---- .../src/db/adapters/wa-sqlite/RawSqliteConnection.ts | 4 ++-- packages/web/webpack.workers.config.js | 1 + 5 files changed, 17 insertions(+), 8 deletions(-) diff --git a/packages/common/src/client/sync/stream/AbstractRemote.ts b/packages/common/src/client/sync/stream/AbstractRemote.ts index 5c619ee73..84dacdb9d 100644 --- a/packages/common/src/client/sync/stream/AbstractRemote.ts +++ b/packages/common/src/client/sync/stream/AbstractRemote.ts @@ -42,7 +42,7 @@ const KEEP_ALIVE_LIFETIME_MS = 90_000; /** * @internal */ -export const DEFAULT_REMOTE_LOGGER = Logger.get('PowerSyncRemote'); +export const DEFAULT_REMOTE_LOGGER: ILogger = Logger.get('PowerSyncRemote'); /** * @internal diff --git a/packages/common/src/utils/Logger.ts b/packages/common/src/utils/Logger.ts index f19db63a9..ca9290832 100644 --- a/packages/common/src/utils/Logger.ts +++ b/packages/common/src/utils/Logger.ts @@ -7,7 +7,15 @@ const TypedLogger: ILogger = Logger as any; /** * @public */ -export const LogLevel = { +export const LogLevel: { + TRACE: ILogLevel; + DEBUG: ILogLevel; + INFO: ILogLevel; + TIME: ILogLevel; + WARN: ILogLevel; + ERROR: ILogLevel; + OFF: ILogLevel; +} = { TRACE: TypedLogger.TRACE, DEBUG: TypedLogger.DEBUG, INFO: TypedLogger.INFO, diff --git a/packages/node/tests/sync.test.ts b/packages/node/tests/sync.test.ts index bac85c084..4eee1178a 100644 --- a/packages/node/tests/sync.test.ts +++ b/packages/node/tests/sync.test.ts @@ -8,9 +8,9 @@ import { ProgressWithOperations, Schema, SyncClientImplementation, - SyncStreamConnectionMethod + SyncStreamConnectionMethod, + LogLevel, } from '@powersync/common'; -import Logger from 'js-logger'; import { bucket, MockSyncService, @@ -602,7 +602,7 @@ function defineSyncTests(bson: boolean) { }); mockSyncServiceTest('handles uploads across checkpoints', async ({ syncService }) => { - const logger = createLogger('test', { logLevel: (Logger as any).TRACE }); + const logger = createLogger('test', { logLevel: LogLevel.TRACE }); const logMessages: string[] = []; (logger as any).invoke = (level, args) => { console.log(...args); @@ -933,7 +933,7 @@ function defineSyncTests(bson: boolean) { mockSyncServiceTest('can reconnect based on query changes', async ({ syncService }) => { // Test for https://discord.com/channels/1138230179878154300/1399340612435710034/1399340612435710034 - const logger = createLogger('test', { logLevel: (Logger as any).TRACE }); + const logger = createLogger('test', { logLevel: LogLevel.TRACE }); const logMessages: string[] = []; (logger as any).invoke = (level, args) => { console.log(...args); diff --git a/packages/web/src/db/adapters/wa-sqlite/RawSqliteConnection.ts b/packages/web/src/db/adapters/wa-sqlite/RawSqliteConnection.ts index 3cf958eb1..7425ff884 100644 --- a/packages/web/src/db/adapters/wa-sqlite/RawSqliteConnection.ts +++ b/packages/web/src/db/adapters/wa-sqlite/RawSqliteConnection.ts @@ -45,8 +45,8 @@ export class RawSqliteConnection { ); await this.executeRaw(`PRAGMA temp_store = ${this.options.temporaryStorage};`); if (this.options.encryptionKey) { - const escapedKey = this.options.encryptionKey.replace("'", "''"); - await this.executeRaw(`PRAGMA key = '${escapedKey}'`); + const escapedKey = this.options.encryptionKey.replaceAll("'", "''"); + await this.executeRaw(`PRAGMA key = '${escapedKey}';`); } await this.executeRaw(`PRAGMA cache_size = -${this.options.cacheSizeKb};`); diff --git a/packages/web/webpack.workers.config.js b/packages/web/webpack.workers.config.js index a4f32d9e0..168656fa4 100644 --- a/packages/web/webpack.workers.config.js +++ b/packages/web/webpack.workers.config.js @@ -18,6 +18,7 @@ export default () => { }, output: { filename: 'worker/[name].umd.js', + chunkFilename: 'worker/[contenthash].umd.js', path: path.join(__dirname, 'dist'), library: { name: 'sdk_web',