effect-app 4.0.0-beta.10 → 4.0.0-beta.101

package/CHANGELOG.md

@@ -1,5 +1,397 @@
 # @effect-app/prelude
 
+## 4.0.0-beta.101
+
+## 4.0.0-beta.100
+
+## 4.0.0-beta.99
+
+## 4.0.0-beta.98
+
+## 4.0.0-beta.97
+
+## 4.0.0-beta.96
+
+### Patch Changes
+
+- 5615e47: bs
+
+## 4.0.0-beta.95
+
+### Patch Changes
+
+- 88838fb: Remove pick/omit customizations from Class/TaggedClass/Struct/TaggedStruct. Use `Struct.pick(X.fields, [...])` from `effect-app` instead.
+
+## 4.0.0-beta.94
+
+## 4.0.0-beta.93
+
+## 4.0.0-beta.92
+
+## 4.0.0-beta.91
+
+### Minor Changes
+
+- 738b482: Add pick/omit to Struct and TaggedStruct
+
+## 4.0.0-beta.90
+
+## 4.0.0-beta.89
+
+## 4.0.0-beta.88
+
+## 4.0.0-beta.87
+
+## 4.0.0-beta.86
+
+## 4.0.0-beta.85
+
+## 4.0.0-beta.84
+
+## 4.0.0-beta.83
+
+## 4.0.0-beta.82
+
+## 4.0.0-beta.81
+
+## 4.0.0-beta.80
+
+## 4.0.0-beta.79
+
+### Minor Changes
+
+- d16845e: Remove `TaggedRequest` from `makeRpcClient`, now only `TaggedRequestFor` is returned. Remove all legacy `meta.moduleName` support — `id` and `moduleName` are now required on `Req` type. Remove `makeRpcGroup` (use `makeRpcGroupFromRequestsAndModuleName` instead).
+
+## 4.0.0-beta.78
+
+## 4.0.0-beta.77
+
+### Minor Changes
+
+- 3613e87: Add `TaggedRequestFor` helper to `makeRpcClient` that curries a `moduleName`, producing request classes with static `id` and `moduleName` properties. This enables passing request classes directly to `makeQueryKey` without going through `clientFor` first. The `clientFor` function no longer requires a `meta` property on the module when requests carry `moduleName`. The meta codegen preset now generates `Req = TaggedRequestFor(moduleName)`. Original `TaggedRequest` remains for backwards compatibility.
+
+## 4.0.0-beta.76
+
+### Patch Changes
+
+- a5248a9: use new schema features
+- fac725d: update effect to latest beta
+
+## 4.0.0-beta.75
+
+### Patch Changes
+
+- 24f0a5a: rename Literal to Literals, no longer hiding Schema's singular Literal.
+
+## 4.0.0-beta.74
+
+### Patch Changes
+
+- 54ec1ef: fix bs
+
+## 4.0.0-beta.73
+
+## 4.0.0-beta.72
+
+### Patch Changes
+
+- 0541f0d: fix withDefault types
+
+## 4.0.0-beta.71
+
+### Minor Changes
+
+- beae3a0: Remove `withDefaultConstructor` wrapper, use `S.withConstructorDefault` directly with `Effect.succeed`/`Effect.sync`.
+
+## 4.0.0-beta.70
+
+## 4.0.0-beta.69
+
+### Patch Changes
+
+- dc465e3: update to latest effect beta
+
+## 4.0.0-beta.68
+
+### Patch Changes
+
+- e6f2341: Add SecretURL tests and switch secretURL config to use Config.nonEmptyString
+
+## 4.0.0-beta.67
+
+## 4.0.0-beta.66
+
+### Patch Changes
+
+- edc52e4: update
+
+## 4.0.0-beta.65
+
+### Minor Changes
+
+- 1f103b2: Replace `proxify` with explicit service accessor helpers: `accessFn`, `accessEffectFn`, `accessCn`, `accessEffectCn`.
+
+### Patch Changes
+
+- 31739d7: Fix JSON schema output for Email, Date, PhoneNumber, and Url schemas. The `jsonSchema` annotation key is not recognized by Effect v4's JSON schema generator — use proper v4 annotations (`format`, `description`) and built-in checks (`isMinLength`, `isMaxLength`) instead.
+
+## 4.0.0-beta.64
+
+### Patch Changes
+
+- c1a6fdc: fix proxify
+
+## 4.0.0-beta.63
+
+## 4.0.0-beta.62
+
+### Patch Changes
+
+- 0b21a02: fix: flatten simple allOf constraints in JSON Schema output for better codegen compatibility
+
+## 4.0.0-beta.61
+
+## 4.0.0-beta.60
+
+## 4.0.0-beta.59
+
+### Patch Changes
+
+- cec026d: update packages
+
+## 4.0.0-beta.58
+
+## 4.0.0-beta.57
+
+## 4.0.0-beta.56
+
+## 4.0.0-beta.55
+
+## 4.0.0-beta.54
+
+### Patch Changes
+
+- d867272: the return of `Context`
+
+## 4.0.0-beta.53
+
+### Patch Changes
+
+- ee9694e: fix type issue?
+
+## 4.0.0-beta.52
+
+### Minor Changes
+
+- 6252808: Add `ReadonlySetFromArray` and `ReadonlyMapFromArray` schema transformations that decode from annotated arrays to Set/Map. Update `ReadonlySet` and `ReadonlyMap` to use these internally.
+
+## 4.0.0-beta.51
+
+## 4.0.0-beta.50
+
+## 4.0.0-beta.49
+
+### Patch Changes
+
+- e585c9c: fix config nested
+
+## 4.0.0-beta.48
+
+### Patch Changes
+
+- 0c88f78: Remove `TaggedError` compatibility re-export, use `TaggedErrorClass` directly
+
+## 4.0.0-beta.47
+
+### Patch Changes
+
+- 3365758: workaround effect error messages
+
+## 4.0.0-beta.46
+
+## 4.0.0-beta.45
+
+### Patch Changes
+
+- 10b55ff: update packages
+
+## 4.0.0-beta.44
+
+### Patch Changes
+
+- a37aa38: Update to effect beta 43
+
+## 4.0.0-beta.43
+
+## 4.0.0-beta.42
+
+## 4.0.0-beta.41
+
+## 4.0.0-beta.40
+
+## 4.0.0-beta.39
+
+### Patch Changes
+
+- 10e90d5: fix: TaggedRequest should be an Opaque Schema Class
+
+## 4.0.0-beta.38
+
+### Patch Changes
+
+- 0b3e00e: fix bug
+
+## 4.0.0-beta.37
+
+### Patch Changes
+
+- 947fe20: fix input date
+
+## 4.0.0-beta.36
+
+## 4.0.0-beta.35
+
+## 4.0.0-beta.34
+
+### Patch Changes
+
+- 8c645d5: update to latest effect
+
+## 4.0.0-beta.33
+
+### Patch Changes
+
+- 4b95009: use Finite instead of Number
+
+## 4.0.0-beta.32
+
+### Patch Changes
+
+- 01d862a: again
+
+## 4.0.0-beta.31
+
+### Patch Changes
+
+- 6b6d601: fix ForceVOid
+
+## 4.0.0-beta.30
+
+### Patch Changes
+
+- 5ec1f45: fix ForceVoid for real
+
+## 4.0.0-beta.29
+
+### Patch Changes
+
+- a899d46: Replace `ForceVoid` in `makeClient` with a typed codec transformation instead of an unsafe cast.
+
+## 4.0.0-beta.28
+
+### Patch Changes
+
+- 0099208: Refactor `Pure` helpers to use typed `useSync` calls instead of unsafe casts.
+
+## 4.0.0-beta.27
+
+### Patch Changes
+
+- 601a1ff: update effect to 4.0.0-beta.37 and drop the Schema Class disableValidation workaround now that the patched effect schema covers it
+
+## 4.0.0-beta.26
+
+### Patch Changes
+
+- 4da28e2: Change `Schema.Class` and `Schema.TaggedClass` wrappers to default constructor options to `{ disableValidation: true }`.
+
+  This avoids strict class identifier validation by default when constructing wrapper classes (for example passing a compatible view class), while keeping existing behavior when explicit options are provided.
+
+## 4.0.0-beta.25
+
+### Patch Changes
+
+- 6282d4b: Update `Effect.allLower` to call `svc.asEffect()` when available, ensuring service entries are normalized before `Effect.all` evaluation.
+
+## 4.0.0-beta.24
+
+### Patch Changes
+
+- 32f71bf: Fix `Schema.TaggedUnion(...).tags` extraction for class-based members (for example `TaggedClass`) by using a local AST sentinel walker instead of relying on internal effect APIs.
+
+  Add tests covering:
+
+  - `TaggedUnion` with `encodeKeys`-wrapped members
+  - `TaggedUnion` with `TaggedClass` members
+
+## 4.0.0-beta.23
+
+### Patch Changes
+
+- ea08a79: remove `fields` constraint from TaggedUnion/tags helpers, extract `_tag` via AST walk instead
+
+## 4.0.0-beta.22
+
+## 4.0.0-beta.21
+
+### Patch Changes
+
+- 0d349e7: Align effect-app tagged union helpers with Effect v4 by delegating to the native tagged union utilities, exposing v4-style `cases` and `guards`, and preserving the local `tags` helper.
+- 75c72ee: update effect to 4.0.0-beta.36, adapt to Option<A> revert from A | undefined
+
+## 4.0.0-beta.20
+
+### Patch Changes
+
+- aa921db: Fix `TaggedRequest` no-config error type inference so requests without a third argument infer the same default error schema as requests with explicit success config.
+
+## 4.0.0-beta.19
+
+### Patch Changes
+
+- ffc10a4: Migrate `Schema/ext` context helpers to Effect v4 by implementing `provide` and `contextFromServices` with proper service subtraction across decoding and encoding requirements.
+
+## 4.0.0-beta.18
+
+### Patch Changes
+
+- e9dbbdd: Tighten schema helper generics in `Schema/ext.ts` so default-related helpers accept properly named schema type parameters instead of bare `S.Top` inputs.
+
+## 4.0.0-beta.17
+
+### Patch Changes
+
+- c8a6a3f: fix TaggedUnion
+
+## 4.0.0-beta.16
+
+### Patch Changes
+
+- 56db2c4: fix: isA
+
+## 4.0.0-beta.15
+
+### Patch Changes
+
+- 20186b6: Migrate schema arbitrary annotations to Effect v4 `toArbitrary` and cover `StringId` generation with a fast-check test.
+
+## 4.0.0-beta.14
+
+## 4.0.0-beta.13
+
+### Patch Changes
+
+- 16de88c: remove hopefully obsolete Struct overrides
+- 1c3c541: Update Effect dependencies to 4.0.0-beta.31 across workspace packages.
+- de2359d: Update Effect dependencies to 4.0.0-beta.28 across workspace packages.
+- 0d72f34: Update Effect dependencies to 4.0.0-beta.29 across workspace packages.
+
+## 4.0.0-beta.12
+
+### Patch Changes
+
+- 622d54a: Configure Changesets fixed versioning for public packages.
+
 ## 4.0.0-beta.10
 
 ### Patch Changes

