From 7f946cb5e004214bb3c4480458449eb921cd41cb Mon Sep 17 00:00:00 2001
From: Patrick Roza <contact@patrickroza.com>
Date: Mon, 4 Dec 2023 14:34:25 +0100
Subject: [PATCH] remove obsolete helpers

---
 .changeset/calm-mails-vanish.md               |  7 ++++
 packages/core/vendor/effect-io-tsplus.json    | 15 +++------
 .../infra/_src/services/RepositoryBase.ts     |  9 ++---
 packages/prelude/_src/service.ts              | 33 ++-----------------
 4 files changed, 16 insertions(+), 48 deletions(-)
 create mode 100644 .changeset/calm-mails-vanish.md

diff --git a/.changeset/calm-mails-vanish.md b/.changeset/calm-mails-vanish.md
new file mode 100644
index 000000000..328e4fbd4
--- /dev/null
+++ b/.changeset/calm-mails-vanish.md
@@ -0,0 +1,7 @@
+---
+"@effect-app/prelude": patch
+"@effect-app/infra": patch
+"@effect-app/core": patch
+---
+
+remove obsolete helpers
diff --git a/packages/core/vendor/effect-io-tsplus.json b/packages/core/vendor/effect-io-tsplus.json
index 645fb6a57..9d2de9a5c 100644
--- a/packages/core/vendor/effect-io-tsplus.json
+++ b/packages/core/vendor/effect-io-tsplus.json
@@ -4857,11 +4857,6 @@
           "kind": "fluent",
           "name": "flatMap"
         },
-        {
-          "typeName": "effect/data/Context/Tag",
-          "kind": "fluent",
-          "name": "accessWithEffect"
-        },
         {
           "kind": "fluent",
           "typeName": "effect/io/Effect",
@@ -4894,6 +4889,11 @@
       "definitionName": "andThen",
       "definitionKind": "const",
       "extensions": [
+        {
+          "typeName": "effect/data/Context/Tag",
+          "kind": "fluent",
+          "name": "andThen"
+        },
         {
           "kind": "fluent",
           "typeName": "effect/io/Effect",
@@ -5645,11 +5645,6 @@
           "kind": "fluent",
           "name": "map"
         },
-        {
-          "typeName": "effect/data/Context/Tag",
-          "kind": "fluent",
-          "name": "accessWith"
-        },
         {
           "kind": "fluent",
           "typeName": "effect/io/Effect",
diff --git a/packages/infra/_src/services/RepositoryBase.ts b/packages/infra/_src/services/RepositoryBase.ts
index 47a4c7013..5f9edbbe1 100644
--- a/packages/infra/_src/services/RepositoryBase.ts
+++ b/packages/infra/_src/services/RepositoryBase.ts
@@ -11,8 +11,6 @@ import { makeCodec } from "@effect-app/infra/api/codec"
 import { makeFilters } from "@effect-app/infra/filter"
 import type { Schema } from "@effect-app/prelude"
 import { EParserFor } from "@effect-app/prelude/schema"
-import type { ServiceHelpers } from "@effect-app/prelude/service"
-import { TagClassBase } from "@effect-app/prelude/service"
 import type { InvalidStateError, OptimisticConcurrencyException } from "../errors.js"
 import { ContextMapContainer } from "./Store/ContextMapContainer.js"
 
@@ -24,7 +22,7 @@ export abstract class RepositoryBaseC<
   PM extends { id: string },
   Evt,
   ItemType extends string
-> extends TagClassBase<unknown>() {
+> {
   abstract readonly itemType: ItemType
   abstract readonly find: (id: T["id"]) => Effect<never, never, Opt<T>>
   abstract readonly all: Effect<never, never, T[]>
@@ -348,12 +346,11 @@ export function makeStore<
 }
 
 export interface Repos<
-  Service,
   T extends { id: string },
   PM extends { id: string; _etag: string | undefined },
   Evt,
   ItemType extends string
-> extends ServiceHelpers<Service> {
+> {
   make<R = never, E = never, R2 = never>(
     args: [Evt] extends [never] ? {
         makeInitial?: Effect<R, E, readonly T[]>
@@ -413,7 +410,6 @@ export const RepositoryBaseImpl = <Service>() => {
     & (abstract new() => RepositoryBaseC1<T, PM, Evt, ItemType>)
     & Tag<Service, Service>
     & Repos<
-      Service,
       T,
       PM,
       Evt,
@@ -451,7 +447,6 @@ export const RepositoryDefaultImpl = <Service>() => {
     ) => RepositoryBaseC2<T, PM, Evt, ItemType>)
     & Tag<Service, Service>
     & Repos<
-      Service,
       T,
       PM,
       Evt,
diff --git a/packages/prelude/_src/service.ts b/packages/prelude/_src/service.ts
index bd4221a44..0dda859d3 100644
--- a/packages/prelude/_src/service.ts
+++ b/packages/prelude/_src/service.ts
@@ -6,7 +6,6 @@
  * https://github.com/microsoft/TypeScript/issues/52644
  */
 
-import type * as C from "effect/Cause"
 import type { TagTypeId as TagTypeIdOriginal } from "effect/Context"
 
 export const ServiceTag = Symbol()
@@ -54,36 +53,8 @@ export function assignTag<Id, Service = Id>(key?: unknown) {
   }
 }
 
-export interface ServiceHelpers<Id, Service = Id> {
-  readonly andThen: {
-    <X>(
-      f: (a: Service) => X
-    ): [X] extends [Effect<infer R1, infer E1, infer A1>] ? Effect<Service | R1, E1, A1>
-      : [X] extends [Promise<infer A1>] ? Effect<Service, C.UnknownException, A1>
-      : Effect<Service, never, X>
-    <X>(f: X): [X] extends [Effect<infer R1, infer E1, infer A1>] ? Effect<Service | R1, E1, A1>
-      : [X] extends [Promise<infer A1>] ? Effect<Service, C.UnknownException, A1>
-      : Effect<Service, never, X>
-  }
-  readonly makeLayer: (svc: Service) => Layer<never, never, Service>
-}
-
-export const TagClassBase = <Id, Service = Id>() => {
-  abstract class TagClassBase {
-    static readonly andThen = (f: any): any => {
-      return Effect.andThen(this as Service as Tag<Service, Service>, f)
-    }
-    static readonly map = <B>(f: (a: Service) => B): Effect<Service, never, B> => {
-      return Effect.map(this as Service as Tag<Service, Service>, f)
-    }
-    static readonly makeLayer = (svc: Service) => {
-      return Layer.succeed(this as Service as Tag<Service, Service>, svc)
-    }
-  }
-  return TagClassBase as ServiceHelpers<Id, Service> & (abstract new() => {})
-}
 export function TagClass<Id, Service = Id>(key?: unknown) {
-  abstract class TagClass extends TagClassBase<Id, Service>() {}
+  abstract class TagClass {}
 
   return assignTag<Id, Service>(key)(TagClass)
 }
@@ -91,7 +62,7 @@ export function TagClass<Id, Service = Id>(key?: unknown) {
 /** @deprecated use `Id` of TagClass for unique id */
 export function ServiceTaggedClass<Id, Service = Id>() {
   return <Key extends PropertyKey>(_: Key) => {
-    abstract class ServiceTaggedClassC extends TagClassBase() {
+    abstract class ServiceTaggedClassC {
       static make = (t: Omit<Service, Key>) => {
         return t as Service
       }