@powersync/common 1.57.1 → 2.0.0

package/lib/utils/Logger.d.ts

@@ -1,40 +1,69 @@
-import Logger, { type ILogger, type ILogLevel } from 'js-logger';
-export { GlobalLogger, ILogger, ILoggerOpts, ILogHandler, ILogLevel } from 'js-logger';
 /**
  * @public
  */
-export declare const LogLevel: {
-    TRACE: Logger.ILogLevel;
-    DEBUG: Logger.ILogLevel;
-    INFO: Logger.ILogLevel;
-    TIME: Logger.ILogLevel;
-    WARN: Logger.ILogLevel;
-    ERROR: Logger.ILogLevel;
-    OFF: Logger.ILogLevel;
+export declare const LogLevels: {
+    readonly trace: 10;
+    readonly debug: 20;
+    readonly info: 30;
+    readonly warn: 40;
+    readonly error: 50;
 };
 /**
+ * A log record passed to a {@link PowerSyncLogger}.
+ *
  * @public
  */
-export interface CreateLoggerOptions {
-    logLevel?: ILogLevel;
+export interface LogRecord {
+    /**
+     * The log level (see {@link LogLevels} for preconfigured values) for the message. Depending on how a receiving logger
+     * has been configured, messages below a configured minimum level may be ignored.
+     */
+    level: number;
+    /**
+     * The main message to log.
+     */
+    message: string;
+    /**
+     * When the log message contains an error, the error causing the log.
+     *
+     * This is not guaranteed to be an `Error` instance. On the web, we might have to serialize objects across message
+     * channels and represent them as a string.
+     */
+    error?: unknown;
 }
 /**
- * Retrieves the base (default) logger instance.
+ * A logger used by the PowerSync SDK.
+ *
+ * This is deliberately a very simple interface, and it's not a designed to be a general-purpose logger you would use in
+ * your application. Instead, you can provide an implementation of this to PowerSync to make it use your preferred
+ * logging libraries.
  *
- * This base logger controls the default logging configuration and is shared
- * across all loggers created with `createLogger`. Adjusting settings on this
- * base logger affects all loggers derived from it unless explicitly overridden.
+ * By default, the SDK uses a {@link createConsoleLogger} instance forwarding messages to `console.log`.
  *
  * @public
  */
-export declare function createBaseLogger(): typeof Logger;
+export interface PowerSyncLogger {
+    log(record: LogRecord): void;
+}
 /**
- * Creates and configures a new named logger based on the base logger.
- *
- * Named loggers allow specific modules or areas of your application to have
- * their own logging levels and behaviors. These loggers inherit configuration
- * from the base logger by default but can override settings independently.
+ * @public
+ */
+export interface CreateLoggerOptions {
+    /**
+     * A prefix for messages emitted by {@link createConsoleLogger} to make them more recognizable.
+     *
+     * Defaults to `'PowerSync'`.
+     */
+    prefix: string;
+    /**
+     * The minimum log level to consider for messages. Defaults to {@link LogLevels.info}.
+     */
+    minLevel: number;
+}
+/**
+ * A very simple {@link PowerSyncLogger} implementation forwarding messages to `console.log`.
  *
+ * @param options - Options to configure a minimum severity of the logger or a prefix to make messages more recognizable.
  * @public
  */
-export declare function createLogger(name: string, options?: CreateLoggerOptions): ILogger;
+export declare function createConsoleLogger(options?: Partial<CreateLoggerOptions>): PowerSyncLogger & CreateLoggerOptions;

package/lib/utils/Logger.js

@@ -1,43 +1,45 @@
-import Logger from 'js-logger';
-const TypedLogger = Logger;
 /**
  * @public
  */
-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 const LogLevels = {
+    trace: 10,
+    debug: 20,
+    info: 30,
+    warn: 40,
+    error: 50
 };
 /**
- * Retrieves the base (default) logger instance.
- *
- * This base logger controls the default logging configuration and is shared
- * across all loggers created with `createLogger`. Adjusting settings on this
- * base logger affects all loggers derived from it unless explicitly overridden.
- *
- * @public
- */
-export function createBaseLogger() {
-    return Logger;
-}
-/**
- * Creates and configures a new named logger based on the base logger.
- *
- * Named loggers allow specific modules or areas of your application to have
- * their own logging levels and behaviors. These loggers inherit configuration
- * from the base logger by default but can override settings independently.
+ * A very simple {@link PowerSyncLogger} implementation forwarding messages to `console.log`.
  *
+ * @param options - Options to configure a minimum severity of the logger or a prefix to make messages more recognizable.
  * @public
  */
-export function createLogger(name, options = {}) {
-    const logger = Logger.get(name);
-    if (options.logLevel) {
-        logger.setLevel(options.logLevel);
-    }
-    return logger;
+export function createConsoleLogger(options) {
+    const { prefix = 'PowerSync', minLevel = LogLevels.info } = options ?? {};
+    return {
+        prefix,
+        minLevel,
+        log({ level, message, error }) {
+            if (level < this.minLevel)
+                return;
+            let emitter = console.log;
+            if (level >= LogLevels.error) {
+                emitter = console.error;
+            }
+            else if (level >= LogLevels.warn) {
+                emitter = console.warn;
+            }
+            else if (level >= LogLevels.info) {
+                emitter = console.info;
+            }
+            const messageWithPrefix = `[${prefix}]: ${message}`;
+            if (error) {
+                emitter(messageWithPrefix, error);
+            }
+            else {
+                emitter(messageWithPrefix);
+            }
+        }
+    };
 }
 //# sourceMappingURL=Logger.js.map

package/lib/utils/Logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"Logger.js","sourceRoot":"","sources":["../../src/utils/Logger.ts"],"names":[],"mappings":"AAAA,OAAO,MAAwC,MAAM,WAAW,CAAC;AAIjE,MAAM,WAAW,GAAY,MAAa,CAAC;AAE3C;;GAEG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG;IACtB,KAAK,EAAE,WAAW,CAAC,KAAK;IACxB,KAAK,EAAE,WAAW,CAAC,KAAK;IACxB,IAAI,EAAE,WAAW,CAAC,IAAI;IACtB,IAAI,EAAE,WAAW,CAAC,IAAI;IACtB,IAAI,EAAE,WAAW,CAAC,IAAI;IACtB,KAAK,EAAE,WAAW,CAAC,KAAK;IACxB,GAAG,EAAE,WAAW,CAAC,GAAG;CACrB,CAAC;AASF;;;;;;;;GAQG;AACH,MAAM,UAAU,gBAAgB;IAC9B,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,YAAY,CAAC,IAAY,EAAE,UAA+B,EAAE;IAC1E,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAChC,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;QACrB,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACpC,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}
+{"version":3,"file":"Logger.js","sourceRoot":"","sources":["../../src/utils/Logger.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG;IACvB,KAAK,EAAE,EAAE;IACT,KAAK,EAAE,EAAE;IACT,IAAI,EAAE,EAAE;IACR,IAAI,EAAE,EAAE;IACR,KAAK,EAAE,EAAE;CACD,CAAC;AA4DX;;;;;GAKG;AACH,MAAM,UAAU,mBAAmB,CAAC,OAAsC;IACxE,MAAM,EAAE,MAAM,GAAG,WAAW,EAAE,QAAQ,GAAG,SAAS,CAAC,IAAI,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;IAE1E,OAAO;QACL,MAAM;QACN,QAAQ;QACR,GAAG,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE;YAC3B,IAAI,KAAK,GAAG,IAAI,CAAC,QAAQ;gBAAE,OAAO;YAElC,IAAI,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC;YAC1B,IAAI,KAAK,IAAI,SAAS,CAAC,KAAK,EAAE,CAAC;gBAC7B,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC;YAC1B,CAAC;iBAAM,IAAI,KAAK,IAAI,SAAS,CAAC,IAAI,EAAE,CAAC;gBACnC,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;YACzB,CAAC;iBAAM,IAAI,KAAK,IAAI,SAAS,CAAC,IAAI,EAAE,CAAC;gBACnC,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;YACzB,CAAC;YAED,MAAM,iBAAiB,GAAG,IAAI,MAAM,MAAM,OAAO,EAAE,CAAC;YACpD,IAAI,KAAK,EAAE,CAAC;gBACV,OAAO,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC;YACpC,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,iBAAiB,CAAC,CAAC;YAC7B,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC"}

package/lib/utils/MetaBaseObserver.d.ts

@@ -1,29 +1,29 @@
-import { BaseListener, BaseObserver, BaseObserverInterface } from './BaseObserver.js';
+import { BaseListener, BaseObserverInterface } from './BaseObserver.js';
 /**
  * Represents the counts of listeners for each event type in a BaseListener.
+ *
+ * @public
  */
 export type ListenerCounts<Listener extends BaseListener> = Partial<Record<keyof Listener, number>> & {
     total: number;
 };
 /**
  * Meta listener which reports the counts of listeners for each event type.
+ *
+ * @public
  */
 export interface MetaListener<ParentListener extends BaseListener> extends BaseListener {
     listenersChanged?: (counts: ListenerCounts<ParentListener>) => void;
 }
+/**
+ * @public
+ */
 export interface ListenerMetaManager<Listener extends BaseListener> extends BaseObserverInterface<MetaListener<Listener>> {
     counts: ListenerCounts<Listener>;
 }
-export interface MetaBaseObserverInterface<Listener extends BaseListener> extends BaseObserverInterface<Listener> {
-    listenerMeta: ListenerMetaManager<Listener>;
-}
 /**
- * A BaseObserver that tracks the counts of listeners for each event type.
+ * @public
  */
-export declare class MetaBaseObserver<Listener extends BaseListener> extends BaseObserver<Listener> implements MetaBaseObserverInterface<Listener> {
-    protected get listenerCounts(): ListenerCounts<Listener>;
-    get listenerMeta(): ListenerMetaManager<Listener>;
-    protected metaListener: BaseObserver<MetaListener<Listener>>;
-    constructor();
-    registerListener(listener: Partial<Listener>): () => void;
+export interface MetaBaseObserverInterface<Listener extends BaseListener> extends BaseObserverInterface<Listener> {
+    listenerMeta: ListenerMetaManager<Listener>;
 }

package/lib/utils/MetaBaseObserver.js

@@ -1,51 +1,2 @@
-import { BaseObserver } from './BaseObserver.js';
-/**
- * A BaseObserver that tracks the counts of listeners for each event type.
- */
-export class MetaBaseObserver extends BaseObserver {
-    get listenerCounts() {
-        const counts = {};
-        let total = 0;
-        for (const listener of this.listeners) {
-            for (const key in listener) {
-                if (listener[key]) {
-                    counts[key] = (counts[key] ?? 0) + 1;
-                    total++;
-                }
-            }
-        }
-        return {
-            ...counts,
-            total
-        };
-    }
-    get listenerMeta() {
-        return {
-            counts: this.listenerCounts,
-            // Allows registering a meta listener that will be notified of changes in listener counts
-            registerListener: (listener) => {
-                return this.metaListener.registerListener(listener);
-            }
-        };
-    }
-    metaListener;
-    constructor() {
-        super();
-        this.metaListener = new BaseObserver();
-    }
-    registerListener(listener) {
-        const dispose = super.registerListener(listener);
-        const updatedCount = this.listenerCounts;
-        this.metaListener.iterateListeners((l) => {
-            l.listenersChanged?.(updatedCount);
-        });
-        return () => {
-            dispose();
-            const updatedCount = this.listenerCounts;
-            this.metaListener.iterateListeners((l) => {
-                l.listenersChanged?.(updatedCount);
-            });
-        };
-    }
-}
+export {};
 //# sourceMappingURL=MetaBaseObserver.js.map

package/lib/utils/MetaBaseObserver.js.map

@@ -1 +1 @@
-{"version":3,"file":"MetaBaseObserver.js","sourceRoot":"","sources":["../../src/utils/MetaBaseObserver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,YAAY,EAAyB,MAAM,mBAAmB,CAAC;AAyBtF;;GAEG;AACH,MAAM,OAAO,gBACX,SAAQ,YAAsB;IAG9B,IAAc,cAAc;QAC1B,MAAM,MAAM,GAAG,EAA6C,CAAC;QAC7D,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACtC,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;gBAC3B,IAAI,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;oBAClB,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;oBACrC,KAAK,EAAE,CAAC;gBACV,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO;YACL,GAAG,MAAM;YACT,KAAK;SACN,CAAC;IACJ,CAAC;IAED,IAAI,YAAY;QACd,OAAO;YACL,MAAM,EAAE,IAAI,CAAC,cAAc;YAC3B,yFAAyF;YACzF,gBAAgB,EAAE,CAAC,QAAyC,EAAE,EAAE;gBAC9D,OAAO,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;YACtD,CAAC;SACF,CAAC;IACJ,CAAC;IAES,YAAY,CAAuC;IAE7D;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,YAAY,GAAG,IAAI,YAAY,EAA0B,CAAC;IACjE,CAAC;IAED,gBAAgB,CAAC,QAA2B;QAC1C,MAAM,OAAO,GAAG,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACjD,MAAM,YAAY,GAAG,IAAI,CAAC,cAAc,CAAC;QACzC,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,EAAE;YACvC,CAAC,CAAC,gBAAgB,EAAE,CAAC,YAAY,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;QACH,OAAO,GAAG,EAAE;YACV,OAAO,EAAE,CAAC;YACV,MAAM,YAAY,GAAG,IAAI,CAAC,cAAc,CAAC;YACzC,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,EAAE;gBACvC,CAAC,CAAC,gBAAgB,EAAE,CAAC,YAAY,CAAC,CAAC;YACrC,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;IACJ,CAAC;CACF"}
+{"version":3,"file":"MetaBaseObserver.js","sourceRoot":"","sources":["../../src/utils/MetaBaseObserver.ts"],"names":[],"mappings":""}

package/lib/utils/mutex.d.ts

@@ -1,57 +1,7 @@
 /**
- * @internal
+ * @internal This is implemented in `@powersync/shared-internals`, but we need it in the attachment service
+ * implementation.
  */
-export type UnlockFn = () => void;
-/**
- * An asynchronous semaphore implementation with associated items per lease.
- *
- * @internal This class is meant to be used in PowerSync SDKs only, and is not part of the public API.
- */
-export declare class Semaphore<T> {
-    private readonly available;
-    readonly size: number;
-    private firstWaiter?;
-    private lastWaiter?;
-    constructor(elements: Iterable<T>);
-    private addWaiter;
-    private deactivateWaiter;
-    private requestPermits;
-    /**
-     * Requests a single item from the pool.
-     *
-     * The returned `release` callback must be invoked to return the item into the pool.
-     */
-    requestOne(abort?: AbortSignal): Promise<{
-        item: T;
-        release: UnlockFn;
-    }>;
-    /**
-     * Requests access to all items from the pool.
-     *
-     * The returned `release` callback must be invoked to return items into the pool.
-     */
-    requestAll(abort?: AbortSignal): Promise<{
-        items: T[];
-        release: UnlockFn;
-    }>;
-}
-/**
- * An asynchronous mutex implementation.
- *
- * @internal This class is meant to be used in PowerSync SDKs only, and is not part of the public API.
- */
-export declare class Mutex {
-    private inner;
-    acquire(abort?: AbortSignal): Promise<UnlockFn>;
+export interface Mutex {
     runExclusive<T>(fn: () => PromiseLike<T> | T, abort?: AbortSignal): Promise<T>;
 }
-/**
- * Creates a signal aborting after the set timeout.
- *
- * @internal
- */
-export declare function timeoutSignal(timeout: number): AbortSignal;
-/**
- * @internal
- */
-export declare function timeoutSignal(timeout?: number): AbortSignal | undefined;

package/lib/utils/mutex.js

@@ -1,157 +1,2 @@
-import { Queue } from './queue.js';
-/**
- * An asynchronous semaphore implementation with associated items per lease.
- *
- * @internal This class is meant to be used in PowerSync SDKs only, and is not part of the public API.
- */
-export class Semaphore {
-    // Available items that are not currently assigned to a waiter.
-    available;
-    size;
-    // Linked list of waiters. We don't expect the wait list to become particularly large, and this allows removing
-    // aborted waiters from the middle of the list efficiently.
-    firstWaiter;
-    lastWaiter;
-    constructor(elements) {
-        this.available = new Queue(elements);
-        this.size = this.available.length;
-    }
-    addWaiter(requestedItems, onAcquire) {
-        const node = {
-            isActive: true,
-            acquiredItems: [],
-            remainingItems: requestedItems,
-            onAcquire,
-            prev: this.lastWaiter
-        };
-        if (this.lastWaiter) {
-            this.lastWaiter.next = node;
-            this.lastWaiter = node;
-        }
-        else {
-            // First waiter
-            this.lastWaiter = this.firstWaiter = node;
-        }
-        return node;
-    }
-    deactivateWaiter(waiter) {
-        const { prev, next } = waiter;
-        waiter.isActive = false;
-        if (prev)
-            prev.next = next;
-        if (next)
-            next.prev = prev;
-        if (waiter == this.firstWaiter)
-            this.firstWaiter = next;
-        if (waiter == this.lastWaiter)
-            this.lastWaiter = prev;
-    }
-    requestPermits(amount, abort) {
-        if (amount <= 0 || amount > this.size) {
-            throw new Error(`Invalid amount of items requested (${amount}), must be between 1 and ${this.size}`);
-        }
-        return new Promise((resolve, reject) => {
-            function rejectAborted() {
-                reject(abort?.reason ?? new Error('Semaphore acquire aborted'));
-            }
-            if (abort?.aborted) {
-                return rejectAborted();
-            }
-            let waiter;
-            const markCompleted = () => {
-                const items = waiter.acquiredItems;
-                waiter.acquiredItems = []; // Avoid releasing items twice.
-                for (const element of items) {
-                    // Give to next waiter, if possible.
-                    const nextWaiter = this.firstWaiter;
-                    if (nextWaiter) {
-                        nextWaiter.acquiredItems.push(element);
-                        nextWaiter.remainingItems--;
-                        if (nextWaiter.remainingItems == 0) {
-                            nextWaiter.onAcquire();
-                        }
-                    }
-                    else {
-                        // No pending waiter, return lease into pool.
-                        this.available.addLast(element);
-                    }
-                }
-            };
-            const onAbort = () => {
-                abort?.removeEventListener('abort', onAbort);
-                if (waiter.isActive) {
-                    this.deactivateWaiter(waiter);
-                    rejectAborted();
-                }
-            };
-            const resolvePromise = () => {
-                this.deactivateWaiter(waiter);
-                abort?.removeEventListener('abort', onAbort);
-                const items = waiter.acquiredItems;
-                resolve({ items, release: markCompleted });
-            };
-            waiter = this.addWaiter(amount, resolvePromise);
-            // If there are items in the pool that haven't been assigned, we can pull them into this waiter. Note that this is
-            // only the case if we're the first waiter (otherwise, items would have been assigned to an earlier waiter).
-            while (!this.available.isEmpty && waiter.remainingItems > 0) {
-                waiter.acquiredItems.push(this.available.removeFirst());
-                waiter.remainingItems--;
-            }
-            if (waiter.remainingItems == 0) {
-                return resolvePromise();
-            }
-            abort?.addEventListener('abort', onAbort);
-        });
-    }
-    /**
-     * Requests a single item from the pool.
-     *
-     * The returned `release` callback must be invoked to return the item into the pool.
-     */
-    async requestOne(abort) {
-        const { items, release } = await this.requestPermits(1, abort);
-        return { release, item: items[0] };
-    }
-    /**
-     * Requests access to all items from the pool.
-     *
-     * The returned `release` callback must be invoked to return items into the pool.
-     */
-    requestAll(abort) {
-        return this.requestPermits(this.size, abort);
-    }
-}
-/**
- * An asynchronous mutex implementation.
- *
- * @internal This class is meant to be used in PowerSync SDKs only, and is not part of the public API.
- */
-export class Mutex {
-    inner = new Semaphore([null]);
-    async acquire(abort) {
-        const { release } = await this.inner.requestOne(abort);
-        return release;
-    }
-    async runExclusive(fn, abort) {
-        const returnMutex = await this.acquire(abort);
-        try {
-            return await fn();
-        }
-        finally {
-            returnMutex();
-        }
-    }
-}
-/**
- * @internal
- */
-export function timeoutSignal(timeout) {
-    if (timeout == null)
-        return;
-    if ('timeout' in AbortSignal)
-        return AbortSignal.timeout(timeout);
-    const controller = new AbortController();
-    setTimeout(() => controller.abort(new Error('Timeout waiting for lock')), timeout);
-    return controller.signal;
-}
+export {};
 //# sourceMappingURL=mutex.js.map

package/lib/utils/mutex.js.map

@@ -1 +1 @@
-{"version":3,"file":"mutex.js","sourceRoot":"","sources":["../../src/utils/mutex.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mutex.js","sourceRoot":"","sources":["../../src/utils/mutex.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,38 +1,17 @@
 {
   "name": "@powersync/common",
-  "version": "1.57.1",
+  "version": "2.0.0",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
   "description": "API definitions for PowerSync",
   "type": "module",
-  "main": "dist/bundle.mjs",
-  "module": "dist/bundle.mjs",
-  "types": "lib/index.d.ts",
+  "types": "./lib/index.d.ts",
   "exports": {
     ".": {
-      "node": {
-        "import": {
-          "types": "./lib/index.d.ts",
-          "default": "./dist/bundle.node.mjs"
-        },
-        "require": {
-          "types": "./dist/index.d.cts",
-          "require": "./dist/bundle.node.cjs"
-        }
-      },
-      "import": {
-        "types": "./lib/index.d.ts",
-        "default": "./dist/bundle.mjs"
-      },
-      "require": {
-        "types": "./dist/index.d.cts",
-        "require": "./dist/bundle.cjs"
-      }
-    },
-    "./internal/sync_protocol": {
-      "types": "./legacy/sync_protocol.d.ts"
+      "types": "./lib/index.d.ts",
+      "default": "./lib/index.js"
     }
   },
   "author": "PowerSync",
@@ -40,8 +19,7 @@
   "files": [
     "lib",
     "dist",
-    "src",
-    "legacy"
+    "src"
   ],
   "repository": {
     "type": "git",
@@ -51,31 +29,16 @@
     "url": "https://github.com/powersync-ja/powersync-js/issues"
   },
   "homepage": "https://docs.powersync.com",
-  "dependencies": {
-    "js-logger": "^1.6.1"
-  },
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^29.0.0",
-    "@rollup/plugin-inject": "^5.0.5",
-    "@rollup/plugin-json": "^6.1.0",
-    "@rollup/plugin-node-resolve": "^16.0.3",
     "@types/node": "^24.0.0",
     "@types/uuid": "^9.0.6",
-    "buffer": "^6.0.3",
-    "cross-fetch": "^4.1.0",
-    "estree-walker": "^3.0.3",
-    "magic-string": "^0.30.21",
-    "rollup": "^4.52.5",
-    "rollup-plugin-dts": "^6.2.1",
-    "rsocket-core": "1.0.0-alpha.3",
-    "rsocket-websocket-client": "1.0.0-alpha.3",
     "@microsoft/api-extractor": "^7.58.7"
   },
   "scripts": {
-    "build": "tsc -b && rollup -c rollup.config.mjs",
-    "build:prod": "tsc -b && rollup -c rollup.config.mjs",
+    "build": "tsc -b",
+    "build:prod": "tsc -b",
     "clean": "rm -rf lib dist tsconfig.tsbuildinfo",
     "test": "vitest",
-    "test:exports": "attw --pack . --exclude-entrypoints internal/sync_protocol"
+    "test:exports": "attw --pack . --ignore-rules no-resolution cjs-resolves-to-esm"
   }
 }

package/src/attachments/AttachmentContext.ts

@@ -1,7 +1,7 @@
-import { AbstractPowerSyncDatabase } from '../client/AbstractPowerSyncDatabase.js';
+import { LogLevels, PowerSyncLogger } from '../utils/Logger.js';
 import { Transaction } from '../db/DBAdapter.js';
-import { ILogger } from '../utils/Logger.js';
 import { AttachmentRecord, AttachmentState, attachmentFromSql } from './Schema.js';
+import { CommonPowerSyncDatabase } from '../client/CommonPowerSyncDatabase.js';
 
 /**
  * AttachmentContext provides database operations for managing attachment records.
@@ -14,13 +14,13 @@ import { AttachmentRecord, AttachmentState, attachmentFromSql } from './Schema.j
  */
 export class AttachmentContext {
   /** PowerSync database instance for executing queries */
-  readonly db: AbstractPowerSyncDatabase;
+  readonly db: CommonPowerSyncDatabase;
 
   /** Name of the database table storing attachment records */
   readonly tableName: string;
 
   /** Logger instance for diagnostic information */
-  readonly logger: ILogger;
+  readonly logger: PowerSyncLogger;
 
   /** Maximum number of archived attachments to keep before cleanup */
   readonly archivedCacheLimit: number = 100;
@@ -33,9 +33,9 @@ export class AttachmentContext {
    * @param logger - Logger instance for diagnostic output
    */
   constructor(
-    db: AbstractPowerSyncDatabase,
+    db: CommonPowerSyncDatabase,
     tableName: string = 'attachments',
-    logger: ILogger,
+    logger: PowerSyncLogger,
     archivedCacheLimit: number
   ) {
     this.db = db;
@@ -234,9 +234,10 @@ export class AttachmentContext {
     if (archivedAttachments.length === 0) return false;
 
     await callback?.(archivedAttachments);
-    this.logger.info(
-      `Deleting ${archivedAttachments.length} archived attachments. Archived attachment exceeds cache archiveCacheLimit of ${this.archivedCacheLimit}.`
-    );
+    this.logger.log({
+      level: LogLevels.info,
+      message: `Deleting ${archivedAttachments.length} archived attachments. Archived attachment exceeds cache archiveCacheLimit of ${this.archivedCacheLimit}.`
+    });
 
     const ids = archivedAttachments.map((attachment) => attachment.id);
 
@@ -255,7 +256,7 @@ export class AttachmentContext {
       [JSON.stringify(ids)]
     );
 
-    this.logger.info(`Deleted ${archivedAttachments.length} archived attachments`);
+    this.logger.log({ level: LogLevels.info, message: `Deleted ${archivedAttachments.length} archived attachments` });
     return archivedAttachments.length < limit;
   }