@effect-atom/atom 0.1.8 → 0.1.9

package/dist/cjs/AtomRpc.js

@@ -3,17 +3,19 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.make = void 0;
+exports.Tag = void 0;
 var Reactivity = /*#__PURE__*/_interopRequireWildcard(/*#__PURE__*/require("@effect/experimental/Reactivity"));
 var Headers = /*#__PURE__*/_interopRequireWildcard(/*#__PURE__*/require("@effect/platform/Headers"));
 var RpcClient = /*#__PURE__*/_interopRequireWildcard(/*#__PURE__*/require("@effect/rpc/RpcClient"));
 var RpcSchema = /*#__PURE__*/_interopRequireWildcard(/*#__PURE__*/require("@effect/rpc/RpcSchema"));
+var Context = /*#__PURE__*/_interopRequireWildcard(/*#__PURE__*/require("effect/Context"));
 var Data = /*#__PURE__*/_interopRequireWildcard(/*#__PURE__*/require("effect/Data"));
 var Duration = /*#__PURE__*/_interopRequireWildcard(/*#__PURE__*/require("effect/Duration"));
 var Effect = /*#__PURE__*/_interopRequireWildcard(/*#__PURE__*/require("effect/Effect"));
 var Equal = /*#__PURE__*/_interopRequireWildcard(/*#__PURE__*/require("effect/Equal"));
 var _Function = /*#__PURE__*/require("effect/Function");
 var Hash = /*#__PURE__*/_interopRequireWildcard(/*#__PURE__*/require("effect/Hash"));
