@effect-atom/atom-livestore 0.1.9 → 0.1.11

package/dist/cjs/AtomLivestore.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.make = void 0;
+exports.Tag = void 0;
 var Atom = /*#__PURE__*/_interopRequireWildcard(/*#__PURE__*/require("@effect-atom/atom/Atom"));
 var Result = /*#__PURE__*/_interopRequireWildcard(/*#__PURE__*/require("@effect-atom/atom/Result"));
 var _livestore = /*#__PURE__*/require("@livestore/livestore");
@@ -40,20 +40,20 @@ function _interopRequireWildcard(e, t) {
  * @since 1.0.0
  * @category Constructors
  */
-const make = options => {
-  const StoreService = Context.GenericTag("@effect-atom/atom-livestore/StoreService");
-  const layer = Layer.scoped(StoreService, (0, _livestore.createStore)(options).pipe((0, _livestore.provideOtel)({
+const Tag = () => (id, options) => {
+  const self = Context.Tag(id)();
+  self.layer = Layer.scoped(self, (0, _livestore.createStore)(options).pipe((0, _livestore.provideOtel)({
     parentSpanContext: options?.otelOptions?.rootSpanContext,
     otelTracer: options?.otelOptions?.tracer
   }), Effect.orDie));
-  const runtimeAtom = Atom.runtime(layer);
-  const storeAtom = runtimeAtom.atom(StoreService);
-  const storeAtomUnsafe = Atom.readable(get => {
-    const result = get(storeAtom);
+  self.runtime = Atom.runtime(self.layer);
+  self.store = self.runtime.atom(self);
+  self.storeUnsafe = Atom.readable(get => {
+    const result = get(self.store);
     return Result.getOrElse(result, _Function.constUndefined);
   });
-  const makeQueryAtom = query => Atom.readable(get => {
-    const store = get(storeAtom);
+  self.makeQuery = query => Atom.readable(get => {
+    const store = get(self.store);
     return Result.map(store, store => {
       const result = store.query(query);
       get.addFinalizer(store.subscribe(query, {
@@ -64,8 +64,8 @@ const make = options => {
       return result;
     });
   });
-  const makeQueryAtomUnsafe = query => Atom.readable(get => {
-    const store = get(storeAtomUnsafe);
+  self.makeQueryUnsafe = query => Atom.readable(get => {
+    const store = get(self.storeUnsafe);
     if (store === undefined) {
       return undefined;
     }
@@ -76,21 +76,12 @@ const make = options => {
     }));
     return store.query(query);
   });
-  const commitAtom = Atom.writable(get => {
-    get(storeAtomUnsafe);
+  self.commit = Atom.writable(get => {
+    get(self.storeUnsafe);
   }, (ctx, value) => {
-    ctx.get(storeAtomUnsafe)?.commit(value);
+    ctx.get(self.storeUnsafe)?.commit(value);
   });
-  return {
-    StoreService,
-    layer,
-    runtimeAtom,
-    storeAtom,
-    storeAtomUnsafe,
-    makeQueryAtom,
-    makeQueryAtomUnsafe,
-    commitAtom
-  };
+  return self;
 };
-exports.make = make;
+exports.Tag = Tag;
 //# sourceMappingURL=AtomLivestore.js.map

package/dist/cjs/AtomLivestore.js.map

@@ -1 +1 @@
-{"version":3,"file":"AtomLivestore.js","names":["Atom","_interopRequireWildcard","require","Result","_livestore","Context","Effect","_Function","Layer","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","make","options","StoreService","GenericTag","layer","scoped","createStore","pipe","provideOtel","parentSpanContext","otelOptions","rootSpanContext","otelTracer","tracer","orDie","runtimeAtom","runtime","storeAtom","atom","storeAtomUnsafe","readable","result","getOrElse","constUndefined","makeQueryAtom","query","store","map","addFinalizer","subscribe","onUpdate","value","setSelf","success","makeQueryAtomUnsafe","undefined","commitAtom","writable","ctx","commit","exports"],"sources":["../../src/AtomLivestore.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"AtomLivestore.js","names":["Atom","_interopRequireWildcard","require","Result","_livestore","Context","Effect","_Function","Layer","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","Tag","id","options","self","layer","scoped","createStore","pipe","provideOtel","parentSpanContext","otelOptions","rootSpanContext","otelTracer","tracer","orDie","runtime","store","atom","storeUnsafe","readable","result","getOrElse","constUndefined","makeQuery","query","map","addFinalizer","subscribe","onUpdate","value","setSelf","success","makeQueryUnsafe","undefined","commit","writable","ctx","exports"],"sources":["../../src/AtomLivestore.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/dts/AtomLivestore.d.ts

@@ -8,53 +8,47 @@ import * as Context from "effect/Context";
 import * as Layer from "effect/Layer";
 /**
  * @since 1.0.0
- * @category Store
+ * @category Models
  */
-export interface StoreService {
-    readonly _: unique symbol;
-}
-/**
- * @since 1.0.0
- * @category Constructors
- */
-export declare const make: <S extends LiveStoreSchema, Context = {}>(options: CreateStoreOptions<S, Context> & {
-    readonly otelOptions?: Partial<OtelOptions> | undefined;
-}) => {
-    /**
-     * A context tag for the Store.
-     */
-    readonly StoreService: Context.Tag<StoreService, Store<S, Context>>;
-    /**
-     * The Layer that builds the Store
-     */
-    readonly layer: Layer.Layer<StoreService>;
-    /**
-     * A Atom.runtime that contains the Store.
-     */
-    readonly runtimeAtom: Atom.AtomRuntime<StoreService, never>;
+export interface AtomLiveStore<Self, Id extends string, S extends LiveStoreSchema, Context = {}> extends Context.Tag<Self, Store<S, Context>> {
+    new (_: never): Context.TagClassShape<Id, Store<S, Context>>;
+    readonly layer: Layer.Layer<Self>;
+    readonly runtime: Atom.AtomRuntime<Self>;
     /**
      * A Atom that allows you to access the Store. It will emit a `Result` that
      * contains the Store or an error if it could not be created.
      */
-    readonly storeAtom: Atom.Atom<Result.Result<Store<S, Context>>>;
+    readonly store: Atom.Atom<Result.Result<Store<S, Context>>>;
     /**
      * A Atom that allows you to access the Store. It will emit the Store or
      * `undefined` if has not been created yet.
      */
-    readonly storeAtomUnsafe: Atom.Atom<Store<S, Context> | undefined>;
+    readonly storeUnsafe: Atom.Atom<Store<S, Context> | undefined>;
     /**
      * Creates a Atom that allows you to resolve a LiveQueryDef. It embeds the loading
      * of the Store and will emit a `Result` that contains the result of the query
      */
-    readonly makeQueryAtom: <A>(query: LiveQueryDef<A>) => Atom.Atom<Result.Result<A>>;
+    readonly makeQuery: <A>(query: LiveQueryDef<A>) => Atom.Atom<Result.Result<A>>;
     /**
      * Creates a Atom that allows you to resolve a LiveQueryDef. If the Store has
      * not been created yet, it will return `undefined`.
      */
-    readonly makeQueryAtomUnsafe: <A>(query: LiveQueryDef<A>) => Atom.Atom<A | undefined>;
+    readonly makeQueryUnsafe: <A>(query: LiveQueryDef<A>) => Atom.Atom<A | undefined>;
     /**
      * A Atom.Writable that allows you to commit an event to the Store.
      */
-    readonly commitAtom: Atom.Writable<void, {}>;
-};
+    readonly commit: Atom.Writable<void, {}>;
+}
+declare global {
+    interface ErrorConstructor {
+        stackTraceLimit: number;
+    }
+}
+/**
+ * @since 1.0.0
+ * @category Constructors
+ */
+export declare const Tag: <Self>() => <const Id extends string, S extends LiveStoreSchema, Context = {}>(id: Id, options: CreateStoreOptions<S, Context> & {
+    readonly otelOptions?: Partial<OtelOptions> | undefined;
+}) => AtomLiveStore<Self, Id, S, Context>;
 //# sourceMappingURL=AtomLivestore.d.ts.map

package/dist/dts/AtomLivestore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AtomLivestore.d.ts","sourceRoot":"","sources":["../../src/AtomLivestore.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAA;AAC9C,OAAO,KAAK,MAAM,MAAM,0BAA0B,CAAA;AAClD,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,eAAe,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAA;AAEjH,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AAGzC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAErC;;;GAGG;AACH,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,CAAC,EAAE,OAAO,MAAM,CAAA;CAC1B;AAED;;;GAGG;AACH,eAAO,MAAM,IAAI,GAAI,CAAC,SAAS,eAAe,EAAE,OAAO,GAAG,EAAE,EAC1D,SAAS,kBAAkB,CAAC,CAAC,EAAE,OAAO,CAAC,GAAG;IACxC,QAAQ,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,SAAS,CAAA;CACxD,KACA;IACD;;OAEG;IACH,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAA;IACnE;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;IACzC;;OAEG;IACH,QAAQ,CAAC,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,KAAK,CAAC,CAAA;IAC3D;;;OAGG;IACH,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAA;IAC/D;;;OAGG;IACH,QAAQ,CAAC,eAAe,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC,CAAA;IAClE;;;OAGG;IACH,QAAQ,CAAC,aAAa,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;IAClF;;;OAGG;IACH,QAAQ,CAAC,mBAAmB,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,SAAS,CAAC,CAAA;IACrF;;OAEG;IACH,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;CAgE7C,CAAA"}
+{"version":3,"file":"AtomLivestore.d.ts","sourceRoot":"","sources":["../../src/AtomLivestore.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAA;AAC9C,OAAO,KAAK,MAAM,MAAM,0BAA0B,CAAA;AAClD,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,eAAe,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAA;AAEjH,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AAGzC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAGrC;;;GAGG;AACH,MAAM,WAAW,aAAa,CAAC,IAAI,EAAE,EAAE,SAAS,MAAM,EAAE,CAAC,SAAS,eAAe,EAAE,OAAO,GAAG,EAAE,CAC7F,SAAQ,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;IAE5C,KACE,CAAC,EAAE,KAAK,GACP,OAAO,CAAC,aAAa,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAA;IAE/C,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACjC,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;IAExC;;;OAGG;IACH,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAA;IAC3D;;;OAGG;IACH,QAAQ,CAAC,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC,CAAA;IAC9D;;;OAGG;IACH,QAAQ,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;IAC9E;;;OAGG;IACH,QAAQ,CAAC,eAAe,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,SAAS,CAAC,CAAA;IACjF;;OAEG;IACH,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;CACzC;AAED,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,gBAAgB;QACxB,eAAe,EAAE,MAAM,CAAA;KACxB;CACF;AAED;;;GAGG;AACH,eAAO,MAAM,GAAG,GAAI,IAAI,QACvB,KAAK,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC,SAAS,eAAe,EAAE,OAAO,GAAG,EAAE,EAC/D,IAAI,EAAE,EACN,SAAS,kBAAkB,CAAC,CAAC,EAAE,OAAO,CAAC,GAAG;IACxC,QAAQ,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,SAAS,CAAA;CACxD,KACA,aAAa,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,EAAE,OAAO,CAuDpC,CAAA"}

package/dist/esm/AtomLivestore.js

@@ -13,20 +13,20 @@ import * as Layer from "effect/Layer";
  * @since 1.0.0
  * @category Constructors
  */
-export const make = options => {
-  const StoreService = Context.GenericTag("@effect-atom/atom-livestore/StoreService");
-  const layer = Layer.scoped(StoreService, createStore(options).pipe(provideOtel({
+export const Tag = () => (id, options) => {
+  const self = Context.Tag(id)();
+  self.layer = Layer.scoped(self, createStore(options).pipe(provideOtel({
     parentSpanContext: options?.otelOptions?.rootSpanContext,
     otelTracer: options?.otelOptions?.tracer
   }), Effect.orDie));
-  const runtimeAtom = Atom.runtime(layer);
-  const storeAtom = runtimeAtom.atom(StoreService);
-  const storeAtomUnsafe = Atom.readable(get => {
-    const result = get(storeAtom);
+  self.runtime = Atom.runtime(self.layer);
+  self.store = self.runtime.atom(self);
+  self.storeUnsafe = Atom.readable(get => {
+    const result = get(self.store);
     return Result.getOrElse(result, constUndefined);
   });
-  const makeQueryAtom = query => Atom.readable(get => {
-    const store = get(storeAtom);
+  self.makeQuery = query => Atom.readable(get => {
+    const store = get(self.store);
     return Result.map(store, store => {
       const result = store.query(query);
       get.addFinalizer(store.subscribe(query, {
@@ -37,8 +37,8 @@ export const make = options => {
       return result;
     });
   });
-  const makeQueryAtomUnsafe = query => Atom.readable(get => {
-    const store = get(storeAtomUnsafe);
+  self.makeQueryUnsafe = query => Atom.readable(get => {
+    const store = get(self.storeUnsafe);
     if (store === undefined) {
       return undefined;
     }
@@ -49,20 +49,11 @@ export const make = options => {
     }));
     return store.query(query);
   });
-  const commitAtom = Atom.writable(get => {
-    get(storeAtomUnsafe);
+  self.commit = Atom.writable(get => {
+    get(self.storeUnsafe);
   }, (ctx, value) => {
-    ctx.get(storeAtomUnsafe)?.commit(value);
+    ctx.get(self.storeUnsafe)?.commit(value);
   });
-  return {
-    StoreService,
-    layer,
-    runtimeAtom,
-    storeAtom,
-    storeAtomUnsafe,
-    makeQueryAtom,
-    makeQueryAtomUnsafe,
-    commitAtom
-  };
+  return self;
 };
 //# sourceMappingURL=AtomLivestore.js.map

package/dist/esm/AtomLivestore.js.map

@@ -1 +1 @@
-{"version":3,"file":"AtomLivestore.js","names":["Atom","Result","createStore","provideOtel","Context","Effect","constUndefined","Layer","make","options","StoreService","GenericTag","layer","scoped","pipe","parentSpanContext","otelOptions","rootSpanContext","otelTracer","tracer","orDie","runtimeAtom","runtime","storeAtom","atom","storeAtomUnsafe","readable","get","result","getOrElse","makeQueryAtom","query","store","map","addFinalizer","subscribe","onUpdate","value","setSelf","success","makeQueryAtomUnsafe","undefined","commitAtom","writable","ctx","commit"],"sources":["../../src/AtomLivestore.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"AtomLivestore.js","names":["Atom","Result","createStore","provideOtel","Context","Effect","constUndefined","Layer","Tag","id","options","self","layer","scoped","pipe","parentSpanContext","otelOptions","rootSpanContext","otelTracer","tracer","orDie","runtime","store","atom","storeUnsafe","readable","get","result","getOrElse","makeQuery","query","map","addFinalizer","subscribe","onUpdate","value","setSelf","success","makeQueryUnsafe","undefined","commit","writable","ctx"],"sources":["../../src/AtomLivestore.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-atom/atom-livestore",
-  "version": "0.1.9",
+  "version": "0.1.11",
   "description": "effect-atom bindings to livestore",
   "license": "MIT",
   "repository": {
@@ -11,7 +11,7 @@
   "author": "Effect contributors",
   "homepage": "https://github.com/tim-smart/effect-atom",
   "dependencies": {
-    "@effect-atom/atom": "^0.1.11"
+    "@effect-atom/atom": "^0.1.13"
   },
   "peerDependencies": {
     "@livestore/livestore": "*",

package/src/AtomLivestore.ts

@@ -10,64 +10,69 @@ import * as Context from "effect/Context"
 import * as Effect from "effect/Effect"
 import { constUndefined } from "effect/Function"
 import * as Layer from "effect/Layer"
+import type { Mutable } from "effect/Types"
 
 /**
  * @since 1.0.0
- * @category Store
+ * @category Models
  */
-export interface StoreService {
-  readonly _: unique symbol
-}
+export interface AtomLiveStore<Self, Id extends string, S extends LiveStoreSchema, Context = {}>
+  extends Context.Tag<Self, Store<S, Context>>
+{
+  new(
+    _: never
+  ): Context.TagClassShape<Id, Store<S, Context>>
+
+  readonly layer: Layer.Layer<Self>
+  readonly runtime: Atom.AtomRuntime<Self>
 
-/**
- * @since 1.0.0
- * @category Constructors
- */
-export const make = <S extends LiveStoreSchema, Context = {}>(
-  options: CreateStoreOptions<S, Context> & {
-    readonly otelOptions?: Partial<OtelOptions> | undefined
-  }
-): {
-  /**
-   * A context tag for the Store.
-   */
-  readonly StoreService: Context.Tag<StoreService, Store<S, Context>>
-  /**
-   * The Layer that builds the Store
-   */
-  readonly layer: Layer.Layer<StoreService>
-  /**
-   * A Atom.runtime that contains the Store.
-   */
-  readonly runtimeAtom: Atom.AtomRuntime<StoreService, never>
   /**
    * A Atom that allows you to access the Store. It will emit a `Result` that
    * contains the Store or an error if it could not be created.
    */
-  readonly storeAtom: Atom.Atom<Result.Result<Store<S, Context>>>
+  readonly store: Atom.Atom<Result.Result<Store<S, Context>>>
   /**
    * A Atom that allows you to access the Store. It will emit the Store or
    * `undefined` if has not been created yet.
    */
-  readonly storeAtomUnsafe: Atom.Atom<Store<S, Context> | undefined>
+  readonly storeUnsafe: Atom.Atom<Store<S, Context> | undefined>
   /**
    * Creates a Atom that allows you to resolve a LiveQueryDef. It embeds the loading
    * of the Store and will emit a `Result` that contains the result of the query
    */
-  readonly makeQueryAtom: <A>(query: LiveQueryDef<A>) => Atom.Atom<Result.Result<A>>
+  readonly makeQuery: <A>(query: LiveQueryDef<A>) => Atom.Atom<Result.Result<A>>
   /**
    * Creates a Atom that allows you to resolve a LiveQueryDef. If the Store has
    * not been created yet, it will return `undefined`.
    */
-  readonly makeQueryAtomUnsafe: <A>(query: LiveQueryDef<A>) => Atom.Atom<A | undefined>
+  readonly makeQueryUnsafe: <A>(query: LiveQueryDef<A>) => Atom.Atom<A | undefined>
   /**
    * A Atom.Writable that allows you to commit an event to the Store.
    */
-  readonly commitAtom: Atom.Writable<void, {}>
-} => {
-  const StoreService = Context.GenericTag<StoreService, Store<S, Context>>("@effect-atom/atom-livestore/StoreService")
-  const layer = Layer.scoped(
-    StoreService,
+  readonly commit: Atom.Writable<void, {}>
+}
+
+declare global {
+  interface ErrorConstructor {
+    stackTraceLimit: number
+  }
+}
+
+/**
+ * @since 1.0.0
+ * @category Constructors
+ */
+export const Tag = <Self>() =>
+<const Id extends string, S extends LiveStoreSchema, Context = {}>(
+  id: Id,
+  options: CreateStoreOptions<S, Context> & {
+    readonly otelOptions?: Partial<OtelOptions> | undefined
+  }
+): AtomLiveStore<Self, Id, S, Context> => {
+  const self: Mutable<AtomLiveStore<Self, Id, S, Context>> = Context.Tag(id)<Self, Store<S, Context>>() as any
+
+  self.layer = Layer.scoped(
+    self,
     createStore(options).pipe(
       provideOtel({
         parentSpanContext: options?.otelOptions?.rootSpanContext,
@@ -76,15 +81,15 @@ export const make = <S extends LiveStoreSchema, Context = {}>(
       Effect.orDie
     )
   )
-  const runtimeAtom = Atom.runtime(layer)
-  const storeAtom = runtimeAtom.atom(StoreService)
-  const storeAtomUnsafe = Atom.readable((get) => {
-    const result = get(storeAtom)
+  self.runtime = Atom.runtime(self.layer)
+  self.store = self.runtime.atom(self)
+  self.storeUnsafe = Atom.readable((get) => {
+    const result = get(self.store)
     return Result.getOrElse(result, constUndefined)
   })
-  const makeQueryAtom = <A>(query: LiveQueryDef<A>) =>
+  self.makeQuery = <A>(query: LiveQueryDef<A>) =>
     Atom.readable((get) => {
-      const store = get(storeAtom)
+      const store = get(self.store)
       return Result.map(store, (store) => {
         const result = store.query(query)
         get.addFinalizer(
@@ -97,9 +102,9 @@ export const make = <S extends LiveStoreSchema, Context = {}>(
         return result
       })
     })
-  const makeQueryAtomUnsafe = <A>(query: LiveQueryDef<A>) =>
+  self.makeQueryUnsafe = <A>(query: LiveQueryDef<A>) =>
     Atom.readable((get) => {
-      const store = get(storeAtomUnsafe)
+      const store = get(self.storeUnsafe)
       if (store === undefined) {
         return undefined
       }
@@ -112,19 +117,10 @@ export const make = <S extends LiveStoreSchema, Context = {}>(
       )
       return store.query(query)
     })
-  const commitAtom = Atom.writable((get) => {
-    get(storeAtomUnsafe)
+  self.commit = Atom.writable((get) => {
+    get(self.storeUnsafe)
   }, (ctx, value: {}) => {
-    ctx.get(storeAtomUnsafe)?.commit(value)
+    ctx.get(self.storeUnsafe)?.commit(value)
   })
-  return {
-    StoreService,
-    layer,
-    runtimeAtom,
-    storeAtom,
-    storeAtomUnsafe,
-    makeQueryAtom,
-    makeQueryAtomUnsafe,
-    commitAtom
-  } as const
+  return self as AtomLiveStore<Self, Id, S, Context>
 }