effect-app 4.0.0-beta.29 → 4.0.0-beta.291

package/dist/withToast.js

@@ -0,0 +1,64 @@
+import * as Cause from "effect/Cause";
+import * as Fiber from "effect/Fiber";
+import * as Context from "./Context.js";
+import * as Effect from "./Effect.js";
+import * as Layer from "./Layer.js";
+import * as S from "./Schema.js";
+import { CurrentToastId, Toast } from "./toast.js";
+import { wrapEffect } from "./utils.js";
+// @effect-diagnostics-next-line missingEffectServiceDependency:off
+export class WithToast extends Context.Service()("WithToast", {
+    make: Effect.gen(function* () {
+        const toast = yield* Toast;
+        return (options) => Effect.fnUntraced(function* (self, ...args) {
+            const baseTimeout = options.timeout ?? 3_000;
+            const stableToastId = typeof options.stableToastId === "function"
+                ? options.stableToastId(...args)
+                : options.stableToastId;
+            const requestId = yield* Effect.currentSpan.pipe(Effect.map((span) => span.traceId), Effect.orElseSucceed(() => S.StringId.make()));
+            const groupId = options.groupId;
+            const meta = { ...(groupId !== undefined ? { groupId } : {}), requestId };
+            const t = yield* wrapEffect(options.onWaiting)(...args);
+            const toastId = t === null
+                ? stableToastId
+                : stableToastId ?? `wait-${Math.random().toString(36).slice(2)}`;
+            const waitingFiber = t === null ? undefined : yield* Effect.forkChild(Effect.sleep("1 seconds").pipe(Effect.andThen(toast.info(t, { id: toastId, timeout: Infinity, ...meta }))));
+            const interruptWaiting = waitingFiber ? Fiber.interrupt(waitingFiber) : Effect.void;
+            return yield* self.pipe(Effect.tap(Effect.fnUntraced(function* (a) {
+                yield* interruptWaiting;
+                const t = yield* wrapEffect(options.onSuccess)(a, ...args);
+                if (t === null) {
+                    return;
+                }
+                yield* toast.success(t, toastId !== undefined
+                    ? { id: toastId, timeout: baseTimeout, ...meta }
+                    : { timeout: baseTimeout, ...meta });
+            })), Effect.tapCause(Effect.fnUntraced(function* (cause) {
+                yield* interruptWaiting;
+                yield* Effect.logDebug("WithToast - caught error cause: " + Cause.squash(cause), Cause.hasInterruptsOnly(cause), cause);
+                if (Cause.hasInterruptsOnly(cause)) {
+                    if (toastId)
+                        yield* toast.dismiss(toastId);
+                    return;
+                }
+                const spanInfo = options.showSpanInfo !== false
+                    ? yield* Effect.currentSpan.pipe(Effect.map((span) => `\nTrace: ${span.traceId}\nSpan: ${span.spanId}`), Effect.orElseSucceed(() => ""))
+                    : "";
+                const t = yield* wrapEffect(options.onFailure)(Cause.findErrorOption(cause), ...args);
+                const opts = { timeout: baseTimeout * 2, ...meta };
+                if (typeof t === "object") {
+                    const message = t.message + spanInfo;
+                    return t.level === "warn"
+                        ? yield* toast.warning(message, toastId !== undefined ? { ...opts, id: toastId } : opts)
+                        : yield* toast.error(message, toastId !== undefined ? { ...opts, id: toastId } : opts);
+                }
+                yield* toast.error(t + spanInfo, toastId !== undefined ? { ...opts, id: toastId } : opts);
+            }, Effect.uninterruptible)), toastId !== undefined ? Effect.provideService(CurrentToastId, CurrentToastId.of({ toastId })) : (_) => _);
+        });
+    })
+}) {
+    static DefaultWithoutDependencies = Layer.effect(this, this.make);
+    static Default = this.DefaultWithoutDependencies;
+    static handle = (options) => (self, ...args) => this.use((_) => _(options)(self, ...args));
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid2l0aFRvYXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3dpdGhUb2FzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssS0FBSyxNQUFNLGNBQWMsQ0FBQTtBQUNyQyxPQUFPLEtBQUssS0FBSyxNQUFNLGNBQWMsQ0FBQTtBQUNyQyxPQUFPLEtBQUssT0FBTyxNQUFNLGNBQWMsQ0FBQTtBQUN2QyxPQUFPLEtBQUssTUFBTSxNQUFNLGFBQWEsQ0FBQTtBQUNyQyxPQUFPLEtBQUssS0FBSyxNQUFNLFlBQVksQ0FBQTtBQUVuQyxPQUFPLEtBQUssQ0FBQyxNQUFNLGFBQWEsQ0FBQTtBQUNoQyxPQUFPLEVBQUUsY0FBYyxFQUFFLEtBQUssRUFBZ0IsTUFBTSxZQUFZLENBQUE7QUFDaEUsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLFlBQVksQ0FBQTtBQWtDdkMsbUVBQW1FO0FBQ25FLE1BQU0sT0FBTyxTQUFVLFNBQVEsT0FBTyxDQUFDLE9BQU8sRUFBYSxDQUFDLFdBQVcsRUFBRTtJQUN2RSxJQUFJLEVBQUUsTUFBTSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUM7UUFDeEIsTUFBTSxLQUFLLEdBQUcsS0FBSyxDQUFDLENBQUMsS0FBSyxDQUFBO1FBQzFCLE9BQU8sQ0FDTCxPQUFtRCxFQUNuRCxFQUFFLENBQ0YsTUFBTSxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsRUFBQyxJQUE0QixFQUFFLEdBQUcsSUFBVTtZQUNyRSxNQUFNLFdBQVcsR0FBRyxPQUFPLENBQUMsT0FBTyxJQUFJLEtBQUssQ0FBQTtZQUU1QyxNQUFNLGFBQWEsR0FBRyxPQUFPLE9BQU8sQ0FBQyxhQUFhLEtBQUssVUFBVTtnQkFDL0QsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxhQUFhLENBQUMsR0FBRyxJQUFJLENBQUM7Z0JBQ2hDLENBQUMsQ0FBQyxPQUFPLENBQUMsYUFBYSxDQUFBO1lBRXpCLE1BQU0sU0FBUyxHQUFXLEtBQUssQ0FBQyxD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

package/package.json

@@ -1,31 +1,27 @@
 {
   "name": "effect-app",
-  "version": "4.0.0-beta.29",
+  "version": "4.0.0-beta.291",
   "license": "MIT",
   "type": "module",
   "dependencies": {
     "@tsconfig/strictest": "^2.0.8",
-    "date-fns": "^4.1.0",
-    "nanoid": "^5.1.6",
+    "date-fns": "^4.4.0",
+    "nanoid": "^5.1.11",
     "path-parser": "^6.1.0",
-    "query-string": "^9.3.1",
-    "ts-pattern": "^5.9.0",
+    "query-string": "^9.4.0",
     "ts-toolbelt": "^9.6.0",
-    "uuid": "^13.0.0",
-    "validator": "^13.15.26"
+    "validator": "^13.15.35"
   },
   "devDependencies": {
     "@faker-js/faker": "^8.4.1",
-    "@types/node": "25.3.3",
-    "@types/uuid": "^11.0.0",
+    "@types/node": "25.9.1",
     "@types/validator": "^13.15.10",
-    "fast-check": "~4.5.3",
-    "typescript": "~5.9.3",
-    "vitest": "^4.0.18",
-    "@effect-app/eslint-shared-config": "0.5.7-beta.2"
+    "fast-check": "~4.8.0",
+    "typescript": "~6.0.3",
+    "vitest": "^4.1.7"
   },
   "peerDependencies": {
-    "effect": "^4.0.0-beta.37"
+    "effect": "^4.0.0-beta.90"
   },
   "typesVersions": {
     "*": {
@@ -39,233 +35,10 @@
       "types": "./dist/index.d.ts",
       "default": "./dist/index.js"
     },
-    "./Array": {
-      "types": "./dist/Array.d.ts",
-      "default": "./dist/Array.js"
-    },
-    "./Chunk": {
-      "types": "./dist/Chunk.d.ts",
-      "default": "./dist/Chunk.js"
-    },
-    "./Config/SecretURL": {
-      "types": "./dist/Config/SecretURL.d.ts",
-      "default": "./dist/Config/SecretURL.js"
-    },
-    "./Effect": {
-      "types": "./dist/Effect.d.ts",
-      "default": "./dist/Effect.js"
-    },
-    "./Function": {
-      "types": "./dist/Function.d.ts",
-      "default": "./dist/Function.js"
-    },
-    "./Inputify.type": {
-      "types": "./dist/Inputify.type.d.ts",
-      "default": "./dist/Inputify.type.js"
-    },
-    "./Layer": {
-      "types": "./dist/Layer.d.ts",
-      "default": "./dist/Layer.js"
-    },
-    "./NonEmptySet": {
-      "types": "./dist/NonEmptySet.d.ts",
-      "default": "./dist/NonEmptySet.js"
-    },
-    "./Operations": {
-      "types": "./dist/Operations.d.ts",
-      "default": "./dist/Operations.js"
-    },
-    "./Option": {
-      "types": "./dist/Option.d.ts",
-      "default": "./dist/Option.js"
-    },
-    "./Pure": {
-      "types": "./dist/Pure.d.ts",
-      "default": "./dist/Pure.js"
-    },
-    "./Schema": {
-      "types": "./dist/Schema.d.ts",
-      "default": "./dist/Schema.js"
-    },
-    "./Schema/Class": {
-      "types": "./dist/Schema/Class.d.ts",
-      "default": "./dist/Schema/Class.js"
-    },
-    "./Schema/FastCheck": {
-      "types": "./dist/Schema/FastCheck.d.ts",
-      "default": "./dist/Schema/FastCheck.js"
-    },
-    "./Schema/Methods": {
-      "types": "./dist/Schema/Methods.d.ts",
-      "default": "./dist/Schema/Methods.js"
-    },
-    "./Schema/brand": {
-      "types": "./dist/Schema/brand.d.ts",
-      "default": "./dist/Schema/brand.js"
-    },
-    "./Schema/email": {
-      "types": "./dist/Schema/email.d.ts",
-      "default": "./dist/Schema/email.js"
-    },
-    "./Schema/ext": {
-      "types": "./dist/Schema/ext.d.ts",
-      "default": "./dist/Schema/ext.js"
-    },
-    "./Schema/moreStrings": {
-      "types": "./dist/Schema/moreStrings.d.ts",
-      "default": "./dist/Schema/moreStrings.js"
-    },
-    "./Schema/numbers": {
-      "types": "./dist/Schema/numbers.d.ts",
-      "default": "./dist/Schema/numbers.js"
-    },
-    "./Schema/phoneNumber": {
-      "types": "./dist/Schema/phoneNumber.d.ts",
-      "default": "./dist/Schema/phoneNumber.js"
-    },
-    "./Schema/schema": {
-      "types": "./dist/Schema/schema.d.ts",
-      "default": "./dist/Schema/schema.js"
-    },
-    "./Schema/strings": {
-      "types": "./dist/Schema/strings.d.ts",
-      "default": "./dist/Schema/strings.js"
-    },
-    "./ServiceMap": {
-      "types": "./dist/ServiceMap.d.ts",
-      "default": "./dist/ServiceMap.js"
-    },
-    "./Set": {
-      "types": "./dist/Set.d.ts",
-      "default": "./dist/Set.js"
-    },
-    "./TypeTest": {
-      "types": "./dist/TypeTest.d.ts",
-      "default": "./dist/TypeTest.js"
-    },
-    "./Types": {
-      "types": "./dist/Types.d.ts",
-      "default": "./dist/Types.js"
-    },
-    "./Widen.type": {
-      "types": "./dist/Widen.type.d.ts",
-      "default": "./dist/Widen.type.js"
-    },
-    "./_ext/Array": {
-      "types": "./dist/_ext/Array.d.ts",
-      "default": "./dist/_ext/Array.js"
-    },
-    "./_ext/date": {
-      "types": "./dist/_ext/date.d.ts",
-      "default": "./dist/_ext/date.js"
-    },
-    "./_ext/misc": {
-      "types": "./dist/_ext/misc.d.ts",
-      "default": "./dist/_ext/misc.js"
-    },
-    "./_ext/ord.ext": {
-      "types": "./dist/_ext/ord.ext.d.ts",
-      "default": "./dist/_ext/ord.ext.js"
-    },
-    "./builtin": {
-      "types": "./dist/builtin.d.ts",
-      "default": "./dist/builtin.js"
-    },
-    "./client": {
-      "types": "./dist/client.d.ts",
-      "default": "./dist/client.js"
-    },
-    "./client/apiClientFactory": {
-      "types": "./dist/client/apiClientFactory.d.ts",
-      "default": "./dist/client/apiClientFactory.js"
-    },
-    "./client/clientFor": {
-      "types": "./dist/client/clientFor.d.ts",
-      "default": "./dist/client/clientFor.js"
-    },
-    "./client/errors": {
-      "types": "./dist/client/errors.d.ts",
-      "default": "./dist/client/errors.js"
-    },
-    "./client/makeClient": {
-      "types": "./dist/client/makeClient.d.ts",
-      "default": "./dist/client/makeClient.js"
-    },
-    "./faker": {
-      "types": "./dist/faker.d.ts",
-      "default": "./dist/faker.js"
-    },
-    "./http": {
-      "types": "./dist/http.d.ts",
-      "default": "./dist/http.js"
-    },
-    "./http/Request": {
-      "types": "./dist/http/Request.d.ts",
-      "default": "./dist/http/Request.js"
-    },
-    "./ids": {
-      "types": "./dist/ids.d.ts",
-      "default": "./dist/ids.js"
-    },
-    "./logger": {
-      "types": "./dist/logger.d.ts",
-      "default": "./dist/logger.js"
-    },
-    "./middleware": {
-      "types": "./dist/middleware.d.ts",
-      "default": "./dist/middleware.js"
-    },
-    "./rpc": {
-      "types": "./dist/rpc.d.ts",
-      "default": "./dist/rpc.js"
-    },
-    "./rpc/MiddlewareMaker": {
-      "types": "./dist/rpc/MiddlewareMaker.d.ts",
-      "default": "./dist/rpc/MiddlewareMaker.js"
-    },
-    "./rpc/RpcContextMap": {
-      "types": "./dist/rpc/RpcContextMap.d.ts",
-      "default": "./dist/rpc/RpcContextMap.js"
-    },
-    "./rpc/RpcMiddleware": {
-      "types": "./dist/rpc/RpcMiddleware.d.ts",
-      "default": "./dist/rpc/RpcMiddleware.js"
-    },
-    "./transform": {
-      "types": "./dist/transform.d.ts",
-      "default": "./dist/transform.js"
-    },
-    "./utils": {
-      "types": "./dist/utils.d.ts",
-      "default": "./dist/utils.js"
-    },
-    "./utils/effectify": {
-      "types": "./dist/utils/effectify.d.ts",
-      "default": "./dist/utils/effectify.js"
-    },
-    "./utils/extend": {
-      "types": "./dist/utils/extend.d.ts",
-      "default": "./dist/utils/extend.js"
-    },
-    "./utils/gen": {
-      "types": "./dist/utils/gen.d.ts",
-      "default": "./dist/utils/gen.js"
-    },
-    "./utils/logLevel": {
-      "types": "./dist/utils/logLevel.d.ts",
-      "default": "./dist/utils/logLevel.js"
-    },
-    "./utils/logger": {
-      "types": "./dist/utils/logger.d.ts",
-      "default": "./dist/utils/logger.js"
-    },
-    "./validation": {
-      "types": "./dist/validation.d.ts",
-      "default": "./dist/validation.js"
-    },
-    "./validation/validators": {
-      "types": "./dist/validation/validators.d.ts",
-      "default": "./dist/validation/validators.js"
+    "./internal/*": null,
+    "./*": {
+      "types": "./dist/*.d.ts",
+      "default": "./dist/*.js"
     }
   },
   "gitHead": "bd8e27eea3eff97db8739d577d67e7336c078d28",
@@ -279,26 +52,24 @@
   ],
   "scripts": {
     "watch": "pnpm build:tsc -w",
-    "build:tsc": "pnpm clean-dist && effect-app-cli packagejson && pnpm check",
-    "check": "tsc --build",
-    "build:tsc-src": "pnpm clean-dist && effect-app-cli packagejson tsc --build ./tsconfig.src.json",
+    "build:tsc": "pnpm clean-dist && pnpm check && node ../../scripts/rewrite-dist-declaration-imports.mjs dist",
+    "check": "tsgo --build",
+    "build:tsc-src": "pnpm clean-dist && tsc --build ./tsconfig.src.json && node ../../scripts/rewrite-dist-declaration-imports.mjs dist",
     "build:src": "pnpm build:tsc-src",
     "build": "pnpm build:tsc",
-    "watch2": "pnpm clean-dist && NODE_OPTIONS=--max-old-space-size=6144 tsc -w",
+    "watch2": "pnpm clean-dist && NODE_OPTIONS=--max-old-space-size=6144 tsgo -w",
     "clean": "rm -rf dist",
     "clean-dist": "sh ../../scripts/clean-dist.sh",
     "circular": "pnpm circular:src && pnpm circular:dist",
     "circular:src": "madge --circular --ts-config ./tsconfig.json --extensions ts ./src",
     "circular:dist": "madge --circular --extensions js ./dist",
-    "compile": "NODE_OPTIONS=--max-old-space-size=6144 tsc --noEmit",
-    "lint": "NODE_OPTIONS=--max-old-space-size=6144 ESLINT_TS=1 eslint ./src",
-    "lint:watch": "ESLINT_TS=1 esw -w --changed --clear --ext ts,tsx .",
-    "lint-fix": "pnpm lint --fix",
+    "compile": "NODE_OPTIONS=--max-old-space-size=6144 tsgo --noEmit",
+    "lint": "oxlint --type-aware ./src && pnpm exec dprint check --config ../../dprint.jsonc .",
+    "lint-fix": "oxlint --type-aware --fix ./src && pnpm exec dprint fmt --config ../../dprint.jsonc .",
     "test": "vitest",
     "test:run": "pnpm run test run --passWithNoTests",
     "testsuite": "pnpm lint && pnpm circular && pnpm run test:run",
     "ncu": "ncu",
-    "pub": "pnpm prepublish && npm publish --access public",
-    "prepublish": "cp -f ./tsconfig.json ./tsconfig.json.bak && node ../../scripts/mergeTsConfig.mjs ./tsconfig.json"
+    "pub": "npm publish --access public"
   }
 }

package/src/Array.ts

@@ -1,9 +1,9 @@
-import { Chunk, Effect } from "effect"
 import type { NonEmptyArray, NonEmptyReadonlyArray } from "effect/Array"
 import * as Array from "effect/Array"
-import * as T from "effect/Effect"
-import { dual, type Predicate } from "./Function.js"
-import * as Option from "./Option.js"
+import * as Chunk from "effect/Chunk"
+import * as Effect from "effect/Effect"
+import { dual, type Predicate } from "./Function.ts"
+import * as Option from "./Option.ts"
 
 export const toNonEmptyArray = Option.liftPredicate(Array.isReadonlyArrayNonEmpty)
 
@@ -104,7 +104,7 @@ export function chunk_<T>(items_: Iterable<T>, size: number) {
 }
 
 export function forEachEffectNA<A, R, E, B>(as: NonEmptyReadonlyArray<A>, f: (a: A) => Effect.Effect<B, E, R>) {
-  return Effect.map(T.forEach(as, f), (_) => Option.getOrNull(toNonEmptyArray(_)))
+  return Effect.map(Effect.forEach(as, f), (_) => Option.getOrNull(toNonEmptyArray(_)))
 }
 
 export * from "effect/Array"

package/src/Chunk.ts

@@ -1,9 +1,9 @@
-import { pipe, type Predicate, type Refinement } from "./Function.js"
-import * as Option from "./Option.js"
+import { pipe, type Predicate, type Refinement } from "./Function.ts"
+import * as Option from "./Option.ts"
 
 import * as Chunk from "effect/Chunk"
 import { type Equivalence } from "effect/Equivalence"
-import * as Array from "./Array.js"
+import * as Array from "./Array.ts"
 
 export * from "effect/Chunk"
 

package/src/Config/SecretURL.ts

@@ -1,9 +1,11 @@
 /**
  * @since 1.0.0
  */
-import { Config, type Equal, type Redacted } from "effect"
 import type * as Chunk from "effect/Chunk"
-import * as internal from "./internal/configSecretURL.js"
+import * as Config from "effect/Config"
+import type * as Equal from "effect/Equal"
+import type * as Redacted from "effect/Redacted"
+import * as internal from "./internal/configSecretURL.ts"
 
 // /**
 //  * @since 1.0.0
@@ -21,6 +23,7 @@ import * as internal from "./internal/configSecretURL.js"
  * @since 1.0.0
  * @category models
  */
+// eslint-disable-next-line import/namespace
 export interface SecretURL extends Redacted.Redacted, Equal.Equal {
   /** @internal */
   readonly raw: Array<number>
@@ -73,5 +76,5 @@ export const value: (self: SecretURL) => string = internal.value
 export const unsafeWipe: (self: SecretURL) => void = internal.unsafeWipe
 
 export const secretURL = (name?: string): Config.Config<SecretURL> => {
-  return Config.map(Config.string(name), fromString)
+  return Config.map(Config.nonEmptyString(name), fromString)
 }

package/src/Config/internal/configSecretURL.ts

@@ -1,6 +1,6 @@
-import { Redacted } from "effect"
 import * as Chunk from "effect/Chunk"
-import type * as SecretURL from "../SecretURL.js"
+import * as Redacted from "effect/Redacted"
+import type * as SecretURL from "../SecretURL.ts"
 
 /** @internal */
 export const isSecretURL = (u: unknown): u is SecretURL.SecretURL => {

package/src/Config.ts

@@ -0,0 +1,7 @@
+// `Config.nested` previously needed a local override because effect v3's `nested`
+// did not run the provider's `mapInput`/`constantCase` over the nested namespace
+// segment (see commit "fix Config.nested mapping"). As of effect 4.0.0-beta.84 the
+// upstream `nested` threads the prefix through the lookup path, so the provider
+// transform covers it — the override is obsolete and the old internals it used are
+// gone. Re-export the native module directly.
+export * from "effect/Config"

package/src/ConfigProvider.ts

@@ -0,0 +1,5 @@
+// Local `nested` override removed: it existed to make the nested namespace honour the
+// provider's `mapInput`/`constantCase` (see commit "fix Config.nested mapping"), which
+// effect 4.0.0-beta.84 now does natively. The old override also relied on internals
+// (`provider.get`/`mapInput`/`prefix`) that no longer exist. Re-export native directly.
+export * from "effect/ConfigProvider"

package/src/{ServiceMap.ts → Context.ts}

@@ -1,21 +1,17 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-/**
- * We're doing the long way around here with assignTag, TagBase & TagBaseTagged,
- * because there's a typescript compiler issue where it will complain about Equal.symbol, and Hash.symbol not being accessible.
- * https://github.com/microsoft/TypeScript/issues/52644
- */
+/* eslint-disable import/namespace */
 
-import { type Effect, Layer, type Scope, type Types } from "effect"
-import * as ServiceMap from "effect/ServiceMap"
-import { type Yieldable } from "./Effect.js"
+import * as CTX from "effect/Context"
+import type * as Effect from "effect/Effect"
+import * as Layer from "effect/Layer"
+import type * as Scope from "effect/Scope"
+import type * as Types from "effect/Types"
 
-export * from "effect/ServiceMap"
+export * from "effect/Context"
 
-export interface Opaque<Self extends object, in out Shape extends object>
-  extends ServiceMap.Key<Self, Self>, Yieldable<Opaque<Self, Shape>, Self, never, Self>
-{
+export interface Opaque<Self extends object, in out Shape extends object> extends CTX.Key<Self, Self> {
   of(this: void, self: Shape): Self
-  serviceMap(self: Shape): ServiceMap.ServiceMap<Self>
+  context(self: Shape): CTX.Context<Self>
   // a version that leverages the Shape -> Self conversion
   toLayer: <E, R>(
     eff: Effect.Effect<Shape, E, R>
@@ -25,11 +21,11 @@ export interface Opaque<Self extends object, in out Shape extends object>
 }
 
 // export interface OpaqueMake<Self extends object, in out Shape extends object, E, R>
-//   extends ServiceMap.Service<Self, Self>
+//   extends CTX.Service<Self, Self>
 // {
 //   // temp while sorting out https://github.com/Effect-TS/effect-smol/pull/1534
 //   of(self: Shape): Self
-//   serviceMap2(self: Shape): ServiceMap.ServiceMap<Self>
+//   contextMap2(self: Shape): CTX.Context<Self>
 //   // a version that leverages the Shape -> Self conversion
 //   toLayer: {
 //     <E, R>(
@@ -44,7 +40,7 @@ export function assignTag<Identifier extends object, Shape extends object = Iden
   creationError?: Error
 ) {
   return <S extends object>(cls: S): S & Opaque<Identifier, Shape> => {
-    const tag = ServiceMap.Service<Identifier, Shape>(key)
+    const tag = CTX.Service<Identifier, Shape>(key)
     let fields = tag
     if (Reflect.ownKeys(cls).includes("key")) {
       const { key, ...rest } = tag
@@ -67,54 +63,51 @@ export function assignTag<Identifier extends object, Shape extends object = Iden
   }
 }
 
-export type ServiceAcessorShape<Self, Type> = Type extends Record<PropertyKey, any> ? {
-    [
-      k in keyof Type as Type[k] extends ((...args: [...infer Args]) => infer Ret)
-        ? ((...args: Readonly<Args>) => Ret) extends Type[k] ? k : never
-        : k
-    ]: Type[k] extends (...args: [...infer Args]) => Effect.Effect<infer A, infer E, infer R>
-      ? (...args: Readonly<Args>) => Effect.Effect<A, E, Self | R>
-      : Type[k] extends (...args: [...infer Args]) => infer A
-        ? (...args: Readonly<Args>) => Effect.Effect<A, never, Self>
-      : Type[k] extends Effect.Effect<infer A, infer E, infer R> ? Effect.Effect<A, E, Self | R>
-      : Effect.Effect<Type[k], never, Self>
-  }
-  : {}
+/** Accessor for a service method that returns a plain value. Wraps via `useSync`. */
+export const accessFn = <
+  Self extends object,
+  Shape extends Record<PropertyKey, any>,
+  K extends keyof Shape
+>(
+  Tag: Opaque<Self, Shape>,
+  key: K
+): Shape[K] extends (...args: [...infer Args]) => infer A ? (...args: Readonly<Args>) => Effect.Effect<A, never, Self>
+  : never => ((...args: Array<any>) => Tag.useSync((s: any) => s[key](...args))) as any
 
-/**
- * Only use this in very specific cases where using dependencies directly is prefered, like inside command handlers.
- */
-export const proxify = <T extends object>(Tag: T) =>
-<Self, Shape>():
-  & T
-  & ServiceAcessorShape<Self, Shape> =>
-{
-  const cache = new Map()
-  const done = new Proxy(Tag, {
-    get(_target: any, prop: any, _receiver) {
-      if (prop === "use") {
-        // @ts-expect-error abc
-        return (body) => (Tag as any).use(body)
-      }
-      if (prop in Tag) {
-        return (Tag as any)[prop]
-      }
-      if (cache.has(prop)) {
-        return cache.get(prop)
-      }
-      const fn = (...args: Array<any>) => (Tag as any).use((s: any) => s[prop](...args))
-      const cn = (Tag as any).use((s: any) => s[prop])
-      // @effect-diagnostics effect/floatingEffect:off
-      Object.assign(fn, cn)
-      Object.setPrototypeOf(fn, Object.getPrototypeOf(cn))
-      cache.set(prop, fn)
-      return fn
-    }
-  })
-  return done
-}
+/** Accessor for a service method that returns an Effect. Delegates via `use`. */
+export const accessEffectFn = <
+  Self extends object,
+  Shape extends Record<PropertyKey, any>,
+  K extends keyof Shape
+>(
+  Tag: Opaque<Self, Shape>,
+  key: K
+): Shape[K] extends (...args: [...infer Args]) => Effect.Effect<infer A, infer E, infer R>
+  ? (...args: Readonly<Args>) => Effect.Effect<A, E, Self | R>
+  : never => ((...args: Array<any>) => Tag.use((s: any) => s[key](...args))) as any
+
+/** Accessor for a service property (constant). Wraps via `useSync`. */
+export const accessCn = <
+  Self extends object,
+  Shape extends Record<PropertyKey, any>,
+  K extends keyof Shape
+>(
+  Tag: Opaque<Self, Shape>,
+  key: K
+): Effect.Effect<Shape[K], never, Self> => Tag.useSync((s) => s[key])
+
+/** Accessor for a service property that is an Effect. Delegates via `use`. */
+export const accessEffectCn = <
+  Self extends object,
+  Shape extends Record<PropertyKey, any>,
+  K extends keyof Shape
+>(
+  Tag: Opaque<Self, Shape>,
+  key: K
+): Shape[K] extends Effect.Effect<infer A, infer E, infer R> ? Effect.Effect<A, E, Self | R>
+  : never => Tag.use((s: any) => s[key]) as any
 
-export const TypeId = "~ServiceMap.Opaque"
+export const TypeId = "~Context.Opaque"
 
 // export function Opaque<const Key extends string>(key: Key) {
 //   return <Identifier extends object, Shape extends object>() => {
@@ -179,7 +172,7 @@ export const Opaque: {
     >
     & { readonly make: Make }
 } = () => (id: string, options: any) => {
-  const svc = ServiceMap.Service()(id, options) as any
+  const svc = CTX.Service()(id, options) as any
   return Object.assign(svc, {
     toLayer: (eff: Effect.Effect<any, any, any>) => {
       return Layer.effect(svc, eff)