@livestore/solid 0.4.0-dev.10 → 0.4.0-dev.12

package/dist/query.d.ts

@@ -1,4 +1,4 @@
-import type { LiveQueries } from '@livestore/livestore/internal';
+import type { Queryable } from '@livestore/livestore';
 import * as Solid from 'solid-js';
-export declare const query: <TQuery extends LiveQueries.LiveQueryDef.Any>(queryDef: TQuery, initialValue: LiveQueries.GetResult<TQuery>) => Solid.Accessor<LiveQueries.GetResult<TQuery>>;
+export declare const query: <TResult>(queryDef: Queryable<TResult>, initialValue: TResult) => Solid.Accessor<TResult>;
 //# sourceMappingURL=query.d.ts.map

package/dist/query.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAA;AAChE,OAAO,KAAK,KAAK,MAAM,UAAU,CAAA;AAIjC,eAAO,MAAM,KAAK,GAAI,MAAM,SAAS,WAAW,CAAC,YAAY,CAAC,GAAG,EAC/D,UAAU,MAAM,EAEhB,cAAc,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC,KAC1C,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC,CAa9C,CAAA"}
+{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,KAAK,KAAK,MAAM,UAAU,CAAA;AAGjC,eAAO,MAAM,KAAK,GAAI,OAAO,EAC3B,UAAU,SAAS,CAAC,OAAO,CAAC,EAE5B,cAAc,OAAO,KACpB,KAAK,CAAC,QAAQ,CAAC,OAAO,CAaxB,CAAA"}

package/dist/query.js

@@ -6,7 +6,7 @@ initialValue) => {
     const [value, setValue] = Solid.createSignal(initialValue);
     const store = storeToExport();
     // TODO avoid null-optionality branching
-    const unsubscribe = store?.subscribe(queryDef, { onUpdate: setValue });
+    const unsubscribe = store?.subscribe(queryDef, (value) => setValue(value));
     Solid.onCleanup(() => {
         unsubscribe?.();
     });

package/dist/query.js.map

@@ -1 +1 @@
-{"version":3,"file":"query.js","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,UAAU,CAAA;AAEjC,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAE1C,MAAM,CAAC,MAAM,KAAK,GAAG,CACnB,QAAgB;AAChB,qDAAqD;AACrD,YAA2C,EACI,EAAE;IACjD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,KAAK,CAAC,YAAY,CAAC,YAAY,CAAC,CAAA;IAE1D,MAAM,KAAK,GAAG,aAAa,EAAE,CAAA;IAE7B,wCAAwC;IACxC,MAAM,WAAW,GAAG,KAAK,EAAE,SAAS,CAAC,QAAQ,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAA;IAEtE,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,WAAW,EAAE,EAAE,CAAA;IACjB,CAAC,CAAC,CAAA;IAEF,OAAO,KAAK,CAAA;AACd,CAAC,CAAA"}
+{"version":3,"file":"query.js","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,UAAU,CAAA;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAE1C,MAAM,CAAC,MAAM,KAAK,GAAG,CACnB,QAA4B;AAC5B,qDAAqD;AACrD,YAAqB,EACI,EAAE;IAC3B,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,KAAK,CAAC,YAAY,CAAC,YAAY,CAAC,CAAA;IAE1D,MAAM,KAAK,GAAG,aAAa,EAAE,CAAA;IAE7B,wCAAwC;IACxC,MAAM,WAAW,GAAG,KAAK,EAAE,SAAS,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAY,CAAC,CAAC,CAAA;IAEjF,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,WAAW,EAAE,EAAE,CAAA;IACjB,CAAC,CAAC,CAAA;IAEF,OAAO,KAAK,CAAA;AACd,CAAC,CAAA"}

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@livestore/solid",
-  "version": "0.4.0-dev.10",
+  "version": "0.4.0-dev.12",
   "type": "module",
   "exports": {
     ".": "./dist/mod.js"
   },
   "dependencies": {
     "@opentelemetry/api": "1.9.0",
-    "@livestore/common": "0.4.0-dev.10",
-    "@livestore/livestore": "0.4.0-dev.10",
-    "@livestore/utils": "0.4.0-dev.10"
+    "@livestore/common": "0.4.0-dev.12",
+    "@livestore/utils": "0.4.0-dev.12",
+    "@livestore/livestore": "0.4.0-dev.12"
   },
   "devDependencies": {
     "@opentelemetry/sdk-trace-base": "^2.0.1",

package/src/query.ts

@@ -1,19 +1,18 @@
-import type { LiveQueries } from '@livestore/livestore/internal'
+import type { Queryable } from '@livestore/livestore'
 import * as Solid from 'solid-js'
-
 import { storeToExport } from './store.ts'
 
-export const query = <TQuery extends LiveQueries.LiveQueryDef.Any>(
-  queryDef: TQuery,
+export const query = <TResult>(
+  queryDef: Queryable<TResult>,
   // TODO do we actually need an `initialValue` at all?
-  initialValue: LiveQueries.GetResult<TQuery>,
-): Solid.Accessor<LiveQueries.GetResult<TQuery>> => {
+  initialValue: TResult,
+): Solid.Accessor<TResult> => {
   const [value, setValue] = Solid.createSignal(initialValue)
 
   const store = storeToExport()
 
   // TODO avoid null-optionality branching
-  const unsubscribe = store?.subscribe(queryDef, { onUpdate: setValue })
+  const unsubscribe = store?.subscribe(queryDef, (value) => setValue(value as any))
 
   Solid.onCleanup(() => {
     unsubscribe?.()