@effect-atom/atom-livestore 0.4.3 → 0.4.4

package/dist/cjs/AtomLivestore.js

@@ -55,13 +55,13 @@ const Tag = () => (id, options) => {
   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, {
+      const q = typeof query === "function" ? query(get) : query;
+      get.addFinalizer(store.subscribe(q, {
         onUpdate(value) {
           get.setSelf(Result.success(value));
         }
       }));
-      return result;
+      return store.query(q);
     });
   });
   self.makeQueryUnsafe = query => Atom.readable(get => {
@@ -69,12 +69,13 @@ const Tag = () => (id, options) => {
     if (store === undefined) {
       return undefined;
     }
-    get.addFinalizer(store.subscribe(query, {
+    const q = typeof query === "function" ? query(get) : query;
+    get.addFinalizer(store.subscribe(q, {
       onUpdate(value) {
         get.setSelf(Result.success(value));
       }
     }));
-    return store.query(query);
+    return store.query(q);
   });
   self.commit = Atom.writable(get => {
     get(self.storeUnsafe);

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","Tag","id","options","self","layer","scoped","createStore","pipe","provideOtel","parentSpanContext","otelOptions","rootSpanContext","otelTracer","tracer","orDie","runtime","store","atom","contextWith","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":[]}
+{"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","contextWith","storeUnsafe","readable","result","getOrElse","constUndefined","makeQuery","query","map","q","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

@@ -28,12 +28,12 @@ export interface AtomLiveStore<Self, Id extends string, S extends LiveStoreSchem
      * 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 makeQuery: <A>(query: LiveQueryDef<A>) => Atom.Atom<Result.Result<A>>;
+    readonly makeQuery: <A>(query: LiveQueryDef<A> | ((get: Atom.Context) => 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 makeQueryUnsafe: <A>(query: LiveQueryDef<A>) => Atom.Atom<A | undefined>;
+    readonly makeQueryUnsafe: <A>(query: LiveQueryDef<A> | ((get: Atom.Context) => LiveQueryDef<A>)) => Atom.Atom<A | undefined>;
     /**
      * A Atom.Writable that allows you to commit an event to the Store.
      */

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;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"}
+{"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,EACpB,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,KAAK,YAAY,CAAC,CAAC,CAAC,CAAC,KAC9D,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;IAChC;;;OAGG;IACH,QAAQ,CAAC,eAAe,EAAE,CAAC,CAAC,EAC1B,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,KAAK,YAAY,CAAC,CAAC,CAAC,CAAC,KAC9D,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,SAAS,CAAC,CAAA;IAC7B;;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,CAwDpC,CAAA"}

package/dist/esm/AtomLivestore.js

@@ -28,13 +28,13 @@ export const Tag = () => (id, options) => {
   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, {
+      const q = typeof query === "function" ? query(get) : query;
+      get.addFinalizer(store.subscribe(q, {
         onUpdate(value) {
           get.setSelf(Result.success(value));
         }
       }));
-      return result;
+      return store.query(q);
     });
   });
   self.makeQueryUnsafe = query => Atom.readable(get => {
@@ -42,12 +42,13 @@ export const Tag = () => (id, options) => {
     if (store === undefined) {
       return undefined;
     }
-    get.addFinalizer(store.subscribe(query, {
+    const q = typeof query === "function" ? query(get) : query;
+    get.addFinalizer(store.subscribe(q, {
       onUpdate(value) {
         get.setSelf(Result.success(value));
       }
     }));
-    return store.query(query);
+    return store.query(q);
   });
   self.commit = Atom.writable(get => {
     get(self.storeUnsafe);

package/dist/esm/AtomLivestore.js.map

@@ -1 +1 @@
-{"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","contextWith","get","storeUnsafe","readable","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":[]}
+{"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","contextWith","get","storeUnsafe","readable","result","getOrElse","makeQuery","query","map","q","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.4.3",
+  "version": "0.4.4",
   "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.4.8"
+    "@effect-atom/atom": "^0.4.9"
   },
   "peerDependencies": {
     "@livestore/livestore": "*",

package/src/AtomLivestore.ts

@@ -40,12 +40,16 @@ export interface AtomLiveStore<Self, Id extends string, S extends LiveStoreSchem
    * 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 makeQuery: <A>(query: LiveQueryDef<A>) => Atom.Atom<Result.Result<A>>
+  readonly makeQuery: <A>(
+    query: LiveQueryDef<A> | ((get: Atom.Context) => 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 makeQueryUnsafe: <A>(query: LiveQueryDef<A>) => Atom.Atom<A | undefined>
+  readonly makeQueryUnsafe: <A>(
+    query: LiveQueryDef<A> | ((get: Atom.Context) => LiveQueryDef<A>)
+  ) => Atom.Atom<A | undefined>
   /**
    * A Atom.Writable that allows you to commit an event to the Store.
    */
@@ -87,35 +91,36 @@ export const Tag = <Self>() =>
     const result = get(self.store)
     return Result.getOrElse(result, constUndefined)
   })
-  self.makeQuery = <A>(query: LiveQueryDef<A>) =>
+  self.makeQuery = <A>(query: LiveQueryDef<A> | ((get: Atom.Context) => LiveQueryDef<A>)) =>
     Atom.readable((get) => {
       const store = get(self.store)
       return Result.map(store, (store) => {
-        const result = store.query(query)
+        const q = typeof query === "function" ? query(get) : query
         get.addFinalizer(
-          store.subscribe(query, {
+          store.subscribe(q, {
             onUpdate(value) {
               get.setSelf(Result.success(value))
             }
           })
         )
-        return result
+        return store.query(q)
       })
     })
-  self.makeQueryUnsafe = <A>(query: LiveQueryDef<A>) =>
+  self.makeQueryUnsafe = <A>(query: LiveQueryDef<A> | ((get: Atom.Context) => LiveQueryDef<A>)) =>
     Atom.readable((get) => {
       const store = get(self.storeUnsafe)
       if (store === undefined) {
         return undefined
       }
+      const q = typeof query === "function" ? query(get) : query
       get.addFinalizer(
-        store.subscribe(query, {
+        store.subscribe(q, {
           onUpdate(value) {
             get.setSelf(Result.success(value))
           }
         })
       )
-      return store.query(query)
+      return store.query(q)
     })
   self.commit = Atom.writable((get) => {
     get(self.storeUnsafe)