effect-app 0.154.3 → 0.155.0

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @effect-app/prelude
 
+## 0.155.0
+
+### Minor Changes
+
+- 71dbfc3: update packages
+- 1cc7ee7: cleanup service tags
+
+### Patch Changes
+
+- Updated dependencies [71dbfc3]
+  - @effect-app/fluent-extensions@0.127.0
+  - @effect-app/schema@0.186.0
+  - @effect-app/core@0.132.0
+
 ## 0.154.3
 
 ### Patch Changes

package/_cjs/_global.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"_global.cjs","names":["require"],"sources":["../_src/_global.ts"],"sourcesContent":[null],"mappings":";;AASAA,OAAA;AAKAA,OAAA;AAKAA,OAAA;AAKAA,OAAA;AAKAA,OAAA;AAKAA,OAAA;AAKAA,OAAA;AAKAA,OAAA;AAKAA,OAAA;AAKAA,OAAA;AAKAA,OAAA;AAOAA,OAAA;AAKAA,OAAA;AAIAA,OAAA;AA+BAA,OAAA;AAKAA,OAAA;AAEAA,OAAA;AACAA,OAAA;AACAA,OAAA;AAEAA,OAAA;AACAA,OAAA"}
+{"version":3,"file":"_global.cjs","names":["require"],"sources":["../_src/_global.ts"],"sourcesContent":[null],"mappings":";;AASAA,OAAA;AAKAA,OAAA;AAKAA,OAAA;AAKAA,OAAA;AAKAA,OAAA;AAKAA,OAAA;AAKAA,OAAA;AAKAA,OAAA;AAKAA,OAAA;AAKAA,OAAA;AAKAA,OAAA;AAOAA,OAAA;AAKAA,OAAA;AAIAA,OAAA;AA+BAA,OAAA;AAaAA,OAAA;AAEAA,OAAA;AACAA,OAAA;AACAA,OAAA;AAEAA,OAAA;AACAA,OAAA"}

package/_cjs/service.cjs

@@ -4,15 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ServiceTagged = exports.ServiceTag = exports.PhantomTypeParameter = void 0;
-exports.ServiceTaggedClass = ServiceTaggedClass;
 exports.TagClass = TagClass;
-exports.TagClassLegacy = TagClassLegacy;
-exports.TagTypeId = exports.TagClassMake = void 0;
+exports.TagClassId = TagClassId;
+exports.TagMake = exports.TagClassMakeId = exports.TagClassMake = void 0;
 exports.assignTag = assignTag;
 exports.make = make;
 exports.makeService = makeService;
 var tsplus_module_1 = _interopRequireWildcard(require("effect/Context"));
 var tsplus_module_2 = _interopRequireWildcard(require("effect/Layer"));
