@evolu/common 6.0.1-preview.25 → 6.0.1-preview.27

package/src/Task.ts

@@ -216,6 +216,32 @@ const isAbortError = (error: unknown): error is AbortError =>
   error !== null &&
   (error as { type?: unknown }).type === "AbortError";
 
+// For React Native
+if (typeof AbortSignal.any !== "function") {
+  AbortSignal.any = function (signals: Array<AbortSignal>): AbortSignal {
+    const controller = new AbortController();
+
+    const onAbort = (event: Event) => {
+      controller.abort((event.target as AbortSignal).reason);
+      cleanup();
+    };
+
+    const cleanup = () => {
+      for (const s of signals) s.removeEventListener("abort", onAbort);
+    };
+
+    for (const s of signals) {
+      if (s.aborted) {
+        controller.abort(s.reason);
+        return controller.signal;
+      }
+      s.addEventListener("abort", onAbort);
+    }
+
+    return controller.signal;
+  };
+}
+
 /**
  * Combines user signal from context with an internal signal.
  *
@@ -304,6 +330,21 @@ export const toTask = <T, E>(
     ]);
   }) as Task<T, E>;
 
+// For React Native
+if (typeof AbortSignal.timeout !== "function") {
+  AbortSignal.timeout = function (ms: number): AbortSignal {
+    const controller = new AbortController();
+    const id = setTimeout(() => {
+      controller.abort();
+    }, ms);
+    // clear timeout if aborted early
+    controller.signal.addEventListener("abort", () => {
+      clearTimeout(id);
+    });
+    return controller.signal;
+  };
+}
+
 /**
  * Creates a {@link Task} that waits for the specified duration.
  *

package/src/Type.ts

@@ -182,6 +182,7 @@ import { pack } from "msgpackr";
 import type { Brand } from "./Brand.js";
 import { type RandomBytesDep } from "./Crypto.js";
 import { isPlainObject } from "./Object.js";
+import { hasNodeBuffer } from "./Platform.js";
 import { err, getOrNull, getOrThrow, ok, Result, trySync } from "./Result.js";
 import { safelyStringifyUnknownValue } from "./String.js";
 import type { Literal, Simplify, WidenLiteral } from "./Types.js";
@@ -253,7 +254,6 @@ export interface Type<
    *
    * - When you need to convert a validation result to a nullable value
    * - When the error is not important and you just want the value or nothing
-   * - APIs that expect `T | null`
    *
    * ### Example
    *
@@ -370,8 +370,6 @@ export interface Type<
   readonly ParentError: ParentError;
 
   /**
-   * Error | ParentError
-   *
    * ### Example
    *
    * ```ts
@@ -461,7 +459,7 @@ export type InferParentError<A extends AnyType> =
     : never;
 
 /**
- * Extracts all error types (Error | ParentError) from a {@link Type}.
+ * Extracts all error types from a {@link Type}.
  *
  * @category Utilities
  */
