effect 2.0.0-next.55 → 2.0.0-next.57

package/src/internal/data.ts

@@ -2,6 +2,7 @@ import type * as Data from "../Data.js"
 import * as Equal from "../Equal.js"
 import * as Hash from "../Hash.js"
 import type * as Types from "../Types.js"
+import { StructuralPrototype } from "./effectable.js"
 
 /** @internal */
 export const ArrayProto: Equal.Equal = Object.assign(Object.create(Array.prototype), {
@@ -17,26 +18,6 @@ export const ArrayProto: Equal.Equal = Object.assign(Object.create(Array.prototy
   }
 })
 
-/** @internal */
-export const StructProto: Equal.Equal = {
-  [Hash.symbol](this: Equal.Equal) {
-    return Hash.structure(this)
-  },
-  [Equal.symbol](this: Equal.Equal, that: Equal.Equal) {
-    const selfKeys = Object.keys(this)
-    const thatKeys = Object.keys(that as object)
-    if (selfKeys.length !== thatKeys.length) {
-      return false
-    }
-    for (const key of selfKeys) {
-      if (!(key in (that as object) && Equal.equals((this as any)[key], (that as any)[key]))) {
-        return false
-      }
-    }
-    return true
-  }
-}
-
 /** @internal */
 export const Structural: new<A>(
   args: Types.Equals<Omit<A, keyof Equal.Equal>, {}> extends true ? void
@@ -47,10 +28,10 @@ export const Structural: new<A>(
       Object.assign(this, args)
     }
   }
-  Structural.prototype = StructProto
+  Structural.prototype = StructuralPrototype
   return Structural as any
 })()
 
 /** @internal */
 export const struct = <As extends Readonly<Record<string, any>>>(as: As): Data.Data<As> =>
-  Object.assign(Object.create(StructProto), as)
+  Object.assign(Object.create(StructuralPrototype), as)

package/src/internal/dataSource.ts

