@effect-app/infra 2.35.4 → 2.37.0

package/test/controller.legacy2.test.ts

@@ -1,197 +0,0 @@
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-import { makeMiddleware, makeRouter } from "@effect-app/infra/api/routing.legacy2"
-import type { RequestContext } from "@effect-app/infra/RequestContext"
-import { Rpc } from "@effect/rpc"
-import type { Request } from "effect-app"
-import { Context, Effect, FiberRef, Layer, S, Schedule } from "effect-app"
-import { type GetEffectContext, makeRpcClient, type RPCContextMap, UnauthorizedError } from "effect-app/client"
-import { HttpHeaders, HttpServerRequest } from "effect-app/http"
-import type * as EffectRequest from "effect/Request"
-import { it } from "vitest"
-
-const optimisticConcurrencySchedule = Schedule.once
-  && Schedule.recurWhile<any>((a) => a?._tag === "OptimisticConcurrencyException")
-
-export interface CTX {
-  context: RequestContext
-}
-
-export type CTXMap = {
-  // allowAnonymous: RPCContextMap.Inverted<"userProfile", UserProfile, typeof NotLoggedInError>
-  // TODO: not boolean but `string[]`
-  requireRoles: RPCContextMap.Custom<"", never, typeof UnauthorizedError, Array<string>>
-}
-const middleware = makeMiddleware({
-  contextMap: null as unknown as CTXMap,
-  // helper to deal with nested generic lmitations
-  context: null as any as HttpServerRequest.HttpServerRequest,
-  execute: Effect.gen(function*() {
-    return <T extends { config?: { [K in keyof CTXMap]?: any } }, Req extends S.TaggedRequest.All, R>(
-      _schema: T & S.Schema<Req, any, never>,
-      handler: (request: Req) => Effect.Effect<EffectRequest.Request.Success<Req>, EffectRequest.Request.Error<Req>, R>,
-      moduleName?: string
-    ) =>
-    (
-      req: Req
-    ): Effect.Effect<
-      Request.Request.Success<Req>,
-      Request.Request.Error<Req>,
-      | HttpServerRequest.HttpServerRequest
-      | Exclude<R, GetEffectContext<CTXMap, T["config"]>>
-    > =>
-      Effect
-        .gen(function*() {
-          // const headers = yield* Rpc.currentHeaders
-          const ctx = Context.empty()
-
-          // const config = "config" in schema ? schema.config : undefined
-
-          // Check JWT
-          // TODO
-          // if (!fakeLogin && !request.allowAnonymous) {
-          //   yield* Effect.catchAll(
-          //     checkJWTI({
-          //       ...authConfig,
-          //       issuer: authConfig.issuer + "/",
-          //       jwksUri: `${authConfig.issuer}/.well-known/jwks.json`
-          //     }),
-          //     (err) => Effect.fail(new JWTError({ error: err }))
-          //   )
-          // }
-
-          // const fakeLogin = true
-          // const r = (fakeLogin
-          //   ? makeUserProfileFromUserHeader(headers["x-user"])
-          //   : makeUserProfileFromAuthorizationHeader(
-          //     headers["authorization"]
-          //   ))
-          //   .pipe(Effect.exit, basicRuntime.runSync)
-          // if (!Exit.isSuccess(r)) {
-          //   yield* Effect.logWarning("Parsing userInfo failed").pipe(Effect.annotateLogs("r", r))
-          // }
-          // const userProfile = Option.fromNullable(Exit.isSuccess(r) ? r.value : undefined)
-          // if (Option.isSome(userProfile)) {
-          //   // yield* rcc.update((_) => ({ ..._, userPorfile: userProfile.value }))
-          //   ctx = ctx.pipe(Context.add(UserProfile, userProfile.value))
-          // } else if (!config?.allowAnonymous) {
-          //   return yield* new NotLoggedInError({ message: "no auth" })
-          // }
-
-          // if (config?.requireRoles) {
-          //   // TODO
-          //   if (
-          //     !userProfile.value
-          //     || !config.requireRoles.every((role: any) => userProfile.value!.roles.includes(role))
-          //   ) {
-          //     return yield* new UnauthorizedError()
-          //   }
-          // }
-
-          return yield* handler(req).pipe(
-            Effect.retry(optimisticConcurrencySchedule),
-            Effect.provide(ctx as Context.Context<GetEffectContext<CTXMap, T["config"]>>)
-          )
-        })
-        .pipe(
-          Effect.provide(
-            Effect
-              .gen(function*() {
-                yield* Effect.annotateCurrentSpan("request.name", moduleName ? `${moduleName}.${req._tag}` : req._tag)
-                // yield* RequestContextContainer.update((_) => ({
-                //   ..._,
-                //   name: NonEmptyString255(moduleName ? `${moduleName}.${req._tag}` : req._tag)
-                // }))
-                const httpReq = yield* HttpServerRequest.HttpServerRequest
-                // TODO: only pass Authentication etc, or move headers to actual Rpc Headers
-                yield* FiberRef.update(
-                  Rpc.currentHeaders,
-                  (headers) =>
-                    HttpHeaders.merge(
-                      httpReq.headers,
-                      headers
-                    )
-                )
-              })
-              .pipe(Layer.effectDiscard)
-          )
-        )
-    // .pipe(Effect.provide(RequestCacheLayers)) as any
-  })
-})
-
-export const { matchAll, matchFor } = makeRouter(middleware, true)
-
-export type RequestConfig = {
-  /** Disable authentication requirement */
-  allowAnonymous?: true
-  /** Control the roles that are required to access the resource */
-  allowRoles?: readonly string[]
-}
-export const { TaggedRequest: Req } = makeRpcClient<RequestConfig, CTXMap>({
-  // allowAnonymous: NotLoggedInError,
-  requireRoles: UnauthorizedError
-})
-
-export class GetSomething extends Req<GetSomething>()("GetSomething", {
-  id: S.String
-}, { success: S.Void }) {}
-
-export class GetSomethingElse extends Req<GetSomethingElse>()("GetSomethingElse", {
-  id: S.String
-}, { success: S.String }) {}
-
-const Something = { GetSomething, GetSomethingElse, meta: { moduleName: "Something" as const } }
-
-export class SomethingService extends Effect.Service<SomethingService>()("SomethingService", {
-  dependencies: [],
-  effect: Effect.gen(function*() {
-    return {}
-  })
-}) {}
-
-declare const a: {
-  (opt: { a: 1 }): void
-  (opt: { a: 2 }): void
-  (opt: { b: 3 }): void
-  (opt: { b: 3 }): void
-}
-
-export class SomethingRepo extends Effect.Service<SomethingRepo>()("SomethingRepo", {
-  dependencies: [SomethingService.Default],
-  effect: Effect.gen(function*() {
-    const smth = yield* SomethingService
-    console.log({ smth })
-    return {}
-  })
-}) {}
-
-export class SomethingService2 extends Effect.Service<SomethingService2>()("SomethingService2", {
-  dependencies: [],
-  effect: Effect.gen(function*() {
-    return {}
-  })
-}) {}
-
-it("router.legacy2", () => {
-  const routes = matchFor(Something)({
-    dependencies: [
-      SomethingRepo.Default,
-      SomethingService.Default,
-      SomethingService2.Default
-    ],
-    effect: Effect.gen(function*() {
-      const repo = yield* SomethingRepo
-      const smth = yield* SomethingService
-      const smth2 = yield* SomethingService2
-
-      console.log({ repo, smth, smth2 })
-
-      const { GetSomething, GetSomethingElse } = matchFor(Something)
-      return {
-        GetSomething: GetSomething(Effect.void),
-        GetSomethingElse: GetSomethingElse(Effect.succeed("12"))
-      }
-    })
-  })
-  console.log({ routes })
-})

