effect 4.0.0-beta.43 → 4.0.0-beta.45

package/src/unstable/cluster/EntityResource.ts

@@ -2,12 +2,12 @@
  * @since 4.0.0
  */
 import type * as v1 from "kubernetes-types/core/v1.d.ts"
+import * as Context from "../../Context.ts"
 import * as Duration from "../../Duration.ts"
 import * as Effect from "../../Effect.ts"
 import { identity } from "../../Function.ts"
 import * as RcRef from "../../RcRef.ts"
 import * as Scope from "../../Scope.ts"
-import * as ServiceMap from "../../ServiceMap.ts"
 import * as Entity from "./Entity.ts"
 import * as K8sHttpClient from "./K8sHttpClient.ts"
 import type { Sharding } from "./Sharding.ts"
@@ -42,7 +42,7 @@ export interface EntityResource<out A, out E = never> {
  * @since 4.0.0
  * @category Scope
  */
-export class CloseScope extends ServiceMap.Service<
+export class CloseScope extends Context.Service<
   CloseScope,
   Scope.Scope
 >()("effect/cluster/EntityResource/CloseScope") {}

package/src/unstable/cluster/HttpRunner.ts

@@ -116,7 +116,7 @@ export const toHttpEffect: Effect.Effect<
   return yield* RpcServer.toHttpEffect(Runners.Rpcs, {
     spanPrefix: "RunnerServer",
     disableTracing: true
-  }).pipe(Effect.provideServices(handlers))
+  }).pipe(Effect.provideContext(handlers))
 })
 
 /**
@@ -132,7 +132,7 @@ export const toHttpEffectWebsocket: Effect.Effect<
   return yield* RpcServer.toHttpEffectWebsocket(Runners.Rpcs, {
     spanPrefix: "RunnerServer",
     disableTracing: true
-  }).pipe(Effect.provideServices(handlers))
+  }).pipe(Effect.provideContext(handlers))
 })
 
 /**

package/src/unstable/cluster/K8sHttpClient.ts

@@ -2,6 +2,7 @@
  * @since 4.0.0
  */
 import type * as v1 from "kubernetes-types/core/v1.d.ts"
+import * as Context from "../../Context.ts"
 import * as Effect from "../../Effect.ts"
 import * as FileSystem from "../../FileSystem.ts"
 import { identity } from "../../Function.ts"
@@ -10,7 +11,6 @@ import * as Option from "../../Option.ts"
 import * as Result from "../../Result.ts"
 import * as Schedule from "../../Schedule.ts"
 import * as Schema from "../../Schema.ts"
-import * as ServiceMap from "../../ServiceMap.ts"
 import * as HttpClient from "../http/HttpClient.ts"
 import * as HttpClientError from "../http/HttpClientError.ts"
 import * as HttpClientRequest from "../http/HttpClientRequest.ts"
@@ -20,7 +20,7 @@ import * as HttpClientResponse from "../http/HttpClientResponse.ts"
  * @since 4.0.0
  * @category Tags
  */
-export class K8sHttpClient extends ServiceMap.Service<
+export class K8sHttpClient extends Context.Service<
   K8sHttpClient,
   HttpClient.HttpClient
 >()("effect/cluster/K8sHttpClient") {}

package/src/unstable/cluster/Message.ts

@@ -1,11 +1,11 @@
 /**
  * @since 4.0.0
  */
+import * as Context from "../../Context.ts"
 import * as Data from "../../Data.ts"
 import * as Effect from "../../Effect.ts"
 import * as Option from "../../Option.ts"
 import * as Schema from "../../Schema.ts"
-import * as ServiceMap from "../../ServiceMap.ts"
 import * as Rpc from "../rpc/Rpc.ts"
 import type { PersistenceError } from "./ClusterError.ts"
 import { MalformedMessage } from "./ClusterError.ts"
