Added logger helper methods that wrap js-logger. Removed direct js-logger depedency from web.

Author: Chriztiaan

.changeset/giant-moose-crash.md

@@ -0,0 +1,5 @@
+---
+'@powersync/web': minor
+---
+
+Removed `js-logger` dependency, using the logger helper exposed by `@powersync/common`.

.changeset/lemon-shrimps-pretend.md

@@ -0,0 +1,5 @@
+---
+'@powersync/common': minor
+---
+
+Added logger helpers, which can be used instead of the `js-logger` dependency.

packages/common/src/index.ts

@@ -34,6 +34,7 @@ export * from './db/DBAdapter.js';
 export * from './utils/AbortOperation.js';
 export * from './utils/BaseObserver.js';
 export * from './utils/DataStream.js';
+export * from './utils/Logger.js';
 export * from './utils/parseQuery.js';
 
 export * from './types/types.js';

packages/common/src/utils/Logger.ts

@@ -0,0 +1,32 @@
+import Logger, { type ILogger, type ILogLevel } from 'js-logger';
+
+export { GlobalLogger, ILogger, ILoggerOpts, ILogHandler, ILogLevel } from 'js-logger';
+
+const TypedLogger: ILogger = Logger as any;
+
+export const LogLevel = {
+  TRACE: TypedLogger.TRACE,
+  DEBUG: TypedLogger.DEBUG,
+  INFO: TypedLogger.INFO,
+  TIME: TypedLogger.TIME,
+  WARN: TypedLogger.WARN,
+  ERROR: TypedLogger.ERROR,
+  OFF: TypedLogger.OFF
+};
+
+export interface CreateLoggerOptions {
+  logLevel?: ILogLevel;
+}
+
+export function createBaseLogger() {
+  return Logger;
+}
+
+export function createLogger(name: string, options: CreateLoggerOptions = {}): ILogger {
+  const logger = Logger.get(name);
+  if (options.logLevel) {
+    logger.setLevel(options.logLevel);
+  }
+
+  return logger;
+}

packages/web/package.json

@@ -68,8 +68,7 @@
     "async-mutex": "^0.4.0",
     "bson": "^6.6.0",
     "comlink": "^4.4.2",
-    "commander": "^12.1.0",
-    "js-logger": "^1.6.1"
+    "commander": "^12.1.0"
   },
   "devDependencies": {
     "@journeyapps/wa-sqlite": "^1.2.2",

packages/web/src/db/adapters/AbstractWebSQLOpenFactory.ts

@@ -1,5 +1,4 @@
-import { DBAdapter, SQLOpenFactory } from '@powersync/common';
-import Logger, { ILogger } from 'js-logger';
+import { type ILogger, createLogger, DBAdapter, SQLOpenFactory } from '@powersync/common';
 import { SSRDBAdapter } from './SSRDBAdapter';
 import { ResolvedWebSQLFlags, WebSQLOpenFactoryOptions, isServerSide, resolveWebSQLFlags } from './web-sql-flags';
 
@@ -9,7 +8,7 @@ export abstract class AbstractWebSQLOpenFactory implements SQLOpenFactory {
 
   constructor(protected options: WebSQLOpenFactoryOptions) {
     this.resolvedFlags = resolveWebSQLFlags(options.flags);
-    this.logger = options.logger ?? Logger.get(`AbstractWebSQLOpenFactory - ${this.options.dbFilename}`);
+    this.logger = options.logger ?? createLogger(`AbstractWebSQLOpenFactory - ${this.options.dbFilename}`);
   }
 
   /**

packages/web/src/db/adapters/LockedAsyncDatabaseAdapter.ts

@@ -1,5 +1,7 @@
 import {
+  type ILogger,
   BaseObserver,
+  createLogger,
   DBAdapter,
   DBAdapterListener,
   DBGetUtils,
@@ -8,7 +10,6 @@ import {
   QueryResult,
   Transaction
 } from '@powersync/common';
-import Logger, { ILogger } from 'js-logger';
 import { getNavigatorLocks } from '../..//shared/navigator';
 import { AsyncDatabaseConnection } from './AsyncDatabaseConnection';
 import { SharedConnectionWorker, WebDBAdapter } from './WebDBAdapter';
@@ -50,7 +51,7 @@ export class LockedAsyncDatabaseAdapter
   constructor(protected options: LockedAsyncDatabaseAdapterOptions) {
     super();
     this._dbIdentifier = options.name;
-    this.logger = options.logger ?? Logger.get(`LockedAsyncDatabaseAdapter - ${this._dbIdentifier}`);
+    this.logger = options.logger ?? createLogger(`LockedAsyncDatabaseAdapter - ${this._dbIdentifier}`);
     // Set the name if provided. We can query for the name if not available yet
     this.debugMode = options.debugMode ?? false;
     if (this.debugMode) {

packages/web/src/db/adapters/web-sql-flags.ts

@@ -1,5 +1,4 @@
-import { SQLOpenOptions } from '@powersync/common';
-import { ILogger } from 'js-logger';
+import { type ILogger, SQLOpenOptions } from '@powersync/common';
 
 /**
  * Common settings used when creating SQL connections on web.

packages/web/src/db/sync/WebRemote.ts

@@ -1,12 +1,11 @@
-import { type ILogger } from 'js-logger';
-
 import {
   AbstractRemote,
   AbstractRemoteOptions,
   BSONImplementation,
   DEFAULT_REMOTE_LOGGER,
   FetchImplementation,
   FetchImplementationProvider,
+  ILogger,
   RemoteConnector
 } from '@powersync/common';
 

packages/web/src/worker/sync/BroadcastLogger.ts

@@ -1,4 +1,4 @@
-import Logger, { type ILogLevel, type ILogger } from 'js-logger';
+import { type ILogger, type ILogLevel, LogLevel } from '@powersync/common';
 import { type WrappedSyncPort } from './SharedSyncImplementation';
 
 /**
@@ -14,13 +14,13 @@ export class BroadcastLogger implements ILogger {
   OFF: ILogLevel;
 
   constructor(protected clients: WrappedSyncPort[]) {
-    this.TRACE = Logger.TRACE;
-    this.DEBUG = Logger.DEBUG;
-    this.INFO = Logger.INFO;
-    this.TIME = Logger.TIME;
-    this.WARN = Logger.WARN;
-    this.ERROR = Logger.ERROR;
-    this.OFF = Logger.OFF;
+    this.TRACE = LogLevel.TRACE;
+    this.DEBUG = LogLevel.DEBUG;
+    this.INFO = LogLevel.INFO;
+    this.TIME = LogLevel.TIME;
+    this.WARN = LogLevel.WARN;
+    this.ERROR = LogLevel.ERROR;
+    this.OFF = LogLevel.OFF;
   }
 
   trace(...x: any[]): void {
@@ -75,7 +75,7 @@ export class BroadcastLogger implements ILogger {
 
   getLevel(): ILogLevel {
     // Levels are not adjustable on this level.
-    return Logger.INFO;
+    return LogLevel.INFO;
   }
 
   enabledFor(level: ILogLevel): boolean {