@@ -87,7 +87,7 @@ export const batchN = dual<
   new core.RequestResolverImpl(
     (requests) => {
       return n < 1
-        ? core.die(Cause.IllegalArgumentException("RequestResolver.batchN: n must be at least 1"))
+        ? core.die(new Cause.IllegalArgumentException("RequestResolver.batchN: n must be at least 1"))
         : self.runAll(
           Array.from(Chunk.map(
             RA.reduce(

package/src/internal/deferred.ts

@@ -12,21 +12,23 @@ export const DeferredTypeId: Deferred.DeferredTypeId = Symbol.for(
 
 /** @internal */
 export const deferredVariance = {
-  _E: (_: never) => _,
-  _A: (_: never) => _
+  /* c8 ignore next */
+  _E: (_: any) => _,
+  /* c8 ignore next */
+  _A: (_: any) => _
 }
 
 /** @internal */
-export type State<E, A> = Pending<E, A> | Done<E, A>
+export type State</* in out */ E, /* in out */ A> = Pending<E, A> | Done<E, A>
 
 /** @internal */
-export interface Pending<E, A> {
+export interface Pending<in E, in A> {
   readonly _tag: "Pending"
   readonly joiners: Array<(effect: Effect.Effect<never, E, A>) => void>
 }
 
 /** @internal */
-export interface Done<E, A> {
+export interface Done<out E, out A> {
   readonly _tag: "Done"
   readonly effect: Effect.Effect<never, E, A>
 }

package/src/internal/differ/contextPatch.ts

@@ -40,7 +40,7 @@ const _empty = Object.create(EmptyProto)
 export const empty = <Input, Output>(): Differ.Context.Patch<Input, Output> => _empty
 
 /** @internal */
-export interface AndThen<Input, Output, Output2> extends Differ.Context.Patch<Input, Output2> {
+export interface AndThen<in out Input, in out Output, in out Output2> extends Differ.Context.Patch<Input, Output2> {
   readonly _tag: "AndThen"
   readonly first: Differ.Context.Patch<Input, Output>
   readonly second: Differ.Context.Patch<Output, Output2>
@@ -61,7 +61,7 @@ const makeAndThen = <Input, Output, Output2>(
 }
 
 /** @internal */
-export interface AddService<Env, T, I> extends Differ.Context.Patch<Env, Env | I> {
+export interface AddService<in out Env, in out T, in out I> extends Differ.Context.Patch<Env, Env | I> {
   readonly _tag: "AddService"
   readonly tag: Tag<T, I>
   readonly service: T
@@ -82,7 +82,7 @@ const makeAddService = <Env, I, T>(
 }
 
 /** @internal */
-export interface RemoveService<Env, T, I> extends Differ.Context.Patch<Env, Exclude<Env, I>> {
+export interface RemoveService<in out Env, in out T, in out I> extends Differ.Context.Patch<Env, Exclude<Env, I>> {
   readonly _tag: "RemoveService"
   readonly tag: Tag<T, I>
 }
@@ -100,10 +100,10 @@ const makeRemoveService = <Env, I, T>(
 }
 
 /** @internal */
-export interface UpdateService<Env, T, I> extends Differ.Context.Patch<Env | I, Env | I> {
+export interface UpdateService<in out Env, in out T, in out I> extends Differ.Context.Patch<Env | I, Env | I> {
   readonly _tag: "UpdateService"
   readonly tag: Tag<T, I>
-  readonly update: (service: T) => T
+  update(service: T): T
 }
 
 const UpdateServiceProto = Object.assign(Object.create(PatchProto), {

package/src/internal/differ/orPatch.ts

@@ -24,7 +24,9 @@ const PatchProto = {
 }
 
 /** @internal */
-export interface Empty<Value, Value2, Patch, Patch2> extends Differ.Or.Patch<Value, Value2, Patch, Patch2> {
+export interface Empty<in out Value, in out Value2, in out Patch, in out Patch2>
+  extends Differ.Or.Patch<Value, Value2, Patch, Patch2>
+{
   readonly _tag: "Empty"
 }
 
@@ -43,7 +45,9 @@ export const empty = <Value, Value2, Patch, Patch2>(): Differ.Or.Patch<
 > => _empty
 
 /** @internal */
-export interface AndThen<Value, Value2, Patch, Patch2> extends Differ.Or.Patch<Value, Value2, Patch, Patch2> {
+export interface AndThen<in out Value, in out Value2, in out Patch, Patch2>
+  extends Differ.Or.Patch<Value, Value2, Patch, Patch2>
+{
   readonly _tag: "AndThen"
   readonly first: Differ.Or.Patch<Value, Value2, Patch, Patch2>
   readonly second: Differ.Or.Patch<Value, Value2, Patch, Patch2>
@@ -70,7 +74,9 @@ export const makeAndThen = <Value, Value2, Patch, Patch2>(
 }
 
 /** @internal */
-export interface SetLeft<Value, Value2, Patch, Patch2> extends Differ.Or.Patch<Value, Value2, Patch, Patch2> {
+export interface SetLeft<in out Value, in out Value2, in out Patch, Patch2>
+  extends Differ.Or.Patch<Value, Value2, Patch, Patch2>
+{
   readonly _tag: "SetLeft"
   readonly value: Value
 }
@@ -94,7 +100,9 @@ export const makeSetLeft = <Value, Value2, Patch, Patch2>(
 }
 
 /** @internal */
-export interface SetRight<Value, Value2, Patch, Patch2> extends Differ.Or.Patch<Value, Value2, Patch, Patch2> {
+export interface SetRight<in out Value, in out Value2, in out Patch, in out Patch2>
+  extends Differ.Or.Patch<Value, Value2, Patch, Patch2>
+{
   readonly _tag: "SetRight"
   readonly value: Value2
 }
@@ -118,7 +126,9 @@ export const makeSetRight = <Value, Value2, Patch, Patch2>(
 }
 
 /** @internal */
-export interface UpdateLeft<Value, Value2, Patch, Patch2> extends Differ.Or.Patch<Value, Value2, Patch, Patch2> {
+export interface UpdateLeft<in out Value, in out Value2, in out Patch, in out Patch2>
+  extends Differ.Or.Patch<Value, Value2, Patch, Patch2>
+{
   readonly _tag: "UpdateLeft"
   readonly patch: Patch
 }
@@ -142,7 +152,9 @@ export const makeUpdateLeft = <Value, Value2, Patch, Patch2>(
 }
 
 /** @internal */
-export interface UpdateRight<Value, Value2, Patch, Patch2> extends Differ.Or.Patch<Value, Value2, Patch, Patch2> {
+export interface UpdateRight<in out Value, in out Value2, in out Patch, in out Patch2>
+  extends Differ.Or.Patch<Value, Value2, Patch, Patch2>
+{
   readonly _tag: "UpdateRight"
   readonly patch: Patch2
 }

package/src/internal/effect/circular.ts

@@ -300,7 +300,7 @@ export const fromFiberEffect = <R, E, A>(fiber: Effect.Effect<R, E, Fiber.Fiber<
 
 const memoKeySymbol = Symbol.for("effect/Effect/memoizeFunction.key")
 
-class Key<A> implements Equal.Equal {
+class Key<in out A> implements Equal.Equal {
   [memoKeySymbol] = memoKeySymbol
   constructor(readonly a: A, readonly eq?: Equivalence<A>) {}
   [Equal.symbol](that: Equal.Equal) {
@@ -534,11 +534,12 @@ export const SynchronizedTypeId: Synchronized.SynchronizedRefTypeId = Symbol.for
 
 /** @internal */
 export const synchronizedVariance = {
-  _A: (_: never) => _
+  /* c8 ignore next */
+  _A: (_: any) => _
 }
 
 /** @internal */
-class SynchronizedImpl<A> implements Synchronized.SynchronizedRef<A> {
+class SynchronizedImpl<in out A> implements Synchronized.SynchronizedRef<A> {
   readonly [SynchronizedTypeId] = synchronizedVariance
   readonly [internalRef.RefTypeId] = internalRef.refVariance
   constructor(

package/src/internal/effectable.ts

@@ -6,7 +6,6 @@ import * as Hash from "../Hash.js"
 import { pipeArguments } from "../Pipeable.js"
 import type * as Sink from "../Sink.js"
 import type * as Stream from "../Stream.js"
-import * as Data from "./data.js"
 import * as OpCodes from "./opCodes/effect.js"
 import { moduleVersion } from "./version.js"
 
@@ -24,29 +23,43 @@ export const ChannelTypeId: Channel.ChannelTypeId = Symbol.for("effect/Channel")
 
 /** @internal */
 export const effectVariance = {
+  /* c8 ignore next */
   _R: (_: never) => _,
+  /* c8 ignore next */
   _E: (_: never) => _,
+  /* c8 ignore next */
   _A: (_: never) => _,
+
   _V: moduleVersion
 }
 
-/** @internal */
-export const sinkVariance = {
+const sinkVariance = {
+  /* c8 ignore next */
   _R: (_: never) => _,
+  /* c8 ignore next */
   _E: (_: never) => _,
+  /* c8 ignore next */
   _In: (_: unknown) => _,
+  /* c8 ignore next */
   _L: (_: never) => _,
+  /* c8 ignore next */
   _Z: (_: never) => _
 }
 
-/** @internal */
-export const channelVariance = {
+const channelVariance = {
+  /* c8 ignore next */
   _Env: (_: never) => _,
+  /* c8 ignore next */
   _InErr: (_: unknown) => _,
+  /* c8 ignore next */
   _InElem: (_: unknown) => _,
+  /* c8 ignore next */
   _InDone: (_: unknown) => _,
+  /* c8 ignore next */
   _OutErr: (_: never) => _,
+  /* c8 ignore next */
   _OutElem: (_: never) => _,
+  /* c8 ignore next */
   _OutDone: (_: never) => _
 }
 
@@ -67,6 +80,26 @@ export const EffectPrototype: Effect.Effect<never, never, never> = {
   }
 }
 
+/** @internal */
+export const StructuralPrototype: Equal.Equal = {
+  [Hash.symbol](this: Equal.Equal) {
+    return Hash.structure(this)
+  },
+  [Equal.symbol](this: Equal.Equal, that: Equal.Equal) {
+    const selfKeys = Object.keys(this)
+    const thatKeys = Object.keys(that as object)
+    if (selfKeys.length !== thatKeys.length) {
+      return false
+    }
+    for (const key of selfKeys) {
+      if (!(key in (that as object) && Equal.equals((this as any)[key], (that as any)[key]))) {
+        return false
+      }
+    }
+    return true
+  }
+}
+
 /** @internal */
 export const CommitPrototype: Effect.Effect<never, never, never> = {
   ...EffectPrototype,
@@ -74,10 +107,10 @@ export const CommitPrototype: Effect.Effect<never, never, never> = {
 } as any
 
 /** @internal */
-export const StructuralCommitPrototype = {
+export const StructuralCommitPrototype: Effect.Effect<never, never, never> = {
   ...CommitPrototype,
-  ...Data.Structural.prototype
-}
+  ...StructuralPrototype
+} as any
 
 /** @internal */
 export const Base: Effectable.CommitPrimitive = (function() {

package/src/internal/either.ts

@@ -6,7 +6,7 @@ import type * as Either from "../Either.js"
 import * as Equal from "../Equal.js"
 import { dual } from "../Function.js"
 import * as Hash from "../Hash.js"
-import { NodeInspectSymbol, toJSON, toString } from "../Inspectable.js"
+import { format, NodeInspectSymbol, toJSON } from "../Inspectable.js"
 import type { Option } from "../Option.js"
 import { hasProperty } from "../Predicate.js"
 import { EffectPrototype } from "./effectable.js"
@@ -26,7 +26,7 @@ const CommonProto = {
     return this.toJSON()
   },
   toString<E, A>(this: Either.Left<E, A>) {
-    return toString(this.toJSON())
+    return format(this.toJSON())
   }
 }
 

package/src/internal/fiber.ts

@@ -27,7 +27,9 @@ export const FiberTypeId: Fiber.FiberTypeId = Symbol.for(
 
 /** @internal */
 export const fiberVariance = {
+  /* c8 ignore next */
   _E: (_: never) => _,
+  /* c8 ignore next */
   _A: (_: never) => _
 }
 

package/src/internal/fiberId.ts

@@ -4,7 +4,7 @@ import { dual, pipe } from "../Function.js"
 import { globalValue } from "../GlobalValue.js"
 import * as Hash from "../Hash.js"
 import * as HashSet from "../HashSet.js"
-import { NodeInspectSymbol, toJSON, toString } from "../Inspectable.js"
+import { format, NodeInspectSymbol, toJSON } from "../Inspectable.js"
 import * as MutableRef from "../MutableRef.js"
 import * as Option from "../Option.js"
 import { hasProperty } from "../Predicate.js"
@@ -49,7 +49,7 @@ class None implements FiberId.None {
     return isFiberId(that) && that._tag === OP_NONE
   }
   toString() {
-    return toString(this.toJSON())
+    return format(this.toJSON())
   }
   toJSON() {
     return {
@@ -85,7 +85,7 @@ class Runtime implements FiberId.Runtime {
       this.startTimeMillis === that.startTimeMillis
   }
   toString() {
-    return toString(this.toJSON())
+    return format(this.toJSON())
   }
   toJSON() {
     return {
@@ -123,7 +123,7 @@ class Composite implements FiberId.Composite {
       Equal.equals(this.right, that.right)
   }
   toString() {
-    return toString(this.toJSON())
+    return format(this.toJSON())
   }
   toJSON() {
     return {

package/src/internal/fiberMessage.ts

@@ -39,10 +39,7 @@ export interface InterruptSignal {
 /** @internal */
 export interface Stateful {
   readonly _tag: OP_STATEFUL
-  readonly onFiber: (
-    fiber: FiberRuntime.FiberRuntime<any, any>,
-    status: FiberStatus.FiberStatus
-  ) => void
+  onFiber(fiber: FiberRuntime.FiberRuntime<any, any>, status: FiberStatus.FiberStatus): void
 }
 
 /** @internal */