effect-app 0.182.1 → 0.183.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @effect-app/prelude
 
+## 0.183.0
+
+### Minor Changes
+
+- 77366cc: don't go through service constructor
+
 ## 0.182.1
 
 ### Patch Changes

package/_cjs/service.cjs

@@ -4,9 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ServiceTagged = exports.ServiceTag = exports.PhantomTypeParameter = void 0;
-exports.TagClass = TagClass;
 exports.TagClassId = TagClassId;
-exports.TagMake = exports.TagClassMakeId = exports.TagClassMake = void 0;
+exports.TagClassMakeId = void 0;
 exports.assignTag = assignTag;
 exports.make = make;
 exports.makeService = makeService;
@@ -96,70 +95,92 @@ const proxify = TagClass => () => {
   });
   return done;
 };
+// export const TagMake = <ServiceImpl, R, E, const Key extends string>(
+//   key: Key,
+//   make: Effect<ServiceImpl, E, R>
+// ) =>
+// <Id>() => {
+//   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 Layer.effect(this as any, make)
+//     }
+//     static toLayerScoped = () => {
+//       return Layer.scoped(this as any, make)
+//     }
+//     // eslint-disable-next-line @typescript-eslint/no-explicit-any
+//   } as any
+//   return proxify(assignTag<Id, ServiceImpl>(key, creationError)(c))<Id, ServiceImpl>()
+// }
+// export function TagClass<Id, ServiceImpl, Service = Id>(key?: string) {
+//   const limit = Error.stackTraceLimit
+//   Error.stackTraceLimit = 2
+//   const creationError = new Error()
+//   Error.stackTraceLimit = limit
+//   const c: (abstract new(impl: 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 _key?: string
+//     static toLayer = <E, R>(eff: Effect<ServiceImpl, E, R>) => {
+//       return Layer.effect(this as any, eff)
+//     }
+//     static toLayerScoped = <E, R>(eff: Effect<ServiceImpl, E, R>) => {
+//       return Layer.scoped(this as any, eff)
+//     }
+//     static get key() {
+//       return this._key ?? (this._key = key ?? creationError.stack?.split("\n")[2] ?? this.name)
+//     }
+//   } as any
+//   return proxify(assignTag<Id, Service>(key, creationError)(c))<Id, ServiceImpl>()
+// }
+// export const TagClassMake = <ServiceImpl, R, E>(
+//   make: Effect<ServiceImpl, E, R>,
+//   key?: string
+// ) =>
+// <Id, Service = Id>() => {
+//   const limit = Error.stackTraceLimit
+//   Error.stackTraceLimit = 2
+//   const creationError = new Error()
+//   Error.stackTraceLimit = limit
+//   const c: (abstract new(impl: ServiceImpl) => Readonly<ServiceImpl>) & {
+//     toLayer: { (): Layer<Id, E, R>; <E, R>(eff: Effect<ServiceImpl, E, R>): Layer<Id, E, R> }
+//     toLayerScoped: {
+//       (): Layer<Id, E, Exclude<R, Scope>>
+//       <E, R>(eff: Effect<ServiceImpl, E, R>): Layer<Id, E, Exclude<R, Scope>>
+//     }
+//     make: Effect<Id, E, R>
+//   } = class {
+//     constructor(service: ServiceImpl) {
+//       Object.assign(this, service)
+//     }
+//     static _key: string
+//     static make = make
+//     // works around an issue where defining layer on the class messes up and causes the Tag to infer to `any, any` :/
+//     static toLayer = (arg?: any) => {
+//       return Layer.effect(this as any, arg ?? this.make)
+//     }
+//     static toLayerScoped = (arg?: any) => {
+//       return Layer.scoped(this as any, arg ?? this.make)
+//     }
+//     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 proxify(assignTag<Id, Service>(key, creationError)(c))<Id, ServiceImpl>()
+// }
 exports.proxify = proxify;