@@ -1150,7 +1148,7 @@ export const trimmed: BrandFactory<"Trimmed", string, TrimmedError> = (
 export interface TrimmedError extends TypeError<"Trimmed"> {}
 
 export const formatTrimmedError = createTypeErrorFormatter<TrimmedError>(
-  (error) => `The value ${error.value} is not trimmed.`,
+  (error) => `The value ${error.value} must be trimmed.`,
 );
 
 /**
@@ -1429,7 +1427,6 @@ export const formatBase64UrlError = createTypeErrorFormatter<Base64UrlError>(
   (error) => `The value ${error.value} is not a valid Base64Url string.`,
 );
 
-const hasNodeBuffer = typeof globalThis.Buffer !== "undefined";
 const base64UrlOptions = { alphabet: "base64url", omitPadding: true };
 
 /** Encodes a Uint8Array to a {@link Base64Url} string. */
@@ -1717,7 +1714,7 @@ export const idBytesToId = (idBytes: IdBytes): Id =>
   uint8ArrayToBase64Url(idBytes) as unknown as Id;
 
 /**
- * Positive number.
+ * Positive number (> 0).
  *
  * ### Example
  *
@@ -1740,11 +1737,11 @@ export const positive: BrandFactory<"Positive", number, PositiveError> = (
 export interface PositiveError extends TypeError<"Positive"> {}
 
 export const formatPositiveError = createTypeErrorFormatter<PositiveError>(
-  (error) => `The value ${error.value} is not positive.`,
+  (error) => `The value ${error.value} must be positive (> 0).`,
 );
 
 /**
- * Negative number.
+ * Negative number (< 0).
  *
  * ### Example
  *
@@ -1764,11 +1761,11 @@ export const negative: BrandFactory<"Negative", number, NegativeError> = (
 export interface NegativeError extends TypeError<"Negative"> {}
 
 export const formatNegativeError = createTypeErrorFormatter<NegativeError>(
-  (error) => `The value ${error.value} is not negative.`,
+  (error) => `The value ${error.value} must be negative (< 0).`,
 );
 
 /**
- * Non-positive number.
+ * Non-positive number (≤ 0).
  *
  * ### Example
  *
@@ -1797,7 +1794,7 @@ export const formatNonPositiveError =
   );
 
 /**
- * Non-negative number.
+ * Non-negative number (≥ 0).
  *
  * ### Example
  *
@@ -1862,7 +1859,7 @@ export const int: BrandFactory<"Int", number, IntError> = (parent) =>
 export interface IntError extends TypeError<"Int"> {}
 
 export const formatIntError = createTypeErrorFormatter<IntError>(
-  (error) => `The value ${error.value} is not an integer.`,
+  (error) => `The value ${error.value} must be an integer.`,
 );
 
 /**
@@ -2008,7 +2005,7 @@ export const nonNaN: BrandFactory<"NonNaN", number, NonNaNError> = (parent) =>
 export interface NonNaNError extends TypeError<"NonNaN"> {}
 
 export const formatNonNaNError = createTypeErrorFormatter<NonNaNError>(
-  (error) => `The value ${error.value} is NaN (not a number).`,
+  () => `The value must not be NaN.`,
 );
 
 /** @category Number */
@@ -2030,7 +2027,7 @@ export const finite: BrandFactory<"Finite", number, FiniteError> = (parent) =>
 export interface FiniteError extends TypeError<"Finite"> {}
 
 export const formatFiniteError = createTypeErrorFormatter<FiniteError>(
-  (error) => `The value ${error.value} is not finite.`,
+  (error) => `The value ${error.value} must be finite.`,
 );
 
 /**

package/src/Types.ts

@@ -79,7 +79,7 @@ export type NullablePartial<
 export type IntentionalNever = never;
 
 /**
- * String | number | bigint | boolean | undefined | null
+ * String, number, bigint, boolean, undefined, null
  *
  * https://www.typescriptlang.org/docs/handbook/2/everyday-types.html#literal-types
  */

package/src/WebSocket.ts

@@ -4,7 +4,6 @@
  * @module
  */
 
-import { assertNoErrorInCatch } from "./Assert.js";
 import { constVoid } from "./Function.js";
 import { err, ok, Result } from "./Result.js";
 import { retry, RetryError, RetryOptions } from "./Task.js";
@@ -192,7 +191,7 @@ export const createWebSocket: CreateWebSocket = (
    * - Is rejected when a connection is closed.
    * - Is resolved when WebSocket is disposed().
    */
-  retry(
+  void retry(
     {
       ...defaultRetryOptions,
       ...retryOptions,
@@ -222,6 +221,7 @@ export const createWebSocket: CreateWebSocket = (
             ? { type: "WebSocketConnectionError", event }
             : { type: "WebSocketConnectError", event };
           onError?.(error);
+
           // Trigger reconnect only on WebSocketConnectError.
           if (error.type === "WebSocketConnectError") {
             resolve(err(error));
@@ -237,14 +237,10 @@ export const createWebSocket: CreateWebSocket = (
           onMessage?.(event.data as string | ArrayBuffer | Blob);
         };
       }),
-  )(reconnectController)
-    .then((result) => {
-      if (result.ok || result.error.type === "AbortError") return;
-      onError?.(result.error as WebSocketError);
-    })
-    .catch((error: unknown) => {
-      assertNoErrorInCatch("WebSocket retry", error);
-    });
+  )(reconnectController).then((result) => {
+    if (result.ok || result.error.type === "AbortError") return;
+    onError?.(result.error as WebSocketError);
+  });
 
   return {
     send: (data) => {

package/src/index.ts

@@ -3,6 +3,7 @@ export * from "./Assert.js";
 export * from "./BigInt.js";
 export * from "./Brand.js";
 export * from "./Buffer.js";
+export * from "./Cache.js";
 export * from "./CallbackRegistry.js";
 export * from "./Console.js";
 export * from "./Crypto.js";
@@ -10,10 +11,12 @@ export * from "./Eq.js";
 export * from "./Error.js";
 export * from "./Evolu/Public.js";
 export * from "./Function.js";
+export * from "./Identicon.js";
 export * from "./ManyToManyMap.js";
 export * from "./Number.js";
 export * from "./Object.js";
 export * from "./Order.js";
+export * from "./Platform.js";
 export * from "./Random.js";
 export * from "./Ref.js";
 export * from "./Result.js";