@evolu/common 6.0.1-preview.19 → 6.0.1-preview.20

package/dist/src/WebSocket.d.ts

@@ -3,8 +3,8 @@
  *
  * @module
  */
-import { RetryError, RetryOptions } from "./Promise.js";
 import { Result } from "./Result.js";
+import { RetryError, RetryOptions } from "./Task.js";
 /** WebSocket with auto-reconnect and offline support. */
 export interface WebSocket extends Disposable {
     /**
@@ -13,9 +13,12 @@ export interface WebSocket extends Disposable {
      */
     send: (data: string | ArrayBufferLike | Blob | ArrayBufferView) => Result<void, WebSocketSendError>;
     readonly getReadyState: () => WebSocketReadyState;
+    /** Returns true if the WebSocket is open and ready to send data. */
+    readonly isOpen: () => boolean;
 }
 /**
- * An error that occurs when trying to send data but WebSocket is connecting.
+ * An error that occurs when trying to send data but WebSocket is not available
+ * or is in the CONNECTING state.
  *
  * https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/send
  */

package/dist/src/WebSocket.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WebSocket.d.ts","sourceRoot":"","sources":["../../src/WebSocket.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAS,UAAU,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC/D,OAAO,EAAW,MAAM,EAAE,MAAM,aAAa,CAAC;AAE9C,yDAAyD;AACzD,MAAM,WAAW,SAAU,SAAQ,UAAU;IAC3C;;;OAGG;IACH,IAAI,EAAE,CACJ,IAAI,EAAE,MAAM,GAAG,eAAe,GAAG,IAAI,GAAG,eAAe,KACpD,MAAM,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;IAEtC,QAAQ,CAAC,aAAa,EAAE,MAAM,mBAAmB,CAAC;CACnD;AAED;;;;GAIG;AACH,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,IAAI,EAAE,oBAAoB,CAAC;CACrC;AAED,mCAAmC;AACnC,MAAM,MAAM,mBAAmB,GAAG,YAAY,GAAG,MAAM,GAAG,SAAS,GAAG,QAAQ,CAAC;AAE/E,MAAM,MAAM,eAAe,GAAG,CAC5B,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,gBAAgB,KACvB,SAAS,CAAC;AAEf,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;CAC3C;AAED,6CAA6C;AAC7C,MAAM,WAAW,gBAAgB;IAC/B,wDAAwD;IACxD,SAAS,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;IAEnC,wDAAwD;IACxD,UAAU,CAAC,EAAE,MAAM,GAAG,aAAa,CAAC;IAEpC,mDAAmD;IACnD,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IAEpB,qCAAqC;IACrC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,CAAC;IAE1C,8CAA8C;IAC9C,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,IAAI,CAAC;IAEtC,8CAA8C;IAC9C,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI,KAAK,IAAI,CAAC;IAExD,kCAAkC;IAClC,YAAY,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAAC,EAAE,QAAQ,CAAC,CAAC;IAEjE;;;;;;OAMG;IACH,oBAAoB,CAAC,EAAE,OAAO,UAAU,CAAC,SAAS,CAAC;CACpD;AAED,MAAM,MAAM,cAAc,GACtB,qBAAqB,GACrB,wBAAwB,GACxB,UAAU,CAAC,mBAAmB,CAAC,CAAC;AAEpC;;;GAGG;AACH,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,IAAI,EAAE,uBAAuB,CAAC;IACvC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;CACvB;AAED;;;;;GAKG;AACH,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,IAAI,EAAE,0BAA0B,CAAC;IAC1C,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;CACvB;AAED,MAAM,MAAM,mBAAmB,GAC3B,qBAAqB,GACrB,6BAA6B,CAAC;AAElC,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,CAAC,IAAI,EAAE,+BAA+B,CAAC;IAC/C,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;CAC5B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,eAAO,MAAM,eAAe,EAAE,eA0H7B,CAAC"}
+{"version":3,"file":"WebSocket.d.ts","sourceRoot":"","sources":["../../src/WebSocket.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAW,MAAM,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAS,UAAU,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAG5D,yDAAyD;AACzD,MAAM,WAAW,SAAU,SAAQ,UAAU;IAC3C;;;OAGG;IACH,IAAI,EAAE,CACJ,IAAI,EAAE,MAAM,GAAG,eAAe,GAAG,IAAI,GAAG,eAAe,KACpD,MAAM,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;IAEtC,QAAQ,CAAC,aAAa,EAAE,MAAM,mBAAmB,CAAC;IAElD,oEAAoE;IACpE,QAAQ,CAAC,MAAM,EAAE,MAAM,OAAO,CAAC;CAChC;AAED;;;;;GAKG;AACH,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,IAAI,EAAE,oBAAoB,CAAC;CACrC;AAED,mCAAmC;AACnC,MAAM,MAAM,mBAAmB,GAAG,YAAY,GAAG,MAAM,GAAG,SAAS,GAAG,QAAQ,CAAC;AAE/E,MAAM,MAAM,eAAe,GAAG,CAC5B,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,gBAAgB,KACvB,SAAS,CAAC;AAEf,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;CAC3C;AAED,6CAA6C;AAC7C,MAAM,WAAW,gBAAgB;IAC/B,wDAAwD;IACxD,SAAS,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;IAEnC,wDAAwD;IACxD,UAAU,CAAC,EAAE,MAAM,GAAG,aAAa,CAAC;IAEpC,mDAAmD;IACnD,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IAEpB,qCAAqC;IACrC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,CAAC;IAE1C,8CAA8C;IAC9C,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,IAAI,CAAC;IAEtC,8CAA8C;IAC9C,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI,KAAK,IAAI,CAAC;IAExD,kCAAkC;IAClC,YAAY,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAAC,EAAE,QAAQ,CAAC,CAAC;IAEjE;;;;;;OAMG;IACH,oBAAoB,CAAC,EAAE,OAAO,UAAU,CAAC,SAAS,CAAC;CACpD;AAED,MAAM,MAAM,cAAc,GACtB,qBAAqB,GACrB,wBAAwB,GACxB,UAAU,CAAC,mBAAmB,CAAC,CAAC;AAEpC;;;GAGG;AACH,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,IAAI,EAAE,uBAAuB,CAAC;IACvC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;CACvB;AAED;;;;;GAKG;AACH,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,IAAI,EAAE,0BAA0B,CAAC;IAC1C,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;CACvB;AAED,MAAM,MAAM,mBAAmB,GAC3B,qBAAqB,GACrB,6BAA6B,CAAC;AAElC,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,CAAC,IAAI,EAAE,+BAA+B,CAAC;IAC/C,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;CAC5B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,eAAO,MAAM,eAAe,EAAE,eA2H7B,CAAC"}

package/dist/src/WebSocket.js

@@ -4,8 +4,9 @@
  * @module
  */
 import { assertNoErrorInCatch } from "./Assert.js";
-import { retry } from "./Promise.js";
 import { err, ok } from "./Result.js";
+import { retry } from "./Task.js";
+import { maxPositiveInt } from "./Type.js";
 /**
  * Create a new {@link WebSocket}.
  *
@@ -37,13 +38,11 @@ import { err, ok } from "./Result.js";
  *
  * TODO:
  */
-export const createWebSocket = (url, options = {}) => {
-    const { protocols, binaryType, onOpen, onClose, onMessage, onError, retryOptions, WebSocketConstructor = globalThis.WebSocket, } = options;
+export const createWebSocket = (url, { protocols, binaryType, onOpen, onClose, onMessage, onError, retryOptions, WebSocketConstructor = globalThis.WebSocket, } = {}) => {
     let isDisposed = false;
     const reconnectController = new AbortController();
     const defaultRetryOptions = {
-        signal: reconnectController.signal,
-        maxRetries: Infinity,
+        retries: maxPositiveInt, // Practically infinite retries
     };
     let socket = null;
     const disposeSocket = () => {
@@ -66,7 +65,10 @@ export const createWebSocket = (url, options = {}) => {
      * - Is rejected when a connection is closed.
      * - Is resolved when WebSocket is disposed().
      */
-    retry(() => new Promise((resolve) => {
+    retry({
+        ...defaultRetryOptions,
+        ...retryOptions,
+    }, () => new Promise((resolve) => {
         disposePromise = () => {
             resolve(ok());
         };
@@ -98,19 +100,16 @@ export const createWebSocket = (url, options = {}) => {
         socket.onmessage = (event) => {
             onMessage?.(event.data);
         };
-    }), {
-        ...defaultRetryOptions,
-        ...retryOptions,
-    })
+    }))(reconnectController)
         .then((result) => {
-        if (result.ok || result.error.type === "RetryAbortError")
+        if (result.ok || result.error.type === "AbortError")
             return;
         onError?.(result.error);
     })
         .catch((error) => {
         assertNoErrorInCatch("WebSocket retry", error);
     });
-    const webSocket = {
+    return {
         send: (data) => {
             // https://developer.mozilla.org/en-US/docs/Web/API/WebSocket/send
             if (!socket || socket.readyState === socket.CONNECTING) {
@@ -120,6 +119,7 @@ export const createWebSocket = (url, options = {}) => {
             return ok();
         },
         getReadyState: () => socket ? nativeToStringState[socket.readyState] : "connecting",
+        isOpen: () => (socket ? socket.readyState === socket.OPEN : false),
         [Symbol.dispose]() {
             if (isDisposed)
                 return;
@@ -129,7 +129,6 @@ export const createWebSocket = (url, options = {}) => {
             disposePromise?.();
         },
     };
-    return webSocket;
 };
 const nativeToStringState = {
     [WebSocket.CONNECTING]: "connecting",

package/dist/src/Worker.d.ts

@@ -14,6 +14,21 @@ export interface Worker<Input, Output> {
 export interface WorkerPostMessageDep<Output> {
     readonly postMessage: (message: Output) => void;
 }
+/**
+ * Error reporting wrapper that catches synchronous errors in handlers and
+ * converts them to transferable error messages sent to the main thread.
+ */
+export type WithErrorReporting = <A extends Array<any>>(handler: (...args: A) => void) => (...args: A) => void;
+type HasInit<Input> = Extract<Input, {
+    type: "init";
+}> extends never ? ["Input must contain a variant with { type: 'init' }"] : unknown;
+type HasWorkerErrorOutput<T> = Extract<T, {
+    type: "onError";
+}> extends infer E ? [E] extends [never] ? [
+    "Output must contain { type: 'onError'; error: TransferableError | ... }"
+] : E extends {
+    error: infer Err;
+} ? TransferableError extends Err ? unknown : ["Output.onError.error must include TransferableError"] : ["Output.onError must have an error property"] : never;
 /**
  * Creates a {@link Worker} that supports initialization with dependencies and
  * safe error handling.
@@ -25,20 +40,33 @@ export declare const createInitializedWorker: <Input extends {
 } & HasWorkerErrorOutput<Output>, Deps>({ init, onMessage, }: {
     readonly init: (initMessage: Extract<Input, {
         type: "init";
-    }>, postMessage: (msg: Output) => void, safeHandler: <A extends Array<any>>(handler: (...args: A) => void) => (...args: A) => void) => Promise<Deps | null>;
+    }>, postMessage: (msg: Output) => void, withErrorReporting: WithErrorReporting) => Promise<Deps | null>;
     readonly onMessage: (deps: Deps) => (message: Exclude<Input, {
         type: "init";
     }>) => void;
 }) => Worker<Input, Output>;
-type HasInit<Input> = Extract<Input, {
-    type: "init";
-}> extends never ? ["Input must contain a variant with { type: 'init' }"] : unknown;
-type HasWorkerErrorOutput<T> = Extract<T, {
-    type: "onError";
-}> extends infer E ? [E] extends [never] ? [
-    "Output must contain { type: 'onError'; error: TransferableError | ... }"
-] : E extends {
-    error: infer Err;
-} ? TransferableError extends Err ? unknown : ["Output.onError.error must include TransferableError"] : ["Output.onError must have an error property"] : never;
+/** Type helper to extract message types from a union type */
+export type MessageHandlers<Input extends {
+    readonly type: string;
+}, Deps> = {
+    readonly [K in Input["type"]]: (deps: Deps) => (message: Extract<Input, {
+        type: K;
+    }>) => void;
+};
+/**
+ * Creates a {@link Worker} with type-safe message handlers for each message
+ * type. This provides better type safety and organization compared to a single
+ * onMessage handler.
+ */
+export declare const createInitializedWorkerWithHandlers: <Input extends {
+    readonly type: string;
+} & HasInit<Input>, Output extends {
+    readonly type: string;
+} & HasWorkerErrorOutput<Output>, Deps>({ init, handlers, }: {
+    readonly init: (initMessage: Extract<Input, {
+        type: "init";
+    }>, postMessage: (msg: Output) => void, withErrorReporting: WithErrorReporting) => Promise<Deps | null>;
+    readonly handlers: Omit<MessageHandlers<Input, Deps>, "init">;
+}) => Worker<Input, Output>;
 export {};
 //# sourceMappingURL=Worker.d.ts.map

package/dist/src/Worker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Worker.d.ts","sourceRoot":"","sources":["../../src/Worker.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAA2B,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAExE,yCAAyC;AACzC,MAAM,WAAW,MAAM,CAAC,KAAK,EAAE,MAAM;IACnC,qCAAqC;IACrC,QAAQ,CAAC,WAAW,EAAE,CAAC,OAAO,EAAE,KAAK,KAAK,IAAI,CAAC;IAE/C,oDAAoD;IACpD,QAAQ,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,KAAK,IAAI,CAAC;CACnE;AAED,MAAM,WAAW,oBAAoB,CAAC,MAAM;IAC1C,QAAQ,CAAC,WAAW,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CACjD;AAED;;;GAGG;AACH,eAAO,MAAM,uBAAuB,GAClC,KAAK,SAAS;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,KAAK,CAAC,EACxD,MAAM,SAAS;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,oBAAoB,CAAC,MAAM,CAAC,EACvE,IAAI,EACJ,sBAGC;IACD,QAAQ,CAAC,IAAI,EAAE,CACb,WAAW,EAAE,OAAO,CAAC,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,EAC7C,WAAW,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,EAClC,WAAW,EAAE,CAAC,CAAC,SAAS,KAAK,CAAC,GAAG,CAAC,EAChC,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,KAAK,IAAI,KAC1B,CAAC,GAAG,IAAI,EAAE,CAAC,KAAK,IAAI,KACtB,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC;IAC1B,QAAQ,CAAC,SAAS,EAAE,CAClB,IAAI,EAAE,IAAI,KACP,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,KAAK,IAAI,CAAC;CAC1D,KAAG,MAAM,CAAC,KAAK,EAAE,MAAM,CAkEvB,CAAC;AAEF,KAAK,OAAO,CAAC,KAAK,IAChB,OAAO,CAAC,KAAK,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,SAAS,KAAK,GAC1C,CAAC,oDAAoD,CAAC,GACtD,OAAO,CAAC;AAEd,KAAK,oBAAoB,CAAC,CAAC,IACzB,OAAO,CAAC,CAAC,EAAE;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,CAAC,SAAS,MAAM,CAAC,GAC3C,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,GACjB;IACE,yEAAyE;CAC1E,GACD,CAAC,SAAS;IAAE,KAAK,EAAE,MAAM,GAAG,CAAA;CAAE,GAC5B,iBAAiB,SAAS,GAAG,GAC3B,OAAO,GACP,CAAC,qDAAqD,CAAC,GACzD,CAAC,4CAA4C,CAAC,GAClD,KAAK,CAAC"}
+{"version":3,"file":"Worker.d.ts","sourceRoot":"","sources":["../../src/Worker.ts"],"names":[],"mappings":"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"}

package/dist/src/Worker.js

@@ -24,7 +24,11 @@ export const createInitializedWorker = ({ init, onMessage, }) => {
             error: createTransferableError(error),
         });
     };
-    const safeHandler = (handler) => (...args) => {
+    /**
+     * Wraps function to catch errors and send them to the main thread instead of
+     * crashing the worker.
+     */
+    const withErrorReporting = (handler) => (...args) => {
         try {
             handler(...args);
         }
@@ -39,20 +43,20 @@ export const createInitializedWorker = ({ init, onMessage, }) => {
                     pendingMessages.push(message);
                 }
                 else {
-                    safeHandler(onMessage(deps))(message);
+                    withErrorReporting(onMessage(deps))(message);
                 }
                 return;
             }
             if (initializing)
                 return;
             initializing = true;
-            init(message, postMessage, safeHandler)
+            init(message, postMessage, withErrorReporting)
                 .then((_deps) => {
                 if (_deps == null)
                     return;
                 deps = _deps;
                 for (const message of pendingMessages) {
-                    safeHandler(onMessage(deps))(message);
+                    withErrorReporting(onMessage(deps))(message);
                 }
                 pendingMessages.length = 0;
             })
@@ -64,3 +68,17 @@ export const createInitializedWorker = ({ init, onMessage, }) => {
     };
     return worker;
 };
+/**
+ * Creates a {@link Worker} with type-safe message handlers for each message
+ * type. This provides better type safety and organization compared to a single
+ * onMessage handler.
+ */
+export const createInitializedWorkerWithHandlers = ({ init, handlers, }) => createInitializedWorker({
+    init,
+    onMessage: (deps) => (message) => {
+        const messageType = message.type;
+        const handler = handlers[messageType];
+        // TypeScript knows handler exists because handlers covers all non-init message types
+        handler(deps)(message);
+    },
+});

package/dist/src/index.d.ts

@@ -3,7 +3,7 @@ export * from "./Assert.js";
 export * from "./BigInt.js";
 export * from "./Brand.js";
 export * from "./Buffer.js";
-export * from "./Callbacks.js";
+export * from "./CallbackRegistry.js";
 export * from "./Console.js";
 export * from "./Crypto.js";
 export * from "./Eq.js";
@@ -11,17 +11,16 @@ export * from "./Error.js";
 export * from "./Evolu/Public.js";
 export * from "./Function.js";
 export * from "./ManyToManyMap.js";
-export * from "./NanoId.js";
 export * from "./Number.js";
 export * from "./Object.js";
 export * from "./Order.js";
-export * from "./Promise.js";
 export * from "./Random.js";
 export * from "./Ref.js";
 export * from "./Result.js";
 export * from "./Sqlite.js";
 export * from "./Store.js";
 export * from "./String.js";
+export * from "./Task.js";
 export * from "./Time.js";
 export * from "./Type.js";
 export * from "./Types.js";

package/dist/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,cAAc,YAAY,CAAC;AAC3B,cAAc,mBAAmB,CAAC;AAClC,cAAc,eAAe,CAAC;AAC9B,cAAc,oBAAoB,CAAC;AACnC,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,uBAAuB,CAAC;AACtC,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,cAAc,YAAY,CAAC;AAC3B,cAAc,mBAAmB,CAAC;AAClC,cAAc,eAAe,CAAC;AAC9B,cAAc,oBAAoB,CAAC;AACnC,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC"}

package/dist/src/index.js

@@ -3,7 +3,7 @@ export * from "./Assert.js";
 export * from "./BigInt.js";
 export * from "./Brand.js";
 export * from "./Buffer.js";
-export * from "./Callbacks.js";
+export * from "./CallbackRegistry.js";
 export * from "./Console.js";
 export * from "./Crypto.js";
 export * from "./Eq.js";
@@ -11,17 +11,16 @@ export * from "./Error.js";
 export * from "./Evolu/Public.js";
 export * from "./Function.js";
 export * from "./ManyToManyMap.js";
-export * from "./NanoId.js";
 export * from "./Number.js";
 export * from "./Object.js";
 export * from "./Order.js";
-export * from "./Promise.js";
 export * from "./Random.js";
 export * from "./Ref.js";
 export * from "./Result.js";
 export * from "./Sqlite.js";
 export * from "./Store.js";
 export * from "./String.js";
+export * from "./Task.js";
 export * from "./Time.js";
 export * from "./Type.js";
 export * from "./Types.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evolu/common",
-  "version": "6.0.1-preview.19",
+  "version": "6.0.1-preview.20",
   "description": "TypeScript library and local-first framework",
   "keywords": [
     "evolu",
@@ -42,12 +42,11 @@
     "README.md"
   ],
   "dependencies": {
-    "@noble/ciphers": "^1.3.0",
-    "@noble/hashes": "^1.8.0",
-    "@scure/bip39": "^1.6.0",
+    "@noble/ciphers": "^2.0.0",
+    "@noble/hashes": "^2.0.0",
+    "@scure/bip39": "^2.0.0",
     "kysely": "^0.28.4",
     "msgpackr": "^1.11.5",
-    "nanoid": "^3.3.11",
     "random": "^5.4.1"
   },
   "devDependencies": {
@@ -55,9 +54,10 @@
     "@types/better-sqlite3": "^7.6.13",
     "@types/ws": "^8.18.1",
     "better-sqlite3": "^12.1.1",
-    "shx": "^0.3.4",
+    "fast-check": "^4.2.0",
+    "shx": "^0.4.0",
     "typescript": "^5.9.2",
-    "vitest": "^3.2.3",
+    "vitest": "^4.0.4",
     "ws": "^8.18.2",
     "@evolu/tsconfig": "0.0.2"
   },

package/src/Assert.ts

@@ -110,10 +110,8 @@ export const assertNonEmptyReadonlyArray: <T>(
  * ```
  */
 export function assertNoErrorInCatch(context: string, error: unknown): never {
-  throw Object.assign(
-    new Error(
-      `Error in ${context}: an unexpected error reached a catch block and requires a fix`,
-    ),
+  throw new Error(
+    `Error in ${context}: an unexpected error reached a catch block and requires a fix`,
     { cause: error },
   );
 }

package/src/Buffer.ts

@@ -6,7 +6,7 @@ export {
   concatBytes,
   hexToBytes,
   utf8ToBytes,
-} from "@noble/ciphers/utils";
+} from "@noble/ciphers/utils.js";
 
 /**
  * Custom error for {@link Buffer}-related failures like premature end of data.

package/src/CallbackRegistry.ts

@@ -0,0 +1,84 @@
+import { Brand } from "./Brand.js";
+import { RandomBytesDep } from "./Crypto.js";
+import { Result } from "./Result.js";
+import { createId, Id } from "./Type.js";
+
+/**
+ * A registry for one-time callback functions.
+ *
+ * Stores callbacks with unique IDs and executes them once with an optional
+ * argument. Executed callbacks are automatically removed from the registry.
+ *
+ * This is useful for correlating asynchronous operations across boundaries
+ * where callback functions cannot be passed directly (e.g., web workers).
+ *
+ * The `execute` method intentionally does not use try-catch or {@link Result}
+ * because it's the callback's responsibility to handle its own errors. The
+ * registry is just a correlation mechanism and should not interfere with error
+ * handling or debugging by masking the original error location.
+ *
+ * ### Example
+ *
+ * ```ts
+ * // No-argument callbacks
+ * const registry = createCallbackRegistry(deps);
+ * const id = registry.register(() => console.log("called"));
+ * registry.execute(id);
+ *
+ * // With argument callbacks
+ * const stringRegistry = createCallbackRegistry<string>(deps);
+ * const id = stringRegistry.register((value) => {
+ *   console.log(value);
+ * });
+ * stringRegistry.execute(id, "hello");
+ *
+ * // Promise.withResolvers pattern
+ * const promiseRegistry = createCallbackRegistry<string>(deps);
+ * const { promise, resolve } = Promise.withResolvers<string>();
+ * const id = promiseRegistry.register(resolve);
+ * promiseRegistry.execute(id, "resolved value");
+ * await promise; // "resolved value"
+ * ```
+ *
+ * @template T - The type of argument passed to callbacks (defaults to undefined
+ *   for no-argument callbacks)
+ */
+export interface CallbackRegistry<T = undefined> {
+  /** Registers a callback function and returns a unique ID. */
+  readonly register: (callback: (arg: T) => void) => CallbackId;
+
+  /** Executes and removes a callback associated with the given ID. */
+  readonly execute: T extends undefined
+    ? (id: CallbackId) => undefined
+    : (id: CallbackId, arg: T) => undefined;
+}
+
+export type CallbackId = Id & Brand<"Callback">;
+
+/** Creates a new {@link CallbackRegistry} for one-time callback functions. */
+export const createCallbackRegistry = <T = undefined>(
+  deps: RandomBytesDep,
+): CallbackRegistry<T> => {
+  const callbackMap = new Map<CallbackId, (arg: T) => void>();
+
+  return {
+    register: (callback) => {
+      const id = createId<"Callback">(deps);
+      callbackMap.set(id, callback);
+      return id;
+    },
+
+    execute: (id: CallbackId, ...args: T extends undefined ? [] : [T]) => {
+      const callback = callbackMap.get(id);
+      if (callback) {
+        callbackMap.delete(id);
+        if (args.length === 0) {
+          // Called without argument (undefined case)
+          (callback as () => void)();
+        } else {
+          callback(args[0]);
+        }
+      }
+    },
+  } as CallbackRegistry<T>;
+};

package/src/Console.ts

@@ -13,14 +13,28 @@
  * ### Example
  *
  * ```ts
- * deps.console.log("[db]", "send data message", protocolMessage);
+ * deps.console.log("[evolu]", "createEvoluInstance", { name });
  * ```
  *
  * **Tip**: In browser dev tools, you can filter logs by tag (e.g., `[db]`) to
- * quickly find relevant messages.
+ * quickly find relevant messages. In Node.js, use `grep` to filter output:
  *
- * **Warning**: If you encounter platform-specific issues or missing methods,
- * please contribute a PR with details about the environment and behavior.
+ * ```bash
+ * node app.js | grep "\[relay\]"         # Show only relay logs
+ * node app.js | grep -E "\[db\]|\[sql\]" # Show db and sql logs
+ * node app.js | grep -v "\[debug\]"      # Hide debug logs
+ * ```
+ *
+ * Or add to package.json scripts:
+ *
+ * ```json
+ * {
+ *   "scripts": {
+ *     "dev:relay": "node app.js | grep \"\\[relay\\]\"",
+ *     "dev:db": "node app.js | grep -E \"\\[db\\]|\\[sql\\]\""
+ *   }
+ * }
+ * ```
  *
  * @module
  */
@@ -51,6 +65,9 @@ export interface Console {
   /** Starts a timer with an optional label */
   time: (label?: string) => void;
 
+  /** Logs the elapsed time for a timer without ending it */
+  timeLog: (label?: string, ...data: Array<any>) => void;
+
   /** Ends a timer and logs the elapsed time */
   timeEnd: (label?: string) => void;
 
@@ -69,9 +86,6 @@ export interface Console {
   /** Writes a message if the value is falsy, otherwise does nothing */
   assert: (value: any, message?: string, ...optionalParams: Array<any>) => void;
 
-  /** Logs the elapsed time for a timer without ending it */
-  timeLog: (label?: string, ...data: Array<any>) => void;
-
   /** Prints a stack trace with an optional message */
   trace: (message?: any, ...optionalParams: Array<any>) => void;
 }
@@ -121,6 +135,10 @@ export const createConsole = (config: ConsoleConfig = {}): Console => {
       // eslint-disable-next-line no-console
       if (instance.enabled) console.time(label);
     },
+    timeLog: (label, ...data) => {
+      // eslint-disable-next-line no-console, @typescript-eslint/no-unsafe-argument
+      if (instance.enabled) console.timeLog(label, ...data);
+    },
     timeEnd: (label) => {
       // eslint-disable-next-line no-console
       if (instance.enabled) console.timeEnd(label);
@@ -145,10 +163,6 @@ export const createConsole = (config: ConsoleConfig = {}): Console => {
       // eslint-disable-next-line no-console, @typescript-eslint/no-unsafe-argument
       if (instance.enabled) console.assert(value, message, ...optionalParams);
     },
-    timeLog: (label, ...data) => {
-      // eslint-disable-next-line no-console, @typescript-eslint/no-unsafe-argument
-      if (instance.enabled) console.timeLog(label, ...data);
-    },
     trace: (message, ...optionalParams) => {
       // eslint-disable-next-line no-console, @typescript-eslint/no-unsafe-argument
       if (instance.enabled) console.trace(message, ...optionalParams);
@@ -157,3 +171,69 @@ export const createConsole = (config: ConsoleConfig = {}): Console => {
 
   return instance;
 };
+
+export interface ConsoleWithTimeConfig extends ConsoleConfig {
+  /**
+   * Type of timestamp to prepend to log messages.
+   *
+   * - 'absolute': Shows actual time (e.g., "14:32:15.234")
+   * - 'relative': Shows time since console creation (e.g., "+1.234s")
+   */
+  readonly timestampType: "absolute" | "relative";
+}
+
+/** Creates a console instance with timestamp prefixes. */
+export const createConsoleWithTime = (
+  config: ConsoleWithTimeConfig = { timestampType: "relative" },
+): Console => {
+  const console = createConsole(config);
+  const startTime = performance.now();
+
+  const getTimestamp = (): string => {
+    if (config.timestampType === "relative") {
+      const elapsed = (performance.now() - startTime) / 1000;
+
+      // Format for better readability at different time scales
+      if (elapsed < 60) {
+        // Under 1 minute: show seconds with millisecond precision
+        return `+${elapsed.toFixed(3)}s`;
+      } else if (elapsed < 3600) {
+        // 1 minute to 1 hour: show minutes and seconds with millisecond precision
+        const minutes = Math.floor(elapsed / 60);
+        const seconds = (elapsed % 60).toFixed(3);
+        return `+${minutes}m${seconds}s`;
+      } else {
+        // Over 1 hour: show hours, minutes, and seconds with millisecond precision
+        const hours = Math.floor(elapsed / 3600);
+        const minutes = Math.floor((elapsed % 3600) / 60);
+        const seconds = ((elapsed % 3600) % 60).toFixed(3);
+        return `+${hours}h${minutes}m${seconds}s`;
+      }
+    } else {
+      // Absolute time - format as HH:MM:SS.mmm
+      const now = new Date();
+      const hours = now.getHours().toString().padStart(2, "0");
+      const minutes = now.getMinutes().toString().padStart(2, "0");
+      const seconds = now.getSeconds().toString().padStart(2, "0");
+      const milliseconds = now.getMilliseconds().toString().padStart(3, "0");
+      return `${hours}:${minutes}:${seconds}.${milliseconds}`;
+    }
+  };
+
+  const withTimestamp =
+    (fn: (...args: Array<any>) => void) =>
+    (...args: Array<any>) => {
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+      fn(`[${getTimestamp()}]`, ...args);
+    };
+
+  // Override methods that should have timestamps
+  console.log = withTimestamp(console.log);
+  console.info = withTimestamp(console.info);
+  console.warn = withTimestamp(console.warn);
+  console.error = withTimestamp(console.error);
+  console.debug = withTimestamp(console.debug);
+  console.trace = withTimestamp(console.trace);
+
+  return console;
+};