package/dist/Config/SecretURL.js

@@ -36,6 +36,6 @@ export const value = internal.value;
  */
 export const unsafeWipe = internal.unsafeWipe;
 export const secretURL = (name) => {
-    return Config.map(Config.string(name), fromString);
+    return Config.map(Config.nonEmptyString(name), fromString);
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2VjcmV0VVJMLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0NvbmZpZy9TZWNyZXRVUkwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7O0dBRUc7QUFDSCxPQUFPLEVBQUUsTUFBTSxFQUE2QixNQUFNLFFBQVEsQ0FBQTtBQUUxRCxPQUFPLEtBQUssUUFBUSxNQUFNLCtCQUErQixDQUFBO0FBeUJ6RCxNQUFNLENBQUMsTUFBTSxTQUFTLEdBQWlCLEVBQUUsQ0FBQTtBQU96Qzs7OztHQUlHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sV0FBVyxHQUFtQyxRQUFRLENBQUMsV0FBVyxDQUFBO0FBRS9FOzs7R0FHRztBQUNILE1BQU0sQ0FBQyxNQUFNLElBQUksR0FBd0MsUUFBUSxDQUFDLElBQUksQ0FBQTtBQUV0RTs7O0dBR0c7QUFDSCxNQUFNLENBQUMsTUFBTSxTQUFTLEdBQThDLFFBQVEsQ0FBQyxTQUFTLENBQUE7QUFFdEY7OztHQUdHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFnQyxRQUFRLENBQUMsVUFBVSxDQUFBO0FBRTFFOzs7R0FHRztBQUNILE1BQU0sQ0FBQyxNQUFNLEtBQUssR0FBZ0MsUUFBUSxDQUFDLEtBQUssQ0FBQTtBQUVoRTs7O0dBR0c7QUFDSCxNQUFNLENBQUMsTUFBTSxVQUFVLEdBQThCLFFBQVEsQ0FBQyxVQUFVLENBQUE7QUFFeEUsTUFBTSxDQUFDLE1BQU0sU0FBUyxHQUFHLENBQUMsSUFBYSxFQUE0QixFQUFFO0lBQ25FLE9BQU8sTUFBTSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxFQUFFLFVBQVUsQ0FBQyxDQUFBO0FBQ3BELENBQUMsQ0FBQSJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2VjcmV0VVJMLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0NvbmZpZy9TZWNyZXRVUkwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7O0dBRUc7QUFDSCxPQUFPLEVBQUUsTUFBTSxFQUE2QixNQUFNLFFBQVEsQ0FBQTtBQUUxRCxPQUFPLEtBQUssUUFBUSxNQUFNLCtCQUErQixDQUFBO0FBeUJ6RCxNQUFNLENBQUMsTUFBTSxTQUFTLEdBQWlCLEVBQUUsQ0FBQTtBQU96Qzs7OztHQUlHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sV0FBVyxHQUFtQyxRQUFRLENBQUMsV0FBVyxDQUFBO0FBRS9FOzs7R0FHRztBQUNILE1BQU0sQ0FBQyxNQUFNLElBQUksR0FBd0MsUUFBUSxDQUFDLElBQUksQ0FBQTtBQUV0RTs7O0dBR0c7QUFDSCxNQUFNLENBQUMsTUFBTSxTQUFTLEdBQThDLFFBQVEsQ0FBQyxTQUFTLENBQUE7QUFFdEY7OztHQUdHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFnQyxRQUFRLENBQUMsVUFBVSxDQUFBO0FBRTFFOzs7R0FHRztBQUNILE1BQU0sQ0FBQyxNQUFNLEtBQUssR0FBZ0MsUUFBUSxDQUFDLEtBQUssQ0FBQTtBQUVoRTs7O0dBR0c7QUFDSCxNQUFNLENBQUMsTUFBTSxVQUFVLEdBQThCLFFBQVEsQ0FBQyxVQUFVLENBQUE7QUFFeEUsTUFBTSxDQUFDLE1BQU0sU0FBUyxHQUFHLENBQUMsSUFBYSxFQUE0QixFQUFFO0lBQ25FLE9BQU8sTUFBTSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsY0FBYyxDQUFDLElBQUksQ0FBQyxFQUFFLFVBQVUsQ0FBQyxDQUFBO0FBQzVELENBQUMsQ0FBQSJ9

package/dist/Config.d.ts

@@ -0,0 +1,7 @@
+import { type Config } from "effect/Config";
+export declare const nested: {
+    (name: string): <A>(self: Config<A>) => Config<A>;
+    <A>(self: Config<A>, name: string): Config<A>;
+};
+export * from "effect/Config";
+//# sourceMappingURL=Config.d.ts.map

package/dist/Config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["../src/Config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAQ,MAAM,eAAe,CAAA;AAKjD,eAAO,MAAM,MAAM,EAAE;IACnB,CAAC,IAAI,EAAE,MAAM,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC,CAAA;IACjD,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;CAI9C,CAAA;AAED,cAAc,eAAe,CAAA"}

package/dist/Config.js

@@ -0,0 +1,6 @@
+import { make } from "effect/Config";
+import { dual } from "effect/Function";
+import * as ConfigProvider from "./ConfigProvider.js";
+export const nested = dual(2, (self, name) => make((provider) => self.parse(ConfigProvider.nested(provider, name))));
+export * from "effect/Config";
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL0NvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQWUsSUFBSSxFQUFFLE1BQU0sZUFBZSxDQUFBO0FBQ2pELE9BQU8sRUFBRSxJQUFJLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQTtBQUV0QyxPQUFPLEtBQUssY0FBYyxNQUFNLHFCQUFxQixDQUFBO0FBRXJELE1BQU0sQ0FBQyxNQUFNLE1BQU0sR0FHZixJQUFJLENBQ04sQ0FBQyxFQUNELENBQUksSUFBZSxFQUFFLElBQVksRUFBYSxFQUFFLENBQUMsSUFBSSxDQUFDLENBQUMsUUFBUSxFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLGNBQWMsQ0FBQyxNQUFNLENBQUMsUUFBUSxFQUFFLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FDdkgsQ0FBQTtBQUVELGNBQWMsZUFBZSxDQUFBIn0=

package/dist/ConfigProvider.d.ts

@@ -0,0 +1,39 @@
+import { type ConfigProvider, type Path } from "effect/ConfigProvider";
+/**
+ * Scopes a provider so that all lookups are prefixed with the given path
+ * segments.
+ *
+ * When to use:
+ * - Namespacing config under a prefix like `"app"` or `"database"`.
+ * - Reusing the same provider shape for multiple sub-configs.
+ *
+ * Accepts a single string or a full `Path` array. The prefix is prepended
+ * *after* any `mapInput` transformation runs, so ordering matters when
+ * composing with {@link mapInput} or {@link constantCase}.
+ *
+ * Supports both data-last and data-first calling conventions.
+ *
+ * **Example** (Nesting under a prefix)
+ *
+ * ```ts
+ * import { ConfigProvider } from "effect"
+ *
+ * const provider = ConfigProvider.fromEnv({
+ *   env: { APP_HOST: "localhost", APP_PORT: "3000" }
+ * })
+ *
+ * // Lookups for ["HOST"] now resolve to ["APP", "HOST"]
+ * const scoped = ConfigProvider.nested(provider, "APP")
+ * ```
+ *
+ * @see {@link mapInput} – for arbitrary path transformations
+ *
+ * @category Combinators
+ * @since 4.0.0
+ */
+export declare const nested: {
+    (prefix: string | Path): (self: ConfigProvider) => ConfigProvider;
+    (self: ConfigProvider, prefix: string | Path): ConfigProvider;
+};
+export * from "effect/ConfigProvider";
+//# sourceMappingURL=ConfigProvider.d.ts.map

package/dist/ConfigProvider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ConfigProvider.d.ts","sourceRoot":"","sources":["../src/ConfigProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAQ,KAAK,IAAI,EAAE,MAAM,uBAAuB,CAAA;AAG5E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,eAAO,MAAM,MAAM,EAAE;IACnB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,CAAC,IAAI,EAAE,cAAc,KAAK,cAAc,CAAA;IACjE,CAAC,IAAI,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,cAAc,CAAA;CAQ9D,CAAA;AAED,cAAc,uBAAuB,CAAA"}

package/dist/ConfigProvider.js

@@ -0,0 +1,42 @@
+import { make } from "effect/ConfigProvider";
+import { dual } from "effect/Function";
+/**
+ * Scopes a provider so that all lookups are prefixed with the given path
+ * segments.
+ *
+ * When to use:
+ * - Namespacing config under a prefix like `"app"` or `"database"`.
+ * - Reusing the same provider shape for multiple sub-configs.
+ *
+ * Accepts a single string or a full `Path` array. The prefix is prepended
+ * *after* any `mapInput` transformation runs, so ordering matters when
+ * composing with {@link mapInput} or {@link constantCase}.
+ *
+ * Supports both data-last and data-first calling conventions.
+ *
+ * **Example** (Nesting under a prefix)
+ *
+ * ```ts
+ * import { ConfigProvider } from "effect"
+ *
+ * const provider = ConfigProvider.fromEnv({
+ *   env: { APP_HOST: "localhost", APP_PORT: "3000" }
+ * })
+ *
+ * // Lookups for ["HOST"] now resolve to ["APP", "HOST"]
+ * const scoped = ConfigProvider.nested(provider, "APP")
+ * ```
+ *
+ * @see {@link mapInput} – for arbitrary path transformations
+ *
+ * @category Combinators
+ * @since 4.0.0
+ */
+export const nested = dual(2, (self, prefix) => {
+    let path = typeof prefix === "string" ? [prefix] : prefix;
+    if (self.mapInput)
+        path = self.mapInput(path);
+    return make(self.get, self.mapInput, self.prefix ? [...self.prefix, ...path] : path);
+});
+export * from "effect/ConfigProvider";
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29uZmlnUHJvdmlkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvQ29uZmlnUHJvdmlkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUF1QixJQUFJLEVBQWEsTUFBTSx1QkFBdUIsQ0FBQTtBQUM1RSxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0saUJBQWlCLENBQUE7QUFFdEM7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7R0ErQkc7QUFDSCxNQUFNLENBQUMsTUFBTSxNQUFNLEdBR2YsSUFBSSxDQUNOLENBQUMsRUFDRCxDQUFDLElBQW9CLEVBQUUsTUFBcUIsRUFBa0IsRUFBRTtJQUM5RCxJQUFJLElBQUksR0FBUyxPQUFPLE1BQU0sS0FBSyxRQUFRLENBQUMsQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQTtJQUMvRCxJQUFJLElBQUksQ0FBQyxRQUFRO1FBQUUsSUFBSSxHQUFHLElBQUksQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLENBQUE7SUFDN0MsT0FBTyxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxJQUFJLENBQUMsUUFBUSxFQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxJQUFJLENBQUMsTUFBTSxFQUFFLEdBQUcsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFBO0FBQ3RGLENBQUMsQ0FDRixDQUFBO0FBRUQsY0FBYyx1QkFBdUIsQ0FBQSJ9

package/dist/{ServiceMap.d.ts → Context.d.ts}

@@ -1,28 +1,24 @@
-/**
- * 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
- */
 import { type Effect, Layer, type Scope, type Types } from "effect";
-import * as ServiceMap from "effect/ServiceMap";
+import * as CTX from "effect/Context";
 import { type Yieldable } from "./Effect.js";
-export * from "effect/ServiceMap";
-export interface Opaque<Self extends object, in out Shape extends object> extends ServiceMap.Key<Self, Self>, Yieldable<Opaque<Self, Shape>, Self, never, Self> {
+export * from "effect/Context";
+export interface Opaque<Self extends object, in out Shape extends object> extends CTX.Key<Self, Self>, Yieldable<Opaque<Self, Shape>, Self, never, Self> {
     of(this: void, self: Shape): Self;
-    serviceMap(self: Shape): ServiceMap.ServiceMap<Self>;
+    serviceMap(self: Shape): CTX.Context<Self>;
     toLayer: <E, R>(eff: Effect.Effect<Shape, E, R>) => Layer.Layer<Self, E, Exclude<R, Scope.Scope>>;
     use<A, E, R>(f: (service: Shape) => Effect.Effect<A, E, R>): Effect.Effect<A, E, R | Self>;
     useSync<A>(f: (service: Shape) => A): Effect.Effect<A, never, Self>;
 }
 export declare function assignTag<Identifier extends object, Shape extends object = Identifier>(key: string, creationError?: Error): <S extends object>(cls: S) => S & Opaque<Identifier, Shape>;
-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>;
-} : {};
-/**
- * Only use this in very specific cases where using dependencies directly is prefered, like inside command handlers.
- */
-export declare const proxify: <T extends object>(Tag: T) => <Self, Shape>() => T & ServiceAcessorShape<Self, Shape>;
-export declare const TypeId = "~ServiceMap.Opaque";
+/** Accessor for a service method that returns a plain value. Wraps via `useSync`. */
+export declare 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;
+/** Accessor for a service method that returns an Effect. Delegates via `use`. */
+export declare 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;
+/** Accessor for a service property (constant). Wraps via `useSync`. */
+export declare 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>;
+/** Accessor for a service property that is an Effect. Delegates via `use`. */
+export declare 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;
+export declare const TypeId = "~Context.Opaque";
 export interface OpaqueClass<Self extends object, in out Identifier extends string, Shape extends object> extends Opaque<Self, Shape> {
     new (_: never): Shape & {
         readonly [TypeId]: Identifier;
@@ -41,4 +37,4 @@ export declare const Opaque: {
         readonly make: Make;
     };
 };
-//# sourceMappingURL=ServiceMap.d.ts.map
+//# sourceMappingURL=Context.d.ts.map

package/dist/Context.d.ts.map

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

package/dist/Context.js

@@ -0,0 +1,66 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { Layer } from "effect";
+import * as CTX from "effect/Context";
+export * from "effect/Context";
+// export interface OpaqueMake<Self extends object, in out Shape extends object, E, R>
+//   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): CTX.Context<Self>
+//   // a version that leverages the Shape -> Self conversion
+//   toLayer: {
+//     <E, R>(
+//       eff: Effect.Effect<Shape, E, R>
+//     ): Layer.Layer<Self, E, Exclude<R, Scope.Scope>>
+//     (): Layer.Layer<Self, E, Exclude<R, Scope.Scope>>
+//   }
+// }
+export function assignTag(key, creationError) {
+    return (cls) => {
+        const tag = CTX.Service(key);
+        let fields = tag;
+        if (Reflect.ownKeys(cls).includes("key")) {
+            const { key, ...rest } = tag;
+            fields = rest;
+        }
+        const t = Object.assign(cls, Object.getPrototypeOf(tag), fields);
+        if (!creationError) {
+            const limit = Error.stackTraceLimit;
+            Error.stackTraceLimit = 2;
+            creationError = new Error();
+            Error.stackTraceLimit = limit;
+        }
+        // the stack is used to get the location of the tag definition, if a service is not found in the registry
+        Object.defineProperty(t, "stack", {
+            get() {
+                return creationError.stack;
+            }
+        });
+        return t;
+    };
+}
+/** Accessor for a service method that returns a plain value. Wraps via `useSync`. */
+export const accessFn = (Tag, key) => ((...args) => Tag.useSync((s) => s[key](...args)));
+/** Accessor for a service method that returns an Effect. Delegates via `use`. */
+export const accessEffectFn = (Tag, key) => ((...args) => Tag.use((s) => s[key](...args)));
+/** Accessor for a service property (constant). Wraps via `useSync`. */
+export const accessCn = (Tag, key) => Tag.useSync((s) => s[key]);
+/** Accessor for a service property that is an Effect. Delegates via `use`. */
+export const accessEffectCn = (Tag, key) => Tag.use((s) => s[key]);
+export const TypeId = "~Context.Opaque";
+// export interface OpaqueClassMake<Self extends object, in out Identifier extends string, Shape extends object, E, R>
+//   extends OpaqueMake<Self, Shape, E, R>
+// {
+//   new(_: never): Shape & { readonly [TypeId]: Identifier }
+//   readonly key: Identifier
+// }
+export const Opaque = () => (id, options) => {
+    const svc = CTX.Service()(id, options);
+    return Object.assign(svc, {
+        toLayer: (eff) => {
+            return Layer.effect(svc, eff);
+        }
+    });
+};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29udGV4dC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9Db250ZXh0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLHVEQUF1RDtBQUV2RCxPQUFPLEVBQWUsS0FBSyxFQUEwQixNQUFNLFFBQVEsQ0FBQTtBQUNuRSxPQUFPLEtBQUssR0FBRyxNQUFNLGdCQUFnQixDQUFBO0FBR3JDLGNBQWMsZ0JBQWdCLENBQUE7QUFlOUIsc0ZBQXNGO0FBQ3RGLG9DQUFvQztBQUNwQyxJQUFJO0FBQ0osaUZBQWlGO0FBQ2pGLDBCQUEwQjtBQUMxQixnREFBZ0Q7QUFDaEQsNkRBQTZEO0FBQzdELGVBQWU7QUFDZixjQUFjO0FBQ2Qsd0NBQXdDO0FBQ3hDLHVEQUF1RDtBQUN2RCx3REFBd0Q7QUFDeEQsTUFBTTtBQUNOLElBQUk7QUFFSixNQUFNLFVBQVUsU0FBUyxDQUN2QixHQUFXLEVBQ1gsYUFBcUI7SUFFckIsT0FBTyxDQUFtQixHQUFNLEVBQWlDLEVBQUU7UUFDakUsTUFBTSxHQUFHLEdBQUcsR0FBRyxDQUFDLE9BQU8sQ0FBb0IsR0FBRyxDQUFDLENBQUE7UUFDL0MsSUFBSSxNQUFNLEdBQUcsR0FBRyxDQUFBO1FBQ2hCLElBQUksT0FBTyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQztZQUN6QyxNQUFNLEVBQUUsR0FBRyxFQUFFLEdBQUcsSUFBSSxFQUFFLEdBQUcsR0FBRyxDQUFBO1lBQzVCLE1BQU0sR0FBRyxJQUFXLENBQUE7UUFDdEIsQ0FBQztRQUNELE1BQU0sQ0FBQyxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUMsR0FBRyxFQUFFLE1BQU0sQ0FBQyxjQUFjLENBQUMsR0FBRyxDQUFDLEVBQUUsTUFBTSxDQUFDLENBQUE7UUFDaEUsSUFBSSxDQUFDLGFBQWEsRUFBRSxDQUFDO1lBQ25CLE1BQU0sS0FBSyxHQUFHLEtBQUssQ0FBQyxlQUFlLENBQUE7WUFDbkMsS0FBSyxDQUFDLGVBQWUsR0FBRyxDQUFDLENBQUE7WUFDekIsYUFBYSxHQUFHLElBQUksS0FBSyxFQUFFLENBQUE7WUFDM0IsS0FBSyxDQUFDLGVBQWUsR0FBRyxLQUFLLENBQUE7UUFDL0IsQ0FBQztRQUNELHlHQUF5RztRQUN6RyxNQUFNLENBQUMsY0FBYyxDQUFDLENBQUMsRUFBRSxPQUFPLEVBQUU7WUFDaEMsR0FBRztnQkFDRCxPQUFPLGFBQWMsQ0FBQyxLQUFLLENBQUE7WUFDN0IsQ0FBQztTQUNGLENBQUMsQ0FBQTtRQUNGLE9BQU8sQ0FBQyxDQUFBO0lBQ1YsQ0FBQyxDQUFBO0FBQ0gsQ0FBQztBQUVELHFGQUFxRjtBQUNyRixNQUFNLENBQUMsTUFBTSxRQUFRLEdBQUcsQ0FLdEIsR0FBd0IsRUFDeEIsR0FBTSxFQUVFLEVBQUUsQ0FBQyxDQUFDLENBQUMsR0FBRyxJQUFnQixFQUFFLEVBQUUsQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBTSxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsR0FBRyxJQUFJLENBQUMsQ0FBQyxDQUFRLENBQUE7QUFFdkYsaUZBQWlGO0FBQ2pGLE1BQU0sQ0FBQyxNQUFNLGNBQWMsR0FBRyxDQUs1QixHQUF3QixFQUN4QixHQUFNLEVBR0UsRUFBRSxDQUFDLENBQUMsQ0FBQyxHQUFHLElBQWdCLEVBQUUsRUFBRSxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFNLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxHQUFHLElBQUksQ0FBQyxDQUFDLENBQVEsQ0FBQTtBQUVuRix1RUFBdUU7QUFDdkUsTUFBTSxDQUFDLE1BQU0sUUFBUSxHQUFHLENBS3RCLEdBQXdCLEVBQ3hCLEdBQU0sRUFDZ0MsRUFBRSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBUSxDQUFBO0FBRTVFLDhFQUE4RTtBQUM5RSxNQUFNLENBQUMsTUFBTSxjQUFjLEdBQUcsQ0FLNUIsR0FBd0IsRUFDeEIsR0FBTSxFQUVFLEVBQUUsQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBTSxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQVEsQ0FBQTtBQUUvQyxNQUFNLENBQUMsTUFBTSxNQUFNLEdBQUcsaUJBQWlCLENBQUE7QUFxQnZDLHNIQUFzSDtBQUN0SCwwQ0FBMEM7QUFDMUMsSUFBSTtBQUNKLDZEQUE2RDtBQUM3RCw2QkFBNkI7QUFDN0IsSUFBSTtBQUVKLE1BQU0sQ0FBQyxNQUFNLE1BQU0sR0FvQ2YsR0FBRyxFQUFFLENBQUMsQ0FBQyxFQUFVLEVBQUUsT0FBWSxFQUFFLEVBQUU7SUFDckMsTUFBTSxHQUFHLEdBQUcsR0FBRyxDQUFDLE9BQU8sRUFBRSxDQUFDLEVBQUUsRUFBRSxPQUFPLENBQVEsQ0FBQTtJQUM3QyxPQUFPLE1BQU0sQ0FBQyxNQUFNLENBQUMsR0FBRyxFQUFFO1FBQ3hCLE9BQU8sRUFBRSxDQUFDLEdBQWlDLEVBQUUsRUFBRTtZQUM3QyxPQUFPLEtBQUssQ0FBQyxNQUFNLENBQUMsR0FBRyxFQUFFLEdBQUcsQ0FBQyxDQUFBO1FBQy9CLENBQUM7S0FDRixDQUFDLENBQUE7QUFDSixDQUFDLENBQUEifQ==