effect 2.0.0-next.45 → 2.0.0-next.46

package/src/Data.ts

@@ -1,8 +1,14 @@
 /**
  * @since 2.0.0
  */
+import type * as Channel from "./Channel"
+import * as Effect from "./Effect"
+import * as Effectable from "./Effectable"
 import type * as Equal from "./Equal"
+import type * as Inspectable from "./Inspectable"
 import * as internal from "./internal/Data"
+import { type Pipeable } from "./Pipeable"
+import type * as Sink from "./Sink"
 import type * as Types from "./Types"
 
 /**
@@ -40,8 +46,7 @@ export declare namespace Case {
  * @category constructors
  * @since 2.0.0
  */
-export const struct = <As extends Readonly<Record<string, any>>>(as: As): Data<As> =>
-  Object.assign(Object.create(internal.StructProto), as)
+export const struct: <As extends Readonly<Record<string, any>>>(as: As) => Data<As> = internal.struct
 
 /**
  * @category constructors
@@ -293,3 +298,70 @@ export const taggedEnum: {
     tag: K
   ) => Case.Constructor<Extract<A, { readonly _tag: K }>, "_tag">
 } = () => tagged as any
+
+/**
+ * @since 2.0.0
+ * @category models
+ */
+export interface YieldableError extends Case, Pipeable, Inspectable.Inspectable {
+  readonly [Effectable.EffectTypeId]: Effect.Effect.VarianceStruct<never, this, never>
+  readonly [Effectable.StreamTypeId]: Effect.Effect.VarianceStruct<never, this, never>
+  readonly [Effectable.SinkTypeId]: Sink.Sink.VarianceStruct<never, this, unknown, never, never>
+  readonly [Effectable.ChannelTypeId]: Channel.Channel.VarianceStruct<
+    never,
+    unknown,
+    unknown,
+    unknown,
+    this,
+    never,
+    never
+  >
+}
+
+const YieldableErrorProto = Object.setPrototypeOf(
+  {
+    ...Effectable.StructuralCommitPrototype,
+    toString() {
+      return `${this.name}: ${this.message}`
+    },
+    get message() {
+      return JSON.stringify(this)
+    },
+    commit() {
+      return Effect.fail(this)
+    }
+  },
+  globalThis.Error.prototype
+)
+
+/**
+ * Provides a constructor for a Case Class.
+ *
+ * @since 2.0.0
+ * @category constructors
+ */
+export const Error: new<A extends Record<string, any>>(
+  args: Types.Equals<Omit<A, keyof Equal.Equal>, {}> extends true ? void : Omit<A, keyof Equal.Equal>
+) => YieldableError & A = (function() {
+  function Base(this: any, args: any) {
+    if (args) {
+      Object.assign(this, args)
+    }
+    globalThis.Error.captureStackTrace(this, this.constructor)
+  }
+  Base.prototype = YieldableErrorProto
+  return Base as any
+})()
+
+/**
+ * @since 2.0.0
+ * @category constructors
+ */
+export const TaggedError = <Tag extends string>(tag: Tag): new<A extends Record<string, any>>(
+  args: Types.Equals<Omit<A, keyof Equal.Equal>, {}> extends true ? void : Omit<A, keyof Equal.Equal>
+) => YieldableError & { readonly _tag: Tag } & A => {
+  class Base extends Error<{}> {
+    readonly _tag = tag
+  }
+  return Base as any
+}

package/src/Number.ts

@@ -1,7 +1,7 @@
 /**
  * This module provides utility functions and type class instances for working with the `number` type in TypeScript.
  * It includes functions for basic arithmetic operations, as well as type class instances for
- * `Equivalence`, `Order`, `Semigroup`, and `Monoid`.
+ * `Equivalence` and `Order`.
  *
  * @since 2.0.0
  */

package/src/String.ts

