@livestore/livestore 0.2.0 → 0.3.0-dev.11

package/src/utils/dev.ts

@@ -1,3 +1,5 @@
+import { isDevEnv } from '@livestore/utils'
+
 /* eslint-disable unicorn/prefer-global-this */
 export const downloadBlob = (
   data: Uint8Array | Blob | string,
@@ -24,7 +26,7 @@ export const downloadURL = (data: string, fileName: string) => {
 }
 
 export const exposeDebugUtils = () => {
-  if (import.meta.env.DEV) {
-    globalThis.__debugDownloadBlob = downloadBlob
+  if (isDevEnv()) {
+    globalThis.__debugLiveStoreUtils = { downloadBlob }
   }
 }

package/src/utils/function-string.ts

@@ -0,0 +1,12 @@
+// Related https://github.com/facebook/hermes/issues/612#issuecomment-2549404649
+const REACT_NATIVE_BAD_FUNCTION_STRING = 'function() { [bytecode] }'
+
+export const isValidFunctionString = (
+  fnStr: string,
+): { _tag: 'valid' } | { _tag: 'invalid'; reason: 'react-native' } => {
+  if (fnStr === REACT_NATIVE_BAD_FUNCTION_STRING) {
+    return { _tag: 'invalid', reason: 'react-native' }
+  }
+
+  return { _tag: 'valid' }
+}

package/src/utils/stack-info.test.ts

@@ -46,7 +46,7 @@ Error
 
 it('Tracklist_ stacktrace', async () => {
   const stackTrace = `\
-stack Error
+Error
     at https://localhost:8081/@fs/Users/schickling/Code/overtone/submodules/livestore/packages/@livestore/livestore/dist/react/useQuery.js?t=1701368568351:19:23
     at mountMemo (https://localhost:8081/node_modules/.vite-web/deps/chunk-YKTDXTVC.js?v=86daed82:12817:27)
     at Object.useMemo (https://localhost:8081/node_modules/.vite-web/deps/chunk-YKTDXTVC.js?v=86daed82:13141:24)
@@ -77,3 +77,60 @@ stack Error
     }
   `)
 })
+
+it('React 19', async () => {
+  const stackTrace = `\
+Error: 
+    at /Users/schickling/Code/overtone/submodules/livestore/packages/@livestore/react/src/useQuery.ts:57:19
+    at mountMemo (/Users/schickling/Code/overtone/node_modules/.pnpm/react-dom@19.0.0_react@19.0.0/node_modules/react-dom/cjs/react-dom-client.development.js:6816:23)
+    at Object.useMemo (/Users/schickling/Code/overtone/node_modules/.pnpm/react-dom@19.0.0_react@19.0.0/node_modules/react-dom/cjs/react-dom-client.development.js:22757:18)
+    at Object.process.env.NODE_ENV.exports.useMemo (/Users/schickling/Code/overtone/node_modules/.pnpm/react@19.0.0/node_modules/react/cjs/react.development.js:1488:34)
+    at Module.useQueryRef (/Users/schickling/Code/overtone/submodules/livestore/packages/@livestore/react/src/useQuery.ts:54:27)
+    at Module.useRow (/Users/schickling/Code/overtone/submodules/livestore/packages/@livestore/react/src/useRow.ts:111:20)
+    at TestComponent (/Users/schickling/Code/overtone/node_modules/.pnpm/@testing-library+react@16.1.0_@testing-library+dom@10.4.0_@types+react-dom@19.0.3_@types+reac_2jaiibiag2sxou3wtzbuqx3r5a/node_modules/@testing-library/react/dist/pure.js:309:27)
+    at Object.react-stack-bottom-frame (/Users/schickling/Code/overtone/node_modules/.pnpm/react-dom@19.0.0_react@19.0.0/node_modules/react-dom/cjs/react-dom-client.development.js:22428:20)
+    at renderWithHooks (/Users/schickling/Code/overtone/node_modules/.pnpm/react-dom@19.0.0_react@19.0.0/node_modules/react-dom/cjs/react-dom-client.development.js:5757:22)
+  `
+
+  const stackInfo = extractStackInfoFromStackTrace(stackTrace)
+  expect(stackInfo).toMatchInlineSnapshot(`
+    {
+      "frames": [
+        {
+          "filePath": "/Users/schickling/Code/overtone/node_modules/.pnpm/@testing-library+react@16.1.0_@testing-library+dom@10.4.0_@types+react-dom@19.0.3_@types+reac_2jaiibiag2sxou3wtzbuqx3r5a/node_modules/@testing-library/react/dist/pure.js:309:27",
+          "name": "TestComponent",
+        },
+        {
+          "filePath": "/Users/schickling/Code/overtone/submodules/livestore/packages/@livestore/react/src/useRow.ts:111:20",
+          "name": "useRow",
+        },
+      ],
+    }
+  `)
+})
+
+it('React 19 - skip react-stack-bottom-frame', async () => {
+  const stackTrace = `\
+Error: 
+    at /Users/schickling/Code/overtone/submodules/livestore/packages/@livestore/react/src/useQuery.ts:57:19
+    at mountMemo (/Users/schickling/Code/overtone/node_modules/.pnpm/react-dom@19.0.0_react@19.0.0/node_modules/react-dom/cjs/react-dom-client.development.js:6816:23)
+    at Object.useMemo (/Users/schickling/Code/overtone/node_modules/.pnpm/react-dom@19.0.0_react@19.0.0/node_modules/react-dom/cjs/react-dom-client.development.js:22757:18)
+    at Object.process.env.NODE_ENV.exports.useMemo (/Users/schickling/Code/overtone/node_modules/.pnpm/react@19.0.0/node_modules/react/cjs/react.development.js:1488:34)
+    at Module.useQueryRef (/Users/schickling/Code/overtone/submodules/livestore/packages/@livestore/react/src/useQuery.ts:54:27)
+    at Module.useRow (/Users/schickling/Code/overtone/submodules/livestore/packages/@livestore/react/src/useRow.ts:111:20)
+    at Object.react-stack-bottom-frame (/Users/schickling/Code/overtone/node_modules/.pnpm/react-dom@19.0.0_react@19.0.0/node_modules/react-dom/cjs/react-dom-client.development.js:22428:20)
+    at renderWithHooks (/Users/schickling/Code/overtone/node_modules/.pnpm/react-dom@19.0.0_react@19.0.0/node_modules/react-dom/cjs/react-dom-client.development.js:5757:22)
+  `
+
+  const stackInfo = extractStackInfoFromStackTrace(stackTrace)
+  expect(stackInfo).toMatchInlineSnapshot(`
+    {
+      "frames": [
+        {
+          "filePath": "/Users/schickling/Code/overtone/submodules/livestore/packages/@livestore/react/src/useRow.ts:111:20",
+          "name": "useRow",
+        },
+      ],
+    }
+  `)
+})

package/src/utils/stack-info.ts

@@ -34,15 +34,20 @@ export const extractStackInfoFromStackTrace = (stackTrace: string): StackInfo =>
 
   while ((match = namePattern.exec(stackTrace)) !== null) {
     const [, name, filePath] = match as any as [string, string, string]
+    // console.debug(name, filePath)
 
     // NOTE No idea where this `Module.` comes from - possibly a Vite thing?
     if ((name.startsWith('use') || name.startsWith('Module.use')) && name.endsWith('QueryRef') === false) {
       hasReachedStart = true
+      // console.debug('hasReachedStart. adding one more frame.')
 
       frames.unshift({ name: name.replace(/^Module\./, ''), filePath })
     } else if (hasReachedStart) {
       // We've reached the end of the `use*` functions, so we're adding the component name and stop
-      frames.unshift({ name, filePath })
+      // Unless it's `react-stack-bottom-frame`, which we skip
+      if (name !== 'Object.react-stack-bottom-frame') {
+        frames.unshift({ name, filePath })
+      }
       break
     }
   }

package/src/utils/tests/fixture.ts

@@ -1,7 +1,8 @@
+import { provideOtel } from '@livestore/common'
 import type { FromInputSchema } from '@livestore/common/schema'
 import type { Store } from '@livestore/livestore'
-import { createStore, DbSchema, globalReactivityGraph, makeReactivityGraph, makeSchema } from '@livestore/livestore'
-import { Effect, FiberSet } from '@livestore/utils/effect'
+import { createStore, DbSchema, makeSchema } from '@livestore/livestore'
+import { Effect } from '@livestore/utils/effect'
 import { makeInMemoryAdapter } from '@livestore/web'
 import type * as otel from '@opentelemetry/api'
 
@@ -46,28 +47,17 @@ export interface FixtureSchema extends FromInputSchema.DeriveSchema<{ tables: ty
 export const makeTodoMvc = ({
   otelTracer,
   otelContext,
-  useGlobalReactivityGraph = true,
 }: {
   otelTracer?: otel.Tracer
   otelContext?: otel.Context
-  useGlobalReactivityGraph?: boolean
 } = {}) =>
   Effect.gen(function* () {
-    const reactivityGraph = useGlobalReactivityGraph ? globalReactivityGraph : makeReactivityGraph()
-
-    const fiberSet = yield* FiberSet.make()
-
     const store: Store<any, FixtureSchema> = yield* createStore({
       schema,
       storeId: 'default',
       adapter: makeInMemoryAdapter(),
-      reactivityGraph,
-      otelOptions: {
-        tracer: otelTracer,
-        rootSpanContext: otelContext,
-      },
-      fiberSet,
+      debug: { instanceId: 'test' },
     })
 
-    return { store, reactivityGraph }
-  })
+    return store
+  }).pipe(provideOtel({ parentSpanContext: otelContext, otelTracer: otelTracer }))