package/test/controller.legacy3.test.ts

@@ -1,195 +0,0 @@
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-import { makeMiddleware, makeRouter } from "@effect-app/infra/api/routing.legacy3"
-import type { RequestContext } from "@effect-app/infra/RequestContext"
-import { Rpc } from "@effect/rpc"
-import type { Request } from "effect-app"
-import { Context, Effect, FiberRef, Layer, S, Schedule } from "effect-app"
-import { type GetEffectContext, makeRpcClient, type RPCContextMap, UnauthorizedError } from "effect-app/client"
-import { HttpHeaders, HttpServerRequest } from "effect-app/http"
-import type * as EffectRequest from "effect/Request"
-import { it } from "vitest"
-
-const optimisticConcurrencySchedule = Schedule.once
-  && Schedule.recurWhile<any>((a) => a?._tag === "OptimisticConcurrencyException")
-
-export interface CTX {
-  context: RequestContext
-}
-
-export type CTXMap = {
-  // allowAnonymous: RPCContextMap.Inverted<"userProfile", UserProfile, typeof NotLoggedInError>
-  // TODO: not boolean but `string[]`
-  requireRoles: RPCContextMap.Custom<"", never, typeof UnauthorizedError, Array<string>>
-}
-const middleware = makeMiddleware({
-  contextMap: null as unknown as CTXMap,
-  // helper to deal with nested generic lmitations
-  context: null as any as HttpServerRequest.HttpServerRequest,
-  execute: Effect.gen(function*() {
-    return <T extends { config?: { [K in keyof CTXMap]?: any } }, Req extends S.TaggedRequest.All, R>(
-      _schema: T & S.Schema<Req, any, never>,
-      handler: (request: Req) => Effect.Effect<EffectRequest.Request.Success<Req>, EffectRequest.Request.Error<Req>, R>,
-      moduleName?: string
-    ) =>
-    (
-      req: Req
-    ): Effect.Effect<
-      Request.Request.Success<Req>,
-      Request.Request.Error<Req>,
-      | HttpServerRequest.HttpServerRequest
-      | Exclude<R, GetEffectContext<CTXMap, T["config"]>>
-    > =>
-      Effect
-        .gen(function*() {
-          // const headers = yield* Rpc.currentHeaders
-          const ctx = Context.empty()
-
-          // const config = "config" in schema ? schema.config : undefined
-
-          // Check JWT
-          // TODO
-          // if (!fakeLogin && !request.allowAnonymous) {
-          //   yield* Effect.catchAll(
-          //     checkJWTI({
-          //       ...authConfig,
-          //       issuer: authConfig.issuer + "/",
-          //       jwksUri: `${authConfig.issuer}/.well-known/jwks.json`
-          //     }),
-          //     (err) => Effect.fail(new JWTError({ error: err }))
-          //   )
-          // }
-
-          // const fakeLogin = true
-          // const r = (fakeLogin
-          //   ? makeUserProfileFromUserHeader(headers["x-user"])
-          //   : makeUserProfileFromAuthorizationHeader(
-          //     headers["authorization"]
-          //   ))
-          //   .pipe(Effect.exit, basicRuntime.runSync)
-          // if (!Exit.isSuccess(r)) {
-          //   yield* Effect.logWarning("Parsing userInfo failed").pipe(Effect.annotateLogs("r", r))
-          // }
-          // const userProfile = Option.fromNullable(Exit.isSuccess(r) ? r.value : undefined)
-          // if (Option.isSome(userProfile)) {
-          //   // yield* rcc.update((_) => ({ ..._, userPorfile: userProfile.value }))
-          //   ctx = ctx.pipe(Context.add(UserProfile, userProfile.value))
-          // } else if (!config?.allowAnonymous) {
-          //   return yield* new NotLoggedInError({ message: "no auth" })
-          // }
-
-          // if (config?.requireRoles) {
-          //   // TODO
-          //   if (
-          //     !userProfile.value
-          //     || !config.requireRoles.every((role: any) => userProfile.value!.roles.includes(role))
-          //   ) {
-          //     return yield* new UnauthorizedError()
-          //   }
-          // }
-
-          return yield* handler(req).pipe(
-            Effect.retry(optimisticConcurrencySchedule),
-            Effect.provide(ctx as Context.Context<GetEffectContext<CTXMap, T["config"]>>)
-          )
-        })
-        .pipe(
-          Effect.provide(
-            Effect
-              .gen(function*() {
-                yield* Effect.annotateCurrentSpan("request.name", moduleName ? `${moduleName}.${req._tag}` : req._tag)
-                // yield* RequestContextContainer.update((_) => ({
-                //   ..._,
-                //   name: NonEmptyString255(moduleName ? `${moduleName}.${req._tag}` : req._tag)
-                // }))
-                const httpReq = yield* HttpServerRequest.HttpServerRequest
-                // TODO: only pass Authentication etc, or move headers to actual Rpc Headers
-                yield* FiberRef.update(
-                  Rpc.currentHeaders,
-                  (headers) =>
-                    HttpHeaders.merge(
-                      httpReq.headers,
-                      headers
-                    )
-                )
-              })
-              .pipe(Layer.effectDiscard)
-          )
-        )
-    // .pipe(Effect.provide(RequestCacheLayers)) as any
-  })
-})
-
-export const { matchAll, matchFor } = makeRouter(middleware, true)
-
-export type RequestConfig = {
-  /** Disable authentication requirement */
-  allowAnonymous?: true
-  /** Control the roles that are required to access the resource */
-  allowRoles?: readonly string[]
-}
-export const { TaggedRequest: Req } = makeRpcClient<RequestConfig, CTXMap>({
-  // allowAnonymous: NotLoggedInError,
-  requireRoles: UnauthorizedError
-})
-
-export class GetSomething extends Req<GetSomething>()("GetSomething", {
-  id: S.String
-}, { success: S.Void }) {}
-
-export class GetSomethingElse extends Req<GetSomethingElse>()("GetSomethingElse", {
-  id: S.String
-}, { success: S.String }) {}
-
-const Something = { GetSomething, GetSomethingElse, meta: { moduleName: "Something" as const } }
-
-export class SomethingService extends Effect.Service<SomethingService>()("SomethingService", {
-  dependencies: [],
-  effect: Effect.gen(function*() {
-    return {}
-  })
-}) {}
-
-declare const a: {
-  (opt: { a: 1 }): void
-  (opt: { a: 2 }): void
-  (opt: { b: 3 }): void
-  (opt: { b: 3 }): void
-}
-
-export class SomethingRepo extends Effect.Service<SomethingRepo>()("SomethingRepo", {
-  dependencies: [SomethingService.Default],
-  effect: Effect.gen(function*() {
-    const smth = yield* SomethingService
-    console.log({ smth })
-    return {}
-  })
-}) {}
-
-export class SomethingService2 extends Effect.Service<SomethingService2>()("SomethingService2", {
-  dependencies: [],
-  effect: Effect.gen(function*() {
-    return {}
-  })
-}) {}
-
-it("router.legacy3 fluent", () => {
-  const routes = matchFor(Something)({
-    dependencies: [
-      SomethingRepo.Default,
-      SomethingService.Default,
-      SomethingService2.Default
-    ],
-    effect: Effect.gen(function*() {
-      const repo = yield* SomethingRepo
-      const smth = yield* SomethingService
-      const smth2 = yield* SomethingService2
-
-      console.log({ repo, smth, smth2 })
-
-      return matchFor(Something)
-        .GetSomething(Effect.void)
-        .GetSomethingElse(Effect.succeed("12"))
-    })
-  })
-  console.log({ routes })
-})