effect 4.0.0-beta.56 → 4.0.0-beta.58

package/dist/unstable/sql/SqlResolver.js

@@ -118,11 +118,7 @@ export const grouped = options => {
 export const findById = options => {
   const decodeResults = Schema.decodeUnknownEffect(Schema.Array(options.Result));
   return RequestResolver.makeGrouped({
-    key(entry) {
-      const conn = entry.context.mapUnsafe.get(SqlClient.TransactionConnection.key);
-      if (!conn) return undefined;
-      return Equal.byReferenceUnsafe(conn);
-    },
+    key: transactionKey,
     resolver: Effect.fnUntraced(function* (entries) {
       const [inputs, idMap] = yield* partitionRequestsById(entries, options.Id);
       const results = yield* options.execute(inputs).pipe(Effect.provideContext(entries[0].context));
@@ -206,7 +202,9 @@ const partitionRequestsById = function* (requests, schema) {
   return [inputs, byIdMap];
 };
 function transactionKey(entry) {
-  const conn = entry.context.mapUnsafe.get(SqlClient.TransactionConnection.key);
+  const client = entry.context.mapUnsafe.get(SqlClient.SqlClient.key);
+  if (!client) return undefined;
+  const conn = entry.context.mapUnsafe.get(client.transactionService.key);
   if (!conn) return undefined;
   return Equal.byReferenceUnsafe(conn);
 }

package/dist/unstable/sql/SqlResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"SqlResolver.js","names":["Arr","Cause","Effect","Equal","Exit","Hash","MutableHashMap","Request","RequestResolver","Schema","SqlClient","ResultLengthMismatch","SqlRequestProto","Class","prototype","symbol","that","equals","payload","hash","request","arguments","length","resolver","SqlRequest","self","Object","create","ordered","options","decodeArray","decodeUnknownEffect","Array","Result","makeGrouped","key","transactionKey","fnUntraced","entries","inputs","partitionRequests","results","execute","pipe","provideContext","context","expected","actual","decodedResults","i","completeUnsafe","succeed","grouped","decodeResults","resultMap","empty","len","result","ResultGroupKey","group","get","_tag","set","value","push","entry","RequestGroupKey","constNoSuchElement","findById","conn","mapUnsafe","TransactionConnection","undefined","byReferenceUnsafe","idMap","partitionRequestsById","Id","id","ResultId","remove","isEmpty","forEach","void_","void","fail","NoSuchElementError","requests","schema","encode","encodeEffect","handle","matchCauseEager","onFailure","cause","failCause","onSuccess","byIdMap"],"sources":["../../../src/unstable/sql/SqlResolver.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"SqlResolver.js","names":["Arr","Cause","Effect","Equal","Exit","Hash","MutableHashMap","Request","RequestResolver","Schema","SqlClient","ResultLengthMismatch","SqlRequestProto","Class","prototype","symbol","that","equals","payload","hash","request","arguments","length","resolver","SqlRequest","self","Object","create","ordered","options","decodeArray","decodeUnknownEffect","Array","Result","makeGrouped","key","transactionKey","fnUntraced","entries","inputs","partitionRequests","results","execute","pipe","provideContext","context","expected","actual","decodedResults","i","completeUnsafe","succeed","grouped","decodeResults","resultMap","empty","len","result","ResultGroupKey","group","get","_tag","set","value","push","entry","RequestGroupKey","constNoSuchElement","findById","idMap","partitionRequestsById","Id","id","ResultId","remove","isEmpty","forEach","void_","void","fail","NoSuchElementError","requests","schema","encode","encodeEffect","handle","matchCauseEager","onFailure","cause","failCause","onSuccess","byIdMap","client","mapUnsafe","undefined","conn","transactionService","byReferenceUnsafe"],"sources":["../../../src/unstable/sql/SqlResolver.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "effect",
   "type": "module",
-  "version": "4.0.0-beta.56",
+  "version": "4.0.0-beta.58",
   "license": "MIT",
   "description": "The missing standard library for TypeScript, for writing production-grade software.",
   "homepage": "https://effect.website",

package/src/Effect.ts

@@ -13342,6 +13342,14 @@ export const interruptibleMask: <A, E, R>(
   ) => Effect<A, E, R>
 ) => Effect<A, E, R> = internal.interruptibleMask
 
+/**
+ * Creates an AbortSignal that is managed by the provided scope.
+ *
+ * @since 4.0.0
+ * @category Interruption
+ */
+export const abortSignal: Effect<AbortSignal, never, Scope> = internal.abortSignal
+
 // -----------------------------------------------------------------------------
 // Repetition & Recursion
 // -----------------------------------------------------------------------------

package/src/Stream.ts

@@ -17810,20 +17810,31 @@ export const mkString = <E, R>(self: Stream<string, E, R>): Effect.Effect<string
  * @category Destructors
  */
 export const mkUint8Array = <E, R>(self: Stream<Uint8Array, E, R>): Effect.Effect<Uint8Array, E, R> =>
-  Channel.runFold(
-    self.channel,
-    () => new Uint8Array(0),
-    (acc, chunk) => {
-      let chunkLength = 0
-      for (let i = 0; i < chunk.length; i++) {
-        chunkLength += chunk[i].length
+  Effect.map(
+    Channel.runFold(
+      self.channel,
+      (): {
+        bytes: number
+        readonly arrays: Array<Uint8Array>
+      } => ({
+        bytes: 0,
+        arrays: []
+      }),
+      (acc, chunk) => {
+        for (let i = 0; i < chunk.length; i++) {
+          acc.bytes += chunk[i].length
+          acc.arrays.push(chunk[i])
+        }
+        return acc
       }
-      const result = new Uint8Array(acc.length + chunkLength)
-      result.set(acc, 0)
-      let offset = acc.length
-      for (let i = 0; i < chunk.length; i++) {
-        result.set(chunk[i], offset)
-        offset += chunk[i].length
+    ),
+    ({ arrays, bytes }) => {
+      const result = new Uint8Array(bytes)
+      let offset = 0
+      for (let i = 0; i < arrays.length; i++) {
+        const array = arrays[i]
+        result.set(array, offset)
+        offset += array.length
       }
       return result
     }

package/src/internal/effect.ts

@@ -4177,6 +4177,15 @@ export const interruptibleMask = <A, E, R>(
     return f(uninterruptible)
   })
 
+/** @internal */
+export const abortSignal: Effect.Effect<AbortSignal, never, Scope.Scope> = map(
+  acquireRelease(
+    sync(() => new AbortController()),
+    (controller) => sync(() => controller.abort())
+  ),
+  (_) => _.signal
+)
+
 // ========================================================================
 // collecting & elements
 // ========================================================================

package/src/unstable/http/HttpClientResponse.ts

@@ -316,7 +316,10 @@ class WebHttpClientResponse extends Inspectable.Class implements HttpClientRespo
 
   private textBody?: Effect.Effect<string, Error.HttpClientError>
   get text(): Effect.Effect<string, Error.HttpClientError> {
-    return this.textBody ??= Effect.tryPromise({
+    if (this.textBody) {
+      return this.textBody
+    }
+    this.textBody = Effect.tryPromise({
       try: () => this.source.text(),
       catch: (cause) =>
         new Error.HttpClientError({
@@ -327,6 +330,8 @@ class WebHttpClientResponse extends Inspectable.Class implements HttpClientRespo
           })
         })
     }).pipe(Effect.cached, Effect.runSync)
+    this.arrayBufferBody = Effect.map(this.textBody, (_) => new TextEncoder().encode(_).buffer)
+    return this.textBody
   }
 
   get urlParamsBody(): Effect.Effect<UrlParams.UrlParams, Error.HttpClientError> {
@@ -361,7 +366,10 @@ class WebHttpClientResponse extends Inspectable.Class implements HttpClientRespo
 
   private arrayBufferBody?: Effect.Effect<ArrayBuffer, Error.HttpClientError>
   get arrayBuffer(): Effect.Effect<ArrayBuffer, Error.HttpClientError> {
-    return this.arrayBufferBody ??= Effect.tryPromise({
+    if (this.arrayBufferBody) {
+      return this.arrayBufferBody
+    }
+    this.arrayBufferBody = Effect.tryPromise({
       try: () => this.source.arrayBuffer(),
       catch: (cause) =>
         new Error.HttpClientError({
@@ -372,6 +380,8 @@ class WebHttpClientResponse extends Inspectable.Class implements HttpClientRespo
           })
         })
     }).pipe(Effect.cached, Effect.runSync)
+    this.textBody = Effect.map(this.arrayBufferBody, (_) => new TextDecoder().decode(_))
+    return this.arrayBufferBody
   }
 
   pipe() {

package/src/unstable/reactivity/AsyncResult.ts

@@ -684,54 +684,85 @@ export const builder = <A extends AsyncResult<any, any>>(self: A): Builder<
   never,
   A extends Success<infer _A, infer _E> ? _A : never,
   A extends Failure<infer _A, infer _E> ? _E : never,
-  A extends Initial<infer _A, infer _E> ? true : never
+  A extends Initial<infer _A, infer _E> ? true : never,
+  A extends Failure<infer _A, infer _E> ? Defect | Interrupt : never
 > => new BuilderImpl(self) as any
 
 /**
  * @since 4.0.0
  * @category Builder
  */
-export type Builder<Out, A, E, I> =
+export interface Defect {
+  readonly _: unique symbol
+}
+
+/**
+ * @since 4.0.0
+ * @category Builder
+ */
+export interface Interrupt {
+  readonly _: unique symbol
+}
+
+/**
+ * @since 4.0.0
+ * @category Builder
+ */
+export type Builder<Out, A, E, I, F> =
   & Pipeable
   & {
-    onWaiting<B>(f: (result: AsyncResult<A, E>) => B): Builder<Out | B, A, E, I>
-    onDefect<B>(f: (defect: unknown, result: Failure<A, E>) => B): Builder<Out | B, A, E, I>
+    onWaiting<B>(f: (result: AsyncResult<A, E>) => B): Builder<Out | B, A, E, I, F>
     orElse<B>(orElse: LazyArg<B>): Out | B
     orNull(): Out | null
     render(): [A | I] extends [never] ? Out : Out | null
   }
-  & ([I] extends [never] ? {} :
+  & ([A | E | I | F] extends [never] ? {
+      exhaustive(): Out
+    } :
+    unknown)
+  & ([I] extends [never] ? unknown :
     {
-      onInitial<B>(f: (result: Initial<A, E>) => B): Builder<Out | B, A, E, never>
-      onInitialOrWaiting<B>(f: (result: AsyncResult<A, E>) => B): Builder<Out | B, A, E, never>
+      onInitial<B>(f: (result: Initial<A, E>) => B): Builder<Out | B, A, E, never, F>
+      onInitialOrWaiting<B>(f: (result: AsyncResult<A, E>) => B): Builder<Out | B, A, E, never, F>
     })
-  & ([A] extends [never] ? {} :
+  & ([A] extends [never] ? unknown :
     {
-      onSuccess<B>(f: (value: A, result: Success<A, E>) => B): Builder<Out | B, never, E, I>
+      onSuccess<B>(f: (value: A, result: Success<A, E>) => B): Builder<Out | B, never, E, I, F>
     })
-  & ([E] extends [never] ? {} : {
-    onFailure<B>(f: (cause: Cause.Cause<E>, result: Failure<A, E>) => B): Builder<Out | B, A, never, I>
-
-    onError<B>(f: (error: E, result: Failure<A, E>) => B): Builder<Out | B, A, never, I>
+  & ([E] extends [never] ? unknown : {
+    onError<B>(f: (error: E, result: Failure<A, E>) => B): Builder<Out | B, A, never, I, F>
 
     onErrorIf<B extends E, C>(
       refinement: Refinement<E, B>,
       f: (error: B, result: Failure<A, E>) => C
-    ): Builder<Out | C, A, Types.EqualsWith<E, B, E, Exclude<E, B>>, I>
+    ): Builder<Out | C, A, Types.EqualsWith<E, B, E, Exclude<E, B>>, I, F>
     onErrorIf<C>(
       predicate: Predicate<E>,
       f: (error: E, result: Failure<A, E>) => C
-    ): Builder<Out | C, A, E, I>
+    ): Builder<Out | C, A, E, I, F>
 
     onErrorTag<const Tags extends ReadonlyArray<Types.Tags<E>>, B>(
       tags: Tags,
       f: (error: Types.ExtractTag<E, Tags[number]>, result: Failure<A, E>) => B
-    ): Builder<Out | B, A, Types.ExcludeTag<E, Tags[number]>, I>
+    ): Builder<Out | B, A, Types.ExcludeTag<E, Tags[number]>, I, F>
     onErrorTag<const Tag extends Types.Tags<E>, B>(
       tag: Tag,
       f: (error: Types.ExtractTag<E, Tag>, result: Failure<A, E>) => B
-    ): Builder<Out | B, A, Types.ExcludeTag<E, Tag>, I>
+    ): Builder<Out | B, A, Types.ExcludeTag<E, Tag>, I, F>
   })
+  & ([E | F] extends [never] ? unknown : {
+    onFailure<B>(f: (cause: Cause.Cause<E>, result: Failure<A, E>) => B): Builder<Out | B, A, never, I, never>
+  })
+  & (Interrupt extends F ? {
+      onInterrupt<B>(
+        f: (interruptors: ReadonlySet<number>, result: Failure<A, E>) => B
+      ): Builder<Out | B, A, E, I, Exclude<F, Interrupt>>
+    } :
+    unknown)
+  & (Defect extends F ? {
+      onDefect<B>(f: (defect: unknown, result: Failure<A, E>) => B): Builder<Out | B, A, E, I, Exclude<F, Defect>>
+    } :
+    unknown)
 
 class BuilderImpl<Out, A, E> {
   constructor(result: AsyncResult<A, E>) {
@@ -817,6 +848,13 @@ class BuilderImpl<Out, A, E> {
     })
   }
 
+  onInterrupt<B>(f: (interruptors: ReadonlySet<number>, result: Failure<A, E>) => B): BuilderImpl<Out | B, A, E> {
+    return this.when(isFailure, (result) => {
+      const interruptors = Cause.filterInterruptors(result.cause)
+      return Result.isFailure(interruptors) ? Option.none() : Option.some(f(interruptors.success, result))
+    })
+  }
+
   orElse<B>(orElse: LazyArg<B>): Out | B {
     return Option.getOrElse(this.output, orElse)
   }
@@ -833,6 +871,10 @@ class BuilderImpl<Out, A, E> {
     }
     return null
   }
+
+  exhaustive(): Out {
+    return this.render() as Out
+  }
 }
 
 /**

package/src/unstable/sql/SqlClient.ts

@@ -46,6 +46,11 @@ export interface SqlClient extends Constructor {
     self: Effect.Effect<A, E, R>
   ) => Effect.Effect<A, E | SqlError, R>
 
+  /**
+   * The transaction service for this client.
+   */
+  readonly transactionService: Context.Service<TransactionConnection, TransactionConnection.Service>
+
   /**
    * Use the Reactivity service from @effect/experimental to create a reactive
    * query.
@@ -85,6 +90,7 @@ export namespace SqlClient {
     readonly compiler: Compiler
     readonly transactionAcquirer?: Connection.Acquirer
     readonly spanAttributes: ReadonlyArray<readonly [string, unknown]>
+    readonly transactionService?: Context.Service<TransactionConnection, TransactionConnection.Service>
     readonly beginTransaction?: string | undefined
     readonly rollback?: string | undefined
     readonly commit?: string | undefined
@@ -98,13 +104,16 @@ export namespace SqlClient {
   }
 }
 
+let clientIdCounter = 0
+
 /**
  * @category constructors
  * @since 4.0.0
  */
 export const make = Effect.fnUntraced(function*(options: SqlClient.MakeOptions) {
+  const transactionService = options.transactionService ?? TransactionConnection(clientIdCounter++)
   const getConnection = Effect.flatMap(
-    Effect.serviceOption(TransactionConnection),
+    Effect.serviceOption(transactionService),
     Option.match({
       onNone: () => options.acquirer,
       onSome: ([conn]) => Effect.succeed(conn)
@@ -118,7 +127,7 @@ export const make = Effect.fnUntraced(function*(options: SqlClient.MakeOptions)
   const rollbackSavepoint = options.rollbackSavepoint ?? ((name: string) => `ROLLBACK TO SAVEPOINT ${name}`)
   const transactionAcquirer = options.transactionAcquirer ?? options.acquirer
   const withTransaction = makeWithTransaction({
-    transactionService: TransactionConnection,
+    transactionService,
     spanAttributes: options.spanAttributes,
     acquireConnection: Effect.flatMap(
       Scope.make(),
@@ -138,6 +147,7 @@ export const make = Effect.fnUntraced(function*(options: SqlClient.MakeOptions)
       [TypeId]: TypeId as typeof TypeId,
       safe: undefined as any,
       withTransaction,
+      transactionService,
       reserve: transactionAcquirer,
       withoutTransforms(): any {
         if (options.transformRows === undefined) {
@@ -189,8 +199,8 @@ export const makeWithTransaction = <I, S>(options: {
   readonly rollback: (conn: NoInfer<S>) => Effect.Effect<void, SqlError>
   readonly rollbackSavepoint: (conn: NoInfer<S>, id: number) => Effect.Effect<void, SqlError>
 }) =>
-<R, E, A>(effect: Effect.Effect<A, E, R>): Effect.Effect<A, E | SqlError, R> =>
-  Effect.uninterruptibleMask((restore) =>
+<R, E, A>(effect: Effect.Effect<A, E, R>): Effect.Effect<A, E | SqlError, R> => {
+  return Effect.uninterruptibleMask((restore) =>
     Effect.useSpan(
       "sql.transaction",
       { kind: "client" },
@@ -249,15 +259,32 @@ export const makeWithTransaction = <I, S>(options: {
         })
     )
   )
+}
 
 /**
  * @since 4.0.0
  */
-export class TransactionConnection
-  extends Context.Service<TransactionConnection, readonly [conn: Connection.Connection, depth: number]>()(
-    "effect/sql/SqlClient/TransactionConnection"
-  )
-{}
+export interface TransactionConnection {
+  readonly _: unique symbol
+}
+
+/**
+ * @since 4.0.0
+ */
+export declare namespace TransactionConnection {
+  /**
+   * @since 4.0.0
+   */
+  export type Service = readonly [conn: Connection.Connection, depth: number]
+}
+
+/**
+ * @since 4.0.0
+ */
+export const TransactionConnection = (
+  clientId: number
+): Context.Service<TransactionConnection, TransactionConnection.Service> =>
+  Context.Service(`effect/sql/SqlClient/TransactionConnection/${clientId}`)
 
 /**
  * @since 4.0.0

package/src/unstable/sql/SqlResolver.ts

@@ -102,7 +102,7 @@ export const ordered = <Req extends Schema.Top, Res extends Schema.Top, _, E, R>
       E | ResultLengthMismatch,
       Req["EncodingServices"] | Res["DecodingServices"] | R
     >,
-    SqlClient.TransactionConnection["Service"] | undefined
+    SqlClient.TransactionConnection.Service | undefined
   >({
     key: transactionKey,
     resolver: Effect.fnUntraced(function*(entries) {
@@ -158,7 +158,7 @@ export const grouped = <Req extends Schema.Top, Res extends Schema.Top, K, Row,
       E | Schema.SchemaError | Cause.NoSuchElementError,
       Req["EncodingServices"] | Res["DecodingServices"] | R
     >,
-    SqlClient.TransactionConnection["Service"] | undefined
+    SqlClient.TransactionConnection.Service | undefined
   >({
     key: transactionKey,
     resolver: Effect.fnUntraced(function*(entries) {
@@ -224,13 +224,9 @@ export const findById = <Id extends Schema.Top, Res extends Schema.Top, Row, E,
       E | Schema.SchemaError | Cause.NoSuchElementError,
       Id["EncodingServices"] | Res["DecodingServices"] | R
     >,
-    SqlClient.TransactionConnection["Service"] | undefined
+    SqlClient.TransactionConnection.Service | undefined
   >({
-    key(entry) {
-      const conn = entry.context.mapUnsafe.get(SqlClient.TransactionConnection.key)
-      if (!conn) return undefined
-      return Equal.byReferenceUnsafe(conn)
-    },
+    key: transactionKey,
     resolver: Effect.fnUntraced(function*(entries) {
       const [inputs, idMap] = yield* partitionRequestsById(entries, options.Id)
       const results = yield* options.execute(inputs as any).pipe(
@@ -281,7 +277,7 @@ const void_ = <Req extends Schema.Top, _, E, R>(
       E | Schema.SchemaError,
       Req["EncodingServices"] | R
     >,
-    SqlClient.TransactionConnection["Service"] | undefined
+    SqlClient.TransactionConnection.Service | undefined
   >({
     key: transactionKey,
     resolver: Effect.fnUntraced(function*(entries) {
@@ -359,8 +355,10 @@ const partitionRequestsById = function*<In, A, E, R, InE>(
   return [inputs, byIdMap] as const
 }
 
-function transactionKey<A>(entry: Request.Entry<A>): SqlClient.TransactionConnection["Service"] | undefined {
-  const conn = entry.context.mapUnsafe.get(SqlClient.TransactionConnection.key)
+function transactionKey<A>(entry: Request.Entry<A>): SqlClient.TransactionConnection.Service | undefined {
+  const client = entry.context.mapUnsafe.get(SqlClient.SqlClient.key)
+  if (!client) return undefined
+  const conn = entry.context.mapUnsafe.get(client.transactionService.key)
   if (!conn) return undefined
   return Equal.byReferenceUnsafe(conn)
 }