+var tsplus_module_3 = _interopRequireWildcard(require("effect/Effect"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 const ServiceTag = exports.ServiceTag = Symbol();
@@ -35,40 +35,84 @@ function makeService(_) {
 function make(_, t) {
   return t;
 }
-const TagTypeId = exports.TagTypeId = Symbol.for("effect/Context/Tag");
 let i = 0;
 const randomId = () => "unknown-service-" + i++;
-function assignTag(key) {
+function assignTag(key, creationError) {
   return cls => {
     const tag = tsplus_module_1.GenericTag(key ?? randomId());
-    const t = Object.assign(cls, Object.getPrototypeOf(tag), tag);
-    const limit = Error.stackTraceLimit;
-    Error.stackTraceLimit = 4; // TODO
-    const creationError = new Error();
-    Error.stackTraceLimit = limit;
+    let fields = tag;
+    if (Reflect.ownKeys(cls).includes("key")) {
+      const {
+        key,
+        ...rest
+      } = tag;
+      fields = rest;
+    }
+    const t = Object.assign(cls, Object.getPrototypeOf(tag), fields);
+    if (!creationError) {
+      const limit = Error.stackTraceLimit;
+      Error.stackTraceLimit = 2;
+      creationError = new Error();
+      Error.stackTraceLimit = limit;
+    }
     // the stack is used to get the location of the tag definition, if a service is not found in the registry
     Object.defineProperty(t, "stack", {
       get() {
-        // remove one line as assignTag is generally used inside a class constructor function
-        return creationError.stack?.split("\n").slice(1).join("\n");
+        return creationError.stack;
       }
     });
     return t;
   };
 }
+const TagMake = () => (key, make) => {
+  const limit = Error.stackTraceLimit;
+  Error.stackTraceLimit = 2;
+  const creationError = new Error();
+  Error.stackTraceLimit = limit;
+  const c = class {
+    static toLayer() {
+      return tsplus_module_2.effect(this)(make);
+    }
+    static toLayerScoped() {
+      return tsplus_module_2.scoped(this)(make);
+    }
+  };
+  return assignTag(key, creationError)(c);
+};
+exports.TagMake = TagMake;
 function TagClass(key) {
+  const limit = Error.stackTraceLimit;
+  Error.stackTraceLimit = 2;
+  const creationError = new Error();
+  Error.stackTraceLimit = limit;
   const c = class {
     constructor(service) {
       Object.assign(this, service);
     }
+    static toLayer(eff) {
+      return tsplus_module_2.effect(this)(tsplus_module_3.map(eff, _ => new this(_)));
+    }
+    static toLayerScoped(eff) {
+      return tsplus_module_2.scoped(this)(tsplus_module_3.map(eff, _ => new this(_)));
+    }
+    static get key() {
+      return this._key ?? (this._key = key ?? creationError.stack?.split("\n")[2] ?? this.name);
+    }
   };
-  return assignTag(key)(c);
+  return assignTag(key, creationError)(c);
 }
 const TagClassMake = () => (make, key) => {
+  const limit = Error.stackTraceLimit;
+  Error.stackTraceLimit = 2;
+  const creationError = new Error();
+  Error.stackTraceLimit = limit;
   const c = class {
     constructor(service) {
       Object.assign(this, service);
     }
+    static make() {
+      return make.andThen(_ => new this(_));
+    }
     // works around an issue where defining layer on the class messes up and causes the Tag to infer to `any, any` :/
     static toLayer() {
       return tsplus_module_2.effect(this)(make);
@@ -76,22 +120,54 @@ const TagClassMake = () => (make, key) => {
     static toLayerScoped() {
       return tsplus_module_2.scoped(this)(make);
     }
+    static get key() {
+      return this._key ?? (this._key = key ?? creationError.stack?.split("\n")[2] ?? this.name);
+    }
   };
-  return assignTag(key)(c);
+  return assignTag(key, creationError)(c);
 };
 exports.TagClassMake = TagClassMake;
-function TagClassLegacy(key) {
-  class TagClassLegacy {}
-  return assignTag(key)(TagClassLegacy);
-}
-/** @deprecated use `Id` of TagClass for unique id */
-function ServiceTaggedClass() {
-  return _ => {
-    class ServiceTaggedClassC {}
-    ServiceTaggedClassC.make = t => {
-      return t;
+function TagClassId() {
+  return key => {
+    const limit = Error.stackTraceLimit;
+    Error.stackTraceLimit = 2;
+    const creationError = new Error();
+    Error.stackTraceLimit = limit;
+    const c = class {
+      constructor(service) {
+        Object.assign(this, service);
+      }
+      static toLayer(eff) {
+        return tsplus_module_2.effect(this)(tsplus_module_3.map(eff, _ => new this(_)));
+      }
+      static toLayerScoped(eff) {
+        return tsplus_module_2.scoped(this)(tsplus_module_3.map(eff, _ => new this(_)));
+      }
     };
-    return assignTag()(ServiceTaggedClassC);
+    return assignTag(key, creationError)(c);
   };
 }
+const TagClassMakeId = () => (key, make) => {
+  const limit = Error.stackTraceLimit;
+  Error.stackTraceLimit = 2;
+  const creationError = new Error();
+  Error.stackTraceLimit = limit;
+  const c = class {
+    constructor(service) {
+      Object.assign(this, service);
+    }
+    static make() {
+      return make.andThen(_ => new this(_));
+    }
+    // works around an issue where defining layer on the class messes up and causes the Tag to infer to `any, any` :/
+    static toLayer() {
+      return tsplus_module_2.effect(this)(make);
+    }
+    static toLayerScoped() {
+      return tsplus_module_2.scoped(this)(make);
+    }
+  };
+  return assignTag(key, creationError)(c);
+};
+exports.TagClassMakeId = TagClassMakeId;
 //# sourceMappingURL=service.cjs.map

package/_cjs/service.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"service.cjs","names":["ServiceTag","exports","Symbol","PhantomTypeParameter","ServiceTagged","makeService","_","make","t","TagTypeId","for","i","randomId","assignTag","key","cls","tag","tsplus_module_1","GenericTag","Object","assign","getPrototypeOf","limit","Error","stackTraceLimit","creationError","defineProperty","get","stack","split","slice","join","TagClass","c","constructor","service","TagClassMake","toLayer","tsplus_module_2","effect","toLayerScoped","scoped","TagClassLegacy","ServiceTaggedClass","ServiceTaggedClassC"],"sources":["../_src/service.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"service.cjs","names":["ServiceTag","exports","Symbol","PhantomTypeParameter","ServiceTagged","makeService","_","make","t","i","randomId","assignTag","key","creationError","cls","tag","tsplus_module_1","GenericTag","fields","Reflect","ownKeys","includes","rest","Object","assign","getPrototypeOf","limit","Error","stackTraceLimit","defineProperty","get","stack","TagMake","c","toLayer","tsplus_module_2","effect","toLayerScoped","scoped","TagClass","constructor","service","eff","tsplus_module_3","map","_key","split","name","TagClassMake","andThen","TagClassId","TagClassMakeId"],"sources":["../_src/service.ts"],"sourcesContent":[null],"mappings":"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"}

package/_src/_global.ts

@@ -104,7 +104,15 @@ import {
 /**
  * @tsplus global
  */
-import { assignTag, ServiceTagged, TagClass, TagClassMake } from "effect-app/service"
+import {
+  assignTag,
+  ServiceTagged,
+  TagClass,
+  TagClassId,
+  TagClassMake,
+  TagClassMakeId,
+  TagMake
+} from "effect-app/service"
 
 /**
  * @tsplus global

package/_src/service.ts

@@ -6,7 +6,7 @@
  * https://github.com/microsoft/TypeScript/issues/52644
  */
 
-import type { TagTypeId as TagTypeIdOriginal } from "effect/Context"
+import type { Context } from "effect"
 
 export const ServiceTag = Symbol()
 export type ServiceTag = typeof ServiceTag
@@ -36,40 +36,87 @@ export function make<T extends ServiceTagged<any>, I = T>(_: Tag<I, T>, t: Omit<
   return t as T
 }
 
-export const TagTypeId: TagTypeIdOriginal = Symbol.for("effect/Context/Tag") as unknown as TagTypeIdOriginal
-export type TagTypeId = typeof TagTypeId
-
 let i = 0
 const randomId = () => "unknown-service-" + i++
 
-export function assignTag<Id, Service = Id>(key?: string) {
+export function assignTag<Id, Service = Id>(key?: string, creationError?: Error) {
   return <S extends object>(cls: S): S & Tag<Id, Service> => {
     const tag = GenericTag<Id, Service>(key ?? randomId())
-    const t = Object.assign(cls, Object.getPrototypeOf(tag), tag)
-    const limit = Error.stackTraceLimit
-    Error.stackTraceLimit = 4 // TODO
-    const creationError = new Error()
-    Error.stackTraceLimit = limit
+    let fields = tag
+    if (Reflect.ownKeys(cls).includes("key")) {
+      const { key, ...rest } = tag
+      fields = rest as any
+    }
+    const t = Object.assign(cls, Object.getPrototypeOf(tag), fields)
+    if (!creationError) {
+      const limit = Error.stackTraceLimit
+      Error.stackTraceLimit = 2
+      creationError = new Error()
+      Error.stackTraceLimit = limit
+    }
     // the stack is used to get the location of the tag definition, if a service is not found in the registry
     Object.defineProperty(t, "stack", {
       get() {
-        // remove one line as assignTag is generally used inside a class constructor function
-        return creationError.stack?.split("\n").slice(1).join("\n")
+        return creationError!.stack
       }
     })
     return t
   }
 }
 
+export const TagMake = <Id>() =>
+<ServiceImpl, R, E, const Key extends string>(
+  key: Key,
+  make: Effect<ServiceImpl, E, R>
+) => {
+  const limit = Error.stackTraceLimit
+  Error.stackTraceLimit = 2
+  const creationError = new Error()
+  Error.stackTraceLimit = limit
+  const c: {
+    new(): Context.TagClassShape<Key, ServiceImpl>
+    toLayer: () => Layer<Id, E, R>
+    toLayerScoped: () => Layer<Id, E, Exclude<R, Scope>>
+  } = class {
+    static toLayer() {
+      return make.toLayer(this as any)
+    }
+
+    static toLayerScoped() {
+      return make.toLayerScoped(this as any)
+    }
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  } as any
+
+  return assignTag<Id, ServiceImpl>(key, creationError)(c)
+}
+
 export function TagClass<Id, ServiceImpl, Service = Id>(key?: string) {
-  const c: { new(service: ServiceImpl): Readonly<ServiceImpl> } = class {
+  const limit = Error.stackTraceLimit
+  Error.stackTraceLimit = 2
+  const creationError = new Error()
+  Error.stackTraceLimit = limit
+  const c: {
+    new(service: ServiceImpl): Readonly<ServiceImpl>
+    toLayer: <E, R>(eff: Effect<ServiceImpl, E, R>) => Layer<Id, E, R>
+    toLayerScoped: <E, R>(eff: Effect<ServiceImpl, E, R>) => Layer<Id, E, Exclude<R, Scope>>
+  } = class {
     constructor(service: ServiceImpl) {
       Object.assign(this, service)
     }
-    // static readonly Id: Id
+    static _key?: string
+    static toLayer<E, R>(eff: Effect<ServiceImpl, E, R>) {
+      return eff.map((_) => new this(_)).toLayer(this as any)
+    }
+    static toLayerScoped<E, R>(eff: Effect<ServiceImpl, E, R>) {
+      return eff.map((_) => new this(_)).toLayerScoped(this as any)
+    }
+    static get key() {
+      return this._key ?? (this._key = key ?? creationError.stack?.split("\n")[2] ?? this.name)
+    }
   } as any
 
-  return assignTag<Id, Service>(key)(c)
+  return assignTag<Id, Service>(key, creationError)(c)
 }
 
 export const TagClassMake = <Id, Service = Id>() =>
@@ -77,14 +124,23 @@ export const TagClassMake = <Id, Service = Id>() =>
   make: Effect<ServiceImpl, E, R>,
   key?: string
 ) => {
+  const limit = Error.stackTraceLimit
+  Error.stackTraceLimit = 2
+  const creationError = new Error()
+  Error.stackTraceLimit = limit
   const c: {
     new(service: ServiceImpl): Readonly<ServiceImpl>
-    toLayer: () => Layer<Service, E, R>
-    toLayerScoped: () => Layer<Service, E, Exclude<R, Scope>>
+    toLayer: () => Layer<Id, E, R>
+    toLayerScoped: () => Layer<Id, E, Exclude<R, Scope>>
+    make: Effect<Id, E, R>
   } = class {
     constructor(service: ServiceImpl) {
       Object.assign(this, service)
     }
+    static _key: string
+    static make() {
+      return make.andThen((_) => new this(_))
+    }
     // works around an issue where defining layer on the class messes up and causes the Tag to infer to `any, any` :/
     static toLayer() {
       return make.toLayer(this as any)
@@ -93,27 +149,73 @@ export const TagClassMake = <Id, Service = Id>() =>
     static toLayerScoped() {
       return make.toLayerScoped(this as any)
     }
+
+    static get key() {
+      return this._key ?? (this._key = key ?? creationError.stack?.split("\n")[2] ?? this.name)
+    }
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
   } as any
 
-  return assignTag<Id, Service>(key)(c)
+  return assignTag<Id, Service>(key, creationError)(c)
 }
 
-export function TagClassLegacy<Id, Service = Id>(key?: string) {
-  abstract class TagClassLegacy {}
+export function TagClassId<Id, ServiceImpl>() {
+  return <const Key extends string>(key: Key) => {
+    const limit = Error.stackTraceLimit
+    Error.stackTraceLimit = 2
+    const creationError = new Error()
+    Error.stackTraceLimit = limit
+    const c: {
+      new(service: ServiceImpl): Readonly<ServiceImpl> & Context.TagClassShape<Key, ServiceImpl>
+      toLayer: <E, R>(eff: Effect<ServiceImpl, E, R>) => Layer<Id, E, R>
+      toLayerScoped: <E, R>(eff: Effect<ServiceImpl, E, R>) => Layer<Id, E, Exclude<R, Scope>>
+    } = class {
+      constructor(service: ServiceImpl) {
+        Object.assign(this, service)
+      }
+      static toLayer<E, R>(eff: Effect<ServiceImpl, E, R>) {
+        return eff.map((_) => new this(_)).toLayer(this as any)
+      }
+      static toLayerScoped<E, R>(eff: Effect<ServiceImpl, E, R>) {
+        return eff.map((_) => new this(_)).toLayerScoped(this as any)
+      }
+    } as any
 
-  return assignTag<Id, Service>(key)(TagClassLegacy)
+    return assignTag<Id, Id>(key, creationError)(c)
+  }
 }
 
-/** @deprecated use `Id` of TagClass for unique id */
-export function ServiceTaggedClass<Id, Service = Id>() {
-  return <Key extends PropertyKey>(_: Key) => {
-    abstract class ServiceTaggedClassC {
-      static make = (t: Omit<Service, Key>) => {
-        return t as Service
-      }
+export const TagClassMakeId = <Id>() =>
+<ServiceImpl, R, E, const Key extends string>(
+  key: Key,
+  make: Effect<ServiceImpl, E, R>
+) => {
+  const limit = Error.stackTraceLimit
+  Error.stackTraceLimit = 2
+  const creationError = new Error()
+  Error.stackTraceLimit = limit
+  const c: {
+    new(service: ServiceImpl): Readonly<ServiceImpl> & Context.TagClassShape<Key, ServiceImpl>
+    toLayer: () => Layer<Id, E, R>
+    toLayerScoped: () => Layer<Id, E, Exclude<R, Scope>>
+    make: Effect<Id, E, R>
+  } = class {
+    constructor(service: ServiceImpl) {
+      Object.assign(this, service)
+    }
+    static make() {
+      return make.andThen((_) => new this(_))
+    }
+    // works around an issue where defining layer on the class messes up and causes the Tag to infer to `any, any` :/
+    static toLayer() {
+      return make.toLayer(this as any)
     }
 
-    return assignTag<Id, Service>()(ServiceTaggedClassC)
-  }
+    static toLayerScoped() {
+      return make.toLayerScoped(this as any)
+    }
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  } as any
+
+  return assignTag<Id, Id>(key, creationError)(c)
 }

package/dist/_global.d.ts

@@ -57,7 +57,7 @@ import { Fnc, NonEmptySet, ReadonlySet, Record, S, Utils } from "effect-app";
 /**
  * @tsplus global
  */
-import { assignTag, ServiceTagged, TagClass, TagClassMake } from "effect-app/service";
+import { assignTag, ServiceTagged, TagClass, TagClassId, TagClassMake, TagClassMakeId, TagMake } from "effect-app/service";
 /**
  * @tsplus global
  */

package/dist/_global.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"_global.d.ts","sourceRoot":"","sources":["../_src/_global.ts"],"names":[],"mappings":"AAMA;;GAEG;AACH,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAA;AAExC;;GAEG;AACH,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AAEtC;;GAEG;AACH,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AAEvD;;GAEG;AACH,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AAEtC;;GAEG;AACH,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAEhD;;GAEG;AACH,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAEtD;;GAEG;AACH,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAE3E;;GAEG;AACH,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAA;AAExC;;GAEG;AACH,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAA;AAEnE;;GAEG;AACH,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAE3E;;GAEG;AACH,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAIxD;;GAEG;AACH,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAE3D;;GAEG;AACH,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AACrF;;GAEG;AACH,OAAO,EASL,GAAG,EAMH,WAAW,EAEX,WAAW,EAGX,MAAM,EAEN,CAAC,EAED,KAAK,EAEN,MAAM,YAAY,CAAA;AAEnB;;GAEG;AACH,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAErF;;GAEG;AACH,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AAE3C,OAAO,0BAA0B,CAAA;AACjC,OAAO,0BAA0B,CAAA;AACjC,OAAO,4BAA4B,CAAA;AAEnC,OAAO,kBAAkB,CAAA;AACzB,OAAO,kBAAkB,CAAA"}
+{"version":3,"file":"_global.d.ts","sourceRoot":"","sources":["../_src/_global.ts"],"names":[],"mappings":"AAMA;;GAEG;AACH,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAA;AAExC;;GAEG;AACH,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AAEtC;;GAEG;AACH,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AAEvD;;GAEG;AACH,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AAEtC;;GAEG;AACH,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAEhD;;GAEG;AACH,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAEtD;;GAEG;AACH,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAE3E;;GAEG;AACH,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAA;AAExC;;GAEG;AACH,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAA;AAEnE;;GAEG;AACH,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAE3E;;GAEG;AACH,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAIxD;;GAEG;AACH,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAE3D;;GAEG;AACH,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AACrF;;GAEG;AACH,OAAO,EASL,GAAG,EAMH,WAAW,EAEX,WAAW,EAGX,MAAM,EAEN,CAAC,EAED,KAAK,EAEN,MAAM,YAAY,CAAA;AAEnB;;GAEG;AACH,OAAO,EACL,SAAS,EACT,aAAa,EACb,QAAQ,EACR,UAAU,EACV,YAAY,EACZ,cAAc,EACd,OAAO,EACR,MAAM,oBAAoB,CAAA;AAE3B;;GAEG;AACH,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AAE3C,OAAO,0BAA0B,CAAA;AACjC,OAAO,0BAA0B,CAAA;AACjC,OAAO,4BAA4B,CAAA;AAEnC,OAAO,kBAAkB,CAAA;AACzB,OAAO,kBAAkB,CAAA"}

package/dist/_global.js

@@ -73,4 +73,4 @@ import "@effect-app/core/Prelude";
 import "@effect-app/schema/_global";
 import "./_global.ext.js";
 import "./refinements.js";
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiX2dsb2JhbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL19zcmMvX2dsb2JhbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxxREFBcUQ7QUFDckQsTUFBTTtBQUNOLG9CQUFvQjtBQUNwQixNQUFNO0FBQ04sd0RBQXdEO0FBRXhEOztHQUVHO0FBQ0gsT0FBd0IsZ0JBQWdCLENBQUE7QUFFeEM7O0dBRUc7QUFDSCxPQUF1QixlQUFlLENBQUE7QUFFdEM7O0dBRUc7QUFDSCxPQUEwQiw2QkFBNkIsQ0FBQTtBQUV2RDs7R0FFRztBQUNILE9BQXVCLGVBQWUsQ0FBQTtBQUV0Qzs7R0FFRztBQUNILE9BQTRCLG9CQUFvQixDQUFBO0FBRWhEOztHQUVHO0FBQ0gsT0FBK0IsdUJBQXVCLENBQUE7QUFFdEQ7O0dBRUc7QUFDSCxPQUE2RCxjQUFjLENBQUE7QUFFM0U7O0dBRUc7QUFDSCxPQUF3QixnQkFBZ0IsQ0FBQTtBQUV4Qzs7R0FFRztBQUNILE9BQThCLHFDQUFxQyxDQUFBO0FBRW5FOztHQUVHO0FBQ0gsT0FBdUQsb0JBQW9CLENBQUE7QUFFM0U7O0dBRUc7QUFDSCxPQUFnQyx3QkFBd0IsQ0FBQTtBQUV4RCxxREFBcUQ7QUFFckQ7O0dBRUc7QUFDSCxPQUEwQyxpQkFBaUIsQ0FBQTtBQUUzRDs7R0FFRztBQUNILE9BQW1FLGtCQUFrQixDQUFBO0FBQ3JGOztHQUVHO0FBQ0gsT0EwQk8sWUFBWSxDQUFBO0FBRW5COztHQUVHO0FBQ0gsT0FBaUUsb0JBQW9CLENBQUE7QUFFckY7O0dBRUc7QUFDSCxPQUErQixZQUFZLENBQUE7QUFFM0MsT0FBTywwQkFBMEIsQ0FBQTtBQUNqQyxPQUFPLDBCQUEwQixDQUFBO0FBQ2pDLE9BQU8sNEJBQTRCLENBQUE7QUFFbkMsT0FBTyxrQkFBa0IsQ0FBQTtBQUN6QixPQUFPLGtCQUFrQixDQUFBIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiX2dsb2JhbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL19zcmMvX2dsb2JhbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxxREFBcUQ7QUFDckQsTUFBTTtBQUNOLG9CQUFvQjtBQUNwQixNQUFNO0FBQ04sd0RBQXdEO0FBRXhEOztHQUVHO0FBQ0gsT0FBd0IsZ0JBQWdCLENBQUE7QUFFeEM7O0dBRUc7QUFDSCxPQUF1QixlQUFlLENBQUE7QUFFdEM7O0dBRUc7QUFDSCxPQUEwQiw2QkFBNkIsQ0FBQTtBQUV2RDs7R0FFRztBQUNILE9BQXVCLGVBQWUsQ0FBQTtBQUV0Qzs7R0FFRztBQUNILE9BQTRCLG9CQUFvQixDQUFBO0FBRWhEOztHQUVHO0FBQ0gsT0FBK0IsdUJBQXVCLENBQUE7QUFFdEQ7O0dBRUc7QUFDSCxPQUE2RCxjQUFjLENBQUE7QUFFM0U7O0dBRUc7QUFDSCxPQUF3QixnQkFBZ0IsQ0FBQTtBQUV4Qzs7R0FFRztBQUNILE9BQThCLHFDQUFxQyxDQUFBO0FBRW5FOztHQUVHO0FBQ0gsT0FBdUQsb0JBQW9CLENBQUE7QUFFM0U7O0dBRUc7QUFDSCxPQUFnQyx3QkFBd0IsQ0FBQTtBQUV4RCxxREFBcUQ7QUFFckQ7O0dBRUc7QUFDSCxPQUEwQyxpQkFBaUIsQ0FBQTtBQUUzRDs7R0FFRztBQUNILE9BQW1FLGtCQUFrQixDQUFBO0FBQ3JGOztHQUVHO0FBQ0gsT0EwQk8sWUFBWSxDQUFBO0FBRW5COztHQUVHO0FBQ0gsT0FRTyxvQkFBb0IsQ0FBQTtBQUUzQjs7R0FFRztBQUNILE9BQStCLFlBQVksQ0FBQTtBQUUzQyxPQUFPLDBCQUEwQixDQUFBO0FBQ2pDLE9BQU8sMEJBQTBCLENBQUE7QUFDakMsT0FBTyw0QkFBNEIsQ0FBQTtBQUVuQyxPQUFPLGtCQUFrQixDQUFBO0FBQ3pCLE9BQU8sa0JBQWtCLENBQUEifQ==

package/dist/service.d.ts

@@ -7,7 +7,7 @@ import { Tag } from "effect/Context";
 import { Effect } from "effect/Effect";
 import { Layer } from "effect/Layer";
 import { Scope } from "effect/Scope";
-import type { TagTypeId as TagTypeIdOriginal } from "effect/Context";
+import type { Context } from "effect";
 export declare const ServiceTag: unique symbol;
 export type ServiceTag = typeof ServiceTag;
 export declare abstract class PhantomTypeParameter<Identifier extends keyof any, InstantiatedType> {
@@ -30,18 +30,32 @@ export declare function makeService<T extends ServiceTagged<any>>(_: Omit<T, Ser
  * @tsplus location "effect-app/service"
  */
 export declare function make<T extends ServiceTagged<any>, I = T>(_: Tag<I, T>, t: Omit<T, ServiceTag>): T;
-export declare const TagTypeId: TagTypeIdOriginal;
-export type TagTypeId = typeof TagTypeId;
-export declare function assignTag<Id, Service = Id>(key?: string): <S extends object>(cls: S) => S & Tag<Id, Service>;
-export declare function TagClass<Id, ServiceImpl, Service = Id>(key?: string): (new (service: ServiceImpl) => Readonly<ServiceImpl>) & import("effect/Context").Tag<Id, Service>;
+export declare function assignTag<Id, Service = Id>(key?: string, creationError?: Error): <S extends object>(cls: S) => S & Tag<Id, Service>;
+export declare const TagMake: <Id>() => <ServiceImpl, R, E, const Key extends string>(key: Key, make: Effect<ServiceImpl, E, R>) => {
+    new (): Context.TagClassShape<Key, ServiceImpl>;
+    toLayer: () => Layer<Id, E, R>;
+    toLayerScoped: () => Layer<Id, E, Exclude<R, Scope>>;
+} & Context.Tag<Id, ServiceImpl>;
+export declare function TagClass<Id, ServiceImpl, Service = Id>(key?: string): {
+    new (service: ServiceImpl): Readonly<ServiceImpl>;
+    toLayer: <E, R>(eff: Effect<ServiceImpl, E, R>) => Layer<Id, E, R>;
+    toLayerScoped: <E_1, R_1>(eff: import("effect/Effect").Effect<ServiceImpl, E_1, R_1>) => import("effect/Layer").Layer<Id, E_1, Exclude<R_1, import("effect/Scope").Scope>>;
+} & Context.Tag<Id, Service>;
 export declare const TagClassMake: <Id, Service = Id>() => <ServiceImpl, R, E>(make: Effect<ServiceImpl, E, R>, key?: string) => {
     new (service: ServiceImpl): Readonly<ServiceImpl>;
-    toLayer: () => Layer<Service, E, R>;
-    toLayerScoped: () => Layer<Service, E, Exclude<R, Scope>>;
-} & import("effect/Context").Tag<Id, Service>;
-export declare function TagClassLegacy<Id, Service = Id>(key?: string): (abstract new () => {}) & import("effect/Context").Tag<Id, Service>;
-/** @deprecated use `Id` of TagClass for unique id */
-export declare function ServiceTaggedClass<Id, Service = Id>(): <Key extends PropertyKey>(_: Key) => ((abstract new () => {}) & {
-    make: (t: Omit<Service, Key>) => Service;
-}) & import("effect/Context").Tag<Id, Service>;
+    toLayer: () => Layer<Id, E, R>;
+    toLayerScoped: () => Layer<Id, E, Exclude<R, Scope>>;
+    make: Effect<Id, E, R>;
+} & Context.Tag<Id, Service>;
+export declare function TagClassId<Id, ServiceImpl>(): <const Key extends string>(key: Key) => {
+    new (service: ServiceImpl): Readonly<ServiceImpl> & Context.TagClassShape<Key, ServiceImpl>;
+    toLayer: <E, R>(eff: import("effect/Effect").Effect<ServiceImpl, E, R>) => import("effect/Layer").Layer<Id, E, R>;
+    toLayerScoped: <E_1, R_1>(eff: import("effect/Effect").Effect<ServiceImpl, E_1, R_1>) => import("effect/Layer").Layer<Id, E_1, Exclude<R_1, import("effect/Scope").Scope>>;
+} & Context.Tag<Id, Id>;
+export declare const TagClassMakeId: <Id>() => <ServiceImpl, R, E, const Key extends string>(key: Key, make: Effect<ServiceImpl, E, R>) => {
+    new (service: ServiceImpl): Readonly<ServiceImpl> & Context.TagClassShape<Key, ServiceImpl>;
+    toLayer: () => Layer<Id, E, R>;
+    toLayerScoped: () => Layer<Id, E, Exclude<R, Scope>>;
+    make: Effect<Id, E, R>;
+} & Context.Tag<Id, Id>;
 //# sourceMappingURL=service.d.ts.map

package/dist/service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../_src/service.ts"],"names":[],"mappings":"AAEA;;;;GAIG;;;;;AAEH,OAAO,KAAK,EAAE,SAAS,IAAI,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAEpE,eAAO,MAAM,UAAU,eAAW,CAAA;AAClC,MAAM,MAAM,UAAU,GAAG,OAAO,UAAU,CAAA;AAE1C,8BAAsB,oBAAoB,CAAC,UAAU,SAAS,MAAM,GAAG,EAAE,gBAAgB;IACvF,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,UAAU,CAAC,EAAE;QACxC,QAAQ,EAAE,KAAK,IAAI,UAAU,GAAG,CAAC,CAAC,EAAE,gBAAgB,KAAK,gBAAgB;KAC1E,CAAA;CACF;AAED;;GAEG;AACH,8BAAsB,aAAa,CAAC,UAAU,CAAE,SAAQ,oBAAoB,CAAC,MAAM,EAAE,UAAU,CAAC;CAAG;;;;;AAKnG,wBAAgB,WAAW,CAAC,CAAC,SAAS,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE,UAAU,CAAC,KAE/E;;;;;AAKD,wBAAgB,IAAI,CAAC,CAAC,SAAS,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE,UAAU,CAAC,KAE7F;AAED,eAAO,MAAM,SAAS,EAAE,iBAAoF,CAAA;AAC5G,MAAM,MAAM,SAAS,GAAG,OAAO,SAAS,CAAA;AAKxC,wBAAgB,SAAS,CAAC,EAAE,EAAE,OAAO,GAAG,EAAE,EAAE,GAAG,CAAC,EAAE,MAAM,2BACvB,CAAC,KAAG,CAAC,GAAG,IAAI,EAAE,EAAE,OAAO,CAAC,CAgBxD;AAED,wBAAgB,QAAQ,CAAC,EAAE,EAAE,WAAW,EAAE,OAAO,GAAG,EAAE,EAAE,GAAG,CAAC,EAAE,MAAM,kBAC1C,WAAW,KAAG,SAAS,WAAW,CAAC,8CAQ5D;AAED,eAAO,MAAM,YAAY,oDAEjB,OAAO,WAAW,EAAE,CAAC,EAAE,CAAC,CAAC,QACzB,MAAM;kBAGG,WAAW,GAAG,SAAS,WAAW,CAAC;aACvC,MAAM,MAAM,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;mBACpB,MAAM,MAAM,OAAO,EAAE,CAAC,EAAE,QAAQ,CAAC,EAAE,KAAK,CAAC,CAAC;6CAiB5D,CAAA;AAED,wBAAgB,cAAc,CAAC,EAAE,EAAE,OAAO,GAAG,EAAE,EAAE,GAAG,CAAC,EAAE,MAAM,uEAI5D;AAED,qDAAqD;AACrD,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,OAAO,GAAG,EAAE,kCACb,GAAG;cAEjB,KAAK,OAAO,EAAE,GAAG,CAAC;+CAOzC"}
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../_src/service.ts"],"names":[],"mappings":"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"}

package/dist/service.js

@@ -1,5 +1,6 @@
 import * as tsplus_module_1 from "effect/Context";
 import * as tsplus_module_2 from "effect/Layer";
+import * as tsplus_module_3 from "effect/Effect";
 export const ServiceTag = Symbol();
 export class PhantomTypeParameter {
 }
@@ -20,40 +21,80 @@ export function makeService(_) {
 export function make(_, t) {
     return t;
 }
-export const TagTypeId = Symbol.for("effect/Context/Tag");
 let i = 0;
 const randomId = () => "unknown-service-" + i++;
-export function assignTag(key) {
+export function assignTag(key, creationError) {
     return (cls) => {
         const tag = tsplus_module_1.GenericTag(key ?? randomId());
-        const t = Object.assign(cls, Object.getPrototypeOf(tag), tag);
-        const limit = Error.stackTraceLimit;
-        Error.stackTraceLimit = 4; // TODO
-        const creationError = new Error();
-        Error.stackTraceLimit = limit;
+        let fields = tag;
+        if (Reflect.ownKeys(cls).includes("key")) {
+            const { key, ...rest } = tag;
+            fields = rest;
+        }
+        const t = Object.assign(cls, Object.getPrototypeOf(tag), fields);
+        if (!creationError) {
+            const limit = Error.stackTraceLimit;
+            Error.stackTraceLimit = 2;
+            creationError = new Error();
+            Error.stackTraceLimit = limit;
+        }
         // the stack is used to get the location of the tag definition, if a service is not found in the registry
         Object.defineProperty(t, "stack", {
             get() {
-                // remove one line as assignTag is generally used inside a class constructor function
-                return creationError.stack?.split("\n").slice(1).join("\n");
+                return creationError.stack;
             }
         });
         return t;
     };
 }
+export const TagMake = () => (key, make) => {
+    const limit = Error.stackTraceLimit;
+    Error.stackTraceLimit = 2;
+    const creationError = new Error();
+    Error.stackTraceLimit = limit;
+    const c = class {
+        static toLayer() {
+            return tsplus_module_2.effect(this)(make);
+        }
+        static toLayerScoped() {
+            return tsplus_module_2.scoped(this)(make);
+        }
+    };
+    return assignTag(key, creationError)(c);
+};
 export function TagClass(key) {
+    const limit = Error.stackTraceLimit;
+    Error.stackTraceLimit = 2;
+    const creationError = new Error();
+    Error.stackTraceLimit = limit;
     const c = class {
         constructor(service) {
             Object.assign(this, service);
         }
+        static toLayer(eff) {
+            return tsplus_module_2.effect(this)(tsplus_module_3.map(eff, (_) => new this(_)));
+        }
+        static toLayerScoped(eff) {
+            return tsplus_module_2.scoped(this)(tsplus_module_3.map(eff, (_) => new this(_)));
+        }
+        static get key() {
+            return this._key ?? (this._key = key ?? creationError.stack?.split("\n")[2] ?? this.name);
+        }
     };
-    return assignTag(key)(c);
+    return assignTag(key, creationError)(c);
 }
 export const TagClassMake = () => (make, key) => {
+    const limit = Error.stackTraceLimit;
+    Error.stackTraceLimit = 2;
+    const creationError = new Error();
+    Error.stackTraceLimit = limit;
     const c = class {
         constructor(service) {
             Object.assign(this, service);
         }
+        static make() {
+            return make.andThen((_) => new this(_));
+        }
         // works around an issue where defining layer on the class messes up and causes the Tag to infer to `any, any` :/
         static toLayer() {
             return tsplus_module_2.effect(this)(make);
@@ -61,23 +102,52 @@ export const TagClassMake = () => (make, key) => {
         static toLayerScoped() {
             return tsplus_module_2.scoped(this)(make);
         }
+        static get key() {
+            return this._key ?? (this._key = key ?? creationError.stack?.split("\n")[2] ?? this.name);
+        }
     };
-    return assignTag(key)(c);
+    return assignTag(key, creationError)(c);
 };
-export function TagClassLegacy(key) {
-    class TagClassLegacy {
-    }
-    return assignTag(key)(TagClassLegacy);
-}
-/** @deprecated use `Id` of TagClass for unique id */
-export function ServiceTaggedClass() {
-    return (_) => {
-        class ServiceTaggedClassC {
-        }
-        ServiceTaggedClassC.make = (t) => {
-            return t;
+export function TagClassId() {
+    return (key) => {
+        const limit = Error.stackTraceLimit;
+        Error.stackTraceLimit = 2;
+        const creationError = new Error();
+        Error.stackTraceLimit = limit;
+        const c = class {
+            constructor(service) {
+                Object.assign(this, service);
+            }
+            static toLayer(eff) {
+                return tsplus_module_2.effect(this)(tsplus_module_3.map(eff, (_) => new this(_)));
+            }
+            static toLayerScoped(eff) {
+                return tsplus_module_2.scoped(this)(tsplus_module_3.map(eff, (_) => new this(_)));
+            }
         };
-        return assignTag()(ServiceTaggedClassC);
+        return assignTag(key, creationError)(c);
     };
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL19zcmMvc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQVVBLE1BQU0sQ0FBQyxNQUFNLFVBQVUsR0FBRyxNQUFNLEVBQUUsQ0FBQTtBQUdsQyxNQUFNLE9BQWdCLG9CQUFvQjtDQUl6QztBQUVEOztHQUVHO0FBQ0gsTUFBTSxPQUFnQixhQUEwQixTQUFRLG9CQUF3QztDQUFHO0FBRW5HOztHQUVHO0FBQ0gsTUFBTSxVQUFVLFdBQVcsQ0FBK0IsQ0FBc0I7SUFDOUUsT0FBTyxDQUFNLENBQUE7QUFDZixDQUFDO0FBRUQ7O0dBRUc7QUFDSCxNQUFNLFVBQVUsSUFBSSxDQUFzQyxDQUFZLEVBQUUsQ0FBc0I7SUFDNUYsT0FBTyxDQUFNLENBQUE7QUFDZixDQUFDO0FBRUQsTUFBTSxDQUFDLE1BQU0sU0FBUyxHQUFzQixNQUFNLENBQUMsR0FBRyxDQUFDLG9CQUFvQixDQUFpQyxDQUFBO0FBRzVHLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQTtBQUNULE1BQU0sUUFBUSxHQUFHLEdBQUcsRUFBRSxDQUFDLGtCQUFrQixHQUFHLENBQUMsRUFBRSxDQUFBO0FBRS9DLE1BQU0sVUFBVSxTQUFTLENBQW1CLEdBQVk7SUFDdEQsT0FBTyxDQUFtQixHQUFNLEVBQXdCLEVBQUU7UUFDeEQsTUFBTSxHQUFHLEdBQUcsZ0JBQUEsVUFBVSxDQUFjLEdBQUcsSUFBSSxRQUFRLEVBQUUsQ0FBQyxDQUFBO1FBQ3RELE1BQU0sQ0FBQyxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUMsR0FBRyxFQUFFLE1BQU0sQ0FBQyxjQUFjLENBQUMsR0FBRyxDQUFDLEVBQUUsR0FBRyxDQUFDLENBQUE7UUFDN0QsTUFBTSxLQUFLLEdBQUcsS0FBSyxDQUFDLGVBQWUsQ0FBQTtRQUNuQyxLQUFLLENBQUMsZUFBZSxHQUFHLENBQUMsQ0FBQSxDQUFDLE9BQU87UUFDakMsTUFBTSxhQUFhLEdBQUcsSUFBSSxLQUFLLEVBQUUsQ0FBQTtRQUNqQyxLQUFLLENBQUMsZUFBZSxHQUFHLEtBQUssQ0FBQTtRQUM3Qix5R0FBeUc7UUFDekcsTUFBTSxDQUFDLGNBQWMsQ0FBQyxDQUFDLEVBQUUsT0FBTyxFQUFFO1lBQ2hDLEdBQUc7Z0JBQ0QscUZBQXFGO2dCQUNyRixPQUFPLGFBQWEsQ0FBQyxLQUFLLEVBQUUsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUE7WUFDN0QsQ0FBQztTQUNGLENBQUMsQ0FBQTtRQUNGLE9BQU8sQ0FBQyxDQUFBO0lBQ1YsQ0FBQyxDQUFBO0FBQ0gsQ0FBQztBQUVELE1BQU0sVUFBVSxRQUFRLENBQWdDLEdBQVk7SUFDbEUsTUFBTSxDQUFDLEdBQXlEO1FBQzlELFlBQVksT0FBb0I7WUFDOUIsTUFBTSxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUUsT0FBTyxDQUFDLENBQUE7UUFDOUIsQ0FBQztLQUVLLENBQUE7SUFFUixPQUFPLFNBQVMsQ0FBYyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQTtBQUN2QyxDQUFDO0FBRUQsTUFBTSxDQUFDLE1BQU0sWUFBWSxHQUFHLEdBQXFCLEVBQUUsQ0FDbkQsQ0FDRSxJQUErQixFQUMvQixHQUFZLEVBQ1osRUFBRTtJQUNGLE1BQU0sQ0FBQyxHQUlIO1FBQ0YsWUFBWSxPQUFvQjtZQUM5QixNQUFNLENBQUMsTUFBTSxDQUFDLElBQUksRUFBRSxPQUFPLENBQUMsQ0FBQTtRQUM5QixDQUFDO1FBQ0QsaUhBQWlIO1FBQ2pILE1BQU0sQ0FBQyxPQUFPO1lBQ1osT0FBTyx1QkFBYSxJQUFXLEVBQXhCLElBQUksQ0FBcUIsQ0FBQTtRQUNsQyxDQUFDO1FBRUQsTUFBTSxDQUFDLGFBQWE7WUFDbEIsT0FBTyx1QkFBbUIsSUFBVyxFQUE5QixJQUFJLENBQTJCLENBQUE7UUFDeEMsQ0FBQztLQUVLLENBQUE7SUFFUixPQUFPLFNBQVMsQ0FBYyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQTtBQUN2QyxDQUFDLENBQUE7QUFFRCxNQUFNLFVBQVUsY0FBYyxDQUFtQixHQUFZO0lBQzNELE1BQWUsY0FBYztLQUFHO0lBRWhDLE9BQU8sU0FBUyxDQUFjLEdBQUcsQ0FBQyxDQUFDLGNBQWMsQ0FBQyxDQUFBO0FBQ3BELENBQUM7QUFFRCxxREFBcUQ7QUFDckQsTUFBTSxVQUFVLGtCQUFrQjtJQUNoQyxPQUFPLENBQTBCLENBQU0sRUFBRSxFQUFFO1FBQ3pDLE1BQWUsbUJBQW1COztRQUN6Qix3QkFBSSxHQUFHLENBQUMsQ0FBcUIsRUFBRSxFQUFFO1lBQ3RDLE9BQU8sQ0FBWSxDQUFBO1FBQ3JCLENBQUMsQ0FBQTtRQUdILE9BQU8sU0FBUyxFQUFlLENBQUMsbUJBQW1CLENBQUMsQ0FBQTtJQUN0RCxDQUFDLENBQUE7QUFDSCxDQUFDIn0=
+export const TagClassMakeId = () => (key, make) => {
+    const limit = Error.stackTraceLimit;
+    Error.stackTraceLimit = 2;
+    const creationError = new Error();
+    Error.stackTraceLimit = limit;
+    const c = class {
+        constructor(service) {
+            Object.assign(this, service);
+        }
+        static make() {
+            return make.andThen((_) => new this(_));
+        }
+        // works around an issue where defining layer on the class messes up and causes the Tag to infer to `any, any` :/
+        static toLayer() {
+            return tsplus_module_2.effect(this)(make);
+        }
+        static toLayerScoped() {
+            return tsplus_module_2.scoped(this)(make);
+        }
+    };
+    return assignTag(key, creationError)(c);
+};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL19zcmMvc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFVQSxNQUFNLENBQUMsTUFBTSxVQUFVLEdBQUcsTUFBTSxFQUFFLENBQUE7QUFHbEMsTUFBTSxPQUFnQixvQkFBb0I7Q0FJekM7QUFFRDs7R0FFRztBQUNILE1BQU0sT0FBZ0IsYUFBMEIsU0FBUSxvQkFBd0M7Q0FBRztBQUVuRzs7R0FFRztBQUNILE1BQU0sVUFBVSxXQUFXLENBQStCLENBQXNCO0lBQzlFLE9BQU8sQ0FBTSxDQUFBO0FBQ2YsQ0FBQztBQUVEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLElBQUksQ0FBc0MsQ0FBWSxFQUFFLENBQXNCO0lBQzVGLE9BQU8sQ0FBTSxDQUFBO0FBQ2YsQ0FBQztBQUVELElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQTtBQUNULE1BQU0sUUFBUSxHQUFHLEdBQUcsRUFBRSxDQUFDLGtCQUFrQixHQUFHLENBQUMsRUFBRSxDQUFBO0FBRS9DLE1BQU0sVUFBVSxTQUFTLENBQW1CLEdBQVksRUFBRSxhQUFxQjtJQUM3RSxPQUFPLENBQW1CLEdBQU0sRUFBd0IsRUFBRTtRQUN4RCxNQUFNLEdBQUcsR0FBRyxnQkFBQSxVQUFVLENBQWMsR0FBRyxJQUFJLFFBQVEsRUFBRSxDQUFDLENBQUE7UUFDdEQsSUFBSSxNQUFNLEdBQUcsR0FBRyxDQUFBO1FBQ2hCLElBQUksT0FBTyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQztZQUN6QyxNQUFNLEVBQUUsR0FBRyxFQUFFLEdBQUcsSUFBSSxFQUFFLEdBQUcsR0FBRyxDQUFBO1lBQzVCLE1BQU0sR0FBRyxJQUFXLENBQUE7UUFDdEIsQ0FBQztRQUNELE1BQU0sQ0FBQyxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUMsR0FBRyxFQUFFLE1BQU0sQ0FBQyxjQUFjLENBQUMsR0FB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

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "effect-app",
-  "version": "0.154.3",
+  "version": "0.155.0",
   "license": "MIT",
   "type": "module",
   "dependencies": {
-    "@effect/platform": "^0.44.2",
-    "@effect/schema": "^0.62.1",
+    "@effect/platform": "^0.44.3",
+    "@effect/schema": "^0.62.2",
     "@fp-ts/optic": "^0.22.0",
     "date-fns": "^3.3.1",
-    "effect": "^2.3.1",
+    "effect": "^2.3.2",
     "lodash": "^4.17.21",
     "nanoid": "^5.0.5",
     "path-parser": "^6.1.0",
@@ -16,9 +16,9 @@
     "ts-pattern": "^5.0.6",
     "uuid": "^9.0.1",
     "validator": "^13.11.0",
-    "@effect-app/core": "0.131.9",
-    "@effect-app/schema": "0.185.2",
-    "@effect-app/fluent-extensions": "0.126.10"
+    "@effect-app/fluent-extensions": "0.127.0",
+    "@effect-app/core": "0.132.0",
+    "@effect-app/schema": "0.186.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.23.9",