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

package/src/node-vitest/Vitest.ts

@@ -1,5 +1,7 @@
 import * as inspector from 'node:inspector'
+
 import type * as Vitest from '@effect/vitest'
+
 import { IS_CI } from '@livestore/utils'
 import {
   type Cause,
@@ -14,6 +16,7 @@ import {
   type Scope,
 } from '@livestore/utils/effect'
 import { OtelLiveDummy } from '@livestore/utils/node'
+
 import { OtelLiveHttp } from '../node/mod.ts'
 
 export * from '@effect/vitest'
@@ -47,7 +50,7 @@ export const withTestCtx =
     {
       suffix,
       makeLayer,
-      timeout = IS_CI ? 60_000 : 10_000,
+      timeout = IS_CI === true ? 60_000 : 10_000,
       forceOtel = false,
     }: {
       suffix?: string
@@ -67,24 +70,24 @@ export const withTestCtx =
     // provided layer from the effect dependencies
     | Exclude<R, ROut | OtelTracer.OtelTracer | Scope.Scope>
   > => {
-    const spanName = `${testContext.task.suite?.name}:${testContext.task.name}${suffix ? `:${suffix}` : ''}`
+    const spanName = `${testContext.task.suite?.name}:${testContext.task.name}${suffix !== undefined ? `:${suffix}` : ''}`
     const layer = makeLayer?.(testContext) ?? Layer.empty
 
     const otelLayer =
-      DEBUGGER_ACTIVE || forceOtel
+      DEBUGGER_ACTIVE === true || forceOtel === true
         ? OtelLiveHttp({ rootSpanName: spanName, serviceName: 'vitest-runner', skipLogUrl: false })
         : OtelLiveDummy
 
     const combinedLayer = layer.pipe(Layer.provideMerge(otelLayer))
 
     return self.pipe(
-      DEBUGGER_ACTIVE
+      DEBUGGER_ACTIVE === true
         ? identity
         : Effect.logWarnIfTakesLongerThan({
             duration: Duration.toMillis(timeout) * 0.8,
             label: `${spanName} approaching timeout (timeout: ${Duration.format(timeout)})`,
           }),
-      DEBUGGER_ACTIVE ? identity : Effect.timeout(timeout),
+      DEBUGGER_ACTIVE === true ? identity : Effect.timeout(timeout),
       Effect.provide(combinedLayer),
       Effect.scoped, // We need to scope the effect manually here because otherwise the span is not closed
       Effect.annotateLogs({ suffix }),
@@ -132,7 +135,7 @@ const normalizePropOptions = <Arbs extends Vitest.Vitest.Arbitraries>(
   }>
 } => {
   // If it's a number, treat as timeout and add our default fastCheck
-  if (!Predicate.isObject(propOptions)) {
+  if (Predicate.isObject(propOptions) === false) {
     return {
       timeout: propOptions,
       fastCheck: { numRuns: 100 },
@@ -140,7 +143,7 @@ const normalizePropOptions = <Arbs extends Vitest.Vitest.Arbitraries>(
   }
 
   // If no fastCheck property, add it with our default numRuns
-  if (!propOptions.fastCheck) {
+  if (propOptions.fastCheck == null) {
     return {
       ...propOptions,
       fastCheck: { numRuns: 100 },
@@ -148,7 +151,7 @@ const normalizePropOptions = <Arbs extends Vitest.Vitest.Arbitraries>(
   }
 
   // If fastCheck exists but no numRuns, add our default
-  if (propOptions.fastCheck && !propOptions.fastCheck.numRuns) {
+  if (propOptions.fastCheck !== undefined && propOptions.fastCheck.numRuns == null) {
     return {
       ...propOptions,
       fastCheck: {
@@ -205,31 +208,32 @@ export const asProp = <Arbs extends Vitest.Vitest.Arbitraries, A, E, R>(
     name,
     arbitraries,
     (properties, ctx) => {
-      if (ctx.signal.aborted) {
+      if (ctx.signal.aborted === true) {
         return ctx.skip('Test aborted')
       }
 
       totalExecutions++
       const isInShrinkingPhase = runIndex >= numRuns
 
-      if (isInShrinkingPhase) {
+      if (isInShrinkingPhase === true) {
         shrinkAttempts++
       }
 
-      const enhancedContext: EnhancedTestContext = isInShrinkingPhase
-        ? {
-            _tag: 'shrinking',
-            numRuns,
-            runIndex: runIndex++,
-            shrinkAttempt: shrinkAttempts,
-            totalExecutions,
-          }
-        : {
-            _tag: 'initial',
-            numRuns,
-            runIndex: runIndex++,
-            totalExecutions,
-          }
+      const enhancedContext: EnhancedTestContext =
+        isInShrinkingPhase === true
+          ? {
+              _tag: 'shrinking',
+              numRuns,
+              runIndex: runIndex++,
+              shrinkAttempt: shrinkAttempts,
+              totalExecutions,
+            }
+          : {
+              _tag: 'initial',
+              numRuns,
+              runIndex: runIndex++,
+              totalExecutions,
+            }
 
       return test(properties, ctx, enhancedContext)
     },

package/src/wrangler/WranglerDevServer.test.ts

@@ -1,7 +1,9 @@
+import { expect } from 'vitest'
+
+import { Vitest } from '@livestore/utils-dev/node-vitest'
 import { Effect, FetchHttpClient, Layer } from '@livestore/utils/effect'
 import { getFreePort, PlatformNode } from '@livestore/utils/node'
-import { Vitest } from '@livestore/utils-dev/node-vitest'
-import { expect } from 'vitest'
+
 import {
   type StartWranglerDevServerArgs,
   WranglerDevServerError,

package/src/wrangler/WranglerDevServer.ts

@@ -1,4 +1,5 @@
 import * as path from 'node:path'
+
 import * as Toml from '@iarna/toml'
 import { IS_CI } from '@livestore/utils'
 import { Cause, Duration, Effect, FileSystem, HttpClient, Schedule, Schema } from '@livestore/utils/effect'
@@ -8,7 +9,7 @@ import * as wrangler from 'wrangler'
 /**
  * Error type for WranglerDevServer operations
  */
-export class WranglerDevServerError extends Schema.TaggedError<WranglerDevServerError>()('WranglerDevServerError', {
+export class WranglerDevServerError extends Schema.TaggedError<WranglerDevServerError>('~@livestore/utils-dev/WranglerDevServerError')('WranglerDevServerError', {
   cause: Schema.Unknown,
   message: Schema.String,
   port: Schema.Number,
@@ -37,7 +38,7 @@ export interface WranglerReadinessOptions {
   /** Max time for the HTTP connectivity check after wrangler reports ready. */
   connectTimeout?: Duration.DurationInput
   /** Retry policy for startup attempts (applies when startupTimeout elapses or wrangler throws). */
-  retrySchedule?: Schedule.Schedule<unknown, unknown, never>
+  retrySchedule?: Schedule.Schedule<unknown>
 }
 
 export interface StartWranglerDevServerArgs {
@@ -93,14 +94,14 @@ export class WranglerDevServerService extends Effect.Service<WranglerDevServerSe
       const resolvedMainPath = yield* Effect.try(() => path.resolve(args.cwd, parsedConfig.main))
 
       const readiness = args.readiness ?? {}
-      const startupTimeout = readiness.startupTimeout ?? Duration.seconds(IS_CI ? 30 : 10)
+      const startupTimeout = readiness.startupTimeout ?? Duration.seconds(IS_CI === true ? 30 : 10)
       const devServer = yield* Effect.promise(() =>
         wrangler.unstable_dev(resolvedMainPath, {
           config: configPath,
           port: preferredPort,
           inspectorPort: args.inspectorPort ?? 0,
           persistTo: path.join(args.cwd, '.wrangler/state'),
-          logLevel: showLogs ? 'debug' : 'none',
+          logLevel: showLogs === true ? 'debug' : 'none',
           experimental: {
             disableExperimentalWarning: true,
           },
@@ -150,12 +151,12 @@ export class WranglerDevServerService extends Effect.Service<WranglerDevServerSe
       const url = `http://${actualHost}:${actualPort}`
 
       // Use longer timeout in CI environments to account for slower HTTP readiness
-      const defaultConnectivityTimeout = Duration.seconds(IS_CI ? 30 : 5)
+      const defaultConnectivityTimeout = Duration.seconds(IS_CI === true ? 30 : 5)
       const connectivityTimeout = readiness.connectTimeout ?? defaultConnectivityTimeout
 
       yield* verifyHttpConnectivity({ url, showLogs, connectTimeout: connectivityTimeout })
 
-      if (showLogs) {
+      if (showLogs === true) {
         yield* Effect.logDebug(
           `Wrangler dev server ready and accepting connections on port ${actualPort} (preferred: ${preferredPort})`,
         )
@@ -192,7 +193,7 @@ const verifyHttpConnectivity = ({
   Effect.gen(function* () {
     const client = yield* HttpClient.HttpClient
 
-    if (showLogs) {
+    if (showLogs === true) {
       yield* Effect.logDebug(`Verifying HTTP connectivity to ${url}`)
     }
 
@@ -213,7 +214,7 @@ const verifyHttpConnectivity = ({
             }),
           ),
       ),
-      Effect.tap(() => (showLogs ? Effect.logDebug(`HTTP connectivity verified for ${url}`) : Effect.void)),
+      Effect.tap(() => (showLogs === true ? Effect.logDebug(`HTTP connectivity verified for ${url}`) : Effect.void)),
       Effect.asVoid,
       Effect.withSpan('verifyHttpConnectivity'),
     )

package/src/wrangler/fixtures/wrangler.toml

@@ -8,4 +8,4 @@ class_name = "TestDO"
 
 [[migrations]]
 tag = "v1"
-new_sqlite_classes = ["TestDO"]
+new_sqlite_classes = ["TestDO"]