package/src/utils/tests/mod.ts

@@ -1,2 +1,3 @@
 export * from './fixture.js'
 export * from './otel.js'
+export * as RG from '../../reactive.js'

package/src/utils/tests/otel.ts

@@ -1,7 +1,6 @@
 import { identity } from '@livestore/utils/effect'
 import type { Attributes } from '@opentelemetry/api'
 import type { InMemorySpanExporter, ReadableSpan } from '@opentelemetry/sdk-trace-base'
-
 type SimplifiedNestedSpan = { _name: string; attributes: any; children: SimplifiedNestedSpan[] }
 
 export const getSimplifiedRootSpan = (
@@ -21,27 +20,35 @@ export const getSimplifiedRootSpan = (
   })
 
   type NestedSpan = { span: ReadableSpan; children: NestedSpan[] }
-  const rootSpan = spansMap.get(spans.find((_) => _.name === 'test')!.spanContext().spanId)!
+  const rootSpan = spansMap.get(spans.find((_) => _.name === 'createStore')!.spanContext().spanId)!
 
   const simplifySpanRec = (span: NestedSpan): SimplifiedNestedSpan =>
     omitEmpty({
       _name: span.span.name,
       attributes: mapAttributesfn(span.span.attributes),
       children: span.children
-        .filter((_) => _.span.name !== 'createStore')
+        .filter((_) => _.span.name !== 'createStore:makeAdapter')
         // .sort((a, b) => compareHrTime(a.span.startTime, b.span.startTime))
         .map(simplifySpanRec),
     })
 
