@shivaedev/service 0.8.2 → 0.9.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 0.9.1 - 2026-11-11
+
+### Changed
+
+- Align published dependency requirements with the workspace.
+
+## 0.9.0 - 2026-11-08
+
+### Added
+
+- Expose `requirementLayer` at `@shivaedev/service/adapters/requirementLayer.ts` for binding declared requirements in the service Layer.
+
 ## 0.8.2 - 2026-11-07
 
 ### Fixed

package/README.md

@@ -46,7 +46,7 @@ A **service definition** has four parts: an identity, the services it requires,
 
 An **operation** is an `Effect.fn("Service.operation")` export in its own file, in the service's folder beside its `service.ts`. It reads every dependency with `yield*`: repositories, `SqlClient`, HTTP clients, config, other services and the caller. A dependency never arrives as a parameter, a closure capture or a bundle, and the acting user's id is never an argument. A target id, such as the account an administrator acts on, is an ordinary argument.
 
-A **declared dependency** is a service tag in `requires`. The Layer supplies those services to initialization and binds them to each operation, and the public operation's type no longer requires them. If a caller provides a different value for a declared dependency around a call, the operation still uses the value supplied when the Layer was built.
+A **declared dependency** is a service tag in `requires`. The Layer supplies those services to initialization and binds them to each operation, and the public operation's type no longer requires them. The requirement binder lives in `src/adapters/requirementLayer.ts`; it captures the Layer's declared services once and provides them to initialization and operations. If a caller provides a different value for a declared dependency around a call, the operation still uses the value supplied when the Layer was built.
 
 The **lifetime** of a service is its Layer's. Each build of the Layer runs `initialize` once, and every call on that build shares its state. Where the Layer is registered decides the lifetime: built once by the host, the service is global; built for each request, it is per request and may require the caller, such as `SessionUser` or `Subject`, which the host provides for that request; built with `Layer.fresh` or for a single use, it is fresh each time. A service that requires the caller cannot be built globally, because nothing global provides the caller.
 
@@ -266,6 +266,8 @@ Import the module that defines the name:
 | `@shivaedev/service/genericMethod.ts`       | `genericMethod(method)`                                                            | Preserve a generic Effect-returning function and its caller requirements.               |
 | `@shivaedev/service/ServiceRequirements.ts` | `ServiceRequirements<Requirements, Success, Failure = never, CallerScope = never>` | Annotate an `Effect.fn` generator with declared dependencies and optional caller scope. |
 
+The public `defineService` entry stays at `@shivaedev/service/defineService.ts`. Its context-capturing requirement binder lives in `@shivaedev/service/adapters/requirementLayer.ts`.
+
 The definition's fields are:
 
 | Field            | Meaning                                                                                                               |

package/dist/adapters/requirementLayer.d.ts

@@ -0,0 +1,12 @@
+import { Context, Effect, Layer } from "effect";
+import type { MethodRecord, RuntimeMethodInventory } from "#MethodProof.ts";
+import type { RequirementRecord } from "#ServiceRequirements.ts";
+interface RuntimeDefinition<TState> {
+    readonly id: string;
+    readonly initialize: Effect.Effect<TState, unknown, unknown>;
+    readonly methods: (state: TState) => RuntimeMethodInventory;
+    readonly requires: RequirementRecord;
+}
+export declare function requirementLayer<TState>(service: Context.Service<string, MethodRecord>, definition: RuntimeDefinition<TState>): Layer.Layer<string, unknown, string>;
+export {};
+//# sourceMappingURL=requirementLayer.d.ts.map

package/dist/adapters/requirementLayer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"requirementLayer.d.ts","sourceRoot":"","sources":["../../src/adapters/requirementLayer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAU,MAAM,QAAQ,CAAC;AACxD,OAAO,KAAK,EAAe,YAAY,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AACzF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,UAAU,iBAAiB,CAAC,MAAM;IACjC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IAC7D,QAAQ,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,sBAAsB,CAAC;IAC5D,QAAQ,CAAC,QAAQ,EAAE,iBAAiB,CAAC;CACrC;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE,UAAU,EAAE,iBAAiB,CAAC,MAAM,CAAC,wCAY7H"}

package/dist/adapters/requirementLayer.js

@@ -0,0 +1,13 @@
+import { Context, Effect, Layer, Record } from "effect";
+export function requirementLayer(service, definition) {
+    return Layer.effect(service)(Effect.gen(function* () {
+        const ambient = yield* Effect.context();
+        const declared = Context.pick(...definition.requires)(ambient);
+        const state = yield* Effect.provide(definition.initialize, declared);
+        return Record.map(definition.methods(state), (entry) => {
+            const method = typeof entry === "function" ? entry : entry.method;
+            return (...arguments_) => Effect.provide(method(...arguments_), declared);
+        });
+    }));
+}
+//# sourceMappingURL=requirementLayer.js.map

