effect 4.0.0-beta.42 → 4.0.0-beta.44

package/dist/unstable/rpc/RpcGroup.d.ts

@@ -2,12 +2,12 @@
  * @since 4.0.0
  */
 import type * as Cause from "../../Cause.ts";
+import * as Context from "../../Context.ts";
 import * as Effect from "../../Effect.ts";
 import * as Layer from "../../Layer.ts";
 import type { Pipeable } from "../../Pipeable.ts";
 import type * as Queue from "../../Queue.ts";
 import type { Scope } from "../../Scope.ts";
-import * as ServiceMap from "../../ServiceMap.ts";
 import * as Stream from "../../Stream.ts";
 import type { Headers } from "../http/Headers.ts";
 import * as Rpc from "./Rpc.ts";
@@ -22,7 +22,7 @@ export interface RpcGroup<in out R extends Rpc.Any> extends Pipeable {
     new (_: never): {};
     readonly [TypeId]: typeof TypeId;
     readonly requests: ReadonlyMap<string, R>;
-    readonly annotations: ServiceMap.ServiceMap<never>;
+    readonly annotations: Context.Context<never>;
     /**
      * Add one or more procedures to the group.
      */
@@ -43,7 +43,7 @@ export interface RpcGroup<in out R extends Rpc.Any> extends Pipeable {
      * Implement the handlers for the procedures in this group, returning a
      * context object.
      */
-    toHandlers<Handlers extends HandlersFrom<R>, EX = never, RX = never>(build: Handlers | Effect.Effect<Handlers, EX, RX>): Effect.Effect<ServiceMap.ServiceMap<Rpc.ToHandler<R>>, EX, RX | HandlersServices<R, Handlers>>;
+    toHandlers<Handlers extends HandlersFrom<R>, EX = never, RX = never>(build: Handlers | Effect.Effect<Handlers, EX, RX>): Effect.Effect<Context.Context<Rpc.ToHandler<R>>, EX, RX | HandlersServices<R, Handlers>>;
     /**
      * Implement the handlers for the procedures in this group.
      */
@@ -68,19 +68,19 @@ export interface RpcGroup<in out R extends Rpc.Any> extends Pipeable {
     /**
      * Annotate the group with a value.
      */
-    annotate<I, S>(service: ServiceMap.Key<I, S>, value: S): RpcGroup<R>;
+    annotate<I, S>(service: Context.Key<I, S>, value: S): RpcGroup<R>;
     /**
      * Annotate the Rpc's above this point with a value.
      */
-    annotateRpcs<I, S>(service: ServiceMap.Key<I, S>, value: S): RpcGroup<R>;
+    annotateRpcs<I, S>(service: Context.Key<I, S>, value: S): RpcGroup<R>;
     /**
      * Annotate the group with the provided annotations.
      */
-    annotateMerge<S>(annotations: ServiceMap.ServiceMap<S>): RpcGroup<R>;
+    annotateMerge<S>(annotations: Context.Context<S>): RpcGroup<R>;
     /**
      * Annotate the Rpc's above this point with the provided annotations.
      */
-    annotateRpcsMerge<S>(annotations: ServiceMap.ServiceMap<S>): RpcGroup<R>;
+    annotateRpcsMerge<S>(annotations: Context.Context<S>): RpcGroup<R>;
 }
 /**
  * @since 4.0.0

package/dist/unstable/rpc/RpcGroup.d.ts.map

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

package/dist/unstable/rpc/RpcGroup.js

@@ -1,7 +1,7 @@
+import * as Context from "../../Context.js";
 import * as Effect from "../../Effect.js";
 import { identity } from "../../Function.js";
 import * as Layer from "../../Layer.js";
-import * as ServiceMap from "../../ServiceMap.js";
 import * as Stream from "../../Stream.js";
 import * as Rpc from "./Rpc.js";
 const TypeId = "~effect/rpc/RpcGroup";
@@ -29,7 +29,7 @@ const RpcGroupProto = {
     }
     return makeProto({
       requests,
-      annotations: ServiceMap.makeUnsafe(annotations)
+      annotations: Context.makeUnsafe(annotations)
     });
   },
   middleware(middleware) {
@@ -46,7 +46,7 @@ const RpcGroupProto = {
     // oxlint-disable-next-line no-this-alias
     const self = this;
     return Effect.gen(function* () {
-      const services = yield* Effect.services();
+      const services = yield* Effect.context();
       const handlers = Effect.isEffect(build) ? yield* build : build;
       const contextMap = new Map();
       for (const [tag, handler] of Object.entries(handlers)) {
@@ -54,10 +54,10 @@ const RpcGroupProto = {
         contextMap.set(rpc.key, {
           tag: rpc._tag,
           handler,
-          services
+          context: services
         });
       }
-      return ServiceMap.makeUnsafe(contextMap);
+      return Context.makeUnsafe(contextMap);
     });
   },
   prefix(prefix) {
@@ -72,58 +72,58 @@ const RpcGroupProto = {
     });
   },
   toLayer(build) {
-    return Layer.effectServices(this.toHandlers(build));
+    return Layer.effectContext(this.toHandlers(build));
   },
   of: identity,
   toLayerHandler(service, build) {
     // oxlint-disable-next-line no-this-alias
     const self = this;
-    return Layer.effectServices(Effect.gen(function* () {
-      const services = yield* Effect.services();
+    return Layer.effectContext(Effect.gen(function* () {
+      const services = yield* Effect.context();
       const handler = Effect.isEffect(build) ? yield* build : build;
       const contextMap = new Map();
       const rpc = self.requests.get(service);
       contextMap.set(rpc.key, {
         handler,
-        services
+        context: services
       });
-      return ServiceMap.makeUnsafe(contextMap);
+      return Context.makeUnsafe(contextMap);
     }));
   },
   accessHandler(service) {
-    return Effect.servicesWith(parentServices => {
+    return Effect.contextWith(parentContext => {
       const rpc = this.requests.get(service);
       const {
         handler,
-        services
-      } = parentServices.mapUnsafe.get(rpc.key);
+        context
+      } = parentContext.mapUnsafe.get(rpc.key);
       return Effect.succeed((payload, options) => {
         options.rpc = rpc;
         const result = handler(payload, options);
         const effectOrStream = Rpc.isWrapper(result) ? result.value : result;
-        return Effect.isEffect(effectOrStream) ? Effect.provide(effectOrStream, services) : Stream.provideServices(effectOrStream, services);
+        return Effect.isEffect(effectOrStream) ? Effect.provide(effectOrStream, context) : Stream.provideContext(effectOrStream, context);
       });
     });
   },
   annotate(service, value) {
     return makeProto({
       requests: this.requests,
-      annotations: ServiceMap.add(this.annotations, service, value)
+      annotations: Context.add(this.annotations, service, value)
     });
   },
   annotateRpcs(service, value) {
-    return this.annotateRpcsMerge(ServiceMap.make(service, value));
+    return this.annotateRpcsMerge(Context.make(service, value));
   },
   annotateMerge(context) {
     return makeProto({
       requests: this.requests,
-      annotations: ServiceMap.merge(this.annotations, context)
+      annotations: Context.merge(this.annotations, context)
     });
   },
-  annotateRpcsMerge(serviceMap) {
+  annotateRpcsMerge(context) {
     const requests = new Map();
     for (const [tag, rpc] of this.requests) {
-      requests.set(tag, rpc.annotateMerge(ServiceMap.merge(serviceMap, rpc.annotations)));
+      requests.set(tag, rpc.annotateMerge(Context.merge(context, rpc.annotations)));
     }
     return makeProto({
       requests,
@@ -141,6 +141,6 @@ const makeProto = options => Object.assign(function () {}, RpcGroupProto, {
  */
 export const make = (...rpcs) => makeProto({
   requests: new Map(rpcs.map(rpc => [rpc._tag, rpc])),
-  annotations: ServiceMap.empty()
+  annotations: Context.empty()
 });
 //# sourceMappingURL=RpcGroup.js.map

package/dist/unstable/rpc/RpcGroup.js.map

@@ -1 +1 @@
-{"version":3,"file":"RpcGroup.js","names":["Effect","identity","Layer","ServiceMap","Stream","Rpc","TypeId","RpcGroupProto","add","rpcs","requests","Map","rpc","set","_tag","makeProto","annotations","merge","groups","mapUnsafe","group","tag","key","value","makeUnsafe","middleware","toHandlers","build","self","gen","services","handlers","isEffect","contextMap","handler","Object","entries","get","prefix","values","newRpc","toLayer","effectServices","of","toLayerHandler","service","accessHandler","servicesWith","parentServices","succeed","payload","options","result","effectOrStream","isWrapper","provide","provideServices","annotate","annotateRpcs","annotateRpcsMerge","make","annotateMerge","context","serviceMap","assign","map","empty"],"sources":["../../../src/unstable/rpc/RpcGroup.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"RpcGroup.js","names":["Context","Effect","identity","Layer","Stream","Rpc","TypeId","RpcGroupProto","add","rpcs","requests","Map","rpc","set","_tag","makeProto","annotations","merge","groups","mapUnsafe","group","tag","key","value","makeUnsafe","middleware","toHandlers","build","self","gen","services","context","handlers","isEffect","contextMap","handler","Object","entries","get","prefix","values","newRpc","toLayer","effectContext","of","toLayerHandler","service","accessHandler","contextWith","parentContext","succeed","payload","options","result","effectOrStream","isWrapper","provide","provideContext","annotate","annotateRpcs","annotateRpcsMerge","make","annotateMerge","assign","map","empty"],"sources":["../../../src/unstable/rpc/RpcGroup.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/unstable/rpc/RpcMiddleware.d.ts

@@ -1,11 +1,11 @@
 /**
  * @since 4.0.0
  */
+import * as Context from "../../Context.ts";
 import * as Effect from "../../Effect.ts";
 import * as Layer from "../../Layer.ts";
 import * as Schema from "../../Schema.ts";
 import { Scope } from "../../Scope.ts";
-import * as ServiceMap from "../../ServiceMap.ts";
 import type { unhandled } from "../../Types.ts";
 import type { Headers } from "../http/Headers.ts";
 import type * as Rpc from "./Rpc.ts";
@@ -88,8 +88,8 @@ export interface AnyId {
  * @since 4.0.0
  * @category models
  */
-export interface ServiceClass<Self, Name extends string, Provides, E extends Schema.Top, ClientError, Requires, RequiredForClient extends boolean> extends ServiceMap.Service<Self, RpcMiddleware<Provides, E["Type"], Requires>> {
-    new (_: never): ServiceMap.ServiceClass.Shape<Name, RpcMiddleware<Provides, E["Type"], Requires>> & {
+export interface ServiceClass<Self, Name extends string, Provides, E extends Schema.Top, ClientError, Requires, RequiredForClient extends boolean> extends Context.Service<Self, RpcMiddleware<Provides, E["Type"], Requires>> {
+    new (_: never): Context.ServiceClass.Shape<Name, RpcMiddleware<Provides, E["Type"], Requires>> & {
         readonly [TypeId]: {
             readonly error: E;
             readonly provides: Provides;
@@ -153,7 +153,7 @@ export type ErrorServicesDecode<A> = ErrorSchema<A>["DecodingServices"];
  * @since 4.0.0
  * @category models
  */
-export interface AnyService extends ServiceMap.Key<any, any> {
+export interface AnyService extends Context.Key<any, any> {
     readonly [TypeId]: typeof TypeId;
     readonly error: Schema.Top;
     readonly requiredForClient: boolean;
@@ -163,7 +163,7 @@ export interface AnyService extends ServiceMap.Key<any, any> {
  * @since 4.0.0
  * @category models
  */
-export interface AnyServiceWithProps extends ServiceMap.Key<any, RpcMiddleware<any, any, any>> {
+export interface AnyServiceWithProps extends Context.Key<any, RpcMiddleware<any, any, any>> {
     readonly [TypeId]: typeof TypeId;
     readonly error: Schema.Top;
     readonly requiredForClient: boolean;
@@ -189,5 +189,5 @@ export declare const Service: <Self, Config extends {
  * @since 4.0.0
  * @category client
  */
-export declare const layerClient: <Id extends AnyId, S, R, EX = never, RX = never>(tag: ServiceMap.Key<Id, S>, service: RpcMiddlewareClient<Id[TypeId]["error"]["Type"], Id[TypeId]["clientError"], R> | Effect.Effect<RpcMiddlewareClient<Id[TypeId]["error"]["Type"], Id[TypeId]["clientError"], R>, EX, RX>) => Layer.Layer<ForClient<Id>, EX, R | Exclude<RX, Scope>>;
+export declare const layerClient: <Id extends AnyId, S, R, EX = never, RX = never>(tag: Context.Key<Id, S>, service: RpcMiddlewareClient<Id[TypeId]["error"]["Type"], Id[TypeId]["clientError"], R> | Effect.Effect<RpcMiddlewareClient<Id[TypeId]["error"]["Type"], Id[TypeId]["clientError"], R>, EX, RX>) => Layer.Layer<ForClient<Id>, EX, R | Exclude<RX, Scope>>;
 //# sourceMappingURL=RpcMiddleware.d.ts.map

package/dist/unstable/rpc/RpcMiddleware.d.ts.map

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

package/dist/unstable/rpc/RpcMiddleware.js

@@ -1,11 +1,11 @@
 /**
  * @since 4.0.0
  */
+import * as Context from "../../Context.js";
 import * as Effect from "../../Effect.js";
 import * as Layer from "../../Layer.js";
 import * as Schema from "../../Schema.js";
 import { Scope } from "../../Scope.js";
-import * as ServiceMap from "../../ServiceMap.js";
 /**
  * @since 4.0.0
  * @category Type IDs
@@ -23,7 +23,7 @@ export const Service = () => (id, options) => {
   Err.stackTraceLimit = limit;
   function ServiceClass() {}
   const ServiceClass_ = ServiceClass;
-  Object.setPrototypeOf(ServiceClass, Object.getPrototypeOf(ServiceMap.Service(id)));
+  Object.setPrototypeOf(ServiceClass, Object.getPrototypeOf(Context.Service(id)));
   ServiceClass.key = id;
   Object.defineProperty(ServiceClass, "stack", {
     get() {
@@ -39,9 +39,9 @@ export const Service = () => (id, options) => {
  * @since 4.0.0
  * @category client
  */
-export const layerClient = (tag, service) => Layer.effectServices(Effect.gen(function* () {
-  const services = (yield* Effect.services()).pipe(ServiceMap.omit(Scope));
+export const layerClient = (tag, service) => Layer.effectContext(Effect.gen(function* () {
+  const services = (yield* Effect.context()).pipe(Context.omit(Scope));
   const middleware = Effect.isEffect(service) ? yield* service : service;
-  return ServiceMap.makeUnsafe(new Map([[`${tag.key}/Client`, options => Effect.updateServices(middleware(options), requestContext => ServiceMap.merge(services, requestContext))]]));
+  return Context.makeUnsafe(new Map([[`${tag.key}/Client`, options => Effect.updateContext(middleware(options), requestContext => Context.merge(services, requestContext))]]));
 }));
 //# sourceMappingURL=RpcMiddleware.js.map

package/dist/unstable/rpc/RpcMiddleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"RpcMiddleware.js","names":["Effect","Layer","Schema","Scope","ServiceMap","TypeId","Service","id","options","Err","globalThis","Error","limit","stackTraceLimit","creationError","ServiceClass","ServiceClass_","Object","setPrototypeOf","getPrototypeOf","key","defineProperty","get","stack","error","Never","requiredForClient","layerClient","tag","service","effectServices","gen","services","pipe","omit","middleware","isEffect","makeUnsafe","Map","updateServices","requestContext","merge"],"sources":["../../../src/unstable/rpc/RpcMiddleware.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAGA,OAAO,KAAKA,MAAM,MAAM,iBAAiB;AACzC,OAAO,KAAKC,KAAK,MAAM,gBAAgB;AACvC,OAAO,KAAKC,MAAM,MAAM,iBAAiB;AACzC,SAASC,KAAK,QAAQ,gBAAgB;AACtC,OAAO,KAAKC,UAAU,MAAM,qBAAqB;AAYjD;;;;AAIA,OAAO,MAAMC,MAAM,GAAW,2BAA2B;AA2KzD;;;;AAIA,OAAO,MAAMC,OAAO,GAAGA,CAAA,KA8BvB,CACEC,EAAU,EACVC,OAGC,KACC;EACF,MAAMC,GAAG,GAAGC,UAAU,CAACC,KAAY;EACnC,MAAMC,KAAK,GAAGH,GAAG,CAACI,eAAe;EACjCJ,GAAG,CAACI,eAAe,GAAG,CAAC;EACvB,MAAMC,aAAa,GAAG,IAAIL,GAAG,EAAE;EAC/BA,GAAG,CAACI,eAAe,GAAGD,KAAK;EAE3B,SAASG,YAAYA,CAAA,GAAI;EACzB,MAAMC,aAAa,GAAGD,YAA0C;EAChEE,MAAM,CAACC,cAAc,CAACH,YAAY,EAAEE,MAAM,CAACE,cAAc,CAACf,UAAU,CAACE,OAAO,CAAYC,EAAE,CAAC,CAAC,CAAC;EAC7FQ,YAAY,CAACK,GAAG,GAAGb,EAAE;EACrBU,MAAM,CAACI,cAAc,CAACN,YAAY,EAAE,OAAO,EAAE;IAC3CO,GAAGA,CAAA;MACD,OAAOR,aAAa,CAACS,KAAK;IAC5B;GACD,CAAC;EACFP,aAAa,CAACX,MAAM,CAAC,GAAGA,MAAM;EAC9BW,aAAa,CAACQ,KAAK,GAAGhB,OAAO,EAAEgB,KAAK,IAAItB,MAAM,CAACuB,KAAK;EACpDT,aAAa,CAACU,iBAAiB,GAAGlB,OAAO,EAAEkB,iBAAiB,IAAI,KAAK;EACrE,OAAOX,YAAmB;AAC5B,CAAC;AAED;;;;AAIA,OAAO,MAAMY,WAAW,GAAGA,CACzBC,GAA0B,EAC1BC,OAEyG,KAEzG5B,KAAK,CAAC6B,cAAc,CAAC9B,MAAM,CAAC+B,GAAG,CAAC,aAAS;EACvC,MAAMC,QAAQ,GAAG,CAAC,OAAOhC,MAAM,CAACgC,QAAQ,EAAa,EAAEC,IAAI,CACzD7B,UAAU,CAAC8B,IAAI,CAAC/B,KAAK,CAAC,CACK;EAC7B,MAAMgC,UAAU,GAAGnC,MAAM,CAACoC,QAAQ,CAACP,OAAO,CAAC,GAAG,OAAOA,OAAO,GAAGA,OAAO;EACtE,OAAOzB,UAAU,CAACiC,UAAU,CAC1B,IAAIC,GAAG,CAAC,CAAC,CACP,GAAGV,GAAG,CAACR,GAAG,SAAS,EAClBZ,OAAY,IACXR,MAAM,CAACuC,cAAc,CACnBJ,UAAU,CAAC3B,OAAO,CAAC,EAClBgC,cAAc,IAAKpC,UAAU,CAACqC,KAAK,CAACT,QAAQ,EAAEQ,cAAc,CAAC,CAC/D,CACJ,CAAC,CAAC,CACJ;AACH,CAAC,CAAC,CAAC","ignoreList":[]}
+{"version":3,"file":"RpcMiddleware.js","names":["Context","Effect","Layer","Schema","Scope","TypeId","Service","id","options","Err","globalThis","Error","limit","stackTraceLimit","creationError","ServiceClass","ServiceClass_","Object","setPrototypeOf","getPrototypeOf","key","defineProperty","get","stack","error","Never","requiredForClient","layerClient","tag","service","effectContext","gen","services","context","pipe","omit","middleware","isEffect","makeUnsafe","Map","updateContext","requestContext","merge"],"sources":["../../../src/unstable/rpc/RpcMiddleware.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAGA,OAAO,KAAKA,OAAO,MAAM,kBAAkB;AAC3C,OAAO,KAAKC,MAAM,MAAM,iBAAiB;AACzC,OAAO,KAAKC,KAAK,MAAM,gBAAgB;AACvC,OAAO,KAAKC,MAAM,MAAM,iBAAiB;AACzC,SAASC,KAAK,QAAQ,gBAAgB;AAYtC;;;;AAIA,OAAO,MAAMC,MAAM,GAAW,2BAA2B;AA2KzD;;;;AAIA,OAAO,MAAMC,OAAO,GAAGA,CAAA,KA8BvB,CACEC,EAAU,EACVC,OAGC,KACC;EACF,MAAMC,GAAG,GAAGC,UAAU,CAACC,KAAY;EACnC,MAAMC,KAAK,GAAGH,GAAG,CAACI,eAAe;EACjCJ,GAAG,CAACI,eAAe,GAAG,CAAC;EACvB,MAAMC,aAAa,GAAG,IAAIL,GAAG,EAAE;EAC/BA,GAAG,CAACI,eAAe,GAAGD,KAAK;EAE3B,SAASG,YAAYA,CAAA,GAAI;EACzB,MAAMC,aAAa,GAAGD,YAA0C;EAChEE,MAAM,CAACC,cAAc,CAACH,YAAY,EAAEE,MAAM,CAACE,cAAc,CAACnB,OAAO,CAACM,OAAO,CAAYC,EAAE,CAAC,CAAC,CAAC;EAC1FQ,YAAY,CAACK,GAAG,GAAGb,EAAE;EACrBU,MAAM,CAACI,cAAc,CAACN,YAAY,EAAE,OAAO,EAAE;IAC3CO,GAAGA,CAAA;MACD,OAAOR,aAAa,CAACS,KAAK;IAC5B;GACD,CAAC;EACFP,aAAa,CAACX,MAAM,CAAC,GAAGA,MAAM;EAC9BW,aAAa,CAACQ,KAAK,GAAGhB,OAAO,EAAEgB,KAAK,IAAIrB,MAAM,CAACsB,KAAK;EACpDT,aAAa,CAACU,iBAAiB,GAAGlB,OAAO,EAAEkB,iBAAiB,IAAI,KAAK;EACrE,OAAOX,YAAmB;AAC5B,CAAC;AAED;;;;AAIA,OAAO,MAAMY,WAAW,GAAGA,CACzBC,GAAuB,EACvBC,OAEyG,KAEzG3B,KAAK,CAAC4B,aAAa,CAAC7B,MAAM,CAAC8B,GAAG,CAAC,aAAS;EACtC,MAAMC,QAAQ,GAAG,CAAC,OAAO/B,MAAM,CAACgC,OAAO,EAAa,EAAEC,IAAI,CACxDlC,OAAO,CAACmC,IAAI,CAAC/B,KAAK,CAAC,CACE;EACvB,MAAMgC,UAAU,GAAGnC,MAAM,CAACoC,QAAQ,CAACR,OAAO,CAAC,GAAG,OAAOA,OAAO,GAAGA,OAAO;EACtE,OAAO7B,OAAO,CAACsC,UAAU,CACvB,IAAIC,GAAG,CAAC,CAAC,CACP,GAAGX,GAAG,CAACR,GAAG,SAAS,EAClBZ,OAAY,IACXP,MAAM,CAACuC,aAAa,CAClBJ,UAAU,CAAC5B,OAAO,CAAC,EAClBiC,cAAc,IAAKzC,OAAO,CAAC0C,KAAK,CAACV,QAAQ,EAAES,cAAc,CAAC,CAC5D,CACJ,CAAC,CAAC,CACJ;AACH,CAAC,CAAC,CAAC","ignoreList":[]}

package/dist/unstable/rpc/RpcSchema.d.ts

@@ -2,9 +2,9 @@
  * @since 4.0.0
  */
 import * as Cause from "../../Cause.ts";
+import * as Context from "../../Context.ts";
 import * as Schema from "../../Schema.ts";
 import type * as AST from "../../SchemaAST.ts";
-import * as ServiceMap from "../../ServiceMap.ts";
 import * as Stream_ from "../../Stream.ts";
 declare const StreamSchemaTypeId = "~effect/rpc/RpcSchema/StreamSchema";
 /**
@@ -27,13 +27,13 @@ export interface Stream<A extends Schema.Top, E extends Schema.Top> extends Sche
  * @category Stream
  */
 export declare function Stream<A extends Schema.Top, E extends Schema.Top>(success: A, error: E): Stream<A, E>;
-declare const ClientAbort_base: ServiceMap.ServiceClass<ClientAbort, "effect/rpc/RpcSchema/ClientAbort", true>;
+declare const ClientAbort_base: Context.ServiceClass<ClientAbort, "effect/rpc/RpcSchema/ClientAbort", true>;
 /**
  * @since 4.0.0
  * @category Cause annotations
  */
 export declare class ClientAbort extends ClientAbort_base {
-    static annotation: ServiceMap.ServiceMap<Cause.StackTrace | ClientAbort>;
+    static annotation: Context.Context<Cause.StackTrace | ClientAbort>;
 }
 export {};
 //# sourceMappingURL=RpcSchema.d.ts.map

package/dist/unstable/rpc/RpcSchema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RpcSchema.d.ts","sourceRoot":"","sources":["../../../src/unstable/rpc/RpcSchema.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,KAAK,MAAM,gBAAgB,CAAA;AAIvC,OAAO,KAAK,MAAM,MAAM,iBAAiB,CAAA;AACzC,OAAO,KAAK,KAAK,GAAG,MAAM,oBAAoB,CAAA;AAC9C,OAAO,KAAK,UAAU,MAAM,qBAAqB,CAAA;AACjD,OAAO,KAAK,OAAO,MAAM,iBAAiB,CAAA;AAE1C,QAAA,MAAM,kBAAkB,uCAAuC,CAAA;AAE/D;;;GAGG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,GAAG,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,CAE3F;AAeD;;;GAGG;AACH,MAAM,WAAW,MAAM,CAAC,CAAC,SAAS,MAAM,CAAC,GAAG,EAAE,CAAC,SAAS,MAAM,CAAC,GAAG,CAAE,SAClE,MAAM,CAAC,MAAM,CACX,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,EACpC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,EAC1C,CAAC,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,kBAAkB,CAAC,EAC7C,CAAC,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,kBAAkB,CAAC,EAC7C,GAAG,CAAC,WAAW,EACf,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CACb;IAED,QAAQ,CAAC,cAAc,EAAE,IAAI,CAAA;IAC7B,QAAQ,CAAC,CAAC,kBAAkB,CAAC,EAAE,OAAO,kBAAkB,CAAA;IACxD,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAA;IACnB,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAA;CAClB;AAID;;;GAGG;AACH,wBAAgB,MAAM,CAAC,CAAC,SAAS,MAAM,CAAC,GAAG,EAAE,CAAC,SAAS,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAErG;;AAED;;;GAGG;AACH,qBAAa,WAAY,SAAQ,gBAA2E;IAC1G,MAAM,CAAC,UAAU,wDAMhB;CACF"}
+{"version":3,"file":"RpcSchema.d.ts","sourceRoot":"","sources":["../../../src/unstable/rpc/RpcSchema.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,KAAK,MAAM,gBAAgB,CAAA;AACvC,OAAO,KAAK,OAAO,MAAM,kBAAkB,CAAA;AAI3C,OAAO,KAAK,MAAM,MAAM,iBAAiB,CAAA;AACzC,OAAO,KAAK,KAAK,GAAG,MAAM,oBAAoB,CAAA;AAC9C,OAAO,KAAK,OAAO,MAAM,iBAAiB,CAAA;AAE1C,QAAA,MAAM,kBAAkB,uCAAuC,CAAA;AAE/D;;;GAGG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,GAAG,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,CAE3F;AAeD;;;GAGG;AACH,MAAM,WAAW,MAAM,CAAC,CAAC,SAAS,MAAM,CAAC,GAAG,EAAE,CAAC,SAAS,MAAM,CAAC,GAAG,CAAE,SAClE,MAAM,CAAC,MAAM,CACX,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,EACpC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,EAC1C,CAAC,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,kBAAkB,CAAC,EAC7C,CAAC,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,kBAAkB,CAAC,EAC7C,GAAG,CAAC,WAAW,EACf,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CACb;IAED,QAAQ,CAAC,cAAc,EAAE,IAAI,CAAA;IAC7B,QAAQ,CAAC,CAAC,kBAAkB,CAAC,EAAE,OAAO,kBAAkB,CAAA;IACxD,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAA;IACnB,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAA;CAClB;AAID;;;GAGG;AACH,wBAAgB,MAAM,CAAC,CAAC,SAAS,MAAM,CAAC,GAAG,EAAE,CAAC,SAAS,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAErG;;AAED;;;GAGG;AACH,qBAAa,WAAY,SAAQ,gBAAwE;IACvG,MAAM,CAAC,UAAU,kDAMhB;CACF"}

package/dist/unstable/rpc/RpcSchema.js

@@ -2,11 +2,11 @@
  * @since 4.0.0
  */
 import * as Cause from "../../Cause.js";
+import * as Context from "../../Context.js";
 import { constUndefined } from "../../Function.js";
 import * as Option from "../../Option.js";
 import * as Predicate from "../../Predicate.js";
 import * as Schema from "../../Schema.js";
-import * as ServiceMap from "../../ServiceMap.js";
 import * as Stream_ from "../../Stream.js";
 const StreamSchemaTypeId = "~effect/rpc/RpcSchema/StreamSchema";
 /**
@@ -39,8 +39,8 @@ export function Stream(success, error) {
  * @since 4.0.0
  * @category Cause annotations
  */
-export class ClientAbort extends /*#__PURE__*/ServiceMap.Service()("effect/rpc/RpcSchema/ClientAbort") {
-  static annotation = /*#__PURE__*/this.serviceMap(true).pipe(/*#__PURE__*/ServiceMap.add(Cause.StackTrace, {
+export class ClientAbort extends /*#__PURE__*/Context.Service()("effect/rpc/RpcSchema/ClientAbort") {
+  static annotation = /*#__PURE__*/this.context(true).pipe(/*#__PURE__*/Context.add(Cause.StackTrace, {
     name: "ClientAbort",
     stack: constUndefined,
     parent: undefined

package/dist/unstable/rpc/RpcSchema.js.map

@@ -1 +1 @@
-{"version":3,"file":"RpcSchema.js","names":["Cause","constUndefined","Option","Predicate","Schema","ServiceMap","Stream_","StreamSchemaTypeId","isStreamSchema","schema","hasProperty","getStreamSchemas","some","success","error","none","declare","isStream","Stream","make","ast","ClientAbort","Service","annotation","serviceMap","pipe","add","StackTrace","name","stack","parent","undefined"],"sources":["../../../src/unstable/rpc/RpcSchema.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAGA,OAAO,KAAKA,KAAK,MAAM,gBAAgB;AACvC,SAASC,cAAc,QAAQ,mBAAmB;AAClD,OAAO,KAAKC,MAAM,MAAM,iBAAiB;AACzC,OAAO,KAAKC,SAAS,MAAM,oBAAoB;AAC/C,OAAO,KAAKC,MAAM,MAAM,iBAAiB;AAEzC,OAAO,KAAKC,UAAU,MAAM,qBAAqB;AACjD,OAAO,KAAKC,OAAO,MAAM,iBAAiB;AAE1C,MAAMC,kBAAkB,GAAG,oCAAoC;AAE/D;;;;AAIA,OAAM,SAAUC,cAAcA,CAACC,MAAkB;EAC/C,OAAON,SAAS,CAACO,WAAW,CAACD,MAAM,EAAEF,kBAAkB,CAAC;AAC1D;AAEA;AACA,OAAM,SAAUI,gBAAgBA,CAACF,MAAkB;EAIjD,OAAOD,cAAc,CAACC,MAAM,CAAC,GAC3BP,MAAM,CAACU,IAAI,CAAC;IACVC,OAAO,EAAEJ,MAAM,CAACI,OAAO;IACvBC,KAAK,EAAEL,MAAM,CAACK;GACf,CAAC,GACFZ,MAAM,CAACa,IAAI,EAAE;AACjB;AAsBA,MAAMN,MAAM,gBAAGL,MAAM,CAACY,OAAO,CAACV,OAAO,CAACW,QAAQ,CAAC;AAE/C;;;;AAIA,OAAM,SAAUC,MAAMA,CAA6CL,OAAU,EAAEC,KAAQ;EACrF,OAAOV,MAAM,CAACe,IAAI,CAACV,MAAM,CAACW,GAAG,EAAE;IAAE,CAACb,kBAAkB,GAAGA,kBAAkB;IAAEM,OAAO;IAAEC;EAAK,CAAE,CAAC;AAC9F;AAEA;;;;AAIA,OAAM,MAAOO,WAAY,sBAAQhB,UAAU,CAACiB,OAAO,EAAqB,CAAC,kCAAkC,CAAC;EAC1G,OAAOC,UAAU,gBAAG,IAAI,CAACC,UAAU,CAAC,IAAI,CAAC,CAACC,IAAI,cAC5CpB,UAAU,CAACqB,GAAG,CAAC1B,KAAK,CAAC2B,UAAU,EAAE;IAC/BC,IAAI,EAAE,aAAa;IACnBC,KAAK,EAAE5B,cAAc;IACrB6B,MAAM,EAAEC;GACT,CAAC,CACH","ignoreList":[]}
+{"version":3,"file":"RpcSchema.js","names":["Cause","Context","constUndefined","Option","Predicate","Schema","Stream_","StreamSchemaTypeId","isStreamSchema","schema","hasProperty","getStreamSchemas","some","success","error","none","declare","isStream","Stream","make","ast","ClientAbort","Service","annotation","context","pipe","add","StackTrace","name","stack","parent","undefined"],"sources":["../../../src/unstable/rpc/RpcSchema.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAGA,OAAO,KAAKA,KAAK,MAAM,gBAAgB;AACvC,OAAO,KAAKC,OAAO,MAAM,kBAAkB;AAC3C,SAASC,cAAc,QAAQ,mBAAmB;AAClD,OAAO,KAAKC,MAAM,MAAM,iBAAiB;AACzC,OAAO,KAAKC,SAAS,MAAM,oBAAoB;AAC/C,OAAO,KAAKC,MAAM,MAAM,iBAAiB;AAEzC,OAAO,KAAKC,OAAO,MAAM,iBAAiB;AAE1C,MAAMC,kBAAkB,GAAG,oCAAoC;AAE/D;;;;AAIA,OAAM,SAAUC,cAAcA,CAACC,MAAkB;EAC/C,OAAOL,SAAS,CAACM,WAAW,CAACD,MAAM,EAAEF,kBAAkB,CAAC;AAC1D;AAEA;AACA,OAAM,SAAUI,gBAAgBA,CAACF,MAAkB;EAIjD,OAAOD,cAAc,CAACC,MAAM,CAAC,GAC3BN,MAAM,CAACS,IAAI,CAAC;IACVC,OAAO,EAAEJ,MAAM,CAACI,OAAO;IACvBC,KAAK,EAAEL,MAAM,CAACK;GACf,CAAC,GACFX,MAAM,CAACY,IAAI,EAAE;AACjB;AAsBA,MAAMN,MAAM,gBAAGJ,MAAM,CAACW,OAAO,CAACV,OAAO,CAACW,QAAQ,CAAC;AAE/C;;;;AAIA,OAAM,SAAUC,MAAMA,CAA6CL,OAAU,EAAEC,KAAQ;EACrF,OAAOT,MAAM,CAACc,IAAI,CAACV,MAAM,CAACW,GAAG,EAAE;IAAE,CAACb,kBAAkB,GAAGA,kBAAkB;IAAEM,OAAO;IAAEC;EAAK,CAAE,CAAC;AAC9F;AAEA;;;;AAIA,OAAM,MAAOO,WAAY,sBAAQpB,OAAO,CAACqB,OAAO,EAAqB,CAAC,kCAAkC,CAAC;EACvG,OAAOC,UAAU,gBAAG,IAAI,CAACC,OAAO,CAAC,IAAI,CAAC,CAACC,IAAI,cACzCxB,OAAO,CAACyB,GAAG,CAAC1B,KAAK,CAAC2B,UAAU,EAAE;IAC5BC,IAAI,EAAE,aAAa;IACnBC,KAAK,EAAE3B,cAAc;IACrB4B,MAAM,EAAEC;GACT,CAAC,CACH","ignoreList":[]}

package/dist/unstable/rpc/RpcSerialization.d.ts

@@ -1,6 +1,6 @@
+import * as Context from "../../Context.ts";
 import * as Layer from "../../Layer.ts";
-import * as ServiceMap from "../../ServiceMap.ts";
-declare const RpcSerialization_base: ServiceMap.ServiceClass<RpcSerialization, "effect/rpc/RpcSerialization", {
+declare const RpcSerialization_base: Context.ServiceClass<RpcSerialization, "effect/rpc/RpcSerialization", {
     makeUnsafe(): Parser;
     readonly contentType: string;
     readonly includesFraming: boolean;

package/dist/unstable/rpc/RpcSerialization.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RpcSerialization.d.ts","sourceRoot":"","sources":["../../../src/unstable/rpc/RpcSerialization.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,KAAK,MAAM,gBAAgB,CAAA;AAGvC,OAAO,KAAK,UAAU,MAAM,qBAAqB,CAAA;;kBAQjC,MAAM;0BACE,MAAM;8BACF,OAAO;;AAPnC;;;GAGG;AACH,qBAAa,gBAAiB,SAAQ,qBAIH;CAAG;AAEtC;;;GAGG;AACH,MAAM,WAAW,MAAM;IACrB,QAAQ,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,UAAU,GAAG,MAAM,KAAK,aAAa,CAAC,OAAO,CAAC,CAAA;IACtE,QAAQ,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,OAAO,KAAK,UAAU,GAAG,MAAM,GAAG,SAAS,CAAA;CACxE;AAED;;;GAGG;AACH,eAAO,MAAM,IAAI,EAAE,gBAAgB,CAAC,SAAS,CAa3C,CAAA;AAEF;;;GAGG;AACH,eAAO,MAAM,MAAM,EAAE,gBAAgB,CAAC,SAAS,CAkC7C,CAAA;AAEF;;;GAGG;AACH,eAAO,MAAM,OAAO,GAAI,UAAU;IAChC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAC1C,KAAG,gBAAgB,CAAC,SAAS,CAuB1B,CAAA;AAEJ;;;GAGG;AACH,eAAO,MAAM,SAAS,GAAI,UAAU;IAClC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAC1C,KAAG,gBAAgB,CAAC,SAAS,CA2B1B,CAAA;AAyPJ;;;GAGG;AACH,eAAO,MAAM,OAAO,EAAE,gBAAgB,CAAC,SAAS,CAqC9C,CAAA;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,gBAAgB,CAAyC,CAAA;AAE7F;;;;;;;;GAQG;AACH,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,KAAK,CAAC,gBAAgB,CAA2C,CAAA;AAEjG;;;;;GAKG;AACH,eAAO,MAAM,YAAY,GAAI,UAAU;IACrC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAC1C,KAAG,KAAK,CAAC,KAAK,CAAC,gBAAgB,CAAsD,CAAA;AAEtF;;;;;;GAMG;AACH,eAAO,MAAM,cAAc,GAAI,UAAU;IACvC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAC1C,KAAG,KAAK,CAAC,KAAK,CAAC,gBAAgB,CAAwD,CAAA;AAExF;;;;;;;;GAQG;AACH,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,KAAK,CAAC,gBAAgB,CAA4C,CAAA"}
+{"version":3,"file":"RpcSerialization.d.ts","sourceRoot":"","sources":["../../../src/unstable/rpc/RpcSerialization.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,OAAO,MAAM,kBAAkB,CAAA;AAC3C,OAAO,KAAK,KAAK,MAAM,gBAAgB,CAAA;;kBAUvB,MAAM;0BACE,MAAM;8BACF,OAAO;;AAPnC;;;GAGG;AACH,qBAAa,gBAAiB,SAAQ,qBAIH;CAAG;AAEtC;;;GAGG;AACH,MAAM,WAAW,MAAM;IACrB,QAAQ,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,UAAU,GAAG,MAAM,KAAK,aAAa,CAAC,OAAO,CAAC,CAAA;IACtE,QAAQ,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,OAAO,KAAK,UAAU,GAAG,MAAM,GAAG,SAAS,CAAA;CACxE;AAED;;;GAGG;AACH,eAAO,MAAM,IAAI,EAAE,gBAAgB,CAAC,SAAS,CAa3C,CAAA;AAEF;;;GAGG;AACH,eAAO,MAAM,MAAM,EAAE,gBAAgB,CAAC,SAAS,CAkC7C,CAAA;AAEF;;;GAGG;AACH,eAAO,MAAM,OAAO,GAAI,UAAU;IAChC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAC1C,KAAG,gBAAgB,CAAC,SAAS,CAuB1B,CAAA;AAEJ;;;GAGG;AACH,eAAO,MAAM,SAAS,GAAI,UAAU;IAClC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAC1C,KAAG,gBAAgB,CAAC,SAAS,CA2B1B,CAAA;AAyPJ;;;GAGG;AACH,eAAO,MAAM,OAAO,EAAE,gBAAgB,CAAC,SAAS,CAqC9C,CAAA;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,gBAAgB,CAAyC,CAAA;AAE7F;;;;;;;;GAQG;AACH,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,KAAK,CAAC,gBAAgB,CAA2C,CAAA;AAEjG;;;;;GAKG;AACH,eAAO,MAAM,YAAY,GAAI,UAAU;IACrC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAC1C,KAAG,KAAK,CAAC,KAAK,CAAC,gBAAgB,CAAsD,CAAA;AAEtF;;;;;;GAMG;AACH,eAAO,MAAM,cAAc,GAAI,UAAU;IACvC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAC1C,KAAG,KAAK,CAAC,KAAK,CAAC,gBAAgB,CAAwD,CAAA;AAExF;;;;;;;;GAQG;AACH,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,KAAK,CAAC,gBAAgB,CAA4C,CAAA"}

package/dist/unstable/rpc/RpcSerialization.js

@@ -2,15 +2,15 @@
  * @since 4.0.0
  */
 import * as Msgpackr from "msgpackr";
+import * as Context from "../../Context.js";
 import * as Layer from "../../Layer.js";
 import * as Predicate from "../../Predicate.js";
 import { hasProperty } from "../../Predicate.js";
-import * as ServiceMap from "../../ServiceMap.js";
 /**
  * @since 4.0.0
  * @category serialization
  */
-export class RpcSerialization extends /*#__PURE__*/ServiceMap.Service()("effect/rpc/RpcSerialization") {}
+export class RpcSerialization extends /*#__PURE__*/Context.Service()("effect/rpc/RpcSerialization") {}
 /**
  * @since 4.0.0
  * @category serialization
@@ -139,7 +139,7 @@ function decodeJsonRpcRaw(decoded, batches) {
 }
 function decodeJsonRpcMessage(decoded) {
   if ("method" in decoded) {
-    if (!decoded.id && decoded.method.startsWith("@effect/rpc/")) {
+    if (Predicate.isNullish(decoded.id) && decoded.method.startsWith("@effect/rpc/")) {
       const tag = decoded.method.slice("@effect/rpc/".length);
       const requestId = decoded.params?.requestId;
       return requestId ? {
@@ -151,7 +151,7 @@ function decodeJsonRpcMessage(decoded) {
     }
     return {
       _tag: "Request",
-      id: decoded.id ? String(decoded.id) : "",
+      id: Predicate.isNotNullish(decoded.id) ? String(decoded.id) : "",
       tag: decoded.method,
       payload: decoded.params ?? null,
       headers: decoded.headers ?? [],
@@ -241,7 +241,7 @@ function encodeJsonRpcMessage(response) {
         jsonrpc: "2.0",
         method: response.tag,
         params: response.payload,
-        id: response.id && Number(response.id),
+        id: response.id !== "" ? Number(response.id) : "",
         headers: response.headers,
         traceId: response.traceId,
         spanId: response.spanId,
@@ -271,14 +271,14 @@ function encodeJsonRpcMessage(response) {
         if (response.exit._tag === "Success") {
           return {
             jsonrpc: "2.0",
-            id: response.requestId ? Number(response.requestId) : undefined,
+            id: response.requestId !== "" ? Number(response.requestId) : undefined,
             result: response.exit.value
           };
         }
         const error = response.exit.cause.find(failure => failure._tag === "Fail");
         return {
           jsonrpc: "2.0",
-          id: response.requestId ? Number(response.requestId) : undefined,
+          id: response.requestId !== "" ? Number(response.requestId) : undefined,
           error: response.exit._tag === "Failure" ? {
             _tag: "Cause",
             code: error && Predicate.hasProperty(error, "code") ? Number(error.code) : 0,

package/dist/unstable/rpc/RpcSerialization.js.map

@@ -1 +1 @@
-{"version":3,"file":"RpcSerialization.js","names":["Msgpackr","Layer","Predicate","hasProperty","ServiceMap","RpcSerialization","Service","json","of","contentType","includesFraming","makeUnsafe","decoder","TextDecoder","decode","bytes","decoded","JSON","parse","Array","isArray","encode","response","stringify","ndjson","buffer","position","nlIndex","indexOf","items","item","slice","push","length","undefined","data","i","jsonRpc","options","batches","Map","decodeJsonRpcRaw","encoded","encodeJsonRpcResponse","ndJsonRpc","parser","frames","messages","frame","batch","size","responses","message","decodeJsonRpcMessage","_tag","set","id","method","startsWith","tag","requestId","params","String","payload","headers","spanId","traceId","sampled","error","defect","chunk","values","result","exit","cause","value","encodeJsonRpcRaw","encodeJsonRpcMessage","get","delete","from","current","jsonrpc","Number","find","failure","code","jsonRpcInternalError","msgPack","unpackr","Unpackr","useRecords","packr","Packr","encoder","TextEncoder","incomplete","buf","prev","Uint8Array","unpackMultiple","error_","subarray","lastPosition","pack","layerJson","succeed","layerNdjson","layerJsonRpc","layerNdJsonRpc","layerMsgPack"],"sources":["../../../src/unstable/rpc/RpcSerialization.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"RpcSerialization.js","names":["Msgpackr","Context","Layer","Predicate","hasProperty","RpcSerialization","Service","json","of","contentType","includesFraming","makeUnsafe","decoder","TextDecoder","decode","bytes","decoded","JSON","parse","Array","isArray","encode","response","stringify","ndjson","buffer","position","nlIndex","indexOf","items","item","slice","push","length","undefined","data","i","jsonRpc","options","batches","Map","decodeJsonRpcRaw","encoded","encodeJsonRpcResponse","ndJsonRpc","parser","frames","messages","frame","batch","size","responses","message","decodeJsonRpcMessage","_tag","set","id","isNullish","method","startsWith","tag","requestId","params","String","isNotNullish","payload","headers","spanId","traceId","sampled","error","defect","chunk","values","result","exit","cause","value","encodeJsonRpcRaw","encodeJsonRpcMessage","get","delete","from","current","jsonrpc","Number","find","failure","code","jsonRpcInternalError","msgPack","unpackr","Unpackr","useRecords","packr","Packr","encoder","TextEncoder","incomplete","buf","prev","Uint8Array","unpackMultiple","error_","subarray","lastPosition","pack","layerJson","succeed","layerNdjson","layerJsonRpc","layerNdJsonRpc","layerMsgPack"],"sources":["../../../src/unstable/rpc/RpcSerialization.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}