+  // console.log('rootSpan', rootSpan.span)
+
   // console.dir(
   //   spans.map((_) => [_.spanContext().spanId, _.name, _.attributes, _.parentSpanId]),
   //   { depth: 10 },
   // )
 
-  return simplifySpanRec(rootSpan)
+  const simplifiedRootSpan = simplifySpanRec(rootSpan)
+
+  // console.log('simplifiedRootSpan', simplifiedRootSpan)
+
+  // writeFileSync('tmp/trace.json', JSON.stringify(toTraceFile(spans), null, 2))
+
+  return simplifiedRootSpan
 }
 
-// const compareHrTime = (a: [number, number], b: [number, number]) => {
+// const compareHrTime = (a: [number, numndber], b: [number, number]) => {
 //   if (a[0] !== b[0]) return a[0] - b[0]
 //   return a[1] - b[1]
 // }
@@ -59,3 +66,62 @@ const omitEmpty = (obj: any) => {
   }
   return result
 }
+
+export const toTraceFile = (spans: ReadableSpan[]) => {
+  const hrTimeToBigInt = (hrTime: [number, number]) => (BigInt(hrTime[0]) * BigInt(1e9) + BigInt(hrTime[1])).toString()
+  return {
+    batches: [
+      {
+        resource: {
+          attributes: [
+            {
+              key: 'service.name',
+              value: {
+                stringValue: 'test',
+              },
+            },
+          ],
+          droppedAttributesCount: 0,
+        },
+        instrumentationLibrarySpans: [
+          {
+            spans: spans.map((span) => ({
+              traceId: span.spanContext().traceId,
+              spanId: span.spanContext().spanId,
+              ...(span.parentSpanId ? { parentSpanId: span.parentSpanId } : {}),
+              // traceState: span.spanContext().traceState ?? '',
+              name: span.name,
+              kind: 'SPAN_KIND_INTERNAL',
+              startTimeUnixNano: hrTimeToBigInt(span.startTime),
+              endTimeUnixNano: hrTimeToBigInt(span.endTime),
+              attributes: Object.entries(span.attributes).map(([key, value]) => ({
+                key,
+                value:
+                  typeof value === 'string'
+                    ? { stringValue: value }
+                    : typeof value === 'number'
+                      ? Number.isInteger(value)
+                        ? { intValue: value }
+                        : { doubleValue: value }
+                      : typeof value === 'boolean'
+                        ? { boolValue: value }
+                        : { stringValue: JSON.stringify(value) },
+              })),
+              droppedAttributesCount: span.droppedAttributesCount ?? 0,
+              droppedEventsCount: span.droppedEventsCount ?? 0,
+              droppedLinksCount: span.droppedLinksCount ?? 0,
+              status: {
+                code: span.status.code,
+                message: span.status.message ?? '',
+              },
+            })),
+            instrumentationLibrary: {
+              name: 'livestore',
+              version: '',
+            },
+          },
+        ],
+      },
+    ],
+  }
+}

