effect 4.0.0-beta.27 → 4.0.0-beta.29

package/src/unstable/cli/Prompt.ts

@@ -2489,6 +2489,11 @@ const processNumberBackspace = (state: NumberState) => {
   }))
 }
 
+const processNumberClear = (state: NumberState) =>
+  Effect.succeed(Action.NextFrame({
+    state: { ...state, cursor: 0, value: "", error: undefined }
+  }))
+
 const defaultIntProcessor = (input: string, state: NumberState) => {
   if (state.value.length === 0 && input === "-") {
     return Effect.succeed(Action.NextFrame({
@@ -2542,6 +2547,9 @@ const handleRenderInteger = (options: IntegerOptionsReq) => {
 
 const handleProcessInteger = (options: IntegerOptionsReq) => {
   return (input: Terminal.UserInput, state: NumberState) => {
+    if (input.key.ctrl && input.key.name === "u") {
+      return processNumberClear(state)
+    }
     switch (input.key.name) {
       case "backspace": {
         return processNumberBackspace(state)
@@ -2612,6 +2620,9 @@ const handleRenderFloat = (options: FloatOptionsReq) => {
 
 const handleProcessFloat = (options: FloatOptionsReq) => {
   return (input: Terminal.UserInput, state: NumberState) => {
+    if (input.key.ctrl && input.key.name === "u") {
+      return processNumberClear(state)
+    }
     switch (input.key.name) {
       case "backspace": {
         return processNumberBackspace(state)
@@ -2962,6 +2973,9 @@ const processAutoCompleteBackspace = <A>(state: AutoCompleteState, options: Auto
   return Effect.succeed(Action.NextFrame({ state: updateAutoCompleteState(state, options, query) }))
 }
 
+const processAutoCompleteClear = <A>(state: AutoCompleteState, options: AutoCompleteOptionsReq<A>) =>
+  Effect.succeed(Action.NextFrame({ state: updateAutoCompleteState(state, options, "") }))
+
 const processAutoCompleteInput = <A>(input: string, state: AutoCompleteState, options: AutoCompleteOptionsReq<A>) => {
   if (input.length === 0) {
     return Effect.succeed(Action.Beep())
@@ -3045,6 +3059,9 @@ const handleSelectProcess = <A>(options: SelectOptionsReq<A>) => {
 
 const handleAutoCompleteProcess = <A>(options: AutoCompleteOptionsReq<A>) => {
   return (input: Terminal.UserInput, state: AutoCompleteState) => {
+    if (input.key.ctrl && input.key.name === "u") {
+      return processAutoCompleteClear(state, options)
+    }
     switch (input.key.name) {
       case "k":
       case "up": {
@@ -3091,10 +3108,6 @@ interface TextState {
   readonly error: string | undefined
 }
 
-const getValue = (state: TextState, options: TextOptionsReq): string => {
-  return state.value.length > 0 ? state.value : options.default
-}
-
 const renderClearScreen = Effect.fnUntraced(function*(state: TextState, options: TextOptionsReq) {
   const terminal = yield* Terminal.Terminal
   const columns = yield* terminal.columns
@@ -3115,7 +3128,7 @@ const renderTextInput = (
   submitted: boolean,
   renderOptions?: RenderOptions | undefined
 ) => {
-  const text = getValue(nextState, options)
+  const text = nextState.value
   if (renderOptions?.plain === true) {
     switch (options.type) {
       case "hidden": {
@@ -3217,6 +3230,13 @@ const processTextBackspace = (state: TextState) => {
   )
 }
 
+const processTextClear = (state: TextState) =>
+  Effect.succeed(
+    Action.NextFrame({
+      state: { ...state, cursor: 0, value: "", error: undefined }
+    })
+  )
+
 const processTextCursorLeft = (state: TextState) => {
   if (state.cursor <= 0) {
     return Effect.succeed(Action.Beep())
@@ -3245,11 +3265,10 @@ const processTab = (state: TextState, options: TextOptionsReq) => {
   if (state.value === options.default) {
     return Effect.succeed(Action.Beep())
   }
-  const value = getValue(state, options)
-  const cursor = value.length
+  const value = state.value.length === 0 ? options.default : state.value
   return Effect.succeed(
     Action.NextFrame({
-      state: { ...state, value, cursor, error: undefined }
+      state: { ...state, value, cursor: value.length, error: undefined }
     })
   )
 }
@@ -3278,6 +3297,9 @@ const handleTextRender = (options: TextOptionsReq) => {
 
 const handleTextProcess = (options: TextOptionsReq) => {
   return (input: Terminal.UserInput, state: TextState) => {
+    if (input.key.ctrl && input.key.name === "u") {
+      return processTextClear(state)
+    }
     switch (input.key.name) {
       case "backspace": {
         return processTextBackspace(state)
@@ -3290,7 +3312,7 @@ const handleTextProcess = (options: TextOptionsReq) => {
       }
       case "enter":
       case "return": {
-        const value = getValue(state, options)
+        const value = state.value
         return Effect.match(options.validate(value), {
           onFailure: (error) =>
             Action.NextFrame({

package/src/unstable/http/Cookies.ts

@@ -668,6 +668,90 @@ export const setUnsafe: {
     ))
 )
 
+/**
+ * Add an expired cookie to a Cookies object
+ *
+ * @since 4.0.0
+ * @category combinators
+ */
+export const expireCookie: {
+  /**
+   * Add an expired cookie to a Cookies object
+   *
+   * @since 4.0.0
+   * @category combinators
+   */
+  (
+    name: string,
+    options?: Omit<NonNullable<Cookie["options"]>, "expires" | "maxAge">
+  ): (self: Cookies) => Result.Result<Cookies, CookiesError>
+  /**
+   * Add an expired cookie to a Cookies object
+   *
+   * @since 4.0.0
+   * @category combinators
+   */
+  (
+    self: Cookies,
+    name: string,
+    options?: Omit<NonNullable<Cookie["options"]>, "expires" | "maxAge">
+  ): Result.Result<Cookies, CookiesError>
+} = dual(
+  (args) => isCookies(args[0]),
+  (
+    self: Cookies,
+    name: string,
+    options?: Omit<NonNullable<Cookie["options"]>, "expires" | "maxAge">
+  ) =>
+    set(self, name, "", {
+      ...options,
+      maxAge: 0,
+      expires: new Date(0)
+    })
+)
+
+/**
+ * Add an expired cookie to a Cookies object, throwing an error if invalid
+ *
+ * @since 4.0.0
+ * @category combinators
+ */
+export const expireCookieUnsafe: {
+  /**
+   * Add an expired cookie to a Cookies object, throwing an error if invalid
+   *
+   * @since 4.0.0
+   * @category combinators
+   */
+  (
+    name: string,
+    options?: Omit<NonNullable<Cookie["options"]>, "expires" | "maxAge">
+  ): (self: Cookies) => Cookies
+  /**
+   * Add an expired cookie to a Cookies object, throwing an error if invalid
+   *
+   * @since 4.0.0
+   * @category combinators
+   */
+  (
+    self: Cookies,
+    name: string,
+    options?: Omit<NonNullable<Cookie["options"]>, "expires" | "maxAge">
+  ): Cookies
+} = dual(
+  (args) => isCookies(args[0]),
+  (
+    self: Cookies,
+    name: string,
+    options?: Omit<NonNullable<Cookie["options"]>, "expires" | "maxAge">
+  ): Cookies =>
+    setUnsafe(self, name, "", {
+      ...options,
+      maxAge: 0,
+      expires: new Date(0)
+    })
+)
+
 /**
  * Add multiple cookies to a Cookies object
  *

package/src/unstable/http/HttpClient.ts

@@ -6,7 +6,6 @@ import * as Cause from "../../Cause.ts"
 import { Clock } from "../../Clock.ts"
 import * as Duration from "../../Duration.ts"
 import * as Effect from "../../Effect.ts"
-import * as Exit from "../../Exit.ts"
 import * as Fiber from "../../Fiber.ts"
 import { constant, constFalse, constTrue, dual, flow, identity } from "../../Function.ts"
 import * as Inspectable from "../../Inspectable.ts"
@@ -1735,12 +1734,12 @@ class InterruptibleResponse implements HttpClientResponse.HttpClientResponse {
   get stream() {
     return Stream.suspend(() => {
       responseRegistry.unregister(this.original)
-      return Stream.onExit(this.original.stream, (exit) => {
-        if (Exit.hasInterrupts(exit)) {
+      return Stream.ensuring(
+        this.original.stream,
+        Effect.sync(() => {
           this.controller.abort()
-        }
-        return Effect.void
-      })
+        })
+      )
     })
   }
 

package/src/unstable/http/HttpClientRequest.ts

@@ -87,7 +87,11 @@ const Proto = {
   }
 }
 
-function makeProto(
+/**
+ * @since 4.0.0
+ * @category constructors
+ */
+export function makeWith(
   method: HttpMethod,
   url: string,
   urlParams: UrlParams.UrlParams,
@@ -109,7 +113,7 @@ function makeProto(
  * @since 4.0.0
  * @category constructors
  */
-export const empty: HttpClientRequest = makeProto(
+export const empty: HttpClientRequest = makeWith(
   "GET",
   "",
   UrlParams.empty,
@@ -251,7 +255,7 @@ export const setMethod: {
 } = dual(
   2,
   (self: HttpClientRequest, method: HttpMethod): HttpClientRequest =>
-    makeProto(method, self.url, self.urlParams, self.hash, self.headers, self.body)
+    makeWith(method, self.url, self.urlParams, self.hash, self.headers, self.body)
 )
 
 /**
@@ -270,7 +274,7 @@ export const setHeader: {
    */
   (self: HttpClientRequest, key: string, value: string): HttpClientRequest
 } = dual(3, (self: HttpClientRequest, key: string, value: string): HttpClientRequest =>
-  makeProto(
+  makeWith(
     self.method,
     self.url,
     self.urlParams,
@@ -295,7 +299,7 @@ export const setHeaders: {
    */
   (self: HttpClientRequest, input: Headers.Input): HttpClientRequest
 } = dual(2, (self: HttpClientRequest, input: Headers.Input): HttpClientRequest =>
-  makeProto(
+  makeWith(
     self.method,
     self.url,
     self.urlParams,
@@ -394,7 +398,7 @@ export const setUrl: {
   (self: HttpClientRequest, url: string | URL): HttpClientRequest
 } = dual(2, (self: HttpClientRequest, url: string | URL): HttpClientRequest => {
   if (typeof url === "string") {
-    return makeProto(
+    return makeWith(
       self.method,
       url,
       self.urlParams,
@@ -408,7 +412,7 @@ export const setUrl: {
   const hash = clone.hash ? clone.hash.slice(1) : undefined
   clone.search = ""
   clone.hash = ""
-  return makeProto(
+  return makeWith(
     self.method,
     clone.toString(),
     urlParams,
@@ -435,7 +439,7 @@ export const prependUrl: {
   (self: HttpClientRequest, path: string): HttpClientRequest
 } = dual(2, (self: HttpClientRequest, path: string): HttpClientRequest => {
   if (path === "") return self
-  return makeProto(
+  return makeWith(
     self.method,
     joinSegments(path, self.url),
     self.urlParams,
@@ -462,7 +466,7 @@ export const appendUrl: {
   (self: HttpClientRequest, path: string): HttpClientRequest
 } = dual(2, (self: HttpClientRequest, path: string): HttpClientRequest => {
   if (path === "") return self
-  return makeProto(
+  return makeWith(
     self.method,
     joinSegments(self.url, path),
     self.urlParams,
@@ -500,7 +504,7 @@ export const updateUrl: {
    */
   (self: HttpClientRequest, f: (url: string) => string): HttpClientRequest
 } = dual(2, (self: HttpClientRequest, f: (url: string) => string): HttpClientRequest =>
-  makeProto(
+  makeWith(
     self.method,
     f(self.url),
     self.urlParams,
@@ -525,7 +529,7 @@ export const setUrlParam: {
    */
   (self: HttpClientRequest, key: string, value: string): HttpClientRequest
 } = dual(3, (self: HttpClientRequest, key: string, value: string): HttpClientRequest =>
-  makeProto(
+  makeWith(
     self.method,
     self.url,
     UrlParams.set(self.urlParams, key, value),
@@ -550,7 +554,7 @@ export const setUrlParams: {
    */
   (self: HttpClientRequest, input: UrlParams.Input): HttpClientRequest
 } = dual(2, (self: HttpClientRequest, input: UrlParams.Input): HttpClientRequest =>
-  makeProto(
+  makeWith(
     self.method,
     self.url,
     UrlParams.setAll(self.urlParams, input),
@@ -575,7 +579,7 @@ export const appendUrlParam: {
    */
   (self: HttpClientRequest, key: string, value: string): HttpClientRequest
 } = dual(3, (self: HttpClientRequest, key: string, value: string): HttpClientRequest =>
-  makeProto(
+  makeWith(
     self.method,
     self.url,
     UrlParams.append(self.urlParams, key, value),
@@ -600,7 +604,7 @@ export const appendUrlParams: {
    */
   (self: HttpClientRequest, input: UrlParams.Input): HttpClientRequest
 } = dual(2, (self: HttpClientRequest, input: UrlParams.Input): HttpClientRequest =>
-  makeProto(
+  makeWith(
     self.method,
     self.url,
     UrlParams.appendAll(self.urlParams, input),
@@ -625,7 +629,7 @@ export const setHash: {
    */
   (self: HttpClientRequest, hash: string): HttpClientRequest
 } = dual(2, (self: HttpClientRequest, hash: string): HttpClientRequest =>
-  makeProto(
+  makeWith(
     self.method,
     self.url,
     self.urlParams,
@@ -639,7 +643,7 @@ export const setHash: {
  * @category combinators
  */
 export const removeHash = (self: HttpClientRequest): HttpClientRequest =>
-  makeProto(
+  makeWith(
     self.method,
     self.url,
     self.urlParams,
@@ -675,7 +679,7 @@ export const setBody: {
       headers = Headers.set(headers, "content-length", body.contentLength.toString())
     }
   }
-  return makeProto(
+  return makeWith(
     self.method,
     self.url,
     self.urlParams,

package/src/unstable/http/HttpEffect.ts

@@ -173,6 +173,14 @@ export const appendPreResponseHandler = (handler: PreResponseHandler): Effect.Ef
     return Effect.void
   })
 
+export {
+  /**
+   * @since 4.0.0
+   * @category fiber refs
+   */
+  appendPreResponseHandlerUnsafe
+}
+
 /**
  * @since 4.0.0
  * @category fiber refs