@livestore/utils 0.4.0-dev.21 → 0.4.0-dev.23

package/src/browser/Opfs/debug-utils.ts

@@ -6,6 +6,8 @@
 
 import { Effect, Stream } from 'effect'
 import prettyBytes from 'pretty-bytes'
+
+import type * as WebError from '../WebError.ts'
 import { Opfs } from './Opfs.ts'
 import { getDirectoryHandleByPath, getMetadata, remove } from './utils.ts'
 
@@ -33,10 +35,10 @@ const ROOT_NAME = '/'
 const buildTree = Effect.fn('@livestore/utils:Opfs.buildTree')(function* () {
   const rootHandle = yield* Opfs.getRootDirectoryHandle
 
-  const collectDirectory: (
+  const collectDirectory = (
     handle: FileSystemDirectoryHandle,
     pathSegments: ReadonlyArray<string>,
-  ) => Effect.Effect<OpfsTreeNode, unknown, Opfs> = (handle, pathSegments) =>
+  ): Effect.Effect<OpfsTreeNode, WebError.WebError, Opfs> =>
     Effect.gen(function* () {
       const handlesStream = yield* Opfs.values(handle)
       const handles = yield* handlesStream.pipe(
@@ -100,17 +102,17 @@ const formatLabel = ({ name, kind, size, lastModified }: OpfsEntryMetadata) => {
   return label
 }
 
-const logAsciiTree = (node: OpfsTreeNode): Effect.Effect<void, never, never> =>
+const logAsciiTree = (node: OpfsTreeNode): Effect.Effect<void> =>
   logAsciiNode(node, { prefix: '', isLast: true, isRoot: true })
 
 const logAsciiNode: (
   node: OpfsTreeNode,
   options: { readonly prefix: string; readonly isLast: boolean; readonly isRoot?: boolean },
-) => Effect.Effect<void, never, never> = (node, options) =>
+) => Effect.Effect<void> = (node, options) =>
   Effect.gen(function* () {
     const label = formatLabel(node.metadata)
-    const branch = options.isRoot ? '' : `${options.prefix}${options.isLast ? '└── ' : '├── '}`
-    const nextPrefix = options.isRoot ? '' : `${options.prefix}${options.isLast ? '    ' : '│   '}`
+    const branch = options.isRoot === true ? '' : `${options.prefix}${options.isLast === true ? '└── ' : '├── '}`
+    const nextPrefix = options.isRoot === true ? '' : `${options.prefix}${options.isLast === true ? '    ' : '│   '}`
 
     console.log(`${branch}${label}`)
 

package/src/browser/Opfs/utils.ts

@@ -1,4 +1,5 @@
 import { Effect, Stream } from 'effect'
+
 import { Opfs, OpfsError } from './Opfs.ts'
 
 /**
@@ -30,7 +31,7 @@ const parsePathSegments = (path: string) =>
     }
 
     for (const segment of segments) {
-      if (DISALLOWED_SEGMENTS.has(segment)) {
+      if (DISALLOWED_SEGMENTS.has(segment) === true) {
         return yield* new OpfsError({
           message: `Invalid OPFS path '${path}': segment '${segment}' is not supported`,
         })
@@ -92,7 +93,7 @@ const ensureDirectoryPath = (segments: ReadonlyArray<string>, options: { readonl
       currentDirHandle = yield* Opfs.getDirectoryHandle(
         currentDirHandle,
         segment,
-        shouldCreate ? { create: true } : undefined,
+        shouldCreate === true ? { create: true } : undefined,
       )
     }
 
@@ -110,7 +111,7 @@ export const getDirectoryHandleByPath = Effect.fn('@livestore/utils:Opfs.getDire
   path: string,
   options?: FileSystemGetDirectoryOptions,
 ) {
-  if (isRootPath(path)) return yield* Opfs.getRootDirectoryHandle
+  if (isRootPath(path) === true) return yield* Opfs.getRootDirectoryHandle
 
   const pathSegments = yield* parsePathSegments(path)
   return yield* traverseDirectoryPath(pathSegments, options)
@@ -128,7 +129,7 @@ export const remove = Effect.fn('@livestore/utils:Opfs.remove')(function* (
 ) {
   const recursive = options?.recursive ?? false
 
-  if (isRootPath(path)) {
+  if (isRootPath(path) === true) {
     const rootHandle = yield* Opfs.getRootDirectoryHandle
     const handlesStream = yield* Opfs.values(rootHandle)
     yield* handlesStream.pipe(
@@ -151,13 +152,13 @@ export const remove = Effect.fn('@livestore/utils:Opfs.remove')(function* (
  * @returns `true` if the path resolves to a file or directory, otherwise `false`.
  */
 export const exists = Effect.fn('@livestore/utils:Opfs.exists')(function* (path: string) {
-  if (isRootPath(path)) return true
+  if (isRootPath(path) === true) return true
 
   const pathSegments = yield* parsePathSegments(path)
   const { parentSegments, leafSegment: targetName } = splitPathSegments(pathSegments)
 
   const parentDirHandle = yield* traverseDirectoryPath(parentSegments, { create: false }).pipe(
-    Effect.catchTag('@livestore/utils/Web/NotFoundError', () => Effect.succeed(undefined)),
+    Effect.catchTag('NotFoundError', () => Effect.succeed(undefined)),
   )
 
   if (parentDirHandle === undefined) return false
@@ -165,7 +166,7 @@ export const exists = Effect.fn('@livestore/utils:Opfs.exists')(function* (path:
   return yield* Opfs.getFileHandle(parentDirHandle, targetName).pipe(
     Effect.orElse(() => Opfs.getDirectoryHandle(parentDirHandle, targetName, { create: false })),
     Effect.as(true),
-    Effect.catchTag('@livestore/utils/Web/NotFoundError', () => Effect.succeed(false)),
+    Effect.catchTag('NotFoundError', () => Effect.succeed(false)),
   )
 })
 
@@ -181,7 +182,7 @@ export const makeDirectory = Effect.fn('@livestore/utils:Opfs.makeDirectory')(fu
 ) {
   const recursive = options?.recursive ?? false
 
-  if (isRootPath(path)) return
+  if (isRootPath(path) === true) return
 
   const pathSegments = yield* parsePathSegments(path)
 
@@ -215,7 +216,7 @@ export const getMetadata = Effect.fn('@livestore/utils:Opfs.getMetadata')(functi
  * - Only available in Safari 26 or higher (as of Dec 2025, not yet widely available).
  */
 export const writeFile = Effect.fn('@livestore/utils:Opfs.writeFile')(function* (path: string, data: Uint8Array) {
-  if (isRootPath(path)) {
+  if (isRootPath(path) === true) {
     return yield* new OpfsError({
       message: `Invalid OPFS path '${path}': cannot write file directly to the OPFS root`,
     })
@@ -252,7 +253,7 @@ export const syncWriteFile = Effect.fn('@livestore/utils:Opfs.syncWriteFile')(fu
   path: string,
   data: Uint8Array,
 ) {
-  if (isRootPath(path)) {
+  if (isRootPath(path) === true) {
     return yield* new OpfsError({
       message: `Invalid OPFS path '${path}': cannot write file directly to the OPFS root`,
     })

package/src/browser/QuotaExceededError.ts

@@ -55,5 +55,3 @@ declare global {
       }
     | undefined
 }
-
-export {}

package/src/browser/WebChannelBrowser.ts

@@ -66,7 +66,7 @@ export const windowChannel = <MsgListen, MsgSend, MsgListenEncoded, MsgSendEncod
 }: {
   listenWindow: Window
   sendWindow: Window
-  targetOrigin?: string
+  targetOrigin?: string | undefined
   ids: { own: string; other: string }
   schema: InputSchema<MsgListen, MsgSend, MsgListenEncoded, MsgSendEncoded>
 }): Effect.Effect<WebChannel<MsgListen, MsgSend>, never, Scope.Scope> =>

package/src/browser/WebError.ts

@@ -4,12 +4,7 @@ import { Either, ParseResult, Predicate, Schema } from 'effect'
 /**
  * Unique identifier for web errors.
  */
-export const TypeId = '@livestore/utils/WebError'
-
-/**
- * Type-level representation of the web error identifier.
- */
-export type TypeId = typeof TypeId
+const TypeId = '~@livestore/utils/WebError' as const
 
 /**
  * Type guard to check if a value is a web error.
@@ -48,10 +43,12 @@ export const isWebError = (u: unknown): u is WebError => Predicate.hasProperty(u
  * @see {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Evalerror | MDN Reference}
  * @see {@link https://webidl.spec.whatwg.org/#exceptiondef-evalerror | Specification}
  */
-export class EvalError extends Schema.TaggedError<EvalError>()('@livestore/utils/Web/EvalError', {
+export class EvalError extends Schema.TaggedError<EvalError>(
+  `${TypeId}/EvalError`,
+)('EvalError', {
   cause: Schema.instanceOf(globalThis.EvalError),
 }) {
-  readonly [TypeId]: TypeId = TypeId
+  readonly [TypeId] = TypeId
 }
 
 /**
@@ -62,10 +59,12 @@ export class EvalError extends Schema.TaggedError<EvalError>()('@livestore/utils
  * @see {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Rangeerror | MDN Reference}
  * @see {@link https://webidl.spec.whatwg.org/#exceptiondef-rangeerror | Specification}
  */
-export class RangeError extends Schema.TaggedError<RangeError>()('@livestore/utils/Web/RangeError', {
+export class RangeError extends Schema.TaggedError<RangeError>(
+  `${TypeId}/RangeError`,
+)('RangeError', {
   cause: Schema.instanceOf(globalThis.RangeError),
 }) {
-  readonly [TypeId]: TypeId = TypeId
+  readonly [TypeId] = TypeId
 }
 
 /**
@@ -76,10 +75,12 @@ export class RangeError extends Schema.TaggedError<RangeError>()('@livestore/uti
  * @see {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Referenceerror | MDN Reference}
  * @see {@link https://webidl.spec.whatwg.org/#exceptiondef-referenceerror | Specification}
  */
-export class ReferenceError extends Schema.TaggedError<ReferenceError>()('@livestore/utils/Web/ReferenceError', {
+export class ReferenceError extends Schema.TaggedError<ReferenceError>(
+  `${TypeId}/ReferenceError`,
+)('ReferenceError', {
   cause: Schema.instanceOf(globalThis.ReferenceError),
 }) {
-  readonly [TypeId]: TypeId = TypeId
+  readonly [TypeId] = TypeId
 }
 
 /**
@@ -90,10 +91,12 @@ export class ReferenceError extends Schema.TaggedError<ReferenceError>()('@lives
  * @see {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Typeerror | MDN Reference}
  * @see {@link https://webidl.spec.whatwg.org/#exceptiondef-typeerror | Specification}
  */
-export class TypeError extends Schema.TaggedError<TypeError>()('@livestore/utils/Web/TypeError', {
+export class TypeError extends Schema.TaggedError<TypeError>(
+  `${TypeId}/TypeError`,
+)('TypeError', {
   cause: Schema.instanceOf(globalThis.TypeError),
 }) {
-  readonly [TypeId]: TypeId = TypeId
+  readonly [TypeId] = TypeId
 }
 
 /**
@@ -104,10 +107,12 @@ export class TypeError extends Schema.TaggedError<TypeError>()('@livestore/utils
  * @see {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/URIerror | MDN Reference}
  * @see {@link https://webidl.spec.whatwg.org/#exceptiondef-urierror | Specification}
  */
-export class URIError extends Schema.TaggedError<URIError>()('@livestore/utils/Web/URIError', {
+export class URIError extends Schema.TaggedError<URIError>(
+  `${TypeId}/URIError`,
+)('URIError', {
   cause: Schema.instanceOf(globalThis.URIError),
 }) {
-  readonly [TypeId]: TypeId = TypeId
+  readonly [TypeId] = TypeId
 }
 
 // ============================================================================
@@ -136,20 +141,19 @@ const domExceptionWithName = (expectedName: string) =>
  * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/QuotaExceededError | MDN Reference}
  * @see {@link https://webidl.spec.whatwg.org/#quotaexceedederror | Specification}
  */
-export class QuotaExceededError extends Schema.TaggedError<QuotaExceededError>()(
-  '@livestore/utils/Web/QuotaExceededError',
-  {
-    cause: Schema.Union(
-      typeof globalThis.QuotaExceededError === 'function'
-        ? Schema.instanceOf(globalThis.QuotaExceededError)
-        : Schema.Never,
-      // Deprecated but still in use in some browsers
-      domExceptionWithName('QuotaExceededError'),
-    ),
-  },
-) {
-  readonly [TypeId]: TypeId = TypeId
-  get message(): string {
+export class QuotaExceededError extends Schema.TaggedError<QuotaExceededError>(
+  `${TypeId}/QuotaExceededError`,
+)('QuotaExceededError', {
+  cause: Schema.Union(
+    typeof globalThis.QuotaExceededError === 'function'
+      ? Schema.instanceOf(globalThis.QuotaExceededError)
+      : Schema.Never,
+    // Deprecated but still in use in some browsers
+    domExceptionWithName('QuotaExceededError'),
+  ),
+}) {
+  readonly [TypeId] = TypeId
+  override get message(): string {
     return this.cause.message
   }
 }
@@ -169,14 +173,13 @@ export class QuotaExceededError extends Schema.TaggedError<QuotaExceededError>()
  * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/DOMException#nomodificationallowederror | MDN Reference}
  * @see {@link https://webidl.spec.whatwg.org/#nomodificationallowederror | Specification}
  */
-export class NoModificationAllowedError extends Schema.TaggedError<NoModificationAllowedError>()(
-  '@livestore/utils/Web/NoModificationAllowedError',
-  {
-    cause: domExceptionWithName('NoModificationAllowedError'),
-  },
-) {
-  readonly [TypeId]: TypeId = TypeId
-  get message(): string {
+export class NoModificationAllowedError extends Schema.TaggedError<NoModificationAllowedError>(
+  `${TypeId}/NoModificationAllowedError`,
+)('NoModificationAllowedError', {
+  cause: domExceptionWithName('NoModificationAllowedError'),
+}) {
+  readonly [TypeId] = TypeId
+  override get message(): string {
     return this.cause.message
   }
 }
@@ -189,11 +192,13 @@ export class NoModificationAllowedError extends Schema.TaggedError<NoModificatio
  * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/DOMException#notfounderror | MDN Reference}
  * @see {@link https://webidl.spec.whatwg.org/#notfounderror | Specification}
  */
-export class NotFoundError extends Schema.TaggedError<NotFoundError>()('@livestore/utils/Web/NotFoundError', {
+export class NotFoundError extends Schema.TaggedError<NotFoundError>(
+  `${TypeId}/NotFoundError`,
+)('NotFoundError', {
   cause: domExceptionWithName('NotFoundError'),
 }) {
-  readonly [TypeId]: TypeId = TypeId
-  get message(): string {
+  readonly [TypeId] = TypeId
+  override get message(): string {
     return this.cause.message
   }
 }
@@ -206,11 +211,13 @@ export class NotFoundError extends Schema.TaggedError<NotFoundError>()('@livesto
  * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/DOMException#notallowederror | MDN Reference}
  * @see {@link https://webidl.spec.whatwg.org/#notallowederror | Specification}
  */
-export class NotAllowedError extends Schema.TaggedError<NotAllowedError>()('@livestore/utils/Web/NotAllowedError', {
+export class NotAllowedError extends Schema.TaggedError<NotAllowedError>(
+  `${TypeId}/NotAllowedError`,
+)('NotAllowedError', {
   cause: domExceptionWithName('NotAllowedError'),
 }) {
-  readonly [TypeId]: TypeId = TypeId
-  get message(): string {
+  readonly [TypeId] = TypeId
+  override get message(): string {
     return this.cause.message
   }
 }
@@ -223,14 +230,13 @@ export class NotAllowedError extends Schema.TaggedError<NotAllowedError>()('@liv
  * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/DOMException#typemismatcherror | MDN Reference}
  * @see {@link https://webidl.spec.whatwg.org/#typemismatcherror | Specification}
  */
-export class TypeMismatchError extends Schema.TaggedError<TypeMismatchError>()(
-  '@livestore/utils/Web/TypeMismatchError',
-  {
-    cause: domExceptionWithName('TypeMismatchError'),
-  },
-) {
-  readonly [TypeId]: TypeId = TypeId
-  get message(): string {
+export class TypeMismatchError extends Schema.TaggedError<TypeMismatchError>(
+  `${TypeId}/TypeMismatchError`,
+)('TypeMismatchError', {
+  cause: domExceptionWithName('TypeMismatchError'),
+}) {
+  readonly [TypeId] = TypeId
+  override get message(): string {
     return this.cause.message
   }
 }
@@ -243,14 +249,13 @@ export class TypeMismatchError extends Schema.TaggedError<TypeMismatchError>()(
  * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/DOMException#invalidstateerror | MDN Reference}
  * @see {@link https://webidl.spec.whatwg.org/#invalidstateerror | Specification}
  */
-export class InvalidStateError extends Schema.TaggedError<InvalidStateError>()(
-  '@livestore/utils/Web/InvalidStateError',
-  {
-    cause: domExceptionWithName('InvalidStateError'),
-  },
-) {
-  readonly [TypeId]: TypeId = TypeId
-  get message(): string {
+export class InvalidStateError extends Schema.TaggedError<InvalidStateError>(
+  `${TypeId}/InvalidStateError`,
+)('InvalidStateError', {
+  cause: domExceptionWithName('InvalidStateError'),
+}) {
+  readonly [TypeId] = TypeId
+  override get message(): string {
     return this.cause.message
   }
 }
@@ -263,11 +268,13 @@ export class InvalidStateError extends Schema.TaggedError<InvalidStateError>()(
  * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/DOMException#aborterror | MDN Reference}
  * @see {@link https://webidl.spec.whatwg.org/#aborterror | Specification}
  */
-export class AbortError extends Schema.TaggedError<AbortError>()('@livestore/utils/Web/AbortError', {
+export class AbortError extends Schema.TaggedError<AbortError>(
+  `${TypeId}/AbortError`,
+)('AbortError', {
   cause: domExceptionWithName('AbortError'),
 }) {
-  readonly [TypeId]: TypeId = TypeId
-  get message(): string {
+  readonly [TypeId] = TypeId
+  override get message(): string {
     return this.cause.message
   }
 }
@@ -280,14 +287,13 @@ export class AbortError extends Schema.TaggedError<AbortError>()('@livestore/uti
  * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/DOMException#invalidmodificationerror | MDN Reference}
  * @see {@link https://webidl.spec.whatwg.org/#invalidmodificationerror | Specification}
  */
-export class InvalidModificationError extends Schema.TaggedError<InvalidModificationError>()(
-  '@livestore/utils/Web/InvalidModificationError',
-  {
-    cause: domExceptionWithName('InvalidModificationError'),
-  },
-) {
-  readonly [TypeId]: TypeId = TypeId
-  get message(): string {
+export class InvalidModificationError extends Schema.TaggedError<InvalidModificationError>(
+  `${TypeId}/InvalidModificationError`,
+)('InvalidModificationError', {
+  cause: domExceptionWithName('InvalidModificationError'),
+}) {
+  readonly [TypeId] = TypeId
+  override get message(): string {
     return this.cause.message
   }
 }
@@ -300,11 +306,13 @@ export class InvalidModificationError extends Schema.TaggedError<InvalidModifica
  * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/DOMException#securityerror | MDN Reference}
  * @see {@link https://webidl.spec.whatwg.org/#securityerror | Specification}
  */
-export class SecurityError extends Schema.TaggedError<SecurityError>()('@livestore/utils/Web/SecurityError', {
+export class SecurityError extends Schema.TaggedError<SecurityError>(
+  `${TypeId}/SecurityError`,
+)('SecurityError', {
   cause: domExceptionWithName('SecurityError'),
 }) {
-  readonly [TypeId]: TypeId = TypeId
-  get message(): string {
+  readonly [TypeId] = TypeId
+  override get message(): string {
     return this.cause.message
   }
 }
@@ -317,11 +325,13 @@ export class SecurityError extends Schema.TaggedError<SecurityError>()('@livesto
  * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/DOMException#datacloneerror | MDN Reference}
  * @see {@link https://webidl.spec.whatwg.org/#datacloneerror | Specification}
  */
-export class DataCloneError extends Schema.TaggedError<DataCloneError>()('@livestore/utils/Web/DataCloneError', {
+export class DataCloneError extends Schema.TaggedError<DataCloneError>(
+  `${TypeId}/DataCloneError`,
+)('DataCloneError', {
   cause: domExceptionWithName('DataCloneError'),
 }) {
-  readonly [TypeId]: TypeId = TypeId
-  get message(): string {
+  readonly [TypeId] = TypeId
+  override get message(): string {
     return this.cause.message
   }
 }
@@ -357,7 +367,7 @@ export class DataCloneError extends Schema.TaggedError<DataCloneError>()('@lives
  * }
  *
  * const program = riskyOperation().pipe(
- *   Effect.catchTag("@livestore/utils/Web/UnknownError", (error) => {
+ *   Effect.catchTag("UnknownError", (error) => {
  *     console.log(error.message)
  *     // "JSON.parse: Could not parse string as JSON"
  *     return Effect.succeed("JSON parsing not possible")
@@ -365,18 +375,22 @@ export class DataCloneError extends Schema.TaggedError<DataCloneError>()('@lives
  * )
  * ```
  */
-export class UnknownError extends Schema.TaggedError<UnknownError>()('@livestore/utils/Web/UnknownError', {
+export class UnknownError extends Schema.TaggedError<UnknownError>(
+  `${TypeId}/UnknownError`,
+)('UnknownError', {
   module: Schema.optional(Schema.String),
   method: Schema.optional(Schema.String),
   description: Schema.optional(Schema.String),
   cause: Schema.optional(Schema.Defect),
 }) {
-  readonly [TypeId]: TypeId = TypeId
-  get message(): string {
-    const messageEnd = Predicate.isUndefined(this.description) ? 'A web error occurred' : this.description
+  readonly [TypeId] = TypeId
+  override get message(): string {
+    const messageEnd = Predicate.isUndefined(this.description) === true ? 'A web error occurred' : this.description
     const moduleMethod =
-      Predicate.isString(this.module) && Predicate.isString(this.method) ? `${this.module}.${this.method}` : undefined
-    return Predicate.isUndefined(moduleMethod) ? messageEnd : `${moduleMethod}: ${messageEnd}`
+      Predicate.isString(this.module) === true && Predicate.isString(this.method) === true
+        ? `${this.module}.${this.method}`
+        : undefined
+    return Predicate.isUndefined(moduleMethod) === true ? messageEnd : `${moduleMethod}: ${messageEnd}`
   }
 }
 
@@ -494,7 +508,7 @@ const WebErrorFromUnknown = Schema.transform(Schema.Unknown, WebError, {
   strict: true,
   decode: (value) => {
     // Already a WebError
-    if (isWebError(value)) return value
+    if (isWebError(value) === true) return value
 
     // Simple Exception Errors
     if (value instanceof globalThis.EvalError) return new EvalError({ cause: value })
@@ -593,7 +607,7 @@ export function parseWebError(value: unknown, expected: readonly WebErrorConstru
   if (expected.length === 0) return parsed
 
   const expectedTags = new Set(expected.map((ErrorConstructor) => ErrorConstructor._tag))
-  if (expectedTags.has(parsed._tag)) return parsed
+  if (expectedTags.has(parsed._tag) === true) return parsed
 
   return parsed instanceof UnknownError ? parsed : new UnknownError({ cause: parsed })
 }

package/src/browser/WebLock.ts

@@ -18,16 +18,16 @@ export const withLock =
 
       const exit = yield* Effect.tryPromise<Exit.Exit<A, E>, E | E2>({
         try: (signal) => {
-          if (signal.aborted) return 'aborted' as never
+          if (signal.aborted === true) return 'aborted' as never
 
           // NOTE The 'signal' and 'ifAvailable' options cannot be used together.
           const requestOptions = options?.ifAvailable === true ? options : { ...options, signal }
-          return navigator.locks.request(lockName, requestOptions, async (lock) => {
+          return navigator.locks.request(lockName, requestOptions, async (lock: Lock | null) => {
             if (lock === null) {
-              if (onTaken) {
-                const exit = await Runtime.runPromiseExit(runtime)(onTaken)
-                if (exit._tag === 'Failure') {
-                  return exit
+              if (onTaken !== undefined) {
+                const onTakenExit = await Runtime.runPromiseExit(runtime)(onTaken)
+                if (onTakenExit._tag === 'Failure') {
+                  return onTakenExit
                 }
               }
               return
@@ -49,10 +49,10 @@ export const withLock =
 
 export const waitForDeferredLock = (deferred: Deferred.Deferred<void>, lockName: string) =>
   Effect.async<void>((cb, signal) => {
-    if (signal.aborted) return
+    if (signal.aborted === true) return
 
     navigator.locks
-      .request(lockName, { signal, mode: 'exclusive', ifAvailable: false }, (_lock) => {
+      .request(lockName, { signal, mode: 'exclusive', ifAvailable: false }, (_lock: Lock | null) => {
         // immediately continuing calling Effect since we have the lock
         cb(Effect.void)
 
@@ -72,7 +72,7 @@ export const waitForDeferredLock = (deferred: Deferred.Deferred<void>, lockName:
 
 export const tryGetDeferredLock = (deferred: Deferred.Deferred<void>, lockName: string) =>
   Effect.async<boolean>((cb, signal) => {
-    navigator.locks.request(lockName, { mode: 'exclusive', ifAvailable: true }, (lock) => {
+    navigator.locks.request(lockName, { mode: 'exclusive', ifAvailable: true }, (lock: Lock | null) => {
       cb(Effect.succeed(lock !== null))
 
       // the code below is still running
@@ -96,7 +96,7 @@ export const tryGetDeferredLock = (deferred: Deferred.Deferred<void>, lockName:
 
 export const stealDeferredLock = (deferred: Deferred.Deferred<void>, lockName: string) =>
   Effect.async<boolean>((cb, signal) => {
-    navigator.locks.request(lockName, { mode: 'exclusive', steal: true }, (lock) => {
+    navigator.locks.request(lockName, { mode: 'exclusive', steal: true }, (lock: Lock | null) => {
       cb(Effect.succeed(lock !== null))
 
       // the code below is still running
@@ -117,9 +117,9 @@ export const stealDeferredLock = (deferred: Deferred.Deferred<void>, lockName: s
 
 export const waitForLock = (lockName: string) =>
   Effect.async<void>((cb, signal) => {
-    if (signal.aborted) return
+    if (signal.aborted === true) return
 
-    navigator.locks.request(lockName, { mode: 'shared', signal, ifAvailable: false }, (_lock) => {
+    navigator.locks.request(lockName, { mode: 'shared', signal, ifAvailable: false }, (_lock: Lock | null) => {
       cb(Effect.succeed(void 0))
     })
   })
@@ -127,10 +127,10 @@ export const waitForLock = (lockName: string) =>
 /** Attempts to get the lock if available and waits for it to be stolen */
 export const getLockAndWaitForSteal = (lockName: string) =>
   Effect.async<void>((cb, signal) => {
-    if (signal.aborted) return
+    if (signal.aborted === true) return
 
     navigator.locks
-      .request(lockName, { mode: 'exclusive', ifAvailable: true }, async (lock) => {
+      .request(lockName, { mode: 'exclusive', ifAvailable: true }, async (lock: Lock | null) => {
         if (lock === null) {
           // Lock wasn't available, resolve immediately
           cb(Effect.succeed(void 0))
@@ -148,7 +148,7 @@ export const getLockAndWaitForSteal = (lockName: string) =>
             resolve()
           })
 
-          return Promise.race([holdLock, signal.aborted ? Promise.resolve() : holdLock]).catch(() => {})
+          return Promise.race([holdLock, signal.aborted === true ? Promise.resolve() : holdLock]).catch(() => {})
         }).catch(() => {})
 
         cb(Effect.succeed(void 0))

package/src/browser/detect.ts

@@ -1,7 +1,7 @@
 export type DetectedBrowser = 'Something' | 'Opera' | 'Chrome' | 'Safari' | 'Firefox' | 'Edge' | 'Browser'
 
 export const detectBrowserName: () => DetectedBrowser = () => {
-  if (!navigator.userAgent) {
+  if (navigator.userAgent == null) {
     return 'Something'
   }
 
@@ -13,19 +13,19 @@ export const detectBrowserName: () => DetectedBrowser = () => {
 
   // TODO: also parse out version
 
-  if (isOpera) {
+  if (isOpera === true) {
     return 'Opera'
   }
-  if (isChrome) {
+  if (isChrome === true) {
     return 'Chrome'
   }
-  if (isSafari) {
+  if (isSafari === true) {
     return 'Safari'
   }
-  if (isFirefox) {
+  if (isFirefox === true) {
     return 'Firefox'
   }
-  if (isEdge) {
+  if (isEdge === true) {
     return 'Edge'
   }
   return 'Browser'

package/src/cuid/cuid.browser.ts

@@ -82,7 +82,7 @@ export const slug = () => {
 
 export const isCuid = (stringToCheck: string) => {
   if (typeof stringToCheck !== 'string') return false
-  if (stringToCheck.startsWith('c')) return true
+  if (stringToCheck.startsWith('c') === true) return true
   return false
 }
 

package/src/cuid/cuid.node.ts

@@ -90,7 +90,7 @@ export const slug = () => {
 
 export const isCuid = (stringToCheck: string) => {
   if (typeof stringToCheck !== 'string') return false
-  if (stringToCheck.startsWith('c')) return true
+  if (stringToCheck.startsWith('c') === true) return true
   return false
 }
 

package/src/effect/BucketQueue.ts

@@ -15,7 +15,7 @@ export const takeBetween = <A>(
   bucket: BucketQueue<A>,
   min: number,
   max: number,
-): STM.STM<ReadonlyArray<A>, never, never> =>
+): STM.STM<ReadonlyArray<A>> =>
   STM.gen(function* () {
     const bucketValue = yield* TRef.get(bucket)
     if (bucketValue.length < min) {