@livestore/react 0.2.0 → 0.3.0-dev.11

package/dist/useRcResource.test.js

@@ -0,0 +1,122 @@
+import * as ReactTesting from '@testing-library/react';
+import * as React from 'react';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { __resetUseRcResourceCache, useRcResource } from './useRcResource.js';
+describe.each([{ strictMode: true }, { strictMode: false }])('useRcResource (strictMode=%s)', ({ strictMode }) => {
+    beforeEach(() => {
+        __resetUseRcResourceCache();
+    });
+    const wrapper = strictMode ? React.StrictMode : React.Fragment;
+    it('should create a stateful entity using make and call cleanup on unmount', () => {
+        const makeSpy = vi.fn(() => Symbol('statefulResource'));
+        const cleanupSpy = vi.fn();
+        const { result, unmount } = ReactTesting.renderHook(() => useRcResource('key-1', makeSpy, cleanupSpy), { wrapper });
+        expect(makeSpy).toHaveBeenCalledTimes(1);
+        expect(result.current).toBeDefined();
+        expect(cleanupSpy).toHaveBeenCalledTimes(0);
+        unmount();
+        expect(cleanupSpy).toHaveBeenCalledTimes(1);
+    });
+    it('should reuse the same entity when the key remains unchanged', () => {
+        const makeSpy = vi.fn(() => Symbol('statefulResource'));
+        const cleanupSpy = vi.fn();
+        const { result, rerender, unmount } = ReactTesting.renderHook(({ key }) => useRcResource(key, makeSpy, cleanupSpy), { initialProps: { key: 'consistent-key' }, wrapper });
+        const instance1 = result.current;
+        // Re-render with the same key
+        rerender({ key: 'consistent-key' });
+        const instance2 = result.current;
+        expect(instance1).toBe(instance2);
+        expect(makeSpy).toHaveBeenCalledTimes(1);
+        unmount();
+        expect(cleanupSpy).toHaveBeenCalledTimes(1);
+    });
+    it('should dispose the previous instance when the key changes', () => {
+        const makeSpy = vi.fn(() => Symbol('statefulResource'));
+        const cleanupSpy = vi.fn();
+        const { result, rerender, unmount } = ReactTesting.renderHook(({ key }) => useRcResource(key, makeSpy, cleanupSpy), { initialProps: { key: 'a' }, wrapper });
+        const instanceA = result.current;
+        // Change the key; this should trigger the disposal of the 'a' instance
+        rerender({ key: 'b' });
+        const instanceB = result.current;
+        expect(instanceA).not.toBe(instanceB);
+        expect(makeSpy).toHaveBeenCalledTimes(2);
+        expect(cleanupSpy).toHaveBeenCalledTimes(1);
+        unmount();
+        expect(cleanupSpy).toHaveBeenCalledTimes(2);
+    });
+    it('should not dispose the entity until all consumers unmount', () => {
+        const makeSpy = vi.fn(() => Symbol('statefulResource'));
+        const cleanupSpy = vi.fn();
+        // Simulate two consumers using the same key independently.
+        const { unmount: unmount1 } = ReactTesting.renderHook(() => useRcResource('shared-key', makeSpy, cleanupSpy), {
+            wrapper,
+        });
+        const { unmount: unmount2, result } = ReactTesting.renderHook(() => useRcResource('shared-key', makeSpy, cleanupSpy), {
+            wrapper,
+        });
+        expect(result.current).toBeDefined();
+        expect(makeSpy).toHaveBeenCalledTimes(1);
+        // Unmount first consumer; the entity should remain active.
+        unmount1();
+        expect(cleanupSpy).not.toHaveBeenCalled();
+        // Unmount second consumer; now the entity is disposed.
+        unmount2();
+        expect(cleanupSpy).toHaveBeenCalledTimes(1);
+    });
+    it('should handle rapid key changes correctly', () => {
+        const makeSpy = vi.fn(() => Symbol('statefulResource'));
+        const cleanupSpy = vi.fn();
+        const { rerender, unmount } = ReactTesting.renderHook(({ key }) => useRcResource(key, makeSpy, cleanupSpy), {
+            initialProps: { key: '1' },
+            wrapper,
+        });
+        // Rapid sequence of key changes.
+        rerender({ key: '2' });
+        rerender({ key: '3' });
+        // Expect three creations: one each for keys '1', '2', '3'
+        expect(makeSpy).toHaveBeenCalledTimes(3);
+        // Cleanup should have been triggered for key '1' and key '2'
+        expect(cleanupSpy).toHaveBeenCalledTimes(2);
+        unmount();
+        // Unmounting the final consumer disposes the key '3' instance.
+        expect(cleanupSpy).toHaveBeenCalledTimes(3);
+    });
+});
+// This code was useful to better understand the hook behaviour with and without strict mode
+// describe('debug', () => {
+//  const useStrictTest = (key: string) => {
+//   const id = React.useId()
+//   console.log(key, 'id', id)
+//   const x = React.useMemo(() => {
+//     console.log('useMemo', key)
+//     return 'hi' + key
+//   }, [key])
+//   React.useEffect(() => {
+//     console.log('useEffect', key)
+//     return () => {
+//       console.log('unmount', key)
+//     }
+//   }, [])
+//   return x
+// }
+//   it('strict mode component', () => {
+//     console.log('strict mode component')
+//     const Root = () => {
+//       useStrictTest('a')
+//       return null
+//     }
+//     const { unmount } = ReactTesting.render(
+//       <React.StrictMode>
+//         <Root />
+//       </React.StrictMode>,
+//     )
+//     unmount()
+//   })
+//   it('strict mode hook', () => {
+//     console.log('strict mode hook')
+//     const wrapper: React.FC<{ children: React.ReactNode }> = React.StrictMode
+//     const { unmount } = ReactTesting.renderHook(() => useStrictTest('b'), { wrapper })
+//     unmount()
+//   })
+// })
+//# sourceMappingURL=useRcResource.test.js.map