@@ -36,7 +36,7 @@ export const incomingLocalFromOutgoing = <R extends Rpc.Any>(self: Outgoing<R>):
     return new IncomingEnvelope({ envelope: self.envelope })
   }
   return new IncomingRequestLocal({
-    annotations: ServiceMap.get(self.rpc.annotations, ClusterSchema.Dynamic)(
+    annotations: Context.get(self.rpc.annotations, ClusterSchema.Dynamic)(
       self.rpc.annotations,
       self.envelope as any
     ),
@@ -64,7 +64,7 @@ export class IncomingRequestLocal<R extends Rpc.Any> extends Data.TaggedClass("I
   readonly envelope: Envelope.Request<R>
   readonly lastSentReply: Option.Option<Reply.Reply<R>>
   readonly respond: (reply: Reply.Reply<R>) => Effect.Effect<void, MalformedMessage | PersistenceError>
-  readonly annotations: ServiceMap.ServiceMap<never>
+  readonly annotations: Context.Context<never>
 }> {}
 
 /**
@@ -88,11 +88,11 @@ export type Outgoing<R extends Rpc.Any> = OutgoingRequest<R> | OutgoingEnvelope
  */
 export class OutgoingRequest<R extends Rpc.Any> extends Data.TaggedClass("OutgoingRequest")<{
   readonly envelope: Envelope.Request<R>
-  readonly services: ServiceMap.ServiceMap<Rpc.Services<R>>
+  readonly context: Context.Context<Rpc.Services<R>>
   readonly lastReceivedReply: Option.Option<Reply.Reply<R>>
   readonly rpc: R
   readonly respond: (reply: Reply.Reply<R>) => Effect.Effect<void>
-  readonly annotations: ServiceMap.ServiceMap<never>
+  readonly annotations: Context.Context<never>
 }> {
   /**
    * @since 4.0.0
@@ -167,7 +167,7 @@ export const serializeRequest = <Rpc extends Rpc.Any>(
 ): Effect.Effect<Envelope.PartialRequest, MalformedMessage> => {
   const rpc = self.rpc as any as Rpc.AnyWithProps
   return Schema.encodeEffect(Schema.toCodecJson(rpc.payloadSchema))(self.envelope.payload).pipe(
-    Effect.provideServices(self.services),
+    Effect.provideContext(self.context),
     MalformedMessage.refail,
     Effect.map((payload) => ({
       ...self.envelope,
@@ -196,7 +196,7 @@ export const deserializeLocal = <Rpc extends Rpc.Any>(
   }
   const rpc = self.rpc as any as Rpc.AnyWithProps
   return Schema.decodeEffect(Schema.toCodecJson(rpc.payloadSchema))(encoded.payload).pipe(
-    Effect.provideServices(self.services),
+    Effect.provideContext(self.context),
     MalformedMessage.refail,
     Effect.map((payload) => {
       const envelope = Envelope.makeRequest({
@@ -207,7 +207,7 @@ export const deserializeLocal = <Rpc extends Rpc.Any>(
         envelope,
         lastSentReply: Option.none(),
         respond: self.respond,
-        annotations: ServiceMap.get(rpc.annotations, ClusterSchema.Dynamic)(
+        annotations: Context.get(rpc.annotations, ClusterSchema.Dynamic)(
           rpc.annotations,
           envelope as any
         )

package/src/unstable/cluster/MessageStorage.ts

@@ -3,6 +3,7 @@
  */
 import * as Arr from "../../Array.ts"
 import { Clock } from "../../Clock.ts"
+import * as Context from "../../Context.ts"
 import * as Data from "../../Data.ts"
 import * as Effect from "../../Effect.ts"
 import * as Exit from "../../Exit.ts"
@@ -12,7 +13,6 @@ import * as Layer from "../../Layer.ts"
 import * as Option from "../../Option.ts"
 import type { Predicate } from "../../Predicate.ts"
 import * as Schema from "../../Schema.ts"
-import * as ServiceMap from "../../ServiceMap.ts"
 import type * as Rpc from "../rpc/Rpc.ts"
 import { EntityNotAssignedToRunner, MalformedMessage, type PersistenceError } from "./ClusterError.ts"
 import * as DeliverAt from "./DeliverAt.ts"
@@ -20,7 +20,7 @@ import type { EntityAddress } from "./EntityAddress.ts"
 import * as Envelope from "./Envelope.ts"
 import * as Message from "./Message.ts"
 import * as Reply from "./Reply.ts"
-import { ShardId } from "./ShardId.ts"
+import * as ShardId from "./ShardId.ts"
 import type { ShardingConfig } from "./ShardingConfig.ts"
 import * as Snowflake from "./Snowflake.ts"
 
@@ -28,7 +28,7 @@ import * as Snowflake from "./Snowflake.ts"
  * @since 4.0.0
  * @category context
  */
-export class MessageStorage extends ServiceMap.Service<MessageStorage, {
+export class MessageStorage extends Context.Service<MessageStorage, {
   /**
    * Save the provided message and its associated metadata.
    */
@@ -98,7 +98,7 @@ export class MessageStorage extends ServiceMap.Service<MessageStorage, {
   /**
    * Unregister the reply handlers for the specified ShardId.
    */
-  readonly unregisterShardReplyHandlers: (shardId: ShardId) => Effect.Effect<void>
+  readonly unregisterShardReplyHandlers: (shardId: ShardId.ShardId) => Effect.Effect<void>
 
   /**
    * Retrieves the unprocessed messages for the specified shards.
@@ -111,7 +111,7 @@ export class MessageStorage extends ServiceMap.Service<MessageStorage, {
    * - All Interrupt's for unprocessed requests
    */
   readonly unprocessedMessages: (
-    shardIds: Iterable<ShardId>
+    shardIds: Iterable<ShardId.ShardId>
   ) => Effect.Effect<Array<Message.Incoming<any>>, PersistenceError>
 
   /**
@@ -125,7 +125,7 @@ export class MessageStorage extends ServiceMap.Service<MessageStorage, {
    * Reset the mailbox state for the provided shards.
    */
   readonly resetShards: (
-    shardIds: Iterable<ShardId>
+    shardIds: Iterable<ShardId.ShardId>
   ) => Effect.Effect<void, PersistenceError>
 
   /**
@@ -483,7 +483,7 @@ export const makeEncoded: (encoded: Encoded) => Effect.Effect<
           const duplicate = result
           const schema = Reply.Reply(message.rpc)
           return Schema.decodeEffect(schema)(result.lastReceivedReply.value).pipe(
-            Effect.provideServices(message.services),
+            Effect.provideContext(message.context),
             MalformedMessage.refail,
             Effect.map((reply) =>
               SaveResult.Duplicate({
@@ -630,7 +630,7 @@ export const makeEncoded: (encoded: Encoded) => Effect.Effect<
         if (!message) return Effect.void
         const schema = Reply.Reply(message.rpc)
         return Schema.decodeEffect(schema)(reply).pipe(
-          Effect.provideServices(message.services)
+          Effect.provideContext(message.context)
         ) as Effect.Effect<Reply.Reply<any>, Schema.SchemaError>
       }),
       (error) => {
@@ -699,7 +699,7 @@ export type MemoryEntry = {
  * @since 4.0.0
  * @category Memory
  */
-export const MemoryTransaction = ServiceMap.Reference<boolean>("effect/cluster/MessageStorage/MemoryTransaction", {
+export const MemoryTransaction = Context.Reference<boolean>("effect/cluster/MessageStorage/MemoryTransaction", {
   defaultValue: constFalse
 })
 
@@ -707,7 +707,7 @@ export const MemoryTransaction = ServiceMap.Reference<boolean>("effect/cluster/M
  * @since 4.0.0
  * @category Memory
  */
-export class MemoryDriver extends ServiceMap.Service<MemoryDriver>()("effect/cluster/MessageStorage/MemoryDriver", {
+export class MemoryDriver extends Context.Service<MemoryDriver>()("effect/cluster/MessageStorage/MemoryDriver", {
   make: Effect.gen(function*() {
     const clock = yield* Clock
     const requests = new Map<string, MemoryEntry>()
@@ -843,7 +843,7 @@ export class MemoryDriver extends ServiceMap.Service<MemoryDriver>()("effect/clu
           }>()
           for (let index = 0; index < journal.length; index++) {
             const envelope = journal[index]
-            const shardId = ShardId.makeUnsafe(envelope.address.shardId)
+            const shardId = ShardId.make(envelope.address.shardId.group, envelope.address.shardId.id)
             if (!unprocessed.has(envelope as any) || !shardIds.includes(shardId.toString())) {
               continue
             }

package/src/unstable/cluster/Reply.ts

@@ -2,6 +2,7 @@
  * @since 4.0.0
  */
 import type { NonEmptyReadonlyArray } from "../../Array.ts"
+import * as Context from "../../Context.ts"
 import * as Data from "../../Data.ts"
 import * as Effect from "../../Effect.ts"
 import * as Exit from "../../Exit.ts"
@@ -11,7 +12,6 @@ import * as Schema from "../../Schema.ts"
 import * as Issue from "../../SchemaIssue.ts"
 import * as Parser from "../../SchemaParser.ts"
 import * as Transformation from "../../SchemaTransformation.ts"
-import * as ServiceMap from "../../ServiceMap.ts"
 import * as Rpc from "../rpc/Rpc.ts"
 import type * as RpcMessage from "../rpc/RpcMessage.ts"
 import type * as RpcSchema from "../rpc/RpcSchema.ts"
@@ -51,7 +51,7 @@ export const Encoded: Schema.Codec<Encoded> = Schema.Any as any
  */
 export class ReplyWithContext<R extends Rpc.Any> extends Data.TaggedClass("ReplyWithContext")<{
   readonly reply: Reply<R>
-  readonly services: ServiceMap.ServiceMap<Rpc.Services<R>>
+  readonly context: Context.Context<Rpc.Services<R>>
   readonly rpc: R
 }> {
   /**
@@ -68,7 +68,7 @@ export class ReplyWithContext<R extends Rpc.Any> extends Data.TaggedClass("Reply
         id: options.id,
         exit: Exit.die(Schema.encodeSync(Schema.Defect)(options.defect))
       }),
-      services: ServiceMap.empty() as any,
+      context: Context.empty() as any,
       rpc: neverRpc
     })
   }
@@ -85,7 +85,7 @@ export class ReplyWithContext<R extends Rpc.Any> extends Data.TaggedClass("Reply
         id: options.id,
         exit: Exit.interrupt()
       }),
-      services: ServiceMap.empty() as any,
+      context: Context.empty() as any,
       rpc: neverRpc
     })
   }
@@ -339,9 +339,9 @@ export const serialize = <R extends Rpc.Any>(
 ): Effect.Effect<Encoded, MalformedMessage> => {
   const schema = Reply(self.rpc)
   return MalformedMessage.refail(
-    Effect.provideServices(
+    Effect.provideContext(
       Schema.encodeEffect(schema)(self.reply),
-      self.services
+      self.context
     )
   )
 }
@@ -359,7 +359,7 @@ export const serializeLastReceived = <R extends Rpc.Any>(
   }
   const schema = Reply(self.rpc)
   return MalformedMessage.refail(
-    Effect.provideServices(Schema.encodeEffect(schema)(lastReceivedReply.value), self.services)
+    Effect.provideContext(Schema.encodeEffect(schema)(lastReceivedReply.value), self.context)
   ).pipe(
     Effect.map(Option.some)
   )

package/src/unstable/cluster/RunnerHealth.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 Schedule from "../../Schedule.ts"
 import type * as Scope from "../../Scope.ts"
-import * as ServiceMap from "../../ServiceMap.ts"
 import * as K8s from "./K8sHttpClient.ts"
 import type { RunnerAddress } from "./RunnerAddress.ts"
 import * as Runners from "./Runners.ts"
@@ -20,7 +20,7 @@ import * as Runners from "./Runners.ts"
  * @since 4.0.0
  * @category models
  */
-export class RunnerHealth extends ServiceMap.Service<
+export class RunnerHealth extends Context.Service<
   RunnerHealth,
   {
     readonly isAlive: (address: RunnerAddress) => Effect.Effect<boolean>

package/src/unstable/cluster/RunnerServer.ts

@@ -72,7 +72,7 @@ export const layerHandlers = Runners.Rpcs.toLayer(Effect.gen(function*() {
               resume(exit as any)
             }
           }
-          const runFork = Effect.runForkWith(parent.services)
+          const runFork = Effect.runForkWith(parent.context)
           const fiber = runFork(storage.registerReplyHandler(message))
           fiber.addObserver(onExit)
           runFork(Effect.catchTag(

package/src/unstable/cluster/RunnerStorage.ts

@@ -2,15 +2,15 @@
  * @since 4.0.0
  */
 import { isArrayNonEmpty, type NonEmptyArray } from "../../Array.ts"
+import * as Context from "../../Context.ts"
 import * as Effect from "../../Effect.ts"
 import * as Layer from "../../Layer.ts"
 import * as MutableHashMap from "../../MutableHashMap.ts"
-import * as ServiceMap from "../../ServiceMap.ts"
 import type { PersistenceError } from "./ClusterError.ts"
 import * as MachineId from "./MachineId.ts"
 import { Runner } from "./Runner.ts"
 import type { RunnerAddress } from "./RunnerAddress.ts"
-import { ShardId } from "./ShardId.ts"
+import * as ShardId from "./ShardId.ts"
 
 /**
  * Represents a generic interface to the persistent storage required by the
@@ -19,7 +19,7 @@ import { ShardId } from "./ShardId.ts"
  * @since 4.0.0
  * @category models
  */
-export class RunnerStorage extends ServiceMap.Service<RunnerStorage, {
+export class RunnerStorage extends Context.Service<RunnerStorage, {
   /**
    * Register a new runner with the cluster.
    */
@@ -47,23 +47,23 @@ export class RunnerStorage extends ServiceMap.Service<RunnerStorage, {
    */
   readonly acquire: (
     address: RunnerAddress,
-    shardIds: Iterable<ShardId>
-  ) => Effect.Effect<Array<ShardId>, PersistenceError>
+    shardIds: Iterable<ShardId.ShardId>
+  ) => Effect.Effect<Array<ShardId.ShardId>, PersistenceError>
 
   /**
    * Refresh the locks owned by the given runner.
    */
   readonly refresh: (
     address: RunnerAddress,
-    shardIds: Iterable<ShardId>
-  ) => Effect.Effect<Array<ShardId>, PersistenceError>
+    shardIds: Iterable<ShardId.ShardId>
+  ) => Effect.Effect<Array<ShardId.ShardId>, PersistenceError>
 
   /**
    * Release the given shard ids.
    */
   readonly release: (
     address: RunnerAddress,
-    shardId: ShardId
+    shardId: ShardId.ShardId
   ) => Effect.Effect<void, PersistenceError>
 
   /**
@@ -181,7 +181,7 @@ export const makeEncoded = (encoded: Encoded) =>
  */
 export const makeMemory = Effect.gen(function*() {
   const runners = MutableHashMap.empty<RunnerAddress, Runner>()
-  let acquired: Array<ShardId> = []
+  let acquired: Array<ShardId.ShardId> = []
   let id = 0
 
   return RunnerStorage.of({

package/src/unstable/cluster/Runners.ts

@@ -1,6 +1,7 @@
 /**
  * @since 4.0.0
  */
+import * as Context from "../../Context.ts"
 import * as Effect from "../../Effect.ts"
 import * as Exit from "../../Exit.ts"
 import * as Latch from "../../Latch.ts"
@@ -10,7 +11,6 @@ import * as Queue from "../../Queue.ts"
 import * as RcMap from "../../RcMap.ts"
 import * as Schema from "../../Schema.ts"
 import type { Scope } from "../../Scope.ts"
-import * as ServiceMap from "../../ServiceMap.ts"
 import * as Rpc from "../rpc/Rpc.ts"
 import * as RpcClient_ from "../rpc/RpcClient.ts"
 import type { RpcClientError } from "../rpc/RpcClientError.ts"
@@ -31,7 +31,7 @@ import * as Snowflake from "./Snowflake.ts"
  * @since 1.0.0
  * @category context
  */
-export class Runners extends ServiceMap.Service<Runners, {
+export class Runners extends Context.Service<Runners, {
   /**
    * Checks if a Runner is responsive.
    */
@@ -132,7 +132,7 @@ export const make: (options: Omit<Runners["Service"], "sendLocal" | "notifyLocal
     afterPersist: (message: Message.Outgoing<any>, isDuplicate: boolean) => Effect.Effect<void, E>
   ): Effect.Effect<void, E | PersistenceError> {
     const rpc = message.rpc as any as Rpc.AnyWithProps
-    const persisted = ServiceMap.get(rpc.annotations, Persisted)
+    const persisted = Context.get(rpc.annotations, Persisted)
     if (!persisted) {
       return Effect.die("Runners.notify only supports persisted messages")
     }
@@ -505,7 +505,7 @@ export const makeRpc: Effect.Effect<
     },
     send({ address, message }) {
       const rpc = message.rpc as any as Rpc.AnyWithProps
-      const isPersisted = ServiceMap.get(rpc.annotations, Persisted)
+      const isPersisted = Context.get(rpc.annotations, Persisted)
       if (message._tag === "OutgoingEnvelope") {
         return RcMap.get(clients, address).pipe(
           Effect.flatMap((client) =>
@@ -533,7 +533,7 @@ export const makeRpc: Effect.Effect<
               Effect.catchTag("RpcClientError", Effect.die),
               Effect.flatMap((reply) =>
                 Schema.decodeEffect(Reply.Reply(message.rpc))(reply).pipe(
-                  Effect.provideServices(message.services),
+                  Effect.provideContext(message.context),
                   Effect.orDie
                 )
               ),
@@ -567,7 +567,7 @@ export const makeRpc: Effect.Effect<
                 Effect.flatMap(message.respond),
                 Effect.forever,
                 Effect.catchTag("RpcClientError", Effect.die),
-                Effect.provideServices(message.services),
+                Effect.provideContext(message.context),
                 Effect.catchTag("Done", (_) => Effect.void),
                 Effect.catchDefect(() => Effect.fail(new RunnerUnavailable({ address })))
               )
@@ -615,7 +615,7 @@ export const layerRpc: Layer.Layer<
  * @since 1.0.0
  * @category Client
  */
-export class RpcClientProtocol extends ServiceMap.Service<
+export class RpcClientProtocol extends Context.Service<
   RpcClientProtocol,
   (address: RunnerAddress) => Effect.Effect<RpcClient_.Protocol["Service"], never, Scope>
 >()("effect/cluster/Runners/RpcClientProtocol") {}

package/src/unstable/cluster/ShardId.ts

@@ -3,12 +3,46 @@
  */
 import * as Equal from "../../Equal.ts"
 import * as Hash from "../../Hash.ts"
+import { hasProperty } from "../../Predicate.ts"
 import * as PrimaryKey from "../../PrimaryKey.ts"
 import * as S from "../../Schema.ts"
+import * as Getter from "../../SchemaGetter.ts"
 
 const TypeId = "~effect/cluster/ShardId"
 
-const constDisableChecks = { disableChecks: true }
+/**
+ * @since 4.0.0
+ * @category Models
+ */
+export interface ShardId extends Equal.Equal, Hash.Hash, PrimaryKey.PrimaryKey {
+  readonly [TypeId]: typeof TypeId
+  readonly group: string
+  readonly id: number
+}
+
+/**
+ * @since 4.0.0
+ * @category Guards
+ */
+export const isShardId = (u: unknown): u is ShardId => hasProperty(u, TypeId)
+
+/**
+ * @since 4.0.0
+ * @category Schema
+ */
+export const ShardId = S.declare(isShardId, {
+  toCodecJson: () =>
+    S.link<ShardId>()(
+      S.Struct({
+        group: S.String,
+        id: S.Number
+      }),
+      {
+        decode: Getter.transform(({ group, id }) => make(group, id)),
+        encode: Getter.passthrough()
+      }
+    )
+})
 
 /**
  * @since 4.0.0
@@ -18,7 +52,7 @@ export const make = (group: string, id: number): ShardId => {
   const key = `${group}:${id}`
   let shardId = shardIdCache.get(key)
   if (!shardId) {
-    shardId = new ShardId({ group, id }, constDisableChecks)
+    shardId = makeProto(group, id)
     shardIdCache.set(key, shardId)
   }
   return shardId
@@ -26,86 +60,62 @@ export const make = (group: string, id: number): ShardId => {
 
 const shardIdCache = new Map<string, ShardId>()
 
-/**
- * @since 4.0.0
- * @category Models
- */
-export class ShardId extends S.Class<ShardId>(TypeId)({
-  group: S.String,
-  id: S.Int
-}) {
-  /**
-   * @since 4.0.0
-   */
-  static readonly make = make
-
-  /**
-   * @since 4.0.0
-   */
-  readonly [TypeId] = TypeId;
+const makeProto = (group: string, id: number): ShardId => {
+  const self = Object.create(ShardIdProto)
+  self.group = group
+  self.id = id
+  return self
+}
 
-  /**
-   * @since 4.0.0
-   */
-  [Equal.symbol](that: ShardId): boolean {
+const ShardIdProto = {
+  [TypeId]: TypeId,
+  [Equal.symbol](this: ShardId, that: ShardId): boolean {
     return this.group === that.group && this.id === that.id
-  }
-
-  /**
-   * @since 4.0.0
-   */
-  [Hash.symbol](): number {
+  },
+  [Hash.symbol](this: ShardId): number {
     return Hash.string(this.toString())
-  }
-
-  /**
-   * @since 4.0.0
-   */
-  [PrimaryKey.symbol](): string {
+  },
+  [PrimaryKey.symbol](this: ShardId): string {
     return this.toString()
-  }
-
-  /**
-   * @since 4.0.0
-   */
-  override toString(): string {
+  },
+  toString(this: ShardId): string {
     return `${this.group}:${this.id}`
   }
+}
 
-  /**
-   * @since 4.0.0
-   */
-  static override toString(shardId: {
-    readonly group: string
-    readonly id: number
-  }): string {
-    return `${shardId.group}:${shardId.id}`
+/**
+ * @since 4.0.0
+ * @category Conversions
+ */
+export const toString = (shardId: {
+  readonly group: string
+  readonly id: number
+}): string => {
+  return `${shardId.group}:${shardId.id}`
+}
+/**
+ * @since 4.0.0
+ */
+export function fromStringEncoded(s: string): {
+  readonly group: string
+  readonly id: number
+} {
+  const index = s.lastIndexOf(":")
+  if (index === -1) {
+    throw new Error(`Invalid ShardId format`)
   }
-
-  /**
-   * @since 4.0.0
-   */
-  static fromStringEncoded(s: string): {
-    readonly group: string
-    readonly id: number
-  } {
-    const index = s.lastIndexOf(":")
-    if (index === -1) {
-      throw new Error(`Invalid ShardId format`)
-    }
-    const group = s.substring(0, index)
-    const id = Number(s.substring(index + 1))
-    if (isNaN(id)) {
-      throw new Error(`ShardId id must be a number`)
-    }
-    return { group, id }
+  const group = s.substring(0, index)
+  const id = Number(s.substring(index + 1))
+  if (isNaN(id)) {
+    throw new Error(`ShardId id must be a number`)
   }
+  return { group, id }
+}
 
-  /**
-   * @since 4.0.0
-   */
-  static fromString(s: string): ShardId {
-    const encoded = ShardId.fromStringEncoded(s)
-    return make(encoded.group, encoded.id)
-  }
+/**
+ * @since 4.0.0
+ */
+export function fromString(s: string): ShardId {
+  const encoded = fromStringEncoded(s)
+  return make(encoded.group, encoded.id)
 }