effect 4.0.0-beta.6 → 4.0.0-beta.60

package/src/unstable/http/UrlParams.ts

@@ -19,7 +19,6 @@ import * as Schema from "../../Schema.ts"
 import * as Issue from "../../SchemaIssue.ts"
 import * as Transformation from "../../SchemaTransformation.ts"
 import * as Tuple from "../../Tuple.ts"
-import * as UndefinedOr from "../../UndefinedOr.ts"
 
 const TypeId = "~effect/http/UrlParams"
 
@@ -43,10 +42,14 @@ export const isUrlParams = (u: unknown): u is UrlParams => hasProperty(u, TypeId
  * @category models
  */
 export type Input =
-  | CoercibleRecord
+  | CoercibleRecordInput
   | Iterable<readonly [string, Coercible]>
   | URLSearchParams
 
+type CoercibleRecordInput = CoercibleRecord & {
+  readonly [Symbol.iterator]?: never
+}
+
 /**
  * @since 4.0.0
  * @category models
@@ -57,8 +60,17 @@ export type Coercible = string | number | bigint | boolean | null | undefined
  * @since 4.0.0
  * @category models
  */
-export interface CoercibleRecord {
-  readonly [key: string]: Coercible | ReadonlyArray<Coercible> | CoercibleRecord
+type CoercibleRecordField<A> = A extends Coercible ? A
+  : A extends ReadonlyArray<infer Item> ? ReadonlyArray<Item extends Coercible ? Item : never>
+  : A extends object ? CoercibleRecord<A>
+  : never
+
+/**
+ * @since 4.0.0
+ * @category models
+ */
+export type CoercibleRecord<A extends object = any> = {
+  readonly [K in keyof A]: CoercibleRecordField<A[K]>
 }
 
 const Proto = {
@@ -110,7 +122,9 @@ export const fromInput = (input: Input): UrlParams => {
 }
 
 const fromInputNested = (input: Input): Array<[string | Array<string>, any]> => {
-  const entries = Symbol.iterator in input ? Arr.fromIterable(input) : Object.entries(input)
+  const entries = typeof (input as any)[Symbol.iterator] === "function"
+    ? Arr.fromIterable(input as Iterable<readonly [string, Coercible]>)
+    : Object.entries(input)
   const out: Array<[string | Array<string>, string]> = []
   for (const [key, value] of entries) {
     if (Array.isArray(value)) {
@@ -219,18 +233,17 @@ export const getFirst: {
    * @since 4.0.0
    * @category combinators
    */
-  (key: string): (self: UrlParams) => string | undefined
+  (key: string): (self: UrlParams) => Option.Option<string>
   /**
    * @since 4.0.0
    * @category combinators
    */
-  (self: UrlParams, key: string): string | undefined
+  (self: UrlParams, key: string): Option.Option<string>
 } = dual(
   2,
-  (self: UrlParams, key: string): string | undefined =>
+  (self: UrlParams, key: string): Option.Option<string> =>
     Arr.findFirst(self.params, ([k]) => k === key).pipe(
-      Option.map(([, value]) => value),
-      Option.getOrUndefined
+      Option.map(([, value]) => value)
     )
 )
 
@@ -243,16 +256,15 @@ export const getLast: {
    * @since 4.0.0
    * @category combinators
    */
-  (key: string): (self: UrlParams) => string | undefined
+  (key: string): (self: UrlParams) => Option.Option<string>
   /**
    * @since 4.0.0
    * @category combinators
    */
-  (self: UrlParams, key: string): string | undefined
-} = dual(2, (self: UrlParams, key: string): string | undefined =>
+  (self: UrlParams, key: string): Option.Option<string>
+} = dual(2, (self: UrlParams, key: string): Option.Option<string> =>
   Arr.findLast(self.params, ([k]) => k === key).pipe(
-    Option.map(([, value]) => value),
-    Option.getOrUndefined
+    Option.map(([, value]) => value)
   ))
 
 /**
@@ -522,9 +534,9 @@ export const schemaJsonField = (field: string): schemaJsonField =>
       Schema.UnknownFromJsonString,
       Transformation.transformOrFail({
         decode: (params) =>
-          UndefinedOr.match(getFirst(params, field), {
-            onUndefined: () => Effect.fail(new Issue.Pointer([field], new Issue.MissingKey(undefined))),
-            onDefined: Effect.succeed
+          Option.match(getFirst(params, field), {
+            onNone: () => Effect.fail(new Issue.Pointer([field], new Issue.MissingKey(undefined))),
+            onSome: Effect.succeed
           }),
         encode: (value) => Effect.succeed(make([[field, value]]))
       })

package/src/unstable/http/index.ts

@@ -109,6 +109,11 @@ export * as HttpServerRespondable from "./HttpServerRespondable.ts"
  */
 export * as HttpServerResponse from "./HttpServerResponse.ts"
 
+/**
+ * @since 4.0.0
+ */
+export * as HttpStaticServer from "./HttpStaticServer.ts"
+
 /**
  * @since 4.0.0
  */
@@ -129,6 +134,11 @@ export * as Multipasta from "./Multipasta.ts"
  */
 export * as Template from "./Template.ts"
 
+/**
+ * @since 4.0.0
+ */
+export * as Url from "./Url.ts"
+
 /**
  * @since 4.0.0
  */

package/src/unstable/http/internal/preResponseHandler.ts

@@ -0,0 +1,15 @@
+import * as Effect from "../../../Effect.ts"
+import type { PreResponseHandler } from "../HttpEffect.ts"
+import type { HttpServerRequest } from "../HttpServerRequest.ts"
+
+/** @internal */
+export const requestPreResponseHandlers = new WeakMap<object, PreResponseHandler>()
+
+/** @internal */
+export const appendPreResponseHandlerUnsafe = (request: HttpServerRequest, handler: PreResponseHandler): void => {
+  const prev = requestPreResponseHandlers.get(request.source)
+  const next: PreResponseHandler = prev ?
+    (request, response) => Effect.flatMap(prev(request, response), (response) => handler(request, response))
+    : handler
+  requestPreResponseHandlers.set(request.source, next)
+}

package/src/unstable/httpapi/HttpApi.ts

@@ -2,12 +2,12 @@
  * @since 4.0.0
  */
 import type { NonEmptyReadonlyArray } from "../../Array.ts"
+import * as Context from "../../Context.ts"
 import { type Pipeable, pipeArguments } from "../../Pipeable.ts"
 import * as Predicate from "../../Predicate.ts"
 import * as Record from "../../Record.ts"
 import type * as Schema from "../../Schema.ts"
 import type * as AST from "../../SchemaAST.ts"
-import * as ServiceMap from "../../ServiceMap.ts"
 import type { Mutable } from "../../Types.ts"
 import type { PathInput } from "../http/HttpRouter.ts"
 import * as HttpApiEndpoint from "./HttpApiEndpoint.ts"
@@ -40,7 +40,7 @@ export interface HttpApi<
   readonly [TypeId]: typeof TypeId
   readonly identifier: Id
   readonly groups: Record.ReadonlyRecord<string, Groups>
-  readonly annotations: ServiceMap.ServiceMap<never>
+  readonly annotations: Context.Context<never>
 
   /**
    * Add a `HttpApiGroup` to the `HttpApi`.
@@ -57,7 +57,7 @@ export interface HttpApi<
   /**
    * Prefix all endpoints in the `HttpApi`.
    */
-  prefix<const Prefix extends PathInput>(prefix: Prefix): HttpApi<Id, Groups>
+  prefix<const Prefix extends PathInput>(prefix: Prefix): HttpApi<Id, HttpApiGroup.AddPrefix<Groups, Prefix>>
 
   /**
    * Add a middleware to a `HttpApi`. It will be applied to all endpoints in the
@@ -67,18 +67,18 @@ export interface HttpApi<
    * api is called.
    */
   middleware<I extends HttpApiMiddleware.AnyId, S>(
-    middleware: ServiceMap.Service<I, S>
+    middleware: Context.Key<I, S>
   ): HttpApi<Id, HttpApiGroup.AddMiddleware<Groups, I>>
 
   /**
    * Annotate the `HttpApi`.
    */
-  annotate<I, S>(tag: ServiceMap.Service<I, S>, value: S): HttpApi<Id, Groups>
+  annotate<I, S>(tag: Context.Key<I, S>, value: S): HttpApi<Id, Groups>
 
   /**
-   * Annotate the `HttpApi` with a ServiceMap.
+   * Annotate the `HttpApi` with a Context.
    */
-  annotateMerge<I>(context: ServiceMap.ServiceMap<I>): HttpApi<Id, Groups>
+  annotateMerge<I>(context: Context.Context<I>): HttpApi<Id, Groups>
 }
 
 /**
@@ -121,7 +121,7 @@ const Proto = {
     const newGroups = { ...this.groups }
     for (const key in api.groups) {
       const newGroup: Mutable<HttpApiGroup.AnyWithProps> = api.groups[key]
-      newGroup.annotations = ServiceMap.merge(api.annotations, newGroup.annotations)
+      newGroup.annotations = Context.merge(api.annotations, newGroup.annotations)
       newGroups[key] = newGroup as any
     }
     return makeProto({
@@ -137,25 +137,25 @@ const Proto = {
       annotations: this.annotations
     })
   },
-  middleware(this: AnyWithProps, tag: HttpApiMiddleware.AnyKey) {
+  middleware(this: AnyWithProps, tag: HttpApiMiddleware.AnyService) {
     return makeProto({
       identifier: this.identifier,
       groups: Record.map(this.groups, (group) => group.middleware(tag as any)),
       annotations: this.annotations
     })
   },
-  annotate(this: AnyWithProps, key: ServiceMap.Service<any, any>, value: any) {
+  annotate(this: AnyWithProps, key: Context.Key<any, any>, value: any) {
     return makeProto({
       identifier: this.identifier,
       groups: this.groups,
-      annotations: ServiceMap.add(this.annotations, key, value)
+      annotations: Context.add(this.annotations, key, value)
     })
   },
-  annotateMerge(this: AnyWithProps, annotations: ServiceMap.ServiceMap<never>) {
+  annotateMerge(this: AnyWithProps, annotations: Context.Context<never>) {
     return makeProto({
       identifier: this.identifier,
       groups: this.groups,
-      annotations: ServiceMap.merge(this.annotations, annotations)
+      annotations: Context.merge(this.annotations, annotations)
     })
   }
 }
@@ -164,7 +164,7 @@ const makeProto = <Id extends string, Groups extends HttpApiGroup.Any>(
   options: {
     readonly identifier: Id
     readonly groups: Record.ReadonlyRecord<string, Groups>
-    readonly annotations: ServiceMap.ServiceMap<never>
+    readonly annotations: Context.Context<never>
   }
 ): HttpApi<Id, Groups> => {
   function HttpApi() {}
@@ -188,7 +188,7 @@ export const make = <const Id extends string>(identifier: Id): HttpApi<Id, never
   makeProto({
     identifier,
     groups: new Map() as any,
-    annotations: ServiceMap.empty()
+    annotations: Context.empty()
   })
 
 /**
@@ -206,13 +206,13 @@ export const reflect = <Id extends string, Groups extends HttpApiGroup.Any>(
       | undefined
     readonly onGroup: (options: {
       readonly group: HttpApiGroup.AnyWithProps
-      readonly mergedAnnotations: ServiceMap.ServiceMap<never>
+      readonly mergedAnnotations: Context.Context<never>
     }) => void
     readonly onEndpoint: (options: {
       readonly group: HttpApiGroup.AnyWithProps
       readonly endpoint: HttpApiEndpoint.AnyWithProps
-      readonly mergedAnnotations: ServiceMap.ServiceMap<never>
-      readonly middleware: ReadonlySet<HttpApiMiddleware.AnyKey>
+      readonly mergedAnnotations: Context.Context<never>
+      readonly middleware: ReadonlySet<HttpApiMiddleware.AnyService>
       readonly successes: ReadonlyMap<number, readonly [Schema.Top, ...Array<Schema.Top>]>
       readonly errors: ReadonlyMap<number, readonly [Schema.Top, ...Array<Schema.Top>]>
     }) => void
@@ -220,7 +220,7 @@ export const reflect = <Id extends string, Groups extends HttpApiGroup.Any>(
 ) => {
   const groups = Object.values(self.groups) as any as Array<HttpApiGroup.AnyWithProps>
   for (const group of groups) {
-    const groupAnnotations = ServiceMap.merge(self.annotations, group.annotations)
+    const groupAnnotations = Context.merge(self.annotations, group.annotations)
     options.onGroup({
       group,
       mergedAnnotations: groupAnnotations
@@ -238,7 +238,7 @@ export const reflect = <Id extends string, Groups extends HttpApiGroup.Any>(
         group,
         endpoint,
         middleware: endpoint.middlewares as any,
-        mergedAnnotations: ServiceMap.merge(groupAnnotations, endpoint.annotations),
+        mergedAnnotations: Context.merge(groupAnnotations, endpoint.annotations),
         successes: extractResponseContent(
           HttpApiEndpoint.getSuccessSchemas(endpoint),
           HttpApiSchema.getStatusSuccess
@@ -255,7 +255,7 @@ export const reflect = <Id extends string, Groups extends HttpApiGroup.Any>(
 // -------------------------------------------------------------------------------------
 
 const extractResponseContent = (
-  schemas: readonly [Schema.Top, ...Array<Schema.Top>],
+  schemas: Array<Schema.Top>,
   getStatus: (ast: AST.AST) => number
 ): ReadonlyMap<number, [Schema.Top, ...Array<Schema.Top>]> => {
   const map = new Map<number, [Schema.Top, ...Array<Schema.Top>]>()
@@ -283,7 +283,7 @@ const extractResponseContent = (
  * @since 4.0.0
  * @category tags
  */
-export class AdditionalSchemas extends ServiceMap.Service<
+export class AdditionalSchemas extends Context.Service<
   AdditionalSchemas,
   ReadonlyArray<Schema.Top>
 >()("effect/httpapi/HttpApi/AdditionalSchemas") {}