+var Layer = /*#__PURE__*/_interopRequireWildcard(/*#__PURE__*/require("effect/Layer"));
 var Stream = /*#__PURE__*/_interopRequireWildcard(/*#__PURE__*/require("effect/Stream"));
 var Atom = /*#__PURE__*/_interopRequireWildcard(/*#__PURE__*/require("./Atom.js"));
 function _interopRequireWildcard(e, t) {
@@ -44,18 +46,20 @@ function _interopRequireWildcard(e, t) {
  * @since 1.0.0
  * @category Constructors
  */
-const make = (group, options) => {
-  const client = options.runtime.atom(RpcClient.make(group, {
+const Tag = () => (id, options) => {
+  const self = Context.Tag(id)();
+  self.layer = Layer.scoped(self, RpcClient.make(options.group, {
     ...options,
     flatten: true
-  }));
-  const mutation = Atom.family(tag => options.runtime.fn()(Effect.fnUntraced(function* ({
+  })).pipe(Layer.provide(options.protocol));
+  self.runtime = Atom.runtime(self.layer);
+  self.mutation = Atom.family(tag => self.runtime.fn()(Effect.fnUntraced(function* ({
     headers,
     payload,
     reactivityKeys
-  }, get) {
-    const c = yield* get.result(client);
-    const effect = c(tag, payload, {
+  }) {
+    const client = yield* self;
+    const effect = client(tag, payload, {
       headers
     });
     return yield* reactivityKeys ? Reactivity.mutation(effect, reactivityKeys) : effect;
@@ -67,31 +71,27 @@ const make = (group, options) => {
     tag,
     timeToLive
   }) => {
-    const rpc = group.requests.get(tag);
-    let atom = RpcSchema.isStreamSchema(rpc.successSchema) ? Atom.pull(get => get.result(client).pipe(Effect.map(client => client(tag, payload, {
+    const rpc = options.group.requests.get(tag);
+    let atom = RpcSchema.isStreamSchema(rpc.successSchema) ? self.runtime.pull(self.pipe(Effect.map(client => client(tag, payload, {
       headers
-    })), Stream.unwrap)) : Atom.make(get => get.result(client).pipe(Effect.flatMap(client => client(tag, payload, {
+    })), Stream.unwrap)) : self.runtime.atom(Effect.flatMap(self, client => client(tag, payload, {
       headers
-    }))));
+    })));
     if (timeToLive) {
       atom = Duration.isFinite(timeToLive) ? Atom.setIdleTTL(atom, timeToLive) : Atom.keepAlive(atom);
     }
-    return reactivityKeys ? options.runtime.factory.withReactivity(reactivityKeys)(atom) : atom;
+    return reactivityKeys ? self.runtime.factory.withReactivity(reactivityKeys)(atom) : atom;
   });
-  const query = (tag, payload, options) => queryFamily(new QueryKey({
+  self.query = (tag, payload, options) => queryFamily(new QueryKey({
     tag,
     payload: Data.struct(payload),
     headers: options?.headers ? Data.unsafeStruct(Headers.fromInput(options.headers)) : undefined,
     reactivityKeys: options?.reactivityKeys ? Data.array(options.reactivityKeys) : undefined,
     timeToLive: options?.timeToLive ? Duration.decode(options.timeToLive) : undefined
   }));
-  return {
-    client,
-    mutation,
-    query
-  };
+  return self;
 };
-exports.make = make;
+exports.Tag = Tag;
 class QueryKey extends Data.Class {
   [Equal.symbol](that) {
     return this.tag === that.tag && Equal.equals(this.payload, that.payload) && Equal.equals(this.headers, that.headers) && Equal.equals(this.reactivityKeys, that.reactivityKeys) && Equal.equals(this.timeToLive, that.timeToLive);

package/dist/cjs/AtomRpc.js.map

@@ -1 +1 @@
-{"version":3,"file":"AtomRpc.js","names":["Reactivity","_interopRequireWildcard","require","Headers","RpcClient","RpcSchema","Data","Duration","Effect","Equal","_Function","Hash","Stream","Atom","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","make","group","options","client","runtime","atom","flatten","mutation","family","tag","fn","fnUntraced","headers","payload","reactivityKeys","c","result","effect","queryFamily","timeToLive","rpc","requests","isStreamSchema","successSchema","pull","pipe","map","unwrap","flatMap","isFinite","setIdleTTL","keepAlive","factory","withReactivity","query","QueryKey","struct","unsafeStruct","fromInput","undefined","array","decode","exports","Class","symbol","that","equals","string","combine","hash","cached"],"sources":["../../src/AtomRpc.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"AtomRpc.js","names":["Reactivity","_interopRequireWildcard","require","Headers","RpcClient","RpcSchema","Context","Data","Duration","Effect","Equal","_Function","Hash","Layer","Stream","Atom","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","Tag","id","options","self","layer","scoped","make","group","flatten","pipe","provide","protocol","runtime","mutation","family","tag","fn","fnUntraced","headers","payload","reactivityKeys","client","effect","queryFamily","timeToLive","rpc","requests","atom","isStreamSchema","successSchema","pull","map","unwrap","flatMap","isFinite","setIdleTTL","keepAlive","factory","withReactivity","query","QueryKey","struct","unsafeStruct","fromInput","undefined","array","decode","exports","Class","symbol","that","equals","string","combine","hash","cached"],"sources":["../../src/AtomRpc.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/dts/AtomRpc.d.ts

@@ -5,36 +5,47 @@ import type { RpcClientError } from "@effect/rpc/RpcClientError";
 import type * as RpcGroup from "@effect/rpc/RpcGroup";
 import type { RequestId } from "@effect/rpc/RpcMessage";
 import * as RpcSchema from "@effect/rpc/RpcSchema";
+import * as Context from "effect/Context";
 import * as Duration from "effect/Duration";
+import * as Layer from "effect/Layer";
 import type { ReadonlyRecord } from "effect/Record";
+import type { NoInfer } from "effect/Types";
 import * as Atom from "./Atom.js";
 import type * as Result from "./Result.js";
 /**
  * @since 1.0.0
  * @category Models
  */
-export interface AtomRpcClient<Rpcs extends Rpc.Any, E> {
-    readonly client: Atom.Atom<Result.Result<RpcClient.RpcClient.Flat<Rpcs, RpcClientError>, E>>;
+export interface AtomRpcClient<Self, Id extends string, Rpcs extends Rpc.Any, E> extends Context.Tag<Self, RpcClient.RpcClient.Flat<Rpcs, RpcClientError>> {
+    new (_: never): Context.TagClassShape<Id, RpcClient.RpcClient.Flat<Rpcs, RpcClientError>>;
+    readonly layer: Layer.Layer<Self, E>;
+    readonly runtime: Atom.AtomRuntime<Self, E>;
     readonly mutation: <Tag extends Rpc.Tag<Rpcs>>(arg: Tag) => Rpc.ExtractTag<Rpcs, Tag> extends Rpc.Rpc<infer _Tag, infer _Payload, infer _Success, infer _Error, infer _Middleware> ? [_Success] extends [RpcSchema.Stream<infer _A, infer _E>] ? never : Atom.AtomResultFn<{
         readonly payload: Rpc.PayloadConstructor<Rpc.ExtractTag<Rpcs, Tag>>;
-        readonly reactivityKeys?: ReadonlyRecord<string, ReadonlyArray<unknown>> | undefined;
+        readonly reactivityKeys?: ReadonlyArray<unknown> | ReadonlyRecord<string, ReadonlyArray<unknown>> | undefined;
         readonly headers?: Headers.Input | undefined;
     }, _Success["Type"], _Error["Type"] | E | _Middleware["failure"]["Type"]> : never;
     readonly query: <Tag extends Rpc.Tag<Rpcs>>(tag: Tag, payload: Rpc.PayloadConstructor<Rpc.ExtractTag<Rpcs, Tag>>, options?: {
         readonly headers?: Headers.Input | undefined;
-        readonly reactivityKeys?: ReadonlyArray<unknown> | ReadonlyRecord<string, ReadonlyArray<unknown>> | undefined;
+        readonly reactivityKeys?: ReadonlyArray<unknown> | undefined;
         readonly timeToLive?: Duration.DurationInput | undefined;
     }) => Rpc.ExtractTag<Rpcs, Tag> extends Rpc.Rpc<infer _Tag, infer _Payload, infer _Success, infer _Error, infer _Middleware> ? [_Success] extends [RpcSchema.Stream<infer _A, infer _E>] ? Atom.Writable<Atom.PullResult<_A["Type"], _E["Type"] | _Error["Type"] | E | _Middleware["failure"]["Type"]>, void> : Atom.Atom<Result.Result<_Success["Type"], _Error["Type"] | E | _Middleware["failure"]["Type"]>> : never;
 }
+declare global {
+    interface ErrorConstructor {
+        stackTraceLimit: number;
+    }
+}
 /**
  * @since 1.0.0
  * @category Constructors
  */
-export declare const make: <Rpcs extends Rpc.Any, ER>(group: RpcGroup.RpcGroup<Rpcs>, options: {
-    readonly runtime: Atom.AtomRuntime<RpcClient.Protocol | Rpc.MiddlewareClient<Rpcs> | Rpc.Context<Rpcs>, ER>;
+export declare const Tag: <Self>() => <const Id extends string, Rpcs extends Rpc.Any, ER>(id: Id, options: {
+    readonly group: RpcGroup.RpcGroup<Rpcs>;
+    readonly protocol: Layer.Layer<RpcClient.Protocol | Rpc.MiddlewareClient<NoInfer<Rpcs>> | Rpc.Context<NoInfer<Rpcs>>, ER>;
     readonly spanPrefix?: string | undefined;
     readonly spanAttributes?: Record<string, unknown> | undefined;
     readonly generateRequestId?: (() => RequestId) | undefined;
     readonly disableTracing?: boolean | undefined;
-}) => AtomRpcClient<Rpcs, ER>;
+}) => AtomRpcClient<Self, Id, Rpcs, ER>;
 //# sourceMappingURL=AtomRpc.d.ts.map

package/dist/dts/AtomRpc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AtomRpc.d.ts","sourceRoot":"","sources":["../../src/AtomRpc.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,OAAO,MAAM,0BAA0B,CAAA;AACnD,OAAO,KAAK,KAAK,GAAG,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,SAAS,MAAM,uBAAuB,CAAA;AAClD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAChE,OAAO,KAAK,KAAK,QAAQ,MAAM,sBAAsB,CAAA;AACrD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AACvD,OAAO,KAAK,SAAS,MAAM,uBAAuB,CAAA;AAElD,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAA;AAK3C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAEnD,OAAO,KAAK,IAAI,MAAM,WAAW,CAAA;AACjC,OAAO,KAAK,KAAK,MAAM,MAAM,aAAa,CAAA;AAE1C;;;GAGG;AACH,MAAM,WAAW,aAAa,CAAC,IAAI,SAAS,GAAG,CAAC,GAAG,EAAE,CAAC;IACpD,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,CACxB,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,EAAE,CAAC,CAAC,CACjE,CAAA;IAED,QAAQ,CAAC,QAAQ,EAAE,CAAC,GAAG,SAAS,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAC3C,GAAG,EAAE,GAAG,KACL,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,SAAS,GAAG,CAAC,GAAG,CAC5C,MAAM,IAAI,EACV,MAAM,QAAQ,EACd,MAAM,QAAQ,EACd,MAAM,MAAM,EACZ,MAAM,WAAW,CAClB,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,GAAG,KAAK,GACjE,IAAI,CAAC,YAAY,CACjB;QACE,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,kBAAkB,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAA;QACnE,QAAQ,CAAC,cAAc,CAAC,EACpB,cAAc,CAAC,MAAM,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC,GAC9C,SAAS,CAAA;QACb,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,KAAK,GAAG,SAAS,CAAA;KAC7C,EACD,QAAQ,CAAC,MAAM,CAAC,EAChB,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CACpD,GACC,KAAK,CAAA;IAET,QAAQ,CAAC,KAAK,EAAE,CAAC,GAAG,SAAS,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EACxC,GAAG,EAAE,GAAG,EACR,OAAO,EAAE,GAAG,CAAC,kBAAkB,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,EAC1D,OAAO,CAAC,EAAE;QACR,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,KAAK,GAAG,SAAS,CAAA;QAC5C,QAAQ,CAAC,cAAc,CAAC,EACpB,aAAa,CAAC,OAAO,CAAC,GACtB,cAAc,CAAC,MAAM,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC,GAC9C,SAAS,CAAA;QACb,QAAQ,CAAC,UAAU,CAAC,EAAE,QAAQ,CAAC,aAAa,GAAG,SAAS,CAAA;KACzD,KACE,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,SAAS,GAAG,CAAC,GAAG,CAC5C,MAAM,IAAI,EACV,MAAM,QAAQ,EACd,MAAM,QAAQ,EACd,MAAM,MAAM,EACZ,MAAM,WAAW,CAClB,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,CACvE,IAAI,CAAC,UAAU,CACb,EAAE,CAAC,MAAM,CAAC,EACV,EAAE,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CACjE,EACD,IAAI,CACL,GACD,IAAI,CAAC,IAAI,CACT,MAAM,CAAC,MAAM,CACX,QAAQ,CAAC,MAAM,CAAC,EAChB,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CACpD,CACF,GACC,KAAK,CAAA;CACV;AAED;;;GAGG;AACH,eAAO,MAAM,IAAI,GAAI,IAAI,SAAS,GAAG,CAAC,GAAG,EAAE,EAAE,EAC3C,OAAO,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,EAC9B,SAAS;IACP,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,CAChC,SAAS,CAAC,QAAQ,GAAG,GAAG,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EACnE,EAAE,CACH,CAAA;IACD,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACxC,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAA;IAC7D,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC,MAAM,SAAS,CAAC,GAAG,SAAS,CAAA;IAC1D,QAAQ,CAAC,cAAc,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;CAC9C,KACA,aAAa,CAAC,IAAI,EAAE,EAAE,CA6ExB,CAAA"}
+{"version":3,"file":"AtomRpc.d.ts","sourceRoot":"","sources":["../../src/AtomRpc.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,OAAO,MAAM,0BAA0B,CAAA;AACnD,OAAO,KAAK,KAAK,GAAG,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,SAAS,MAAM,uBAAuB,CAAA;AAClD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAChE,OAAO,KAAK,KAAK,QAAQ,MAAM,sBAAsB,CAAA;AACrD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAA;AACvD,OAAO,KAAK,SAAS,MAAM,uBAAuB,CAAA;AAClD,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AAEzC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAA;AAK3C,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAEnD,OAAO,KAAK,EAAW,OAAO,EAAE,MAAM,cAAc,CAAA;AACpD,OAAO,KAAK,IAAI,MAAM,WAAW,CAAA;AACjC,OAAO,KAAK,KAAK,MAAM,MAAM,aAAa,CAAA;AAE1C;;;GAGG;AACH,MAAM,WAAW,aAAa,CAAC,IAAI,EAAE,EAAE,SAAS,MAAM,EAAE,IAAI,SAAS,GAAG,CAAC,GAAG,EAAE,CAAC,CAC7E,SAAQ,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAEzE,KACE,CAAC,EAAE,KAAK,GACP,OAAO,CAAC,aAAa,CAAC,EAAE,EAAE,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,CAAA;IAE5E,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IACpC,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IAE3C,QAAQ,CAAC,QAAQ,EAAE,CAAC,GAAG,SAAS,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAC3C,GAAG,EAAE,GAAG,KACL,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,SAAS,GAAG,CAAC,GAAG,CAC5C,MAAM,IAAI,EACV,MAAM,QAAQ,EACd,MAAM,QAAQ,EACd,MAAM,MAAM,EACZ,MAAM,WAAW,CAClB,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,GAAG,KAAK,GACjE,IAAI,CAAC,YAAY,CACjB;QACE,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,kBAAkB,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAA;QACnE,QAAQ,CAAC,cAAc,CAAC,EACpB,aAAa,CAAC,OAAO,CAAC,GACtB,cAAc,CAAC,MAAM,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC,GAC9C,SAAS,CAAA;QACb,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,KAAK,GAAG,SAAS,CAAA;KAC7C,EACD,QAAQ,CAAC,MAAM,CAAC,EAChB,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CACpD,GACC,KAAK,CAAA;IAET,QAAQ,CAAC,KAAK,EAAE,CAAC,GAAG,SAAS,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EACxC,GAAG,EAAE,GAAG,EACR,OAAO,EAAE,GAAG,CAAC,kBAAkB,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,EAC1D,OAAO,CAAC,EAAE;QACR,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,KAAK,GAAG,SAAS,CAAA;QAC5C,QAAQ,CAAC,cAAc,CAAC,EAAE,aAAa,CAAC,OAAO,CAAC,GAAG,SAAS,CAAA;QAC5D,QAAQ,CAAC,UAAU,CAAC,EAAE,QAAQ,CAAC,aAAa,GAAG,SAAS,CAAA;KACzD,KACE,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,SAAS,GAAG,CAAC,GAAG,CAC5C,MAAM,IAAI,EACV,MAAM,QAAQ,EACd,MAAM,QAAQ,EACd,MAAM,MAAM,EACZ,MAAM,WAAW,CAClB,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,CACvE,IAAI,CAAC,UAAU,CACb,EAAE,CAAC,MAAM,CAAC,EACV,EAAE,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CACjE,EACD,IAAI,CACL,GACD,IAAI,CAAC,IAAI,CACT,MAAM,CAAC,MAAM,CACX,QAAQ,CAAC,MAAM,CAAC,EAChB,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CACpD,CACF,GACC,KAAK,CAAA;CACV;AAED,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,gBAAgB;QACxB,eAAe,EAAE,MAAM,CAAA;KACxB;CACF;AAED;;;GAGG;AACH,eAAO,MAAM,GAAG,GAAI,IAAI,QACvB,KAAK,CAAC,EAAE,SAAS,MAAM,EAAE,IAAI,SAAS,GAAG,CAAC,GAAG,EAAE,EAAE,EAChD,IAAI,EAAE,EACN,SAAS;IACP,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;IACvC,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC,KAAK,CAC1B,SAAS,CAAC,QAAQ,GAClB,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GACnC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,EAC5B,EAAE,CACH,CAAA;IACD,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACxC,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAA;IAC7D,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC,MAAM,SAAS,CAAC,GAAG,SAAS,CAAA;IAC1D,QAAQ,CAAC,cAAc,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;CAC9C,KACA,aAAa,CAAC,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,CAoFlC,CAAA"}

package/dist/esm/AtomRpc.js

@@ -5,30 +5,34 @@ import * as Reactivity from "@effect/experimental/Reactivity";
 import * as Headers from "@effect/platform/Headers";
 import * as RpcClient from "@effect/rpc/RpcClient";
 import * as RpcSchema from "@effect/rpc/RpcSchema";
+import * as Context from "effect/Context";
 import * as Data from "effect/Data";
 import * as Duration from "effect/Duration";
 import * as Effect from "effect/Effect";
 import * as Equal from "effect/Equal";
 import { pipe } from "effect/Function";
 import * as Hash from "effect/Hash";
+import * as Layer from "effect/Layer";
 import * as Stream from "effect/Stream";
 import * as Atom from "./Atom.js";
 /**
  * @since 1.0.0
  * @category Constructors
  */
-export const make = (group, options) => {
-  const client = options.runtime.atom(RpcClient.make(group, {
+export const Tag = () => (id, options) => {
+  const self = Context.Tag(id)();
+  self.layer = Layer.scoped(self, RpcClient.make(options.group, {
     ...options,
     flatten: true
-  }));
-  const mutation = Atom.family(tag => options.runtime.fn()(Effect.fnUntraced(function* ({
+  })).pipe(Layer.provide(options.protocol));
+  self.runtime = Atom.runtime(self.layer);
+  self.mutation = Atom.family(tag => self.runtime.fn()(Effect.fnUntraced(function* ({
     headers,
     payload,
     reactivityKeys
-  }, get) {
-    const c = yield* get.result(client);
-    const effect = c(tag, payload, {
+  }) {
+    const client = yield* self;
+    const effect = client(tag, payload, {
       headers
     });
     return yield* reactivityKeys ? Reactivity.mutation(effect, reactivityKeys) : effect;
@@ -40,29 +44,25 @@ export const make = (group, options) => {
     tag,
     timeToLive
   }) => {
-    const rpc = group.requests.get(tag);
-    let atom = RpcSchema.isStreamSchema(rpc.successSchema) ? Atom.pull(get => get.result(client).pipe(Effect.map(client => client(tag, payload, {
+    const rpc = options.group.requests.get(tag);
+    let atom = RpcSchema.isStreamSchema(rpc.successSchema) ? self.runtime.pull(self.pipe(Effect.map(client => client(tag, payload, {
       headers
-    })), Stream.unwrap)) : Atom.make(get => get.result(client).pipe(Effect.flatMap(client => client(tag, payload, {
+    })), Stream.unwrap)) : self.runtime.atom(Effect.flatMap(self, client => client(tag, payload, {
       headers
-    }))));
+    })));
     if (timeToLive) {
       atom = Duration.isFinite(timeToLive) ? Atom.setIdleTTL(atom, timeToLive) : Atom.keepAlive(atom);
     }
-    return reactivityKeys ? options.runtime.factory.withReactivity(reactivityKeys)(atom) : atom;
+    return reactivityKeys ? self.runtime.factory.withReactivity(reactivityKeys)(atom) : atom;
   });
-  const query = (tag, payload, options) => queryFamily(new QueryKey({
+  self.query = (tag, payload, options) => queryFamily(new QueryKey({
     tag,
     payload: Data.struct(payload),
     headers: options?.headers ? Data.unsafeStruct(Headers.fromInput(options.headers)) : undefined,
     reactivityKeys: options?.reactivityKeys ? Data.array(options.reactivityKeys) : undefined,
     timeToLive: options?.timeToLive ? Duration.decode(options.timeToLive) : undefined
   }));
-  return {
-    client,
-    mutation,
-    query
-  };
+  return self;
 };
 class QueryKey extends Data.Class {
   [Equal.symbol](that) {

package/dist/esm/AtomRpc.js.map

@@ -1 +1 @@
-{"version":3,"file":"AtomRpc.js","names":["Reactivity","Headers","RpcClient","RpcSchema","Data","Duration","Effect","Equal","pipe","Hash","Stream","Atom","make","group","options","client","runtime","atom","flatten","mutation","family","tag","fn","fnUntraced","headers","payload","reactivityKeys","get","c","result","effect","queryFamily","timeToLive","rpc","requests","isStreamSchema","successSchema","pull","map","unwrap","flatMap","isFinite","setIdleTTL","keepAlive","factory","withReactivity","query","QueryKey","struct","unsafeStruct","fromInput","undefined","array","decode","Class","symbol","that","equals","string","combine","hash","cached"],"sources":["../../src/AtomRpc.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"AtomRpc.js","names":["Reactivity","Headers","RpcClient","RpcSchema","Context","Data","Duration","Effect","Equal","pipe","Hash","Layer","Stream","Atom","Tag","id","options","self","layer","scoped","make","group","flatten","provide","protocol","runtime","mutation","family","tag","fn","fnUntraced","headers","payload","reactivityKeys","client","effect","queryFamily","timeToLive","rpc","requests","get","atom","isStreamSchema","successSchema","pull","map","unwrap","flatMap","isFinite","setIdleTTL","keepAlive","factory","withReactivity","query","QueryKey","struct","unsafeStruct","fromInput","undefined","array","decode","Class","symbol","that","equals","string","combine","hash","cached"],"sources":["../../src/AtomRpc.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-atom/atom",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "Reactive toolkit for Effect",
   "license": "MIT",
   "repository": {

package/src/AtomRpc.ts

@@ -9,14 +9,17 @@ import type { RpcClientError } from "@effect/rpc/RpcClientError"
 import type * as RpcGroup from "@effect/rpc/RpcGroup"
 import type { RequestId } from "@effect/rpc/RpcMessage"
 import * as RpcSchema from "@effect/rpc/RpcSchema"
+import * as Context from "effect/Context"
 import * as Data from "effect/Data"
 import * as Duration from "effect/Duration"
 import * as Effect from "effect/Effect"
 import * as Equal from "effect/Equal"
 import { pipe } from "effect/Function"
 import * as Hash from "effect/Hash"
+import * as Layer from "effect/Layer"
 import type { ReadonlyRecord } from "effect/Record"
 import * as Stream from "effect/Stream"
+import type { Mutable, NoInfer } from "effect/Types"
 import * as Atom from "./Atom.js"
 import type * as Result from "./Result.js"
 
@@ -24,10 +27,15 @@ import type * as Result from "./Result.js"
  * @since 1.0.0
  * @category Models
  */
-export interface AtomRpcClient<Rpcs extends Rpc.Any, E> {
-  readonly client: Atom.Atom<
-    Result.Result<RpcClient.RpcClient.Flat<Rpcs, RpcClientError>, E>
-  >
+export interface AtomRpcClient<Self, Id extends string, Rpcs extends Rpc.Any, E>
+  extends Context.Tag<Self, RpcClient.RpcClient.Flat<Rpcs, RpcClientError>>
+{
+  new(
+    _: never
+  ): Context.TagClassShape<Id, RpcClient.RpcClient.Flat<Rpcs, RpcClientError>>
+
+  readonly layer: Layer.Layer<Self, E>
+  readonly runtime: Atom.AtomRuntime<Self, E>
 
   readonly mutation: <Tag extends Rpc.Tag<Rpcs>>(
     arg: Tag
@@ -42,6 +50,7 @@ export interface AtomRpcClient<Rpcs extends Rpc.Any, E> {
       {
         readonly payload: Rpc.PayloadConstructor<Rpc.ExtractTag<Rpcs, Tag>>
         readonly reactivityKeys?:
+          | ReadonlyArray<unknown>
           | ReadonlyRecord<string, ReadonlyArray<unknown>>
           | undefined
         readonly headers?: Headers.Input | undefined
@@ -56,10 +65,7 @@ export interface AtomRpcClient<Rpcs extends Rpc.Any, E> {
     payload: Rpc.PayloadConstructor<Rpc.ExtractTag<Rpcs, Tag>>,
     options?: {
       readonly headers?: Headers.Input | undefined
-      readonly reactivityKeys?:
-        | ReadonlyArray<unknown>
-        | ReadonlyRecord<string, ReadonlyArray<unknown>>
-        | undefined
+      readonly reactivityKeys?: ReadonlyArray<unknown> | undefined
       readonly timeToLive?: Duration.DurationInput | undefined
     }
   ) => Rpc.ExtractTag<Rpcs, Tag> extends Rpc.Rpc<
@@ -84,15 +90,25 @@ export interface AtomRpcClient<Rpcs extends Rpc.Any, E> {
     : never
 }
 
+declare global {
+  interface ErrorConstructor {
+    stackTraceLimit: number
+  }
+}
+
 /**
  * @since 1.0.0
  * @category Constructors
  */
-export const make = <Rpcs extends Rpc.Any, ER>(
-  group: RpcGroup.RpcGroup<Rpcs>,
+export const Tag = <Self>() =>
+<const Id extends string, Rpcs extends Rpc.Any, ER>(
+  id: Id,
   options: {
-    readonly runtime: Atom.AtomRuntime<
-      RpcClient.Protocol | Rpc.MiddlewareClient<Rpcs> | Rpc.Context<Rpcs>,
+    readonly group: RpcGroup.RpcGroup<Rpcs>
+    readonly protocol: Layer.Layer<
+      | RpcClient.Protocol
+      | Rpc.MiddlewareClient<NoInfer<Rpcs>>
+      | Rpc.Context<NoInfer<Rpcs>>,
       ER
     >
     readonly spanPrefix?: string | undefined
@@ -100,16 +116,23 @@ export const make = <Rpcs extends Rpc.Any, ER>(
     readonly generateRequestId?: (() => RequestId) | undefined
     readonly disableTracing?: boolean | undefined
   }
-): AtomRpcClient<Rpcs, ER> => {
-  const client = options.runtime.atom(
-    RpcClient.make(group, {
+): AtomRpcClient<Self, Id, Rpcs, ER> => {
+  const self: Mutable<AtomRpcClient<Self, Id, Rpcs, ER>> = Context.Tag(id)<
+    Self,
+    RpcClient.RpcClient.Flat<Rpcs, RpcClientError>
+  >() as any
+
+  self.layer = Layer.scoped(
+    self,
+    RpcClient.make(options.group, {
       ...options,
       flatten: true
     })
-  )
+  ).pipe(Layer.provide(options.protocol)) as Layer.Layer<Self, ER>
+  self.runtime = Atom.runtime(self.layer)
 
-  const mutation = Atom.family(<Tag extends Rpc.Tag<Rpcs>>(tag: Tag) =>
-    options.runtime.fn<{
+  self.mutation = Atom.family(<Tag extends Rpc.Tag<Rpcs>>(tag: Tag) =>
+    self.runtime.fn<{
       readonly payload: Rpc.PayloadConstructor<Rpc.ExtractTag<Rpcs, Tag>>
       readonly reactivityKeys?:
         | ReadonlyArray<unknown>
@@ -117,39 +140,41 @@ export const make = <Rpcs extends Rpc.Any, ER>(
         | undefined
       readonly headers?: Headers.Input | undefined
     }>()(
-      Effect.fnUntraced(function*({ headers, payload, reactivityKeys }, get) {
-        const c = yield* get.result(client)
-        const effect = c(tag, payload, { headers } as any)
+      Effect.fnUntraced(function*({ headers, payload, reactivityKeys }) {
+        const client = yield* self
+        const effect = client(tag, payload, { headers } as any)
         return yield* reactivityKeys
           ? Reactivity.mutation(effect, reactivityKeys)
           : effect
       })
     )
-  )
+  ) as any
 
-  const queryFamily = Atom.family(({ headers, payload, reactivityKeys, tag, timeToLive }: QueryKey) => {
-    const rpc = group.requests.get(tag)! as any as Rpc.AnyWithProps
-    let atom = RpcSchema.isStreamSchema(rpc.successSchema)
-      ? Atom.pull((get) =>
-        get.result(client).pipe(
-          Effect.map((client) => client(tag, payload, { headers } as any)),
-          Stream.unwrap
-        )
-      )
-      : Atom.make((get) =>
-        get
-          .result(client)
-          .pipe(
-            Effect.flatMap((client) => client(tag, payload, { headers } as any))
+  const queryFamily = Atom.family(
+    ({ headers, payload, reactivityKeys, tag, timeToLive }: QueryKey) => {
+      const rpc = options.group.requests.get(tag)! as any as Rpc.AnyWithProps
+      let atom = RpcSchema.isStreamSchema(rpc.successSchema)
+        ? self.runtime.pull(
+          self.pipe(
+            Effect.map((client) => client(tag, payload, { headers } as any)),
+            Stream.unwrap
           )
-      )
-    if (timeToLive) {
-      atom = Duration.isFinite(timeToLive) ? Atom.setIdleTTL(atom, timeToLive) : Atom.keepAlive(atom)
+        )
+        : self.runtime.atom(
+          Effect.flatMap(self, (client) => client(tag, payload, { headers } as any))
+        )
+      if (timeToLive) {
+        atom = Duration.isFinite(timeToLive)
+          ? Atom.setIdleTTL(atom, timeToLive)
+          : Atom.keepAlive(atom)
+      }
+      return reactivityKeys
+        ? self.runtime.factory.withReactivity(reactivityKeys)(atom)
+        : atom
     }
-    return reactivityKeys ? options.runtime.factory.withReactivity(reactivityKeys)(atom) : atom
-  })
+  )
 
-  const query = <Tag extends Rpc.Tag<Rpcs>>(
+  self.query = <Tag extends Rpc.Tag<Rpcs>>(
     tag: Tag,
     payload: Rpc.PayloadConstructor<Rpc.ExtractTag<Rpcs, Tag>>,
     options?: {
@@ -168,15 +193,13 @@ export const make = <Rpcs extends Rpc.Any, ER>(
         reactivityKeys: options?.reactivityKeys
           ? Data.array(options.reactivityKeys)
           : undefined,
-        timeToLive: options?.timeToLive ? Duration.decode(options.timeToLive) : undefined
+        timeToLive: options?.timeToLive
+          ? Duration.decode(options.timeToLive)
+          : undefined
       })
-    )
+    ) as any
 
-  return {
-    client,
-    mutation,
-    query
-  } as any
+  return self as AtomRpcClient<Self, Id, Rpcs, ER>
 }
 
 class QueryKey extends Data.Class<{