@@ -1,7 +1,7 @@
 /**
  * This module provides utility functions and type class instances for working with the `string` type in TypeScript.
  * It includes functions for basic string manipulation, as well as type class instances for
- * `Equivalence`, `Order`, `Semigroup`, and `Monoid`.
+ * `Equivalence` and `Order`.
  *
  * @since 2.0.0
  */

package/src/index.ts

@@ -32,7 +32,7 @@ export {
 /**
  * This module provides utility functions and type class instances for working with the `bigint` type in TypeScript.
  * It includes functions for basic arithmetic operations, as well as type class instances for
- * `Equivalence`, `Order`, `Semigroup`, and `Monoid`.
+ * `Equivalence` and `Order`.
  *
  * @since 2.0.0
  */
@@ -41,7 +41,7 @@ export * as Bigint from "effect/Bigint"
 /**
  * This module provides utility functions and type class instances for working with the `boolean` type in TypeScript.
  * It includes functions for basic boolean operations, as well as type class instances for
- * `Equivalence`, `Order`, `Semigroup`, and `Monoid`.
+ * `Equivalence` and `Order`.
  *
  * @since 2.0.0
  */
@@ -253,11 +253,6 @@ export * as Equal from "effect/Equal"
  */
 export * as Equivalence from "effect/Equivalence"
 
-/**
- * @since 2.0.0
- */
-export * as Error from "effect/Error"
-
 /**
  * @since 2.0.0
  */
@@ -476,7 +471,7 @@ export * as NonEmptyIterable from "effect/NonEmptyIterable"
 /**
  * This module provides utility functions and type class instances for working with the `number` type in TypeScript.
  * It includes functions for basic arithmetic operations, as well as type class instances for
- * `Equivalence`, `Order`, `Semigroup`, and `Monoid`.
+ * `Equivalence` and `Order`.
  *
  * @since 2.0.0
  */
@@ -674,7 +669,7 @@ export * as Streamable from "effect/Streamable"
 /**
  * This module provides utility functions and type class instances for working with the `string` type in TypeScript.
  * It includes functions for basic string manipulation, as well as type class instances for
- * `Equivalence`, `Order`, `Semigroup`, and `Monoid`.
+ * `Equivalence` and `Order`.
  *
  * @since 2.0.0
  */

package/src/internal/Context.ts

@@ -5,10 +5,10 @@ import { globalValue } from "../GlobalValue"
 import * as Hash from "../Hash"
 import { NodeInspectSymbol, toJSON, toString } from "../Inspectable"
 import type * as O from "../Option"
-import * as option from "../Option"
 import { pipeArguments } from "../Pipeable"
 import type * as STM from "../STM"
 import { EffectPrototype, effectVariance } from "./Effectable"
+import * as option from "./Option"
 
 /** @internal */
 export const TagTypeId: C.TagTypeId = Symbol.for("effect/Context/Tag") as C.TagTypeId
@@ -205,7 +205,7 @@ export const getOption = dual<
   <Services, S, I>(self: C.Context<Services>, tag: C.Tag<I, S>) => O.Option<S>
 >(2, (self, tag) => {
   if (!self.unsafeMap.has(tag)) {
-    return option.none()
+    return option.none
   }
   return option.some(self.unsafeMap.get(tag)! as any)
 })

package/src/internal/Data.ts

@@ -49,3 +49,7 @@ export const Structural: new<A>(
   Structural.prototype = StructProto
   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)

package/src/internal/Differ/ChunkPatch.ts

@@ -1,6 +1,6 @@
 import * as Chunk from "../../Chunk"
-import * as Data from "../../Data"
 import type * as Differ from "../../Differ"
+import * as Data from "../Data"
 
 import * as Equal from "../../Equal"
 import * as Dual from "../../Function"

package/src/internal/Differ/ContextPatch.ts

@@ -1,10 +1,10 @@
 import * as Chunk from "../../Chunk"
 import type { Context, Tag } from "../../Context"
-import { Structural } from "../../Data"
 import type { Differ } from "../../Differ"
 import * as Equal from "../../Equal"
 import * as Dual from "../../Function"
 import { makeContext } from "../../internal/Context"
+import { Structural } from "../Data"
 
 /** @internal */
 export const ContextPatchTypeId: Differ.Context.TypeId = Symbol.for(

package/src/internal/Differ/HashMapPatch.ts

@@ -1,9 +1,9 @@
 import * as Chunk from "../../Chunk"
-import { Structural } from "../../Data"
 import type * as Differ from "../../Differ"
 import * as Equal from "../../Equal"
 import * as Dual from "../../Function"
 import * as HashMap from "../../HashMap"
+import { Structural } from "../Data"
 
 /** @internal */
 export const HashMapPatchTypeId: Differ.Differ.HashMap.TypeId = Symbol.for(

package/src/internal/Differ/HashSetPatch.ts

@@ -1,5 +1,5 @@
 import * as Chunk from "../../Chunk"
-import { Structural } from "../../Data"
+import { Structural } from "../Data"
 
 import type { Differ } from "../../Differ"
 import * as Dual from "../../Function"

package/src/internal/Differ/OrPatch.ts

@@ -1,10 +1,10 @@
 import * as Chunk from "../../Chunk"
-import { Structural } from "../../Data"
 import type { Differ } from "../../Differ"
 import type { Either } from "../../Either"
 import * as E from "../../Either"
 import * as Equal from "../../Equal"
 import * as Dual from "../../Function"
+import { Structural } from "../Data"
 
 /** @internal */
 export const OrPatchTypeId: Differ.Or.TypeId = Symbol.for("effect/DifferOrPatch") as Differ.Or.TypeId

package/src/internal/Effectable.ts

@@ -1,5 +1,4 @@
 import type * as Channel from "../Channel"
-import * as Data from "../Data"
 import type * as Effect from "../Effect"
 import type * as Effectable from "../Effectable"
 import * as Equal from "../Equal"
@@ -7,6 +6,7 @@ import * as Hash from "../Hash"
 import { pipeArguments } from "../Pipeable"
 import type * as Sink from "../Sink"
 import type * as Stream from "../Stream"
+import * as Data from "./Data"
 import * as OpCodes from "./opCodes/effect"
 
 /** @internal */

package/src/internal/cache.ts

@@ -1,7 +1,6 @@
 import type * as Cache from "../Cache"
 import type * as Clock from "../Clock"
 import * as Context from "../Context"
-import * as Data from "../Data"
 import * as Deferred from "../Deferred"
 import * as Duration from "../Duration"
 import type * as Effect from "../Effect"
@@ -17,6 +16,7 @@ import * as MutableRef from "../MutableRef"
 import * as Option from "../Option"
 import * as core from "./core"
 import * as effect from "./core-effect"
+import * as Data from "./Data"
 import { none } from "./fiberId"
 import * as fiberRuntime from "./fiberRuntime"
 

package/src/internal/cause.ts

@@ -1172,21 +1172,6 @@ export const prettyErrorMessage = (u: unknown): string => {
     return u["toString"]()
   }
   // 3)
-  if (typeof u === "object" && u !== null) {
-    if ("message" in u && typeof u["message"] === "string") {
-      const raw = JSON.parse(JSON.stringify(u))
-      const keys = new Set(Object.keys(raw))
-      keys.delete("name")
-      keys.delete("message")
-      keys.delete("_tag")
-      if (keys.size === 0) {
-        const name = "name" in u && typeof u.name === "string" ? u.name : "Error"
-        const tag = "_tag" in u && typeof u["_tag"] === "string" ? `(${u._tag})` : ``
-        return `${name}${tag}: ${u.message}`
-      }
-    }
-  }
-  // 4)
   return `Error: ${JSON.stringify(u)}`
 }
 
@@ -1197,7 +1182,7 @@ const defaultRenderError = (error: unknown): PrettyError => {
   if (typeof error === "object" && error !== null && error instanceof Error) {
     return new PrettyError(
       prettyErrorMessage(error),
-      error.stack?.split("\n").filter((_) => !_.startsWith("Error")).join("\n"),
+      error.stack?.split("\n").filter((_) => _.match(/at (.*)/)).join("\n"),
       span
     )
   }

package/src/internal/core-effect.ts

@@ -1631,7 +1631,7 @@ export const tryPromise: {
           promise
             .then((a) => resolve(core.exitSucceed(a)))
             .catch((e) =>
-              resolve(core.exitFail(
+              resolve(core.fail(
                 catcher ? catcher(e) : e
               ))
             )
@@ -1652,7 +1652,7 @@ export const tryPromise: {
         promise
           .then((a) => resolve(core.exitSucceed(a)))
           .catch((e) =>
-            resolve(core.exitFail(
+            resolve(core.fail(
               catcher ? catcher(e) : e
             ))
           )

package/src/internal/fiberRuntime.ts

@@ -1038,11 +1038,11 @@ export class FiberRuntime<E, A> implements Fiber.RuntimeFiber<E, A> {
   }
 
   ["Left"](op: core.Primitive & { _op: "Left" }) {
-    return core.exitFail(op.left)
+    return core.fail(op.left)
   }
 
   ["None"](_: core.Primitive & { _op: "None" }) {
-    return core.exitFail(internalCause.NoSuchElementException())
+    return core.fail(internalCause.NoSuchElementException())
   }
 
   ["Right"](op: core.Primitive & { _op: "Right" }) {

package/src/internal/layer.ts

@@ -1135,7 +1135,7 @@ export const withSpan = dual<
     readonly root?: boolean
     readonly context?: Context.Context<never>
   }) => Layer.Layer<R, E, A>
->(2, (self, name, options) =>
+>((args) => isLayer(args[0]), (self, name, options) =>
   unwrapScoped(
     core.map(
       fiberRuntime.useSpanScoped(name, options),

package/src/internal/request.ts

@@ -1,9 +1,9 @@
-import * as Data from "../Data"
 import type * as Effect from "../Effect"
 import { dual } from "../Function"
 import * as completedRequestMap from "../internal/completedRequestMap"
 import * as core from "../internal/core"
 import type * as Request from "../Request"
+import * as Data from "./Data"
 
 /** @internal */
 const RequestSymbolKey = "effect/Request"

package/Error/dist/effect-Error.cjs.d.mts

@@ -1,2 +0,0 @@
-export * from "../../dist/declarations/src/Error.js";
-//# sourceMappingURL=effect-Error.cjs.d.mts.map

package/Error/dist/effect-Error.cjs.d.mts.map

@@ -1 +0,0 @@
-{"version":3,"file":"effect-Error.cjs.d.mts","sourceRoot":"","sources":["../../dist/declarations/src/Error.d.ts"],"names":[],"mappings":"AAAA"}

package/Error/dist/effect-Error.cjs.d.ts

@@ -1,2 +0,0 @@
-export * from "../../dist/declarations/src/Error";
-//# sourceMappingURL=effect-Error.cjs.d.ts.map

package/Error/dist/effect-Error.cjs.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"effect-Error.cjs.d.ts","sourceRoot":"","sources":["../../dist/declarations/src/Error.d.ts"],"names":[],"mappings":"AAAA"}

package/Error/dist/effect-Error.cjs.dev.js

@@ -1,140 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var Effect_dist_effectEffect = require('../../Effect/dist/effect-Effect.cjs.dev.js');
-var Effectable_dist_effectEffectable = require('../../Effectable/dist/effect-Effectable.cjs.dev.js');
-require('../../Context/dist/effect-Context.cjs.dev.js');
-require('../../dist/Context-1f857844.cjs.dev.js');
-require('../../Equal/dist/effect-Equal.cjs.dev.js');
-require('../../Hash/dist/effect-Hash.cjs.dev.js');
-require('../../Function/dist/effect-Function.cjs.dev.js');
-require('../../GlobalValue/dist/effect-GlobalValue.cjs.dev.js');
-require('../../Utils/dist/effect-Utils.cjs.dev.js');
-require('../../Predicate/dist/effect-Predicate.cjs.dev.js');
-require('../../Inspectable/dist/effect-Inspectable.cjs.dev.js');
-require('../../Option/dist/effect-Option.cjs.dev.js');
-require('../../Equivalence/dist/effect-Equivalence.cjs.dev.js');
-require('../../dist/Either-d49a9926.cjs.dev.js');
-require('../../dist/Effectable-07258ce9.cjs.dev.js');
-require('../../Data/dist/effect-Data.cjs.dev.js');
-require('../../Pipeable/dist/effect-Pipeable.cjs.dev.js');
-require('../../Number/dist/effect-Number.cjs.dev.js');
-require('../../Order/dist/effect-Order.cjs.dev.js');
-require('../../dist/defaultServices-eb04fba1.cjs.dev.js');
-require('../../Duration/dist/effect-Duration.cjs.dev.js');
-require('../../Either/dist/effect-Either.cjs.dev.js');
-require('../../dist/core-efee9c5a.cjs.dev.js');
-require('../../Chunk/dist/effect-Chunk.cjs.dev.js');
-require('../../ReadonlyArray/dist/effect-ReadonlyArray.cjs.dev.js');
-require('../../dist/ReadonlyArray-9a1474f6.cjs.dev.js');
-require('../../ReadonlyRecord/dist/effect-ReadonlyRecord.cjs.dev.js');
-require('../../Differ/dist/effect-Differ.cjs.dev.js');
-require('../../HashMap/dist/effect-HashMap.cjs.dev.js');
-require('../../dist/HashSet-606682d1.cjs.dev.js');
-require('../../dist/Stack-ada2d201.cjs.dev.js');
-require('../../HashSet/dist/effect-HashSet.cjs.dev.js');
-require('../../dist/FiberId-9c555b91.cjs.dev.js');
-require('../../MutableRef/dist/effect-MutableRef.cjs.dev.js');
-require('../../List/dist/effect-List.cjs.dev.js');
-require('../../dist/RuntimeFlagsPatch-197be4f3.cjs.dev.js');
-require('../../dist/timeout-d380d3f8.cjs.dev.js');
-require('../../dist/configProvider-3cdbe5f3.cjs.dev.js');
-require('../../dist/config-e4643c63.cjs.dev.js');
-require('../../ConfigError/dist/effect-ConfigError.cjs.dev.js');
-require('../../dist/configError-623ccb8d.cjs.dev.js');
-require('../../dist/configSecret-baa8839f.cjs.dev.js');
-require('../../dist/pathPatch-fc0ba157.cjs.dev.js');
-require('../../dist/core-effect-f99b558c.cjs.dev.js');
-require('../../Clock/dist/effect-Clock.cjs.dev.js');
-require('../../FiberRefs/dist/effect-FiberRefs.cjs.dev.js');
-require('../../dist/fiberRefs-e08092fb.cjs.dev.js');
-require('../../dist/patch-b051ae7e.cjs.dev.js');
-require('../../dist/label-011edbe7.cjs.dev.js');
-require('../../LogLevel/dist/effect-LogLevel.cjs.dev.js');
-require('../../LogSpan/dist/effect-LogSpan.cjs.dev.js');
-require('../../dist/Ref-4009db78.cjs.dev.js');
-require('../../Tracer/dist/effect-Tracer.cjs.dev.js');
-require('../../dist/circular-95bf2834.cjs.dev.js');
-require('../../Exit/dist/effect-Exit.cjs.dev.js');
-require('../../dist/ExecutionStrategy-7d9d457b.cjs.dev.js');
-require('../../dist/fiber-4d2acba3.cjs.dev.js');
-require('../../FiberStatus/dist/effect-FiberStatus.cjs.dev.js');
-require('../../dist/fiberRuntime-6e93adff.cjs.dev.js');
-require('../../Boolean/dist/effect-Boolean.cjs.dev.js');
-require('../../Deferred/dist/effect-Deferred.cjs.dev.js');
-require('../../FiberRefsPatch/dist/effect-FiberRefsPatch.cjs.dev.js');
-require('../../dist/boundaries-60c435b8.cjs.dev.js');
-require('../../dist/key-6d9b350e.cjs.dev.js');
-require('../../dist/keyType-22634b88.cjs.dev.js');
-require('../../dist/registry-fc4cef7b.cjs.dev.js');
-require('../../dist/hook-f9a9b660.cjs.dev.js');
-require('../../dist/state-931050c4.cjs.dev.js');
-require('../../dist/pair-291b78d7.cjs.dev.js');
-require('../../MutableHashMap/dist/effect-MutableHashMap.cjs.dev.js');
-require('../../SortedSet/dist/effect-SortedSet.cjs.dev.js');
-require('../../RedBlackTree/dist/effect-RedBlackTree.cjs.dev.js');
-require('../../Scheduler/dist/effect-Scheduler.cjs.dev.js');
-require('../../dist/schedule-fd323904.cjs.dev.js');
-require('../../Random/dist/effect-Random.cjs.dev.js');
-require('../../ScheduleDecision/dist/effect-ScheduleDecision.cjs.dev.js');
-require('../../ScheduleIntervals/dist/effect-ScheduleIntervals.cjs.dev.js');
-require('../../ScheduleInterval/dist/effect-ScheduleInterval.cjs.dev.js');
-require('../../dist/layer-e3745d23.cjs.dev.js');
-require('../../Cause/dist/effect-Cause.cjs.dev.js');
-require('../../dist/runtime-9047860e.cjs.dev.js');
-require('../../Fiber/dist/effect-Fiber.cjs.dev.js');
-require('../../dist/synchronizedRef-1f28b27f.cjs.dev.js');
-require('../../Scope/dist/effect-Scope.cjs.dev.js');
-require('../../dist/circular-325c6904.cjs.dev.js');
-require('../../Layer/dist/effect-Layer.cjs.dev.js');
-require('../../dist/query-ab3d963c.cjs.dev.js');
-require('../../dist/cache-fe0cd2f2.cjs.dev.js');
-require('../../MutableQueue/dist/effect-MutableQueue.cjs.dev.js');
-require('../../MutableList/dist/effect-MutableList.cjs.dev.js');
-
-/**
- * @since 2.0.0
- */
-
-/**
- * @since 2.0.0
- * @category models
- */
-
-const YieldableErrorProto = {
-  ...Effectable_dist_effectEffectable.StructuralCommitPrototype,
-  commit() {
-    return Effect_dist_effectEffect.fail(this);
-  }
-};
-
-/**
- * Provides a constructor for a Case Class.
- *
- * @since 2.0.0
- * @category constructors
- */
-const Class = /*#__PURE__*/function () {
-  function Base(args) {
-    if (args) {
-      Object.assign(this, args);
-    }
-  }
-  Base.prototype = YieldableErrorProto;
-  return Base;
-}();
-
-/**
- * @since 2.0.0
- * @category constructors
- */
-const TaggedClass = tag => {
-  class Base extends Class {
-    _tag = tag;
-  }
-  return Base;
-};
-
-exports.Class = Class;
-exports.TaggedClass = TaggedClass;

package/Error/dist/effect-Error.cjs.js

@@ -1,7 +0,0 @@
-'use strict';
-
-if (process.env.NODE_ENV === "production") {
-  module.exports = require("./effect-Error.cjs.prod.js");
-} else {
-  module.exports = require("./effect-Error.cjs.dev.js");
-}

package/Error/dist/effect-Error.cjs.mjs

@@ -1,4 +0,0 @@
-export {
-  Class,
-  TaggedClass
-} from "./effect-Error.cjs.js";