-const TagMake = (key, make) => () => {
-  const limit = Error.stackTraceLimit;
-  Error.stackTraceLimit = 2;
-  const creationError = new Error();
-  Error.stackTraceLimit = limit;
-  const c = class {
-    static toLayer = () => {
-      return _core.Layer.effect(this, make);
-    };
-    static toLayerScoped = () => {
-      return _core.Layer.scoped(this, make);
-    };
-  };
-  return proxify(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 _key;
-    static toLayer = eff => {
-      return _core.Layer.effect(this, _core.Effect.map(eff, _ => new this(_)));
-    };
-    static toLayerScoped = eff => {
-      return _core.Layer.scoped(this, _core.Effect.map(eff, _ => new this(_)));
-    };
-    static get key() {
-      return this._key ?? (this._key = key ?? creationError.stack?.split("\n")[2] ?? this.name);
-    }
-  };
-  return proxify(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 _key;
-    static make = _core.Effect.andThen(make, _ => 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 _core.Layer.effect(this, this.make);
-    };
-    static toLayerScoped = () => {
-      return _core.Layer.scoped(this, this.make);
-    };
-    static get key() {
-      return this._key ?? (this._key = key ?? creationError.stack?.split("\n")[2] ?? this.name);
-    }
-  };
-  return proxify(assignTag(key, creationError)(c))();
-};
-exports.TagClassMake = TagClassMake;
 function TagClassId(key) {
   return () => {
     const limit = Error.stackTraceLimit;
@@ -168,15 +189,15 @@ function TagClassId(key) {
     Error.stackTraceLimit = limit;
     const c = class {
       constructor(service) {
-        // this addresses prototype inheritance, but the trade-off is that the object won't be `instanceof` the Service Id class, so it's really just used as an interface only.
-        return Object.assign(Object.create(service), service);
+        // TODO: instead, wrap the service, and direct calls?
+        Object.assign(this, service);
       }
-      static wrap = service => new this(service);
+      static of = service => service;
       static toLayer = eff => {
-        return _core.Layer.effect(this, _core.Effect.map(eff, _ => new this(_)));
+        return _core.Layer.effect(this, eff);
       };
       static toLayerScoped = eff => {
-        return _core.Layer.scoped(this, _core.Effect.map(eff, _ => new this(_)));
+        return _core.Layer.scoped(this, eff);
       };
     };
     return proxify(assignTag(key, creationError)(c))();
@@ -189,17 +210,17 @@ const TagClassMakeId = (key, make) => () => {
   Error.stackTraceLimit = limit;
   const c = class {
     constructor(service) {
-      // this addresses prototype inheritance, but the trade-off is that the object won't be `instanceof` the Service Id class, so it's really just used as an interface only.
-      return Object.assign(Object.create(service), service);
+      // TODO: instead, wrap the service, and direct calls?
+      Object.assign(this, service);
     }
-    static wrap = service => new this(service);
-    static make = _core.Effect.andThen(make, _ => new this(_));
+    static of = service => service;
+    static make = make;
     // works around an issue where defining layer on the class messes up and causes the Tag to infer to `any, any` :/
     static toLayer = arg => {
-      return arg ? _core.Layer.effect(this, arg) : _core.Layer.effect(this, this.make);
+      return _core.Layer.effect(this, arg ?? this.make);
     };
     static toLayerScoped = arg => {
-      return arg ? _core.Layer.scoped(this, arg) : _core.Layer.scoped(this, this.make);
+      return _core.Layer.scoped(this, arg ?? this.make);
     };
   };
   return proxify(assignTag(key, creationError)(c))();

package/_cjs/service.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"service.cjs","names":["_core","require","ServiceTag","exports","Symbol","PhantomTypeParameter","ServiceTagged","makeService","_","make","t","i","randomId","assignTag","key","creationError","cls","tag","Context","GenericTag","fields","Reflect","ownKeys","includes","rest","Object","assign","getPrototypeOf","limit","Error","stackTraceLimit","defineProperty","get","stack","proxify","TagClass","cache","Map","done","Proxy","_target","prop","_receiver","body","Effect","andThen","has","fn","args","s","cn","setPrototypeOf","set","TagMake","c","toLayer","Layer","effect","toLayerScoped","scoped","constructor","service","_key","eff","map","split","name","TagClassMake","TagClassId","create","wrap","TagClassMakeId","arg"],"sources":["../src/service.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"service.cjs","names":["_core","require","ServiceTag","exports","Symbol","PhantomTypeParameter","ServiceTagged","makeService","_","make","t","i","randomId","assignTag","key","creationError","cls","tag","Context","GenericTag","fields","Reflect","ownKeys","includes","rest","Object","assign","getPrototypeOf","limit","Error","stackTraceLimit","defineProperty","get","stack","proxify","TagClass","cache","Map","done","Proxy","_target","prop","_receiver","body","Effect","andThen","has","fn","args","s","cn","setPrototypeOf","set","TagClassId","c","constructor","service","of","toLayer","eff","Layer","effect","toLayerScoped","scoped","TagClassMakeId","arg"],"sources":["../src/service.ts"],"sourcesContent":[null],"mappings":"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"}

package/dist/service.d.ts

@@ -33,47 +33,23 @@ export type ServiceAcessorShape<Self, Type> = (Type extends Record<PropertyKey,
     use: <X>(body: (_: Type) => X) => X extends Effect<infer A, infer E, infer R> ? Effect<A, E, R | Self> : Effect<X, never, Self>;
 };
 export declare const proxify: <T extends object>(TagClass: T) => <Self, Shape>() => T & ServiceAcessorShape<Self, Shape>;
-export declare const TagMake: <ServiceImpl, R, E, const Key extends string>(key: Key, make: Effect<ServiceImpl, E, R>) => <Id>() => {
-    new (): Context.TagClassShape<Key, ServiceImpl>;
-    toLayer: () => Layer<Id, E, R>;
-    toLayerScoped: () => Layer<Id, E, Exclude<R, Scope>>;
-} & Context.Tag<Id, ServiceImpl> & (ServiceImpl extends Record<PropertyKey, any> ? { [k in keyof ServiceImpl as ServiceImpl[k] extends (...args_0: infer Args) => infer Ret ? ((...args: Readonly<Args>) => Ret) extends ServiceImpl[k] ? k : never : k]: ServiceImpl[k] extends (...args_0: infer Args_1) => Effect<infer A, infer E_1, infer R_1> ? (...args: Readonly<Args_1>) => Effect<A, E_1, R_1 | Id> : ServiceImpl[k] extends (...args_0: infer Args_2) => infer A_1 ? (...args: Readonly<Args_2>) => Effect<A_1, never, Id> : ServiceImpl[k] extends Effect<infer A_2, infer E_2, infer R_2> ? Effect<A_2, E_2, R_2 | Id> : Effect<ServiceImpl[k], never, Id>; } : {}) & {
-    use: <X>(body: (_: ServiceImpl) => X) => X extends Effect<infer A_3, infer E_3, infer R_3> ? Effect<A_3, E_3, R_3 | Id> : Effect<X, never, Id>;
-};
-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: Effect<ServiceImpl, E_1, R_1>) => Layer<Id, E_1, Exclude<R_1, Scope.Scope>>;
-} & Context.Tag<Id, Service> & (ServiceImpl extends Record<PropertyKey, any> ? { [k in keyof ServiceImpl as ServiceImpl[k] extends (...args_0: infer Args) => infer Ret ? ((...args: Readonly<Args>) => Ret) extends ServiceImpl[k] ? k : never : k]: ServiceImpl[k] extends (...args_0: infer Args_1) => Effect<infer A, infer E_2, infer R_2> ? (...args: Readonly<Args_1>) => Effect<A, E_2, R_2 | Id> : ServiceImpl[k] extends (...args_0: infer Args_2) => infer A_1 ? (...args: Readonly<Args_2>) => Effect<A_1, never, Id> : ServiceImpl[k] extends Effect<infer A_2, infer E_3, infer R_3> ? Effect<A_2, E_3, R_3 | Id> : Effect<ServiceImpl[k], never, Id>; } : {}) & {
-    use: <X>(body: (_: ServiceImpl) => X) => X extends Effect<infer A_3, infer E_4, infer R_4> ? Effect<A_3, E_4, R_4 | Id> : Effect<X, never, Id>;
-};
-export declare const TagClassMake: <ServiceImpl, R, E>(make: Effect<ServiceImpl, E, R>, key?: string) => <Id, Service = Id>() => {
-    new (service: ServiceImpl): Readonly<ServiceImpl>;
-    toLayer: () => Layer<Id, E, R>;
-    toLayerScoped: () => Layer<Id, E, Exclude<R, Scope>>;
-    make: Effect<Id, E, R>;
-} & Context.Tag<Id, Service> & (ServiceImpl extends Record<PropertyKey, any> ? { [k in keyof ServiceImpl as ServiceImpl[k] extends (...args_0: infer Args) => infer Ret ? ((...args: Readonly<Args>) => Ret) extends ServiceImpl[k] ? k : never : k]: ServiceImpl[k] extends (...args_0: infer Args_1) => Effect<infer A, infer E_1, infer R_1> ? (...args: Readonly<Args_1>) => Effect<A, E_1, R_1 | Id> : ServiceImpl[k] extends (...args_0: infer Args_2) => infer A_1 ? (...args: Readonly<Args_2>) => Effect<A_1, never, Id> : ServiceImpl[k] extends Effect<infer A_2, infer E_2, infer R_2> ? Effect<A_2, E_2, R_2 | Id> : Effect<ServiceImpl[k], never, Id>; } : {}) & {
-    use: <X>(body: (_: ServiceImpl) => X) => X extends Effect<infer A_3, infer E_3, infer R_3> ? Effect<A_3, E_3, R_3 | Id> : Effect<X, never, Id>;
-};
-export declare function TagClassId<const Key extends string>(key: Key): <Id, ServiceImpl>() => {
-    new (service: ServiceImpl): Readonly<ServiceImpl> & Context.TagClassShape<Key, ServiceImpl>;
-    toLayer: <E, R>(eff: Effect<ServiceImpl, E, R>) => Layer<Id, E, R>;
-    toLayerScoped: <E_1, R_1>(eff: Effect<ServiceImpl, E_1, R_1>) => Layer<Id, E_1, Exclude<R_1, Scope.Scope>>;
-    wrap: (service: ServiceImpl) => Id;
+export declare function TagClassId<const Key extends string>(key: Key): <Id, ServiceImpl>() => (abstract new (service: ServiceImpl) => Readonly<ServiceImpl> & Context.TagClassShape<Key, ServiceImpl>) & {
+    toLayer: <E, R>(eff: Effect<Omit<Id, keyof Context.TagClassShape<any, any>>, E, R>) => Layer<Id, E, R>;
+    toLayerScoped: <E_1, R_1>(eff: Effect<Omit<Id, keyof Context.TagClassShape<any, any>>, E_1, R_1>) => Layer<Id, E_1, Exclude<R_1, Scope.Scope>>;
+    of: (service: Omit<Id, keyof Context.TagClassShape<any, any>>) => Id;
 } & Context.Tag<Id, Id> & (ServiceImpl extends Record<PropertyKey, any> ? { [k in keyof ServiceImpl as ServiceImpl[k] extends (...args_0: infer Args) => infer Ret ? ((...args: Readonly<Args>) => Ret) extends ServiceImpl[k] ? k : never : k]: ServiceImpl[k] extends (...args_0: infer Args_1) => Effect<infer A, infer E_2, infer R_2> ? (...args: Readonly<Args_1>) => Effect<A, E_2, R_2 | Id> : ServiceImpl[k] extends (...args_0: infer Args_2) => infer A_1 ? (...args: Readonly<Args_2>) => Effect<A_1, never, Id> : ServiceImpl[k] extends Effect<infer A_2, infer E_3, infer R_3> ? Effect<A_2, E_3, R_3 | Id> : Effect<ServiceImpl[k], never, Id>; } : {}) & {
     use: <X>(body: (_: ServiceImpl) => X) => X extends Effect<infer A_3, infer E_4, infer R_4> ? Effect<A_3, E_4, R_4 | Id> : Effect<X, never, Id>;
 };
-export declare const TagClassMakeId: <ServiceImpl, R, E, const Key extends string>(key: Key, make: Effect<ServiceImpl, E, R>) => <Id>() => {
-    new (service: ServiceImpl): Readonly<ServiceImpl> & Context.TagClassShape<Key, ServiceImpl>;
+export declare const TagClassMakeId: <ServiceImpl, R, E, const Key extends string>(key: Key, make: Effect<ServiceImpl, E, R>) => <Id>() => (abstract new (service: ServiceImpl) => Readonly<ServiceImpl> & Context.TagClassShape<Key, ServiceImpl>) & {
     toLayer: {
         (): Layer<Id, E, R>;
-        <E_1, R_1>(eff: Effect<ServiceImpl, E_1, R_1>): Layer<Id, E_1, R_1>;
+        <E_1, R_1>(eff: Effect<Omit<Id, keyof Context.TagClassShape<any, any>>, E_1, R_1>): Layer<Id, E_1, R_1>;
     };
     toLayerScoped: {
         (): Layer<Id, E, Exclude<R, Scope>>;
-        <E_2, R_2>(eff: Effect<ServiceImpl, E_2, R_2>): Layer<Id, E_2, Exclude<R_2, Scope.Scope>>;
+        <E_2, R_2>(eff: Effect<Context.TagClassShape<any, any>, E_2, R_2>): Layer<Id, E_2, Exclude<R_2, Scope.Scope>>;
     };
-    wrap: (service: ServiceImpl) => Id;
+    of: (service: Context.TagClassShape<any, any>) => Id;
     make: Effect<Id, E, R>;
 } & Context.Tag<Id, Id> & (ServiceImpl extends Record<PropertyKey, any> ? { [k in keyof ServiceImpl as ServiceImpl[k] extends (...args_0: infer Args) => infer Ret ? ((...args: Readonly<Args>) => Ret) extends ServiceImpl[k] ? k : never : k]: ServiceImpl[k] extends (...args_0: infer Args_1) => Effect<infer A, infer E_3, infer R_3> ? (...args: Readonly<Args_1>) => Effect<A, E_3, R_3 | Id> : ServiceImpl[k] extends (...args_0: infer Args_2) => infer A_1 ? (...args: Readonly<Args_2>) => Effect<A_1, never, Id> : ServiceImpl[k] extends Effect<infer A_2, infer E_4, infer R_4> ? Effect<A_2, E_4, R_4 | Id> : Effect<ServiceImpl[k], never, Id>; } : {}) & {
     use: <X>(body: (_: ServiceImpl) => X) => X extends Effect<infer A_3, infer E_5, infer R_5> ? Effect<A_3, E_5, R_5 | Id> : Effect<X, never, Id>;

package/dist/service.d.ts.map

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

package/dist/service.js

@@ -79,67 +79,91 @@ export const proxify = (TagClass) => () => {
     });
     return done;
 };
-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 Layer.effect(this, make);
-        };
-        static toLayerScoped = () => {
-            return Layer.scoped(this, make);
-        };
-    };
-    return proxify(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 _key;
-        static toLayer = (eff) => {
-            return Layer.effect(this, Effect.map(eff, (_) => new this(_)));
-        };
-        static toLayerScoped = (eff) => {
-            return Layer.scoped(this, Effect.map(eff, (_) => new this(_)));
-        };
-        static get key() {
-            return this._key ?? (this._key = key ?? creationError.stack?.split("\n")[2] ?? this.name);
-        }
-    };
-    return proxify(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 _key;
-        static make = Effect.andThen(make, (_) => 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 Layer.effect(this, this.make);
-        };
-        static toLayerScoped = () => {
-            return Layer.scoped(this, this.make);
-        };
-        static get key() {
-            return this._key ?? (this._key = key ?? creationError.stack?.split("\n")[2] ?? this.name);
-        }
-    };
-    return proxify(assignTag(key, creationError)(c))();
-};
+// export const TagMake = <ServiceImpl, R, E, const Key extends string>(
+//   key: Key,
+//   make: Effect<ServiceImpl, E, R>
+// ) =>
+// <Id>() => {
+//   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 Layer.effect(this as any, make)
+//     }
+//     static toLayerScoped = () => {
+//       return Layer.scoped(this as any, make)
+//     }
+//     // eslint-disable-next-line @typescript-eslint/no-explicit-any
+//   } as any
+//   return proxify(assignTag<Id, ServiceImpl>(key, creationError)(c))<Id, ServiceImpl>()
+// }
+// export function TagClass<Id, ServiceImpl, Service = Id>(key?: string) {
+//   const limit = Error.stackTraceLimit
+//   Error.stackTraceLimit = 2
+//   const creationError = new Error()
+//   Error.stackTraceLimit = limit
+//   const c: (abstract new(impl: 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 _key?: string
+//     static toLayer = <E, R>(eff: Effect<ServiceImpl, E, R>) => {
+//       return Layer.effect(this as any, eff)
+//     }
+//     static toLayerScoped = <E, R>(eff: Effect<ServiceImpl, E, R>) => {
+//       return Layer.scoped(this as any, eff)
+//     }
+//     static get key() {
+//       return this._key ?? (this._key = key ?? creationError.stack?.split("\n")[2] ?? this.name)
+//     }
+//   } as any
+//   return proxify(assignTag<Id, Service>(key, creationError)(c))<Id, ServiceImpl>()
+// }
+// export const TagClassMake = <ServiceImpl, R, E>(
+//   make: Effect<ServiceImpl, E, R>,
+//   key?: string
+// ) =>
+// <Id, Service = Id>() => {
+//   const limit = Error.stackTraceLimit
+//   Error.stackTraceLimit = 2
+//   const creationError = new Error()
+//   Error.stackTraceLimit = limit
+//   const c: (abstract new(impl: ServiceImpl) => Readonly<ServiceImpl>) & {
+//     toLayer: { (): Layer<Id, E, R>; <E, R>(eff: Effect<ServiceImpl, E, R>): Layer<Id, E, R> }
+//     toLayerScoped: {
+//       (): Layer<Id, E, Exclude<R, Scope>>
+//       <E, R>(eff: Effect<ServiceImpl, E, R>): Layer<Id, E, Exclude<R, Scope>>
+//     }
+//     make: Effect<Id, E, R>
+//   } = class {
+//     constructor(service: ServiceImpl) {
+//       Object.assign(this, service)
+//     }
+//     static _key: string
+//     static make = make
+//     // works around an issue where defining layer on the class messes up and causes the Tag to infer to `any, any` :/
+//     static toLayer = (arg?: any) => {
+//       return Layer.effect(this as any, arg ?? this.make)
+//     }
+//     static toLayerScoped = (arg?: any) => {
+//       return Layer.scoped(this as any, arg ?? this.make)
+//     }
+//     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 proxify(assignTag<Id, Service>(key, creationError)(c))<Id, ServiceImpl>()
+// }
 export function TagClassId(key) {
     return () => {
         const limit = Error.stackTraceLimit;
@@ -148,15 +172,15 @@ export function TagClassId(key) {
         Error.stackTraceLimit = limit;
         const c = class {
             constructor(service) {
-                // this addresses prototype inheritance, but the trade-off is that the object won't be `instanceof` the Service Id class, so it's really just used as an interface only.
-                return Object.assign(Object.create(service), service);
+                // TODO: instead, wrap the service, and direct calls?
+                Object.assign(this, service);
             }
-            static wrap = (service) => new this(service);
+            static of = (service) => service;
             static toLayer = (eff) => {
-                return Layer.effect(this, Effect.map(eff, (_) => new this(_)));
+                return Layer.effect(this, eff);
             };
             static toLayerScoped = (eff) => {
-                return Layer.scoped(this, Effect.map(eff, (_) => new this(_)));
+                return Layer.scoped(this, eff);
             };
         };
         return proxify(assignTag(key, creationError)(c))();
@@ -169,19 +193,19 @@ export const TagClassMakeId = (key, make) => () => {
     Error.stackTraceLimit = limit;
     const c = class {
         constructor(service) {
-            // this addresses prototype inheritance, but the trade-off is that the object won't be `instanceof` the Service Id class, so it's really just used as an interface only.
-            return Object.assign(Object.create(service), service);
+            // TODO: instead, wrap the service, and direct calls?
+            Object.assign(this, service);
         }
-        static wrap = (service) => new this(service);
-        static make = Effect.andThen(make, (_) => new this(_));
+        static of = (service) => service;
+        static make = make;
         // works around an issue where defining layer on the class messes up and causes the Tag to infer to `any, any` :/
         static toLayer = (arg) => {
-            return arg ? Layer.effect(this, arg) : Layer.effect(this, this.make);
+            return Layer.effect(this, arg ?? this.make);
         };
         static toLayerScoped = (arg) => {
-            return arg ? Layer.scoped(this, arg) : Layer.scoped(this, this.make);
+            return Layer.scoped(this, arg ?? this.make);
         };
     };
     return proxify(assignTag(key, creationError)(c))();
 };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"service.js","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLHVEQUF1RDtBQUN2RCxpREFBaUQ7QUFDakQ7Ozs7R0FJRztBQUdILE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxNQUFNLGtCQUFrQixDQUFBO0FBRXpELE1BQU0sQ0FBQyxNQUFNLFVBQVUsR0FBRyxNQUFNLEVBQUUsQ0FBQTtBQUdsQyxNQUFNLE9BQWdCLG9CQUFvQjtDQUl6QztBQU9EOztHQUVHO0FBQ0gsTUFBTSxPQUFnQixhQUEwQixTQUFRLG9CQUF3QztDQUFHO0FBRW5HOztHQUVHO0FBQ0gsTUFBTSxVQUFVLFdBQVcsQ0FBK0IsQ0FBc0I7SUFDOUUsT0FBTyxDQUFNLENBQUE7QUFDZixDQUFDO0FBRUQ7O0dBRUc7QUFDSCxNQUFNLFVBQVUsSUFBSSxDQUFzQyxDQUFvQixFQUFFLENBQXNCO0lBQ3BHLE9BQU8sQ0FBTSxDQUFBO0FBQ2YsQ0FBQztBQUVELElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQTtBQUNULE1BQU0sUUFBUSxHQUFHLEdBQUcsRUFBRSxDQUFDLGtCQUFrQixHQUFHLENBQUMsRUFBRSxDQUFBO0FBRS9DLE1BQU0sVUFBVSxTQUFTLENBQW1CLEdBQVksRUFBRSxhQUFxQjtJQUM3RSxPQUFPLENBQW1CLEdBQU0sRUFBZ0MsRUFBRTtRQUNoRSxNQUFNLEdBQUcsR0FBRyxPQUFPLENBQUMsVUFBVSxDQUFjLEdBQUcsSUFBSSxRQUFRLEVBQUUsQ0FBQyxDQUFBO1FBQzlELElBQUksTUFBTSxHQUFHLEdBQUcsQ0FBQTtRQUNoQixJQUFJLE9BQU8sQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUM7WUFDekMsTUFBTSxFQUFFLEdBQUcsRUFBRSxHQUFHLElBQUksRUFBRSxHQUFHLEdBQUcsQ0FBQTtZQUM1QixN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

package/dist/services/FiberBag.d.ts

@@ -1,45 +1,29 @@
 import { Effect, Fiber, Layer } from "@effect-app/core";
-declare const FiberBag_base: {
-    new (service: {
-        join: Effect.Effect<void, never, never>;
-        run: <R, XE extends never, XA extends never>(effect: Effect.Effect<XA, XE, R>) => Effect.Effect<Fiber.RuntimeFiber<XA, XE>, never, R>;
-        add: (...fibers: Fiber.RuntimeFiber<never, never>[]) => Effect.Effect<void, never, never>;
-        addAll: (fibers: readonly Fiber.RuntimeFiber<never, never>[]) => Effect.Effect<void, never, never>;
-    }): Readonly<{
-        join: Effect.Effect<void, never, never>;
-        run: <R, XE extends never, XA extends never>(effect: Effect.Effect<XA, XE, R>) => Effect.Effect<Fiber.RuntimeFiber<XA, XE>, never, R>;
-        add: (...fibers: Fiber.RuntimeFiber<never, never>[]) => Effect.Effect<void, never, never>;
-        addAll: (fibers: readonly Fiber.RuntimeFiber<never, never>[]) => Effect.Effect<void, never, never>;
-    }> & import("effect/Context").TagClassShape<"FiberBag", {
-        join: Effect.Effect<void, never, never>;
-        run: <R, XE extends never, XA extends never>(effect: Effect.Effect<XA, XE, R>) => Effect.Effect<Fiber.RuntimeFiber<XA, XE>, never, R>;
-        add: (...fibers: Fiber.RuntimeFiber<never, never>[]) => Effect.Effect<void, never, never>;
-        addAll: (fibers: readonly Fiber.RuntimeFiber<never, never>[]) => Effect.Effect<void, never, never>;
-    }>;
+declare const FiberBag_base: (abstract new (service: {
+    join: Effect.Effect<void, never, never>;
+    run: <R, XE extends never, XA extends never>(effect: Effect.Effect<XA, XE, R>) => Effect.Effect<Fiber.RuntimeFiber<XA, XE>, never, R>;
+    add: (...fibers: Fiber.RuntimeFiber<never, never>[]) => Effect.Effect<void, never, never>;
+    addAll: (fibers: readonly Fiber.RuntimeFiber<never, never>[]) => Effect.Effect<void, never, never>;
+}) => Readonly<{
+    join: Effect.Effect<void, never, never>;
+    run: <R, XE extends never, XA extends never>(effect: Effect.Effect<XA, XE, R>) => Effect.Effect<Fiber.RuntimeFiber<XA, XE>, never, R>;
+    add: (...fibers: Fiber.RuntimeFiber<never, never>[]) => Effect.Effect<void, never, never>;
+    addAll: (fibers: readonly Fiber.RuntimeFiber<never, never>[]) => Effect.Effect<void, never, never>;
+}> & import("effect/Context").TagClassShape<"FiberBag", {
+    join: Effect.Effect<void, never, never>;
+    run: <R, XE extends never, XA extends never>(effect: Effect.Effect<XA, XE, R>) => Effect.Effect<Fiber.RuntimeFiber<XA, XE>, never, R>;
+    add: (...fibers: Fiber.RuntimeFiber<never, never>[]) => Effect.Effect<void, never, never>;
+    addAll: (fibers: readonly Fiber.RuntimeFiber<never, never>[]) => Effect.Effect<void, never, never>;
+}>) & {
     toLayer: {
         (): Layer<FiberBag, never, import("effect/Scope").Scope>;
-        <E, R_1>(eff: Effect<{
-            join: Effect.Effect<void, never, never>;
-            run: <R, XE extends never, XA extends never>(effect: Effect.Effect<XA, XE, R>) => Effect.Effect<Fiber.RuntimeFiber<XA, XE>, never, R>;
-            add: (...fibers: Fiber.RuntimeFiber<never, never>[]) => Effect.Effect<void, never, never>;
-            addAll: (fibers: readonly Fiber.RuntimeFiber<never, never>[]) => Effect.Effect<void, never, never>;
-        }, E, R_1>): Layer<FiberBag, E, R_1>;
+        <E, R_1>(eff: Effect<Omit<FiberBag, keyof import("effect/Context").TagClassShape<any, any>>, E, R_1>): Layer<FiberBag, E, R_1>;
     };
     toLayerScoped: {
         (): Layer<FiberBag, never, never>;
-        <E_1, R_2>(eff: Effect<{
-            join: Effect.Effect<void, never, never>;
-            run: <R, XE extends never, XA extends never>(effect: Effect.Effect<XA, XE, R>) => Effect.Effect<Fiber.RuntimeFiber<XA, XE>, never, R>;
-            add: (...fibers: Fiber.RuntimeFiber<never, never>[]) => Effect.Effect<void, never, never>;
-            addAll: (fibers: readonly Fiber.RuntimeFiber<never, never>[]) => Effect.Effect<void, never, never>;
-        }, E_1, R_2>): Layer<FiberBag, E_1, Exclude<R_2, import("effect/Scope").Scope>>;
+        <E_1, R_2>(eff: Effect<import("effect/Context").TagClassShape<any, any>, E_1, R_2>): Layer<FiberBag, E_1, Exclude<R_2, import("effect/Scope").Scope>>;
     };
-    wrap: (service: {
-        join: Effect.Effect<void, never, never>;
-        run: <R, XE extends never, XA extends never>(effect: Effect.Effect<XA, XE, R>) => Effect.Effect<Fiber.RuntimeFiber<XA, XE>, never, R>;
-        add: (...fibers: Fiber.RuntimeFiber<never, never>[]) => Effect.Effect<void, never, never>;
-        addAll: (fibers: readonly Fiber.RuntimeFiber<never, never>[]) => Effect.Effect<void, never, never>;
-    }) => FiberBag;
+    of: (service: import("effect/Context").TagClassShape<any, any>) => FiberBag;
     make: Effect<FiberBag, never, import("effect/Scope").Scope>;
 } & import("effect/Context").Tag<FiberBag, FiberBag> & {
     join: Effect<void, never, FiberBag>;

package/dist/services/FiberBag.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FiberBag.d.ts","sourceRoot":"","sources":["../../src/services/FiberBag.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAY,KAAK,EAAE,MAAM,kBAAkB,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA2BjE;;;;GAIG;AACH,qBAAa,QAAS,SAAQ,aAA4C;IACxE,MAAM,CAAC,QAAQ,CAAC,IAAI,gCAAuB;IAC3C,MAAM,CAAC,QAAQ,CAAC,QAAQ,mCAA0F;IAClH,MAAM,CAAC,QAAQ,CAAC,GAAG,YAAa,OAAO,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,0EAAkD;CAC1G"}
+{"version":3,"file":"FiberBag.d.ts","sourceRoot":"","sources":["../../src/services/FiberBag.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAY,KAAK,EAAE,MAAM,kBAAkB,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA2BjE;;;;GAIG;AACH,qBAAa,QAAS,SAAQ,aAA4C;IACxE,MAAM,CAAC,QAAQ,CAAC,IAAI,gCAAuB;IAC3C,MAAM,CAAC,QAAQ,CAAC,QAAQ,mCAA0F;IAClH,MAAM,CAAC,QAAQ,CAAC,GAAG,YAAa,OAAO,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,0EAAkD;CAC1G"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "effect-app",
-  "version": "0.182.1",
+  "version": "0.183.0",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -26,8 +26,7 @@
     "fast-check": "~3.16.0",
     "ts-node": "^10.9.2",
     "typescript": "^5.4.2",
-    "vitest": "^1.3.1",
-    "@effect-app/compiler": "0.72.0"
+    "vitest": "^1.3.1"
   },
   "peerDependencies": {
     "@effect/platform": "^0.46.3",

package/src/service.ts

@@ -121,98 +121,99 @@ export const proxify = <T extends object>(TagClass: T) =>
   return done
 }
 
-export const TagMake = <ServiceImpl, R, E, const Key extends string>(
-  key: Key,
-  make: Effect<ServiceImpl, E, R>
-) =>
-<Id>() => {
-  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 Layer.effect(this as any, make)
-    }
+// export const TagMake = <ServiceImpl, R, E, const Key extends string>(
+//   key: Key,
+//   make: Effect<ServiceImpl, E, R>
+// ) =>
+// <Id>() => {
+//   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 Layer.effect(this as any, make)
+//     }
 
-    static toLayerScoped = () => {
-      return Layer.scoped(this as any, make)
-    }
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  } as any
+//     static toLayerScoped = () => {
+//       return Layer.scoped(this as any, make)
+//     }
+//     // eslint-disable-next-line @typescript-eslint/no-explicit-any
+//   } as any
 
-  return proxify(assignTag<Id, ServiceImpl>(key, creationError)(c))<Id, ServiceImpl>()
-}
+//   return proxify(assignTag<Id, ServiceImpl>(key, creationError)(c))<Id, ServiceImpl>()
+// }
 
-export function TagClass<Id, ServiceImpl, Service = Id>(key?: string) {
-  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 _key?: string
-    static toLayer = <E, R>(eff: Effect<ServiceImpl, E, R>) => {
-      return Layer.effect(this as any, Effect.map(eff, (_) => new this(_)))
-    }
-    static toLayerScoped = <E, R>(eff: Effect<ServiceImpl, E, R>) => {
-      return Layer.scoped(this as any, Effect.map(eff, (_) => new this(_)))
-    }
-    static get key() {
-      return this._key ?? (this._key = key ?? creationError.stack?.split("\n")[2] ?? this.name)
-    }
-  } as any
+// export function TagClass<Id, ServiceImpl, Service = Id>(key?: string) {
+//   const limit = Error.stackTraceLimit
+//   Error.stackTraceLimit = 2
+//   const creationError = new Error()
+//   Error.stackTraceLimit = limit
+//   const c: (abstract new(impl: 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 _key?: string
+//     static toLayer = <E, R>(eff: Effect<ServiceImpl, E, R>) => {
+//       return Layer.effect(this as any, eff)
+//     }
+//     static toLayerScoped = <E, R>(eff: Effect<ServiceImpl, E, R>) => {
+//       return Layer.scoped(this as any, eff)
+//     }
+//     static get key() {
+//       return this._key ?? (this._key = key ?? creationError.stack?.split("\n")[2] ?? this.name)
+//     }
+//   } as any
 
-  return proxify(assignTag<Id, Service>(key, creationError)(c))<Id, ServiceImpl>()
-}
+//   return proxify(assignTag<Id, Service>(key, creationError)(c))<Id, ServiceImpl>()
+// }
 
-export const TagClassMake = <ServiceImpl, R, E>(
-  make: Effect<ServiceImpl, E, R>,
-  key?: string
-) =>
-<Id, Service = Id>() => {
-  const limit = Error.stackTraceLimit
-  Error.stackTraceLimit = 2
-  const creationError = new Error()
-  Error.stackTraceLimit = limit
-  const c: {
-    new(service: ServiceImpl): Readonly<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 _key: string
-    static make = Effect.andThen(make, (_) => 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 Layer.effect(this as any, this.make)
-    }
+// export const TagClassMake = <ServiceImpl, R, E>(
+//   make: Effect<ServiceImpl, E, R>,
+//   key?: string
+// ) =>
+// <Id, Service = Id>() => {
+//   const limit = Error.stackTraceLimit
+//   Error.stackTraceLimit = 2
+//   const creationError = new Error()
+//   Error.stackTraceLimit = limit
+//   const c: (abstract new(impl: ServiceImpl) => Readonly<ServiceImpl>) & {
+//     toLayer: { (): Layer<Id, E, R>; <E, R>(eff: Effect<ServiceImpl, E, R>): Layer<Id, E, R> }
+//     toLayerScoped: {
+//       (): Layer<Id, E, Exclude<R, Scope>>
+//       <E, R>(eff: Effect<ServiceImpl, E, R>): Layer<Id, E, Exclude<R, Scope>>
+//     }
+//     make: Effect<Id, E, R>
+//   } = class {
+//     constructor(service: ServiceImpl) {
+//       Object.assign(this, service)
+//     }
+//     static _key: string
+//     static make = make
+//     // works around an issue where defining layer on the class messes up and causes the Tag to infer to `any, any` :/
+//     static toLayer = (arg?: any) => {
+//       return Layer.effect(this as any, arg ?? this.make)
+//     }
 
-    static toLayerScoped = () => {
-      return Layer.scoped(this as any, this.make)
-    }
+//     static toLayerScoped = (arg?: any) => {
+//       return Layer.scoped(this as any, arg ?? this.make)
+//     }
 
-    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
+//     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 proxify(assignTag<Id, Service>(key, creationError)(c))<Id, ServiceImpl>()
-}
+//   return proxify(assignTag<Id, Service>(key, creationError)(c))<Id, ServiceImpl>()
+// }
 
 export function TagClassId<const Key extends string>(key: Key) {
   return <Id, ServiceImpl>() => {
@@ -220,24 +221,29 @@ export function TagClassId<const Key extends string>(key: Key) {
     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>>
-      wrap: (service: ServiceImpl) => Id
-    } = class {
-      constructor(service: ServiceImpl) {
-        // this addresses prototype inheritance, but the trade-off is that the object won't be `instanceof` the Service Id class, so it's really just used as an interface only.
-        return Object.assign(Object.create(service as any), service)
-      }
-      static wrap = (service: ServiceImpl) => new this(service)
-      static toLayer = <E, R>(eff: Effect<ServiceImpl, E, R>) => {
-        return Layer.effect(this as any, Effect.map(eff, (_) => new this(_)))
-      }
-      static toLayerScoped = <E, R>(eff: Effect<ServiceImpl, E, R>) => {
-        return Layer.scoped(this as any, Effect.map(eff, (_) => new this(_)))
-      }
-    } as any
+    const c:
+      & (abstract new(
+        service: ServiceImpl
+      ) => Readonly<ServiceImpl> & Context.TagClassShape<Key, ServiceImpl>)
+      & {
+        toLayer: <E, R>(eff: Effect<Omit<Id, keyof Context.TagClassShape<any, any>>, E, R>) => Layer<Id, E, R>
+        toLayerScoped: <E, R>(
+          eff: Effect<Omit<Id, keyof Context.TagClassShape<any, any>>, E, R>
+        ) => Layer<Id, E, Exclude<R, Scope>>
+        of: (service: Omit<Id, keyof Context.TagClassShape<any, any>>) => Id
+      } = class {
+        constructor(service: any) {
+          // TODO: instead, wrap the service, and direct calls?
+          Object.assign(this, service)
+        }
+        static of = (service: ServiceImpl) => service
+        static toLayer = <E, R>(eff: Effect<ServiceImpl, E, R>) => {
+          return Layer.effect(this as any, eff)
+        }
+        static toLayerScoped = <E, R>(eff: Effect<ServiceImpl, E, R>) => {
+          return Layer.scoped(this as any, eff)
+        }
+      } as any
 
     return proxify(assignTag<Id, Id>(key, creationError)(c))<Id, ServiceImpl>()
   }
@@ -252,34 +258,39 @@ export const TagClassMakeId = <ServiceImpl, R, E, const Key extends string>(
   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>; <E, R>(eff: Effect<ServiceImpl, E, R>): Layer<Id, E, R> }
-    toLayerScoped: {
-      (): Layer<Id, E, Exclude<R, Scope>>
-      <E, R>(eff: Effect<ServiceImpl, E, R>): Layer<Id, E, Exclude<R, Scope>>
-    }
-
-    wrap: (service: ServiceImpl) => Id
-    make: Effect<Id, E, R>
-  } = class {
-    constructor(service: ServiceImpl) {
-      // this addresses prototype inheritance, but the trade-off is that the object won't be `instanceof` the Service Id class, so it's really just used as an interface only.
-      return Object.assign(Object.create(service as any), service)
-    }
+  const c:
+    & (abstract new(
+      service: ServiceImpl
+    ) => Readonly<ServiceImpl> & Context.TagClassShape<Key, ServiceImpl>)
+    & {
+      toLayer: {
+        (): Layer<Id, E, R>
+        <E, R>(eff: Effect<Omit<Id, keyof Context.TagClassShape<any, any>>, E, R>): Layer<Id, E, R>
+      }
+      toLayerScoped: {
+        (): Layer<Id, E, Exclude<R, Scope>>
+        <E, R>(eff: Effect<Context.TagClassShape<any, any>, E, R>): Layer<Id, E, Exclude<R, Scope>>
+      }
+      of: (service: Context.TagClassShape<any, any>) => Id
+      make: Effect<Id, E, R>
+    } = class {
+      constructor(service: any) {
+        // TODO: instead, wrap the service, and direct calls?
+        Object.assign(this, service)
+      }
 
-    static wrap = (service: ServiceImpl) => new this(service)
-    static make = Effect.andThen(make, (_) => 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 = (arg?: any) => {
-      return arg ? Layer.effect(this as any, arg) : Layer.effect(this as any, this.make)
-    }
+      static of = (service: ServiceImpl) => service
+      static make = make
+      // works around an issue where defining layer on the class messes up and causes the Tag to infer to `any, any` :/
+      static toLayer = (arg?: any) => {
+        return Layer.effect(this as any, arg ?? this.make)
+      }
 
-    static toLayerScoped = (arg?: any) => {
-      return arg ? Layer.scoped(this as any, arg) : Layer.scoped(this as any, this.make)
-    }
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  } as any
+      static toLayerScoped = (arg?: any) => {
+        return Layer.scoped(this as any, arg ?? this.make)
+      }
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    } as any
 
   return proxify(assignTag<Id, Id>(key, creationError)(c))<Id, ServiceImpl>()
 }

package/{dist → test/dist}/schema.test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.test.d.ts","sourceRoot":"","sources":["../src/schema.test.ts"],"names":[],"mappings":""}
+{"version":3,"file":"schema.test.d.ts","sourceRoot":"","sources":["../schema.test.ts"],"names":[],"mappings":""}

package/{src → test}/schema.test.ts

@@ -1,4 +1,5 @@
 import { StringId } from "@effect-app/schema"
+import { test } from "vitest"
 
 test("works", () => {
   console.log(StringId.make())

package/tsconfig.json

@@ -18,7 +18,7 @@
     "forceConsistentCasingInFileNames": true,
     "module": "Node16",
     "lib": [
-      "esnext"
+      "ES2023"
     ],
     "baseUrl": "./",
     "target": "es2022",
@@ -31,16 +31,14 @@
     "noImplicitAny": true,
     "useUnknownInCatchVariables": true,
     "noImplicitThis": true,
-    "outDir": "./dist",
+    "outDir": "build/dist",
     "resolveJsonModule": true,
     "moduleResolution": "Node16",
     "downlevelIteration": true,
     "noErrorTruncation": true,
     "types": [
       "vitest/globals"
-    ],
-    "rootDir": "./src",
-    "tsBuildInfoFile": "./dist/.tsbuildinfo"
+    ]
   },
   "$schema": "https://json.schemastore.org/tsconfig",
   "display": "Strictest",
@@ -64,22 +62,12 @@
       "*.json"
     ]
   },
-  "include": [
-    "./src/**/*.ts"
-  ],
+  "include": [],
   "exclude": [
     "**/node_modules",
     "**/build",
     "**/dist",
     "**/.*"
   ],
-  "ts-node": {
-    "require": [
-      "tsconfig-paths/register"
-    ],
-    "compilerOptions": {
-      "module": "CommonJS"
-    }
-  },
   "references": []
 }

package/tsconfig.json.bak

@@ -1,43 +1,12 @@
 {
-    "extends": "../../tsconfig.base.json",
-    "compilerOptions": {
-        "lib": [
-            "esnext",
-        ],
-        "moduleResolution": "Node16",
-        "outDir": "./dist",
-        "rootDir": "./src",
-        "tsBuildInfoFile": "./dist/.tsbuildinfo",
-        // "paths": {
-        //     "effect-app": [
-        //         "./src"
-        //     ],
-        //     "effect-app/*": [
-        //         "./src/*"
-        //     ],
-        // },
+  "compilerOptions": {},
+  "extends": "../../tsconfig.base.json",
+  "references": [
+    {
+      "path": "./tsconfig.src.json"
     },
-    "include": [
-        // "./src/**/*.mts",
-        "./src/**/*.ts"
-    ],
-    "ts-node": {
-        "require": [
-            "tsconfig-paths/register"
-        ],
-        "compilerOptions": {
-            "module": "CommonJS"
-        }
-    },
-    "references": [
-        {
-            "path": "../fluent-extensions"
-        },
-        {
-            "path": "../schema"
-        },
-        {
-            "path": "../core"
-        },
-    ]
+    {
+      "path": "./tsconfig.test.json"
+    }
+  ],
 }

package/tsconfig.src.json

@@ -0,0 +1,47 @@
+{
+    "extends": "../../tsconfig.base.json",
+    "compilerOptions": {
+        "lib": [
+            "esnext"
+        ],
+        "tsBuildInfoFile": "./dist/.tsbuildinfo",
+        "esModuleInterop": true,
+        "baseUrl": "./",
+        "rootDir": "./src",
+        // keep in here, cause madge can't detect it from extended tsconfig
+        "moduleResolution": "Node16",
+        "outDir": "./dist"
+    },
+    "include": [
+        "./src/**/*.ts"
+    ],
+    "exclude": [
+        "./dist",
+        "*.test.ts",
+        "node_modules",
+        "build",
+        "lib",
+        "dist",
+        "**/*.d.ts.map",
+        ".git",
+        ".data",
+        "**/.*",
+        "**/*.tmp"
+    ],
+    "ts-node": {
+        "require": [
+            "tsconfig-paths/register"
+        ],
+        "compilerOptions": {
+            "module": "CommonJS"
+        }
+    },
+    "references": [
+        {
+            "path": "../schema"
+        },
+        {
+            "path": "../core"
+        },
+    ]
+}

package/tsconfig.test.json

@@ -0,0 +1,32 @@
+{
+  "extends": "./tsconfig.src.json",
+  "compilerOptions": {
+    "rootDir": "./test",
+    "outDir": "./test/dist",
+    "tsBuildInfoFile": "./test/dist/.tsbuildinfo",
+    // "types": [
+    //   "vitest/globals"
+    // ]
+  },
+  "include": [
+    "./test/**/*.ts"
+  ],
+  "exclude": [
+    "./dist",
+    "./test/dist",
+    "node_modules",
+    "build",
+    "lib",
+    "dist",
+    "**/*.d.ts.map",
+    ".git",
+    ".data",
+    "**/.*",
+    "**/*.tmp"
+  ],
+  "references": [
+    {
+      "path": "./tsconfig.src.json"
+    },
+  ]
+}

package/.prettierignore

@@ -1,6 +0,0 @@
-**/node_modules/
-
-**/dist/
-**/*.js
-**/*.jsx
-**/*.d.ts

package/_cjs/schema.test.cjs

@@ -1,7 +0,0 @@
-"use strict";
-
-var _schema = require("@effect-app/schema");
-test("works", () => {
-  console.log(_schema.StringId.make());
-});
-//# sourceMappingURL=schema.test.cjs.map

package/_cjs/schema.test.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"schema.test.cjs","names":["_schema","require","test","console","log","StringId","make"],"sources":["../src/schema.test.ts"],"sourcesContent":[null],"mappings":";;AAAA,IAAAA,OAAA,GAAAC,OAAA;AAEAC,IAAI,CAAC,OAAO,EAAE,MAAK;EACjBC,OAAO,CAACC,GAAG,CAACC,gBAAQ,CAACC,IAAI,EAAE,CAAC;AAC9B,CAAC,CAAC"}