package/dist/useRcResource.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useRcResource.test.js","sourceRoot":"","sources":["../src/useRcResource.test.tsx"],"names":[],"mappings":"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"}

package/dist/useRow.d.ts

@@ -1,15 +1,12 @@
 import type { QueryInfo, RowQuery } from '@livestore/common';
 import { SessionIdSymbol } from '@livestore/common';
 import { DbSchema } from '@livestore/common/schema';
-import type { LiveQuery, ReactivityGraph } from '@livestore/livestore';
+import type { LiveQuery, Store } from '@livestore/livestore';
 export type UseRowResult<TTableDef extends DbSchema.TableDefBase> = [
     row: RowQuery.Result<TTableDef>,
     setRow: StateSetters<TTableDef>,
     query$: LiveQuery<RowQuery.Result<TTableDef>, QueryInfo>
 ];
-export type UseRowOptionsBase = {
-    reactivityGraph?: ReactivityGraph;
-};
 /**
  * Similar to `React.useState` but returns a tuple of `[row, setRow, query$]` for a given table where ...
  *
@@ -25,20 +22,26 @@ export declare const useRow: {
         deriveMutations: {
             enabled: true;
         };
-    }>>(table: TTableDef, options?: UseRowOptionsBase): UseRowResult<TTableDef>;
+    }>>(table: TTableDef, options?: {
+        store?: Store;
+    }): UseRowResult<TTableDef>;
     <TTableDef extends DbSchema.TableDef<DbSchema.DefaultSqliteTableDef, DbSchema.TableOptions & {
         isSingleton: false;
         requiredInsertColumnNames: 'id';
         deriveMutations: {
             enabled: true;
         };
-    }>>(table: TTableDef, id: string | SessionIdSymbol, options?: UseRowOptionsBase & Partial<RowQuery.RequiredColumnsOptions<TTableDef>>): UseRowResult<TTableDef>;
+    }>>(table: TTableDef, id: string | SessionIdSymbol, options?: Partial<RowQuery.RequiredColumnsOptions<TTableDef>> & {
+        store?: Store;
+    }): UseRowResult<TTableDef>;
     <TTableDef extends DbSchema.TableDef<DbSchema.DefaultSqliteTableDef, DbSchema.TableOptions & {
         isSingleton: false;
         deriveMutations: {
             enabled: true;
         };
-    }>>(table: TTableDef, id: string | SessionIdSymbol, options: UseRowOptionsBase & RowQuery.RequiredColumnsOptions<TTableDef>): UseRowResult<TTableDef>;
+    }>>(table: TTableDef, id: string | SessionIdSymbol, options: RowQuery.RequiredColumnsOptions<TTableDef> & {
+        store?: Store;
+    }): UseRowResult<TTableDef>;
 };
 export type Dispatch<A> = (action: A) => void;
 export type SetStateAction<S> = S | ((previousValue: S) => S);

package/dist/useRow.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useRow.d.ts","sourceRoot":"","sources":["../src/useRow.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAA;AAEnD,OAAO,KAAK,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAUtE,MAAM,MAAM,YAAY,CAAC,SAAS,SAAS,QAAQ,CAAC,YAAY,IAAI;IAClE,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC;IAC/B,MAAM,EAAE,YAAY,CAAC,SAAS,CAAC;IAC/B,MAAM,EAAE,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC;CACzD,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,eAAe,CAAC,EAAE,eAAe,CAAA;CAClC,CAAA;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,MAAM,EAAE;IACnB,CACE,SAAS,SAAS,QAAQ,CAAC,QAAQ,CACjC,QAAQ,CAAC,qBAAqB,EAC9B,QAAQ,CAAC,YAAY,GAAG;QAAE,WAAW,EAAE,IAAI,CAAC;QAAC,eAAe,EAAE;YAAE,OAAO,EAAE,IAAI,CAAA;SAAE,CAAA;KAAE,CAClF,EAED,KAAK,EAAE,SAAS,EAChB,OAAO,CAAC,EAAE,iBAAiB,GAC1B,YAAY,CAAC,SAAS,CAAC,CAAA;IAC1B,CACE,SAAS,SAAS,QAAQ,CAAC,QAAQ,CACjC,QAAQ,CAAC,qBAAqB,EAC9B,QAAQ,CAAC,YAAY,GAAG;QACtB,WAAW,EAAE,KAAK,CAAA;QAClB,yBAAyB,EAAE,IAAI,CAAA;QAC/B,eAAe,EAAE;YAAE,OAAO,EAAE,IAAI,CAAA;SAAE,CAAA;KACnC,CACF,EAED,KAAK,EAAE,SAAS,EAEhB,EAAE,EAAE,MAAM,GAAG,eAAe,EAC5B,OAAO,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC,GAChF,YAAY,CAAC,SAAS,CAAC,CAAA;IAC1B,CACE,SAAS,SAAS,QAAQ,CAAC,QAAQ,CACjC,QAAQ,CAAC,qBAAqB,EAC9B,QAAQ,CAAC,YAAY,GAAG;QAAE,WAAW,EAAE,KAAK,CAAC;QAAC,eAAe,EAAE;YAAE,OAAO,EAAE,IAAI,CAAA;SAAE,CAAA;KAAE,CACnF,EAED,KAAK,EAAE,SAAS,EAEhB,EAAE,EAAE,MAAM,GAAG,eAAe,EAC5B,OAAO,EAAE,iBAAiB,GAAG,QAAQ,CAAC,sBAAsB,CAAC,SAAS,CAAC,GACtE,YAAY,CAAC,SAAS,CAAC,CAAA;CA4G3B,CAAA;AAED,MAAM,MAAM,QAAQ,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,KAAK,IAAI,CAAA;AAC7C,MAAM,MAAM,cAAc,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,aAAa,EAAE,CAAC,KAAK,CAAC,CAAC,CAAA;AAE7D,MAAM,MAAM,YAAY,CAAC,SAAS,SAAS,QAAQ,CAAC,YAAY,IAAI,SAAS,CAAC,SAAS,CAAC,CAAC,gBAAgB,CAAC,SAAS,IAAI,GACnH,QAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,GACpD;KACG,CAAC,IAAI,MAAM,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,QAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CACjG,GAAG;IACF,OAAO,EAAE,QAAQ,CAAC,cAAc,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAA;CACvE,CAAA"}
+{"version":3,"file":"useRow.d.ts","sourceRoot":"","sources":["../src/useRow.ts"],"names":[],"mappings":"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"}

package/dist/useRow.js

@@ -6,7 +6,6 @@ import { ReadonlyRecord } from '@livestore/utils/effect';
 import React from 'react';
 import { useStore } from './LiveStoreContext.js';
 import { useQueryRef } from './useQuery.js';
-import { useMakeScopedQuery } from './useScopedQuery.js';
 /**
  * Similar to `React.useState` but returns a tuple of `[row, setRow, query$]` for a given table where ...
  *
@@ -20,12 +19,12 @@ export const useRow = (table, idOrOptions, options_) => {
     const sqliteTableDef = table.sqliteDef;
     const id = typeof idOrOptions === 'string' || idOrOptions === SessionIdSymbol ? idOrOptions : undefined;
     const options = typeof idOrOptions === 'string' || idOrOptions === SessionIdSymbol ? options_ : idOrOptions;
-    const { insertValues, reactivityGraph } = options ?? {};
+    const { insertValues } = options ?? {};
     const tableName = table.sqliteDef.name;
     if (DbSchema.tableHasDerivedMutations(table) === false) {
         shouldNeverHappen(`useRow called on table "${tableName}" which does not have 'deriveMutations: true' set`);
     }
-    const { store } = useStore();
+    const { store } = useStore({ store: options?.store });
     if (store.schema.tables.has(table.sqliteDef.name) === false &&
         table.sqliteDef.name.startsWith('__livestore') === false) {
         shouldNeverHappen(`Table "${table.sqliteDef.name}" not found in schema`);
@@ -33,20 +32,18 @@ export const useRow = (table, idOrOptions, options_) => {
     // console.debug('useRow', tableName, id)
     const idStr = id === SessionIdSymbol ? 'session' : id;
     const rowQuery = table.query.row;
-    const { query$, otelContext } = useMakeScopedQuery((otelContext) => DbSchema.tableIsSingleton(table)
-        ? queryDb(rowQuery(), { reactivityGraph, otelContext })
-        : queryDb(rowQuery(id, { insertValues: insertValues }), { reactivityGraph, otelContext }), [idStr, tableName], {
-        otel: {
-            spanName: `LiveStore:useRow:${tableName}${idStr === undefined ? '' : `:${idStr}`}`,
-            attributes: { id: idStr },
-        },
+    const queryDef = React.useMemo(() => DbSchema.tableIsSingleton(table)
+        ? queryDb(rowQuery(), {})
+        : queryDb(rowQuery(id, { insertValues: insertValues }), { deps: idStr }), [id, insertValues, rowQuery, table, idStr]);
+    const queryRef = useQueryRef(queryDef, {
+        otelSpanName: `LiveStore:useRow:${tableName}${idStr === undefined ? '' : `:${idStr}`}`,
+        store: options?.store,
     });
-    const query$Ref = useQueryRef(query$, otelContext);
     const setState = React.useMemo(() => {
         if (table.options.isSingleColumn) {
             return (newValueOrFn) => {
-                const newValue = typeof newValueOrFn === 'function' ? newValueOrFn(query$Ref.current) : newValueOrFn;
-                if (query$Ref.current === newValue)
+                const newValue = typeof newValueOrFn === 'function' ? newValueOrFn(queryRef.valueRef.current) : newValueOrFn;
+                if (queryRef.valueRef.current === newValue)
                     return;
                 // NOTE we need to account for the short-hand syntax for single-column+singleton tables
                 if (table.options.isSingleton) {
@@ -63,10 +60,10 @@ export const useRow = (table, idOrOptions, options_) => {
              ReadonlyRecord.map(sqliteTableDef.columns, (column, columnName) => (newValueOrFn) => {
                 const newValue = 
                 // @ts-expect-error TODO fix typing
-                typeof newValueOrFn === 'function' ? newValueOrFn(query$Ref.current[columnName]) : newValueOrFn;
+                typeof newValueOrFn === 'function' ? newValueOrFn(queryRef.valueRef.current[columnName]) : newValueOrFn;
                 // Don't update the state if it's the same as the value already seen in the component
                 // @ts-expect-error TODO fix typing
-                if (query$Ref.current[columnName] === newValue)
+                if (queryRef.valueRef.current[columnName] === newValue)
                     return;
                 store.mutate(table.update({ where: { id: id ?? 'singleton' }, values: { [columnName]: newValue } }));
                 // store.mutate(updateMutationForQueryInfo(query$.queryInfo!, { [columnName]: newValue }))
@@ -74,12 +71,12 @@ export const useRow = (table, idOrOptions, options_) => {
             setState.setMany = (columnValuesOrFn) => {
                 const columnValues = 
                 // @ts-expect-error TODO fix typing
-                typeof columnValuesOrFn === 'function' ? columnValuesOrFn(query$Ref.current) : columnValuesOrFn;
+                typeof columnValuesOrFn === 'function' ? columnValuesOrFn(queryRef.valueRef.current) : columnValuesOrFn;
                 // TODO use hashing instead
                 // Don't update the state if it's the same as the value already seen in the component
                 if (
                 // @ts-expect-error TODO fix typing
-                Object.entries(columnValues).every(([columnName, value]) => query$Ref.current[columnName] === value)) {
+                Object.entries(columnValues).every(([columnName, value]) => queryRef.valueRef.current[columnName] === value)) {
                     return;
                 }
                 store.mutate(table.update({ where: { id: id ?? 'singleton' }, values: columnValues }));
@@ -87,7 +84,7 @@ export const useRow = (table, idOrOptions, options_) => {
             };
             return setState;
         }
-    }, [id, query$Ref, sqliteTableDef.columns, store, table]);
-    return [query$Ref.current, setState, query$];
+    }, [id, queryRef.valueRef, sqliteTableDef.columns, store, table]);
+    return [queryRef.valueRef.current, setState, queryRef.queryRcRef.value];
 };
 //# sourceMappingURL=useRow.js.map

package/dist/useRow.js.map

@@ -1 +1 @@
-{"version":3,"file":"useRow.js","sourceRoot":"","sources":["../src/useRow.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAA;AAGnD,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAA;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAYxD;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,MAAM,GAoCf,CAMF,KAAgB,EAChB,WAA0D,EAC1D,QAAkF,EACzD,EAAE;IAC3B,MAAM,cAAc,GAAG,KAAK,CAAC,SAAS,CAAA;IACtC,MAAM,EAAE,GAAG,OAAO,WAAW,KAAK,QAAQ,IAAI,WAAW,KAAK,eAAe,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAA;IACvG,MAAM,OAAO,GACX,OAAO,WAAW,KAAK,QAAQ,IAAI,WAAW,KAAK,eAAe,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAA;IAC7F,MAAM,EAAE,YAAY,EAAE,eAAe,EAAE,GAAG,OAAO,IAAI,EAAE,CAAA;IAIvD,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC,IAAI,CAAA;IAEtC,IAAI,QAAQ,CAAC,wBAAwB,CAAC,KAAK,CAAC,KAAK,KAAK,EAAE,CAAC;QACvD,iBAAiB,CAAC,2BAA2B,SAAS,mDAAmD,CAAC,CAAA;IAC5G,CAAC;IAED,MAAM,EAAE,KAAK,EAAE,GAAG,QAAQ,EAAE,CAAA;IAE5B,IACE,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,KAAK;QACvD,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,KAAK,EACxD,CAAC;QACD,iBAAiB,CAAC,UAAU,KAAK,CAAC,SAAS,CAAC,IAAI,uBAAuB,CAAC,CAAA;IAC1E,CAAC;IAED,yCAAyC;IAEzC,MAAM,KAAK,GAAG,EAAE,KAAK,eAAe,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAA;IACrD,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,GAAU,CAAA;IAGvC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,kBAAkB,CAChD,CAAC,WAAW,EAAE,EAAE,CACd,QAAQ,CAAC,gBAAgB,CAAC,KAAK,CAAC;QAC9B,CAAC,CAAE,OAAO,CAAC,QAAQ,EAAE,EAAE,EAAE,eAAe,EAAE,WAAW,EAAE,CAAmB;QAC1E,CAAC,CAAE,OAAO,CAAC,QAAQ,CAAC,EAAG,EAAE,EAAE,YAAY,EAAE,YAAa,EAAE,CAAC,EAAE,EAAE,eAAe,EAAE,WAAW,EAAE,CAAmB,EAClH,CAAC,KAAM,EAAE,SAAS,CAAC,EACnB;QACE,IAAI,EAAE;YACJ,QAAQ,EAAE,oBAAoB,SAAS,GAAG,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE,EAAE;YAClF,UAAU,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE;SAC1B;KACF,CACF,CAAA;IAED,MAAM,SAAS,GAAG,WAAW,CAAC,MAAM,EAAE,WAAW,CAAuD,CAAA;IAExG,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAA0B,GAAG,EAAE;QAC3D,IAAI,KAAK,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;YACjC,OAAO,CAAC,YAAwC,EAAE,EAAE;gBAClD,MAAM,QAAQ,GAAG,OAAO,YAAY,KAAK,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,YAAY,CAAA;gBACpG,IAAI,SAAS,CAAC,OAAO,KAAK,QAAQ;oBAAE,OAAM;gBAE1C,uFAAuF;gBACvF,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;oBAC9B,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAA;gBACtC,CAAC;qBAAM,CAAC;oBACN,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAA;gBAC5E,CAAC;gBACD,mFAAmF;YACrF,CAAC,CAAA;QACH,CAAC;aAAM,CAAC;YACN,MAAM,QAAQ,GAAG,uEAAuE;aACtF,cAAc,CAAC,GAAG,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,MAAM,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC,YAAiB,EAAE,EAAE;gBACvF,MAAM,QAAQ;gBACZ,mCAAmC;gBACnC,OAAO,YAAY,KAAK,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC,SAAS,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAA;gBAEjG,qFAAqF;gBACrF,mCAAmC;gBACnC,IAAI,SAAS,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,QAAQ;oBAAE,OAAM;gBAEtD,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,IAAI,WAAW,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAA;gBACpG,0FAA0F;YAC5F,CAAC,CAAC,CAAA;YAEJ,QAAQ,CAAC,OAAO,GAAG,CAAC,gBAA0C,EAAE,EAAE;gBAChE,MAAM,YAAY;gBAChB,mCAAmC;gBACnC,OAAO,gBAAgB,KAAK,UAAU,CAAC,CAAC,CAAC,gBAAgB,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAA;gBAEjG,2BAA2B;gBAC3B,qFAAqF;gBACrF;gBACE,mCAAmC;gBACnC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,KAAK,CAAC,EACpG,CAAC;oBACD,OAAM;gBACR,CAAC;gBAED,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,IAAI,WAAW,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,CAAC,CAAA;gBACtF,4EAA4E;YAC9E,CAAC,CAAA;YAED,OAAO,QAAe,CAAA;QACxB,CAAC;IACH,CAAC,EAAE,CAAC,EAAE,EAAE,SAAS,EAAE,cAAc,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAA;IAEzD,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAA;AAC9C,CAAC,CAAA"}
+{"version":3,"file":"useRow.js","sourceRoot":"","sources":["../src/useRow.ts"],"names":[],"mappings":"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"}

package/dist/useRow.test.js

@@ -1,85 +1,77 @@
 import * as LiveStore from '@livestore/livestore';
 import { getSimplifiedRootSpan } from '@livestore/livestore/internal/testing-utils';
 import { Effect, ReadonlyRecord, Schema } from '@livestore/utils/effect';
+import { Vitest } from '@livestore/utils/node-vitest';
 import * as otel from '@opentelemetry/api';
 import { BasicTracerProvider, InMemorySpanExporter, SimpleSpanProcessor } from '@opentelemetry/sdk-trace-base';
-import { render, renderHook } from '@testing-library/react';
+import * as ReactTesting from '@testing-library/react';
 import React from 'react';
-import { describe, expect, it } from 'vitest';
-import { AppComponentSchema, AppRouterSchema, makeTodoMvcReact, tables, todos } from './__tests__/fixture.js';
+import { beforeEach, expect, it } from 'vitest';
+import { AppRouterSchema, makeTodoMvcReact, tables, todos } from './__tests__/fixture.js';
 import * as LiveStoreReact from './mod.js';
+import { __resetUseRcResourceCache } from './useRcResource.js';
+// const strictMode = process.env.REACT_STRICT_MODE !== undefined
 // NOTE running tests concurrently doesn't work with the default global db graph
-describe('useRow', () => {
-    it('should update the data based on component key', () => Effect.gen(function* () {
-        const { wrapper, store, reactivityGraph, makeRenderCount } = yield* makeTodoMvcReact({
-            useGlobalReactivityGraph: false,
-        });
-        const renderCount = makeRenderCount();
-        const { result, rerender } = renderHook((userId) => {
+Vitest.describe('useRow', () => {
+    beforeEach(() => {
+        __resetUseRcResourceCache();
+    });
+    Vitest.scopedLive('should update the data based on component key', () => Effect.gen(function* () {
+        const { wrapper, store, renderCount } = yield* makeTodoMvcReact({});
+        const { result, rerender } = ReactTesting.renderHook((userId) => {
             renderCount.inc();
-            const [state, setState] = LiveStoreReact.useRow(AppComponentSchema, userId, { reactivityGraph });
+            const [state, setState] = LiveStoreReact.useRow(tables.userInfo, userId);
             return { state, setState };
         }, { wrapper, initialProps: 'u1' });
         expect(result.current.state.id).toBe('u1');
         expect(result.current.state.username).toBe('');
         expect(renderCount.val).toBe(1);
-        React.act(() => store.mutate(LiveStore.rawSqlMutation({
-            sql: LiveStore.sql `INSERT INTO UserInfo (id, username) VALUES ('u2', 'username_u2')`,
-        })));
+        expect(store.reactivityGraph.getSnapshot({ includeResults: true })).toMatchSnapshot();
+        store.mutate(tables.userInfo.insert({ id: 'u2', username: 'username_u2' }));
         rerender('u2');
+        expect(store.reactivityGraph.getSnapshot({ includeResults: true })).toMatchSnapshot();
         expect(result.current.state.id).toBe('u2');
         expect(result.current.state.username).toBe('username_u2');
         expect(renderCount.val).toBe(2);
-    }).pipe(Effect.scoped, Effect.tapCauseLogPretty, Effect.runPromise));
+    }));
     // TODO add a test that makes sure React doesn't re-render when a setter is used to set the same value
-    it('should update the data reactively - via setState', () => Effect.gen(function* () {
-        const { wrapper, reactivityGraph, makeRenderCount } = yield* makeTodoMvcReact({
-            useGlobalReactivityGraph: false,
-        });
-        const renderCount = makeRenderCount();
-        const { result } = renderHook((userId) => {
+    Vitest.scopedLive('should update the data reactively - via setState', () => Effect.gen(function* () {
+        const { wrapper, renderCount } = yield* makeTodoMvcReact({});
+        const { result } = ReactTesting.renderHook((userId) => {
             renderCount.inc();
-            const [state, setState] = LiveStoreReact.useRow(AppComponentSchema, userId, { reactivityGraph });
+            const [state, setState] = LiveStoreReact.useRow(tables.userInfo, userId);
             return { state, setState };
         }, { wrapper, initialProps: 'u1' });
         expect(result.current.state.id).toBe('u1');
         expect(result.current.state.username).toBe('');
         expect(renderCount.val).toBe(1);
-        React.act(() => result.current.setState.username('username_u1_hello'));
+        ReactTesting.act(() => result.current.setState.username('username_u1_hello'));
         expect(result.current.state.id).toBe('u1');
         expect(result.current.state.username).toBe('username_u1_hello');
         expect(renderCount.val).toBe(2);
-    }).pipe(Effect.scoped, Effect.tapCauseLogPretty, Effect.runPromise));
-    it('should update the data reactively - via raw store mutation', () => Effect.gen(function* () {
-        const { wrapper, store, reactivityGraph, makeRenderCount } = yield* makeTodoMvcReact({
-            useGlobalReactivityGraph: false,
-        });
-        const renderCount = makeRenderCount();
-        const { result } = renderHook((userId) => {
+    }));
+    Vitest.scopedLive('should update the data reactively - via raw store mutation', () => Effect.gen(function* () {
+        const { wrapper, store, renderCount } = yield* makeTodoMvcReact({});
+        const { result } = ReactTesting.renderHook((userId) => {
             renderCount.inc();
-            const [state, setState] = LiveStoreReact.useRow(AppComponentSchema, userId, { reactivityGraph });
+            const [state, setState] = LiveStoreReact.useRow(tables.userInfo, userId);
             return { state, setState };
         }, { wrapper, initialProps: 'u1' });
         expect(result.current.state.id).toBe('u1');
         expect(result.current.state.username).toBe('');
         expect(renderCount.val).toBe(1);
-        React.act(() => store.mutate(LiveStore.rawSqlMutation({
-            sql: LiveStore.sql `UPDATE UserInfo SET username = 'username_u1_hello' WHERE id = 'u1';`,
-        })));
+        ReactTesting.act(() => store.mutate(tables.userInfo.update({ where: { id: 'u1' }, values: { username: 'username_u1_hello' } })));
         expect(result.current.state.id).toBe('u1');
         expect(result.current.state.username).toBe('username_u1_hello');
         expect(renderCount.val).toBe(2);
-    }).pipe(Effect.scoped, Effect.tapCauseLogPretty, Effect.runPromise));
-    it('should work for a larger app', () => Effect.gen(function* () {
-        const { wrapper, store, reactivityGraph, makeRenderCount } = yield* makeTodoMvcReact({
-            useGlobalReactivityGraph: false,
-        });
-        const allTodos$ = LiveStore.queryDb({ query: `select * from todos`, schema: Schema.Array(tables.todos.schema) }, { label: 'allTodos', reactivityGraph });
-        const appRouterRenderCount = makeRenderCount();
+    }));
+    Vitest.scopedLive('should work for a larger app', () => Effect.gen(function* () {
+        const { wrapper, store, renderCount } = yield* makeTodoMvcReact({});
+        const allTodos$ = LiveStore.queryDb({ query: `select * from todos`, schema: Schema.Array(tables.todos.schema) }, { label: 'allTodos' });
         let globalSetState;
         const AppRouter = () => {
-            appRouterRenderCount.inc();
-            const [state, setState] = LiveStoreReact.useRow(AppRouterSchema, { reactivityGraph });
+            renderCount.inc();
+            const [state, setState] = LiveStoreReact.useRow(AppRouterSchema);
             globalSetState = setState;
             return (React.createElement("div", null,
                 React.createElement(TasksList, { setTaskId: setState.currentTaskId }),
@@ -93,94 +85,85 @@ describe('useRow', () => {
             return (React.createElement("div", null, allTodos.map((_) => (React.createElement("div", { key: _.id, onClick: () => setTaskId(_.id) }, _.id)))));
         };
         const TaskDetails = ({ id }) => {
-            const [todo] = LiveStoreReact.useRow(todos, id, { reactivityGraph });
+            const [todo] = LiveStoreReact.useRow(todos, id);
             return React.createElement("div", { role: "content" }, JSON.stringify(todo));
         };
-        const renderResult = render(React.createElement(AppRouter, null), { wrapper });
-        expect(appRouterRenderCount.val).toBe(1);
-        React.act(() => store.mutate(LiveStore.rawSqlMutation({
+        const renderResult = ReactTesting.render(React.createElement(AppRouter, null), { wrapper });
+        expect(renderCount.val).toBe(1);
+        ReactTesting.act(() => store.mutate(LiveStore.rawSqlMutation({
             sql: LiveStore.sql `INSERT INTO todos (id, text, completed) VALUES ('t1', 'buy milk', 0)`,
         })));
-        expect(appRouterRenderCount.val).toBe(1);
+        expect(renderCount.val).toBe(1);
         expect(renderResult.getByRole('current-id').innerHTML).toMatchInlineSnapshot('"Current Task Id: -"');
-        React.act(() => globalSetState.currentTaskId('t1'));
-        expect(appRouterRenderCount.val).toBe(2);
+        ReactTesting.act(() => globalSetState.currentTaskId('t1'));
+        expect(renderCount.val).toBe(2);
         expect(renderResult.getByRole('content').innerHTML).toMatchInlineSnapshot(`"{"id":"t1","text":"buy milk","completed":false}"`);
         expect(renderResult.getByRole('current-id').innerHTML).toMatchInlineSnapshot('"Current Task Id: t1"');
-        React.act(() => store.mutate(LiveStore.rawSqlMutation({
+        ReactTesting.act(() => store.mutate(LiveStore.rawSqlMutation({
             sql: LiveStore.sql `INSERT INTO todos (id, text, completed) VALUES ('t2', 'buy eggs', 0)`,
         }), AppRouterSchema.update({ where: { id: 'singleton' }, values: { currentTaskId: 't2' } }), LiveStore.rawSqlMutation({
             sql: LiveStore.sql `INSERT INTO todos (id, text, completed) VALUES ('t3', 'buy bread', 0)`,
         })));
-        expect(appRouterRenderCount.val).toBe(3);
+        expect(renderCount.val).toBe(3);
         expect(renderResult.getByRole('current-id').innerHTML).toMatchInlineSnapshot('"Current Task Id: t2"');
-    }).pipe(Effect.scoped, Effect.tapCauseLogPretty, Effect.runPromise));
-    it('should work for a useRow query chained with a useTemporary query', () => Effect.gen(function* () {
-        const { store, wrapper, reactivityGraph, makeRenderCount } = yield* makeTodoMvcReact({
-            useGlobalReactivityGraph: false,
-        });
-        const renderCount = makeRenderCount();
+    }));
+    Vitest.scopedLive('should work for a useRow query chained with a useTemporary query', () => Effect.gen(function* () {
+        const { store, wrapper, renderCount } = yield* makeTodoMvcReact({});
         store.mutate(todos.insert({ id: 't1', text: 'buy milk', completed: false }), todos.insert({ id: 't2', text: 'buy bread', completed: false }));
-        const { result, unmount, rerender } = renderHook((userId) => {
+        const { result, unmount, rerender } = ReactTesting.renderHook((userId) => {
             renderCount.inc();
-            const [_row, _setRow, rowState$] = LiveStoreReact.useRow(AppComponentSchema, userId, { reactivityGraph });
-            const todos = LiveStoreReact.useScopedQuery(() => LiveStore.queryDb((get) => ({
-                query: LiveStore.sql `select * from todos where text like '%${get(rowState$).text}%'`,
-                schema: Schema.Array(tables.todos.schema),
-            }), { reactivityGraph, label: 'todosFiltered' }), userId);
+            const [_row, _setRow, rowState$] = LiveStoreReact.useRow(tables.userInfo, userId);
+            const todos = LiveStoreReact.useQuery(LiveStore.queryDb((get) => tables.todos.query.where('text', 'LIKE', `%${get(rowState$).text}%`), 
+            // TODO find a way where explicit `userId` is not needed here
+            // possibly by automatically understanding the `get(rowState$)` dependency
+            { label: 'todosFiltered', deps: userId }));
             return { todos };
         }, { wrapper, initialProps: 'u1' });
-        React.act(() => store.mutate(LiveStore.rawSqlMutation({
-            sql: LiveStore.sql `INSERT INTO UserInfo (id, username, text) VALUES ('u2', 'username_u2', 'milk')`,
-        })));
+        ReactTesting.act(() => store.mutate(tables.userInfo.insert({ id: 'u2', username: 'username_u2', text: 'milk' })));
         expect(result.current.todos.length).toBe(2);
-        // expect(result.current.state.username).toBe('')
         expect(renderCount.val).toBe(1);
         rerender('u2');
         expect(result.current.todos.length).toBe(1);
         expect(renderCount.val).toBe(2);
         unmount();
-    }).pipe(Effect.scoped, Effect.tapCauseLogPretty, Effect.runPromise));
-    let cachedProvider;
-    describe('otel', () => {
-        const exporter = new InMemorySpanExporter();
-        const provider = cachedProvider ?? new BasicTracerProvider();
-        cachedProvider = provider;
-        provider.addSpanProcessor(new SimpleSpanProcessor(exporter));
+    }));
+    Vitest.describe('otel', () => {
+        const provider = new BasicTracerProvider({});
         provider.register();
-        const otelTracer = otel.trace.getTracer('test');
-        const span = otelTracer.startSpan('test');
-        const otelContext = otel.trace.setSpan(otel.context.active(), span);
-        it('should update the data based on component key', async () => {
-            const { strictMode } = await Effect.gen(function* () {
-                const { wrapper, store, reactivityGraph, makeRenderCount, strictMode } = yield* makeTodoMvcReact({
-                    useGlobalReactivityGraph: false,
+        it.each([{ strictMode: true }, { strictMode: false }])('should update the data based on component key strictMode=%s', async ({ strictMode }) => {
+            const exporter = new InMemorySpanExporter();
+            // const provider = cachedProvider ?? new BasicTracerProvider({ spanProcessors: [new SimpleSpanProcessor(exporter)] })
+            provider.addSpanProcessor(new SimpleSpanProcessor(exporter));
+            const otelTracer = otel.trace.getTracer(`testing-${strictMode ? 'strict' : 'non-strict'}`);
+            const span = otelTracer.startSpan('test-root');
+            const otelContext = otel.trace.setSpan(otel.context.active(), span);
+            await Effect.gen(function* () {
+                const { wrapper, store, renderCount } = yield* makeTodoMvcReact({
                     otelContext,
                     otelTracer,
+                    strictMode,
                 });
-                const renderCount = makeRenderCount();
-                const { result, rerender, unmount } = renderHook((userId) => {
+                const { result, rerender, unmount } = ReactTesting.renderHook((userId) => {
                     renderCount.inc();
-                    const [state, setState] = LiveStoreReact.useRow(AppComponentSchema, userId, { reactivityGraph });
+                    const [state, setState] = LiveStoreReact.useRow(tables.userInfo, userId);
                     return { state, setState };
                 }, { wrapper, initialProps: 'u1' });
                 expect(result.current.state.id).toBe('u1');
                 expect(result.current.state.username).toBe('');
                 expect(renderCount.val).toBe(1);
-                React.act(() => store.mutate(LiveStore.rawSqlMutation({
-                    sql: LiveStore.sql `INSERT INTO UserInfo (id, username) VALUES ('u2', 'username_u2')`,
-                })));
+                // For u2 we'll make sure that the row already exists,
+                // so the lazy `insert` will be skipped
+                ReactTesting.act(() => store.mutate(tables.userInfo.insert({ id: 'u2', username: 'username_u2' })));
                 rerender('u2');
                 expect(result.current.state.id).toBe('u2');
                 expect(result.current.state.username).toBe('username_u2');
                 expect(renderCount.val).toBe(2);
                 unmount();
                 span.end();
-                return { strictMode };
             }).pipe(Effect.scoped, Effect.tapCauseLogPretty, Effect.runPromise);
             const mapAttributes = (attributes) => {
                 return ReadonlyRecord.map(attributes, (val, key) => {
-                    if (key === 'stackInfo') {
+                    if (key === 'firstStackInfo') {
                         const stackInfo = JSON.parse(val);
                         // stackInfo.frames.shift() // Removes `renderHook.wrapper` from the stack
                         stackInfo.frames.forEach((_) => {
@@ -194,13 +177,7 @@ describe('useRow', () => {
                     return val;
                 });
             };
-            // TODO improve testing setup so "obsolete" warning is avoided
-            if (strictMode) {
-                expect(getSimplifiedRootSpan(exporter, mapAttributes)).toMatchSnapshot('strictMode=true');
-            }
-            else {
-                expect(getSimplifiedRootSpan(exporter, mapAttributes)).toMatchSnapshot('strictMode=false');
-            }
+            expect(getSimplifiedRootSpan(exporter, mapAttributes)).toMatchSnapshot();
         });
     });
 });