@effect-app/infra 2.87.2 → 2.89.0

package/test/requires.test.ts

@@ -1,8 +1,11 @@
-import { expect, expectTypeOf, it } from "@effect/vitest"
-import { Effect, Either, Layer, S } from "effect-app"
+import { Rpc } from "@effect/rpc"
+import { type SuccessValue } from "@effect/rpc/RpcMiddleware"
+import { describe, expect, expectTypeOf, it } from "@effect/vitest"
+import { Context, Effect, Either, Layer, S } from "effect-app"
 import { NotLoggedInError, UnauthorizedError } from "effect-app/client"
+import { HttpHeaders } from "effect-app/http"
 import { makeMiddleware, Middleware } from "../src/api/routing.js"
-import { AllowAnonymous, type RequestContextMap, RequireRoles, Some, SomeElse, Test } from "./fixtures.js"
+import { AllowAnonymous, RequestContextMap, RequireRoles, Some, SomeElse, SomeService, Test } from "./fixtures.js"
 
 export class SomeMiddleware extends Middleware.Tag<SomeMiddleware>()("SomeMiddleware", {
   provides: Some
@@ -17,6 +20,18 @@ export class SomeMiddleware extends Middleware.Tag<SomeMiddleware>()("SomeMiddle
 }) {
 }
 
+// functionally equivalent to the one above
+export class SomeMiddlewareWrap extends Middleware.Tag<SomeMiddlewareWrap>()("SomeMiddlewareWrap", {
+  provides: Some,
+  wrap: true
+})({
+  effect: Effect.gen(function*() {
+    // yield* Effect.context<"test-dep">()
+    return ({ next }) => next.pipe(Effect.provideService(Some, new Some({ a: 1 })))
+  })
+}) {
+}
+
 export class SomeElseMiddleware extends Middleware.Tag<SomeElseMiddleware>()("SomeElseMiddleware", {
   provides: SomeElse,
   wrap: true
@@ -48,109 +63,137 @@ export class RequiresSomeMiddleware extends Middleware.Tag<RequiresSomeMiddlewar
 }) {
 }
 
-it("requires gets enforced", async () => {
-  const middleware3 = makeMiddleware<RequestContextMap>()
-    .middleware(RequiresSomeMiddleware)
-    .middleware(SomeMiddleware)
-    .middleware(RequireRoles)
-    .middleware(AllowAnonymous, Test)
-    .middleware(SomeElseMiddleware)
-
-  const layer = middleware3.Default.pipe(Layer.provide(Layer.succeed(Some, new Some({ a: 1 }))))
-
-  type Default = typeof middleware3["Default"]
-  type LayerContext = Layer.Layer.Context<Default>
-  expectTypeOf({} as LayerContext).toEqualTypeOf<Some>()
-
-  await Effect
-    .gen(function*() {
-      const mw = yield* middleware3
-      const mwM = mw.effect(
-        Object.assign({}, S.Any, { config: { requireRoles: ["manager"] } }),
-        (_req) => Effect.void,
-        "some-module"
-      )
-      yield* mwM({}, { "x-user": "test-user", "x-is-manager": "true" })
-    })
-    .pipe(
-      Effect.scoped,
-      Effect.provide(layer),
-      Effect.runPromise
-    )
+const middleware3 = makeMiddleware(RequestContextMap)
+  .middleware(RequiresSomeMiddleware)
+  .middleware(SomeMiddleware)
+  .middleware(RequireRoles)
+  .middleware(AllowAnonymous, Test)
+  .middleware(SomeElseMiddleware)
 
-  await Effect
-    .gen(function*() {
-      const mw = yield* middleware3
-      const mwM = mw.effect(
-        Object.assign({}, S.Any, { config: { allowAnonymous: true } }),
-        (_req) => Effect.void,
-        "some-module"
-      )
-      yield* mwM({}, {})
-    })
-    .pipe(
-      Effect.scoped,
-      Effect.provide(layer),
-      Effect.runPromise
-    )
+const _middlewareSideways = makeMiddleware(RequestContextMap)
+  .middleware(RequiresSomeMiddleware)
+  .middleware(SomeMiddleware)
+  .middleware(RequireRoles, AllowAnonymous, Test)
+  .middleware(SomeElseMiddleware)
+
+const _middlewareSidewaysFully = makeMiddleware(RequestContextMap)
+  .middleware(RequiresSomeMiddleware, SomeMiddleware, RequireRoles, AllowAnonymous, Test, SomeElseMiddleware)
+
+const _middleware3Bis = makeMiddleware(RequestContextMap)
+  .middleware(RequiresSomeMiddleware)
+  .middleware(SomeMiddlewareWrap)
+  .middleware(RequireRoles)
+  .middleware(AllowAnonymous, Test)
+  .middleware(SomeElseMiddleware)
 
-  expect(
-    await Effect
-      .gen(function*() {
-        const mw = yield* middleware3
-        const mwM = mw.effect(
-          Object.assign({}, S.Any, { config: {} }),
-          (_req) => Effect.void,
-          "some-module"
+expectTypeOf(_middlewareSideways).toEqualTypeOf<typeof middleware3>()
+expectTypeOf(_middlewareSidewaysFully).toEqualTypeOf<typeof _middlewareSideways>()
+expectTypeOf(_middleware3Bis).toEqualTypeOf<typeof middleware3>()
+
+type Default = typeof middleware3["Default"]
+type LayerContext = Layer.Layer.Context<Default>
+expectTypeOf({} as LayerContext).toEqualTypeOf<SomeService>()
+
+class TestRequest extends S.TaggedRequest<Test>("Test")("Test", {
+  payload: {},
+  success: S.Void,
+  failure: S.Never
+}) {}
+
+const testSuite = (_mw: typeof middleware3) =>
+  describe("middleware" + _mw, () => {
+    it.effect(
+      "works",
+      Effect.fn(function*() {
+        const defaultReq = {
+          headers: HttpHeaders.unsafeFromRecord({}),
+          payload: { _tag: "Test" },
+          clientId: 0,
+          rpc: { ...Rpc.fromTaggedRequest(TestRequest), annotations: Context.make(_mw.requestContext, {}) },
+          next: Effect.void as unknown as Effect<SuccessValue, never, any>
+        }
+        const layer = _mw.Default.pipe(Layer.provide(SomeService.toLayer()))
+        yield* Effect
+          .gen(function*() {
+            const mw = yield* _mw
+            const mwM = mw(
+              Object.assign({ ...defaultReq }, {
+                headers: { "x-user": "test-user", "x-is-manager": "true" },
+                rpc: { ...defaultReq.rpc, annotations: Context.make(_mw.requestContext, { requireRoles: ["manager"] }) }
+              })
+            )
+            yield* mwM
+          })
+          .pipe(
+            Effect.scoped,
+            Effect.provide(layer)
+          )
+
+        expect(
+          yield* Effect
+            .gen(function*() {
+              const mw = yield* _mw
+              const mwM = mw(
+                Object.assign({ ...defaultReq }, {})
+              )
+              yield* mwM
+            })
+            .pipe(
+              Effect.scoped,
+              Effect.provide(layer),
+              Effect.either
+            )
         )
-        yield* mwM({}, {})
-      })
-      .pipe(
-        Effect.scoped,
-        Effect.provide(layer),
-        Effect.either,
-        Effect.runPromise
-      )
-  )
-    .toEqual(Either.left(new NotLoggedInError()))
-
-  expect(
-    await Effect
-      .gen(function*() {
-        const mw = yield* middleware3
-        const mwM = mw.effect(
-          Object.assign({}, S.Any, { config: { requireRoles: ["manager"] } }),
-          (_req) => Effect.void,
-          "some-module"
+          .toEqual(Either.left(new NotLoggedInError()))
+
+        expect(
+          yield* Effect
+            .gen(function*() {
+              const mw = yield* _mw
+              const mwM = mw(
+                Object.assign({ ...defaultReq }, {
+                  rpc: {
+                    ...defaultReq.rpc,
+                    annotations: Context.make(_mw.requestContext, { requireRoles: ["manager"] })
+                  }
+                })
+              )
+              yield* mwM
+            })
+            .pipe(
+              Effect.scoped,
+              Effect.provide(layer),
+              Effect.either
+            )
         )
-        yield* mwM({}, {})
-      })
-      .pipe(
-        Effect.scoped,
-        Effect.provide(layer),
-        Effect.either,
-        Effect.runPromise
-      )
-  )
-    .toEqual(Either.left(new NotLoggedInError()))
-
-  expect(
-    await Effect
-      .gen(function*() {
-        const mw = yield* middleware3
-        const mwM = mw.effect(
-          Object.assign({}, S.Any, { config: { requireRoles: ["manager"] } }),
-          (_req) => Effect.void,
-          "some-module"
+          .toEqual(Either.left(new NotLoggedInError()))
+
+        expect(
+          yield* Effect
+            .gen(function*() {
+              const mw = yield* _mw
+              const mwM = mw(
+                Object.assign({ ...defaultReq }, { headers: { "x-user": "test-user" } }, {
+                  rpc: {
+                    ...defaultReq.rpc,
+                    annotations: Context.make(_mw.requestContext, { requireRoles: ["manager"] })
+                  }
+                })
+              )
+              yield* mwM
+            })
+            .pipe(
+              Effect.scoped,
+              Effect.provide(layer),
+              Effect.either
+            )
         )
-        yield* mwM({}, { "x-user": "test-user" })
+          .toEqual(Either.left(new UnauthorizedError({ message: "don't have the right roles" })))
       })
-      .pipe(
-        Effect.scoped,
-        Effect.provide(layer),
-        Effect.either,
-        Effect.runPromise
-      )
-  )
-    .toEqual(Either.left(new UnauthorizedError({ message: "don't have the right roles" })))
-})
+    )
+  })
+
+testSuite(middleware3)
+testSuite(_middleware3Bis)
+testSuite(_middlewareSideways)
+testSuite(_middlewareSidewaysFully)

package/dist/api/routing/middleware/ContextProvider.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ContextProvider.d.ts","sourceRoot":"","sources":["../../../../src/api/routing/middleware/ContextProvider.ts"],"names":[],"mappings":"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"}

package/dist/api/routing/middleware/ContextProvider.js

@@ -1,38 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import { Context, Effect, Layer, pipe } from "effect-app";
-import { mergeContexts } from "../../layerUtils.js";
-// Note: the type here must be aligned with MergedContextProvider
-export const mergeContextProviders = (
-// long life to reverse mapped types
-...deps) => ({
-    dependencies: deps.map((_) => _.Default),
-    effect: Effect.gen(function* () {
-        // uses the tags to request the context providers
-        const makers = yield* Effect.all(deps);
-        return Effect
-            .gen(function* () {
-            const services = makers.map((handle, i) => ({
-                maker: deps[i],
-                handle: handle[Symbol.toStringTag] === "GeneratorFunction" ? Effect.fnUntraced(handle)() : handle
-            }));
-            // services are effects which return some Context.Context<...>
-            const context = yield* mergeContexts(services);
-            return context;
-        });
-    })
-});
-// Effect Rpc Middleware: for single tag providing, we could use Provides, for providing Context or Layer (bad boy) we could use Wrap..
-export const ContextProvider = (input) => {
-    const ctx = Context.GenericTag("ContextProvider");
-    const e = input.effect.pipe(Effect.map((eg) => eg[Symbol.toStringTag] === "GeneratorFunction" ? Effect.fnUntraced(eg)() : eg));
-    const l = Layer.scoped(ctx, e);
-    return Object.assign(ctx, {
-        Default: l.pipe(input.dependencies ? Layer.provide(input.dependencies) : (_) => _)
-    });
-};
-// Note: the type here must be aligned with mergeContextProviders
-export const MergedContextProvider = (
-// long life to reverse mapped types
-...deps) => pipe(deps, (_) => mergeContextProviders(..._), (_) => ContextProvider(_));
-export const EmptyContextProvider = ContextProvider({ effect: Effect.succeed(Effect.succeed(Context.empty())) });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29udGV4dFByb3ZpZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2FwaS9yb3V0aW5nL21pZGRsZXdhcmUvQ29udGV4dFByb3ZpZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLHVEQUF1RDtBQUN2RCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQThCLElBQUksRUFBYyxNQUFNLFlBQVksQ0FBQTtBQUtqRyxPQUFPLEVBQWdFLGFBQWEsRUFBRSxNQUFNLHFCQUFxQixDQUFBO0FBd0VqSCxpRUFBaUU7QUFDakUsTUFBTSxDQUFDLE1BQU0scUJBQXFCLEdBQUc7QUFHbkMsb0NBQW9DO0FBQ3BDLEdBQUcsSUFBcUIsRUFheEIsRUFBRSxDQUFDLENBQUM7SUFDSixZQUFZLEVBQUUsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUUsQ0FBUyxDQUFDLE9BQU8sQ0FBUTtJQUN4RCxNQUFNLEVBQUUsTUFBTSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUM7UUFDMUIsaURBQWlEO1FBQ2pELE1BQU0sTUFBTSxHQUFHLEtBQUssQ0FBQyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsSUFBYSxDQUFDLENBQUE7UUFDL0MsT0FBTyxNQUFNO2FBQ1YsR0FBRyxDQUFDLFFBQVEsQ0FBQztZQUNaLE1BQU0sUUFBUSxHQUFJLE1BQWdCLENBQUMsR0FBRyxDQUFDLENBQUMsTUFBTSxFQUFFLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FDcEQ7Z0JBQ0UsS0FBSyxFQUFFLElBQUksQ0FBQyxDQUFDLENBQUM7Z0JBQ2QsTUFBTSxFQUFFLE1BQU0sQ0FBQyxNQUFNLENBQUMsV0FBVyxDQUFDLEtBQUssbUJBQW1CLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsTUFBTTthQUNsRyxDQUNGLENBQUMsQ0FBQTtZQUNGLDhEQUE4RDtZQUM5RCxNQUFNLE9BQU8sR0FBRyxLQUFLLENBQUMsQ0FBQyxhQUFhLENBQUMsUUFBZSxDQUFDLENBQUE7WUFDckQsT0FBTyxPQUFPLENBQUE7UUFDaEIsQ0FBQyxDQUFDLENBQUE7SUFDTixDQUFDLENBQVE7Q0FDVixDQUFDLENBQUE7QUFFRix1SUFBdUk7QUFDdkksTUFBTSxDQUFDLE1BQU0sZUFBZSxHQUFHLENBTzdCLEtBWUMsRUFDRCxFQUFFO0lBQ0YsTUFBTSxHQUFHLEdBQUcsT0FBTyxDQUFDLFVBQVUsQ0FJNUIsaUJBQWlCLENBQ2xCLENBQUE7SUFDRCxNQUFNLENBQUMsR0FBRyxLQUFLLENBQUMsTUFBTSxDQUFDLElBQUksQ0FDekIsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLENBQUUsRUFBVSxDQUFDLE1BQU0sQ0FBQyxXQUFXLENBQUMsS0FBSyxtQkFBbUIsQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQyxFQUFTLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FDbEgsQ0FBQTtJQUNELE1BQU0sQ0FBQyxHQUFHLEtBQUssQ0FBQyxNQUFNLENBQUMsR0FBRyxFQUFFLENBQVEsQ0FBQyxDQUFBO0lBQ3JDLE9BQU8sTUFBTSxDQUFDLE1BQU0sQ0FBQyxHQUFHLEVBQUU7UUFDeEIsT0FBTyxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQ2IsS0FBSyxDQUFDLFlBQVksQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsWUFBWSxDQUFRLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBT3pFO0tBQ0YsQ0FBQyxDQUFBO0FBQ0osQ0FBQyxDQUFBO0FBRUQsaUVBQWlFO0FBQ2pFLE1BQU0sQ0FBQyxNQUFNLHFCQUFxQixHQUFHO0FBR25DLG9DQUFvQztBQUNwQyxHQUFHLElBQXFCLEVBQ3hCLEVBQUUsQ0FDRixJQUFJLENBQ0YsSUFBcUQsRUFDckQsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLHFCQUFxQixDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQ2xDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxlQUFlLENBQUMsQ0FBUSxDQUFDLENBZWpDLENBQUE7QUFFSCxNQUFNLENBQUMsTUFBTSxvQkFBb0IsR0FBRyxlQUFlLENBQUMsRUFBRSxNQUFNLEVBQUUsTUFBTSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFBIn0=