package/dist/live-queries/sql.d.ts.map

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

package/dist/live-queries/sql.js

@@ -1,175 +0,0 @@
-import { getResultSchema, isQueryBuilder, prepareBindValues, QueryBuilderAstSymbol, replaceSessionIdSymbol, } from '@livestore/common';
-import { deepEqual, shouldNeverHappen } from '@livestore/utils';
-import { Predicate, Schema, TreeFormatter } from '@livestore/utils/effect';
-import * as otel from '@opentelemetry/api';
-import { globalReactivityGraph } from '../global-state.js';
-import { isThunk, NOT_REFRESHED_YET } from '../reactive.js';
-import { makeExecBeforeFirstRun, rowQueryLabel } from '../row-query.js';
-import { getDurationMsFromSpan } from '../utils/otel.js';
-import { LiveStoreQueryBase, makeGetAtomResult } from './base-class.js';
-/**
- * NOTE `query` is only supposed to read data. Don't use it to insert/update/delete data but use mutations instead.
- */
-export const queryDb = (queryInput, options) => new LiveStoreDbQuery({
-    queryInput,
-    label: options?.label,
-    reactivityGraph: options?.reactivityGraph,
-    map: options?.map,
-    queryInfo: Predicate.hasProperty(options, 'queryInfo') ? options.queryInfo : undefined,
-});
-/* An object encapsulating a reactive SQL query */
-export class LiveStoreDbQuery extends LiveStoreQueryBase {
-    _tag = 'sql';
-    /** A reactive thunk representing the query text */
-    queryInput$;
-    /** A reactive thunk representing the query results */
-    results$;
-    label;
-    // TODO
-    queryInfo;
-    reactivityGraph;
-    mapResult;
-    constructor({ queryInput, label: inputLabel, reactivityGraph, map, queryInfo: queryInfo_, }) {
-        super();
-        // TODO implement a proper toString method
-        this.label = inputLabel ? `sql(${inputLabel})` : `sql(${queryInput.toString()})`;
-        this.reactivityGraph = reactivityGraph ?? globalReactivityGraph;
-        this.mapResult = map === undefined ? (rows) => rows : map;
-        const schemaRef = {
-            current: typeof queryInput === 'function' ? undefined : isQueryBuilder(queryInput) ? undefined : queryInput.schema,
-        };
-        const execBeforeFirstRunRef = {
-            current: undefined,
-        };
-        let queryInputRaw$OrQueryInputRaw;
-        const queryBuilderToQueryInputRaw = (qb) => {
-            const qbRes = qb.asSql();
-            const schema = getResultSchema(qb);
-            const ast = qb[QueryBuilderAstSymbol];
-            if (ast._tag === 'RowQuery') {
-                execBeforeFirstRunRef.current = makeExecBeforeFirstRun({
-                    table: ast.tableDef,
-                    insertValues: ast.insertValues,
-                    id: ast.id,
-                });
-                this.label = rowQueryLabel(ast.tableDef, ast.id);
-            }
-            return {
-                query: qbRes.query,
-                schema,
-                bindValues: qbRes.bindValues,
-                queriedTables: new Set([ast.tableDef.sqliteDef.name]),
-                queryInfo: ast._tag === 'RowQuery' ? { _tag: 'Row', table: ast.tableDef, id: ast.id } : { _tag: 'None' },
-            };
-        };
-        if (typeof queryInput === 'function') {
-            queryInputRaw$OrQueryInputRaw = this.reactivityGraph.makeThunk((get, setDebugInfo, ctx, otelContext) => {
-                const startMs = performance.now();
-                const queryInputResult = queryInput(makeGetAtomResult(get, otelContext ?? ctx.rootOtelContext), ctx);
-                const durationMs = performance.now() - startMs;
-                const queryInputRaw = isQueryBuilder(queryInputResult)
-                    ? queryBuilderToQueryInputRaw(queryInputResult)
-                    : queryInputResult;
-                setDebugInfo({ _tag: 'computed', label: `${this.label}:queryInput`, query: queryInputRaw.query, durationMs });
-                schemaRef.current = queryInputRaw.schema;
-                this.queryInfo = queryInputRaw.queryInfo;
-                return queryInputRaw;
-            }, {
-                label: `${this.label}:query`,
-                // TODO adjust to `sqlQueryInput` + adjust in devtools
-                meta: { liveStoreThunkType: 'sqlQuery' },
-                // NOTE we're not checking the schema here as we assume the query string to always change when the schema might change
-                equal: (a, b) => a.query === b.query && deepEqual(a.bindValues, b.bindValues),
-            });
-            // TODO come up with a better way to handle this
-            this.queryInfo = { _tag: 'None' };
-        }
-        else {
-            const queryInputRaw = isQueryBuilder(queryInput) ? queryBuilderToQueryInputRaw(queryInput) : queryInput;
-            schemaRef.current = queryInputRaw.schema;
-            queryInputRaw$OrQueryInputRaw = queryInputRaw;
-            // this.label = inputLabel ? this.label : `sql(${})`
-            if (inputLabel === undefined && isQueryBuilder(queryInput)) {
-                const ast = queryInput[QueryBuilderAstSymbol];
-                if (ast._tag === 'RowQuery') {
-                    this.label = `sql(${rowQueryLabel(ast.tableDef, ast.id)})`;
-                }
-            }
-            this.queryInfo = queryInputRaw.queryInfo;
-        }
-        // TODO
-        const label = this.label;
-        const queriedTablesRef = { current: undefined };
-        // const schemaEqual = Schema.equivalence(schema)
-        // TODO also support derived equality for `map` (probably will depend on having an easy way to transform a schema without an `encode` step)
-        // This would mean dropping the `map` option
-        const resultsEqual = map === undefined
-            ? (a, b) => a === NOT_REFRESHED_YET || b === NOT_REFRESHED_YET ? false : Schema.equivalence(schemaRef.current)(a, b)
-            : undefined;
-        const results$ = this.reactivityGraph.makeThunk((get, setDebugInfo, queryContext, otelContext) => queryContext.otelTracer.startActiveSpan('sql:...', // NOTE span name will be overridden further down
-        {}, otelContext ?? queryContext.rootOtelContext, (span) => {
-            const otelContext = otel.trace.setSpan(otel.context.active(), span);
-            const { store } = queryContext;
-            if (execBeforeFirstRunRef.current !== undefined) {
-                execBeforeFirstRunRef.current(queryContext, otelContext);
-                execBeforeFirstRunRef.current = undefined;
-            }
-            const queryInputResult = isThunk(queryInputRaw$OrQueryInputRaw)
-                ? get(queryInputRaw$OrQueryInputRaw, otelContext)
-                : queryInputRaw$OrQueryInputRaw;
-            const sqlString = queryInputResult.query;
-            const bindValues = queryInputResult.bindValues;
-            if (queriedTablesRef.current === undefined) {
-                queriedTablesRef.current = store.syncDbWrapper.getTablesUsed(sqlString);
-            }
-            if (bindValues !== undefined) {
-                replaceSessionIdSymbol(bindValues, store.clientSession.coordinator.sessionId);
-            }
-            // Establish a reactive dependency on the tables used in the query
-            for (const tableName of queriedTablesRef.current) {
-                const tableRef = store.tableRefs[tableName] ?? shouldNeverHappen(`No table ref found for ${tableName}`);
-                get(tableRef, otelContext);
-            }
-            span.setAttribute('sql.query', sqlString);
-            span.updateName(`sql:${sqlString.slice(0, 50)}`);
-            const rawDbResults = store.syncDbWrapper.select(sqlString, {
-                queriedTables: queriedTablesRef.current,
-                bindValues: bindValues ? prepareBindValues(bindValues, sqlString) : undefined,
-                otelContext,
-            });
-            span.setAttribute('sql.rowsCount', rawDbResults.length);
-            const parsedResult = Schema.decodeEither(schemaRef.current)(rawDbResults);
-            if (parsedResult._tag === 'Left') {
-                const parseErrorStr = TreeFormatter.formatErrorSync(parsedResult.left);
-                const expectedSchemaStr = String(schemaRef.current.ast);
-                const bindValuesStr = bindValues === undefined ? '' : `\nBind values: ${JSON.stringify(bindValues)}`;
-                console.error(`\
-Error parsing SQL query result.
-
-Query: ${sqlString}\
-${bindValuesStr}
-
-Expected schema: ${expectedSchemaStr}
-
-Error: ${parseErrorStr}
-
-Result:`, rawDbResults);
-                return shouldNeverHappen(`Error parsing SQL query result: ${parsedResult.left}`);
-            }
-            const result = this.mapResult(parsedResult.right);
-            span.end();
-            const durationMs = getDurationMsFromSpan(span);
-            this.executionTimes.push(durationMs);
-            setDebugInfo({ _tag: 'sql', label: `${label}:results`, query: sqlString, durationMs });
-            return result;
-        }), { label: `${label}:results`, meta: { liveStoreThunkType: 'sqlResult' }, equal: resultsEqual });
-        this.results$ = results$;
-    }
-    destroy = () => {
-        if (this.queryInput$ !== undefined) {
-            this.reactivityGraph.destroyNode(this.queryInput$);
-        }
-        this.reactivityGraph.destroyNode(this.results$);
-    };
-}
-//# sourceMappingURL=sql.js.map

package/dist/live-queries/sql.js.map

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

package/dist/live-queries/sql.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=sql.test.d.ts.map

package/dist/live-queries/sql.test.d.ts.map

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