@effect-app/infra 4.0.0-beta.23 → 4.0.0-beta.230

package/test/fixtures.ts

@@ -1,9 +1,14 @@
-import { Effect, Layer, S, Scope, ServiceMap } from "effect-app"
 import { NotLoggedInError, UnauthorizedError } from "effect-app/client"
-import { RpcContextMap, RpcX } from "effect-app/rpc"
-import { TaggedError } from "effect-app/Schema"
+import * as Context from "effect-app/Context"
+import * as Effect from "effect-app/Effect"
+import * as Layer from "effect-app/Layer"
+import * as RpcX from "effect-app/rpc"
+import { RpcContextMap } from "effect-app/rpc"
+import * as S from "effect-app/Schema"
+import { TaggedErrorClass } from "effect-app/Schema"
+import * as Scope from "effect/Scope"
 
-export class UserProfile extends ServiceMap.assignTag<UserProfile, UserProfile>("UserProfile")(
+export class UserProfile extends Context.assignTag<UserProfile, UserProfile>("UserProfile")(
   S.Class<UserProfile>("UserProfile")({
     id: S.String,
     roles: S.Array(S.String)
@@ -11,10 +16,10 @@ export class UserProfile extends ServiceMap.assignTag<UserProfile, UserProfile>(
 ) {
 }
 
-export class Some extends ServiceMap.Opaque<Some>()("Some", { make: Effect.succeed({ a: 1 }) }) {}
-export class SomeElse extends ServiceMap.Opaque<SomeElse>()("SomeElse", { make: Effect.succeed({ b: 2 }) }) {}
+export class Some extends Context.Opaque<Some>()("Some", { make: Effect.succeed({ a: 1 }) }) {}
+export class SomeElse extends Context.Opaque<SomeElse>()("SomeElse", { make: Effect.succeed({ b: 2 }) }) {}
 const MakeSomeService = Effect.succeed({ a: 1 })
-export class SomeService extends ServiceMap.Opaque<SomeService>()("SomeService", { make: MakeSomeService }) {
+export class SomeService extends Context.Opaque<SomeService>()("SomeService", { make: MakeSomeService }) {
   static readonly Default = this.toLayer(this.make)
 }
 
@@ -128,5 +133,7 @@ export const TestLive = Layer.effect(
   })
 )
 
-export class CustomError1 extends TaggedError<CustomError1>()("CustomError1", {}) {}
-export class CustomError2 extends TaggedError<CustomError2>()("CustomError2", {}) {}
+export class Counter extends Context.Opaque<Counter>()("Counter", { make: Effect.succeed({ a: 0 }) }) {}
+
+export class CustomError1 extends TaggedErrorClass<CustomError1>()("CustomError1", {}) {}
+export class CustomError2 extends TaggedErrorClass<CustomError2>()("CustomError2", {}) {}

package/test/layerUtils.test.ts

@@ -1,5 +1,5 @@
 import { expectTypeOf, it } from "@effect/vitest"
-import { type Layer } from "effect"
+import type * as Layer from "effect/Layer"
 import { type LayerUtils } from "../src/api/layerUtils.js"
 
 it("works", () => {