package/dist/adapters/requirementLayer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"requirementLayer.js","sourceRoot":"","sources":["../../src/adapters/requirementLayer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAWxD,MAAM,UAAU,gBAAgB,CAAS,OAA8C,EAAE,UAAqC;IAC7H,OAAO,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAC3B,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QACnB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,EAAU,CAAC;QAChD,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC;QAC/D,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QACrE,OAAO,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,KAAkB,EAAE,EAAE;YACnE,MAAM,MAAM,GAAG,OAAO,KAAK,KAAK,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC;YAClE,OAAO,CAAC,GAAG,UAA4B,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,UAAU,CAAC,EAAE,QAAQ,CAAC,CAAC;QAC7F,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CACF,CAAC;AACH,CAAC"}

package/dist/defineService.d.ts

@@ -1,4 +1,4 @@
-import { Context, Effect, Layer } from "effect";
+import { Context, type Effect, type Layer } from "effect";
 import type { GenericMethodDescriptor } from "#genericMethod.ts";
 import type { InitializerProof } from "#InitializerProof.ts";
 import type { MethodInventory, MethodProof } from "#MethodProof.ts";

package/dist/defineService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"defineService.d.ts","sourceRoot":"","sources":["../src/defineService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAU,MAAM,QAAQ,CAAC;AACxD,OAAO,KAAK,EAAa,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAC5E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,KAAK,EAAe,eAAe,EAAE,WAAW,EAAwC,MAAM,iBAAiB,CAAC;AACvH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAEjF,KAAK,WAAW,CAAC,OAAO,EAAE,aAAa,IAAI,OAAO,SAAS,CAC1D,GAAG,UAAU,EAAE,MAAM,UAAU,KAC3B,MAAM,CAAC,MAAM,CAAC,MAAM,QAAQ,EAAE,MAAM,QAAQ,EAAE,MAAM,SAAS,CAAC,GAChE,CAAC,GAAG,UAAU,EAAE,UAAU,KAAK,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC,GACnG,KAAK,CAAC;AAET,KAAK,YAAY,CAAC,MAAM,EAAE,aAAa,IAAI,MAAM,SAAS,uBAAuB,CAAC,MAAM,OAAO,CAAC,GAAG,OAAO,GAAG,WAAW,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;AAEhJ,KAAK,YAAY,CAAC,QAAQ,SAAS,eAAe,EAAE,aAAa,SAAS,iBAAiB,IAAI,QAAQ,CAAC;KACtG,KAAK,IAAI,MAAM,QAAQ,GAAG,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,cAAc,CAAC,aAAa,CAAC,CAAC;CACvF,CAAC,CAAC;AAEH,UAAU,iBAAiB,CAC1B,WAAW,SAAS,MAAM,EAC1B,aAAa,SAAS,iBAAiB,EACvC,YAAY,SAAS,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,EAC7D,QAAQ,SAAS,eAAe;IAEhC,QAAQ,CAAC,EAAE,EAAE,WAAW,CAAC;IACzB,QAAQ,CAAC,UAAU,EAAE,YAAY,GAAG,gBAAgB,CAAC,YAAY,EAAE,cAAc,CAAC,aAAa,CAAC,CAAC,CAAC;IAClG,QAAQ,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,QAAQ,GAAG,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,aAAa,CAAC,CAAC;IACpH,QAAQ,CAAC,QAAQ,EAAE,aAAa,GAAG,gBAAgB,CAAC,aAAa,CAAC,CAAC;CACnE;AASD,KAAK,cAAc,CAAC,WAAW,SAAS,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,IAAI,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,GAAG;IACzH,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,WAAW,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;CAClE,CAAC;AAEF,wBAAgB,aAAa,CAC5B,KAAK,CAAC,WAAW,SAAS,MAAM,EAChC,KAAK,CAAC,aAAa,SAAS,iBAAiB,EAC7C,KAAK,CAAC,YAAY,SAAS,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,EACnE,KAAK,CAAC,QAAQ,SAAS,eAAe,EAEtC,UAAU,EAAE,iBAAiB,CAAC,WAAW,EAAE,aAAa,EAAE,YAAY,EAAE,QAAQ,CAAC,GAC/E,cAAc,CAAC,WAAW,EAAE,YAAY,CAAC,QAAQ,EAAE,aAAa,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,cAAc,CAAC,aAAa,CAAC,CAAC,CAAC"}
+{"version":3,"file":"defineService.d.ts","sourceRoot":"","sources":["../src/defineService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,KAAK,EAAE,MAAM,QAAQ,CAAC;AAE1D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AACjE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,KAAK,EAAE,eAAe,EAAE,WAAW,EAAwC,MAAM,iBAAiB,CAAC;AAC1G,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAEjF,KAAK,WAAW,CAAC,OAAO,EAAE,aAAa,IAAI,OAAO,SAAS,CAC1D,GAAG,UAAU,EAAE,MAAM,UAAU,KAC3B,MAAM,CAAC,MAAM,CAAC,MAAM,QAAQ,EAAE,MAAM,QAAQ,EAAE,MAAM,SAAS,CAAC,GAChE,CAAC,GAAG,UAAU,EAAE,UAAU,KAAK,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC,GACnG,KAAK,CAAC;AAET,KAAK,YAAY,CAAC,MAAM,EAAE,aAAa,IAAI,MAAM,SAAS,uBAAuB,CAAC,MAAM,OAAO,CAAC,GAAG,OAAO,GAAG,WAAW,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;AAEhJ,KAAK,YAAY,CAAC,QAAQ,SAAS,eAAe,EAAE,aAAa,SAAS,iBAAiB,IAAI,QAAQ,CAAC;KACtG,KAAK,IAAI,MAAM,QAAQ,GAAG,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,cAAc,CAAC,aAAa,CAAC,CAAC;CACvF,CAAC,CAAC;AAEH,UAAU,iBAAiB,CAC1B,WAAW,SAAS,MAAM,EAC1B,aAAa,SAAS,iBAAiB,EACvC,YAAY,SAAS,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,EAC7D,QAAQ,SAAS,eAAe;IAEhC,QAAQ,CAAC,EAAE,EAAE,WAAW,CAAC;IACzB,QAAQ,CAAC,UAAU,EAAE,YAAY,GAAG,gBAAgB,CAAC,YAAY,EAAE,cAAc,CAAC,aAAa,CAAC,CAAC,CAAC;IAClG,QAAQ,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,QAAQ,GAAG,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,aAAa,CAAC,CAAC;IACpH,QAAQ,CAAC,QAAQ,EAAE,aAAa,GAAG,gBAAgB,CAAC,aAAa,CAAC,CAAC;CACnE;AASD,KAAK,cAAc,CAAC,WAAW,SAAS,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,IAAI,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,GAAG;IACzH,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,WAAW,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;CAClE,CAAC;AAEF,wBAAgB,aAAa,CAC5B,KAAK,CAAC,WAAW,SAAS,MAAM,EAChC,KAAK,CAAC,aAAa,SAAS,iBAAiB,EAC7C,KAAK,CAAC,YAAY,SAAS,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,EACnE,KAAK,CAAC,QAAQ,SAAS,eAAe,EAEtC,UAAU,EAAE,iBAAiB,CAAC,WAAW,EAAE,aAAa,EAAE,YAAY,EAAE,QAAQ,CAAC,GAC/E,cAAc,CAAC,WAAW,EAAE,YAAY,CAAC,QAAQ,EAAE,aAAa,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,cAAc,CAAC,aAAa,CAAC,CAAC,CAAC"}

package/dist/defineService.js

@@ -1,15 +1,8 @@
-import { Context, Effect, Layer, Record } from "effect";
+import { Context } from "effect";
+import { requirementLayer } from "#adapters/requirementLayer.ts";
 export function defineService(definition) {
     const service = Context.Service(definition.id);
-    const layer = Layer.effect(service)(Effect.gen(function* () {
-        const ambient = yield* Effect.context();
-        const declared = Context.pick(...definition.requires)(ambient);
-        const state = yield* Effect.provide(definition.initialize, declared);
-        return Record.map(definition.methods(state), (entry) => {
-            const method = typeof entry === "function" ? entry : entry.method;
-            return (...arguments_) => Effect.provide(method(...arguments_), declared);
-        });
-    }));
+    const layer = requirementLayer(service, definition);
     return Object.assign(service, { layer });
 }
 //# sourceMappingURL=defineService.js.map

package/dist/defineService.js.map

@@ -1 +1 @@
-{"version":3,"file":"defineService.js","sourceRoot":"","sources":["../src/defineService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAkDxD,MAAM,UAAU,aAAa,CAAS,UAAqC;IAC1E,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAuB,UAAU,CAAC,EAAE,CAAC,CAAC;IACrE,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAClC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QACnB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,EAAU,CAAC;QAChD,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC;QAC/D,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QACrE,OAAO,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,KAAkB,EAAE,EAAE;YACnE,MAAM,MAAM,GAAc,OAAO,KAAK,KAAK,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC;YAC7E,OAAO,CAAC,GAAG,UAA4B,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,UAAU,CAAC,EAAE,QAAQ,CAAC,CAAC;QAC7F,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CACF,CAAC;IACF,OAAO,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;AAC1C,CAAC"}
+{"version":3,"file":"defineService.js","sourceRoot":"","sources":["../src/defineService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAA2B,MAAM,QAAQ,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAkDjE,MAAM,UAAU,aAAa,CAAS,UAAqC;IAC1E,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAuB,UAAU,CAAC,EAAE,CAAC,CAAC;IACrE,MAAM,KAAK,GAAG,gBAAgB,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IACpD,OAAO,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;AAC1C,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shivaedev/service",
-  "version": "0.8.2",
+  "version": "0.9.1",
   "description": "Declared Effect services with scoped initialization and bound dependencies",
   "keywords": [
     "effect"
@@ -43,17 +43,16 @@
     "README.md"
   ],
   "devDependencies": {
-    "@effect/vitest": "4.1.1",
-    "@shivaedev/quality": "0.72.2",
-    "@shivaedev/test": "0.17.1",
-    "@shivaedev/test-story": "0.45.3",
+    "@effect/vitest": "4.1.2",
+    "@shivaedev/quality": "0.77.0",
+    "@shivaedev/test-story": "0.47.0",
     "@types/node": "24.19.2",
-    "effect": "4.1.1",
+    "effect": "4.1.2",
     "typescript": "7.0.2",
-    "vitest": "5.0.5"
+    "vitest": "5.1.0"
   },
   "peerDependencies": {
-    "effect": "4.1.1"
+    "effect": "4.1.2"
   },
   "engines": {
     "node": ">=24"

package/src/adapters/requirementLayer.ts

@@ -0,0 +1,24 @@
+import { Context, Effect, Layer, Record } from "effect";
+import type { MethodEntry, MethodRecord, RuntimeMethodInventory } from "#MethodProof.ts";
+import type { RequirementRecord } from "#ServiceRequirements.ts";
+
+interface RuntimeDefinition<TState> {
+	readonly id: string;
+	readonly initialize: Effect.Effect<TState, unknown, unknown>;
+	readonly methods: (state: TState) => RuntimeMethodInventory;
+	readonly requires: RequirementRecord;
+}
+
+export function requirementLayer<TState>(service: Context.Service<string, MethodRecord>, definition: RuntimeDefinition<TState>) {
+	return Layer.effect(service)(
+		Effect.gen(function* () {
+			const ambient = yield* Effect.context<string>();
+			const declared = Context.pick(...definition.requires)(ambient);
+			const state = yield* Effect.provide(definition.initialize, declared);
+			return Record.map(definition.methods(state), (entry: MethodEntry) => {
+				const method = typeof entry === "function" ? entry : entry.method;
+				return (...arguments_: readonly never[]) => Effect.provide(method(...arguments_), declared);
+			});
+		}),
+	);
+}

package/src/defineService.ts

@@ -1,7 +1,8 @@
-import { Context, Effect, Layer, Record } from "effect";
-import type { AnyMethod, GenericMethodDescriptor } from "#genericMethod.ts";
+import { Context, type Effect, type Layer } from "effect";
+import { requirementLayer } from "#adapters/requirementLayer.ts";
+import type { GenericMethodDescriptor } from "#genericMethod.ts";
 import type { InitializerProof } from "#InitializerProof.ts";
-import type { MethodEntry, MethodInventory, MethodProof, MethodRecord, RuntimeMethodInventory } from "#MethodProof.ts";
+import type { MethodInventory, MethodProof, MethodRecord, RuntimeMethodInventory } from "#MethodProof.ts";
 import type { RequirementProof } from "#RequirementProof.ts";
 import type { RequirementRecord, RequirementsOf } from "#ServiceRequirements.ts";
 
@@ -50,16 +51,6 @@ export function defineService<
 ): DefinedService<TIdentifier, ServiceShape<TMethods, TRequirements>, Effect.Error<TInitializer>, RequirementsOf<TRequirements>>;
 export function defineService<TState>(definition: RuntimeDefinition<TState>): unknown {
 	const service = Context.Service<string, MethodRecord>(definition.id);
-	const layer = Layer.effect(service)(
-		Effect.gen(function* () {
-			const ambient = yield* Effect.context<string>();
-			const declared = Context.pick(...definition.requires)(ambient);
-			const state = yield* Effect.provide(definition.initialize, declared);
-			return Record.map(definition.methods(state), (entry: MethodEntry) => {
-				const method: AnyMethod = typeof entry === "function" ? entry : entry.method;
-				return (...arguments_: readonly never[]) => Effect.provide(method(...arguments_), declared);
-			});
-		}),
-	);
+	const layer = requirementLayer(service, definition);
 	return Object.assign(service, { layer });
 }