@livestore/livestore 0.4.0-dev.2 → 0.4.0-dev.20

package/src/utils/dev.ts

@@ -2,6 +2,10 @@ import type { SqliteDb } from '@livestore/common'
 import { prettyBytes } from '@livestore/utils'
 import { Effect } from '@livestore/utils/effect'
 
+declare global {
+  var __debugLiveStoreUtils: any
+}
+
 export const downloadBlob = (
   data: Uint8Array<ArrayBuffer> | Blob | string,
   fileName: string,

package/src/utils/tests/fixture.ts

@@ -1,6 +1,7 @@
 import { makeInMemoryAdapter } from '@livestore/adapter-web'
 import { provideOtel } from '@livestore/common'
 import { createStore, Events, makeSchema, State } from '@livestore/livestore'
+import { omitUndefineds } from '@livestore/utils'
 import { Effect, Schema } from '@livestore/utils/effect'
 import type * as otel from '@opentelemetry/api'
 
@@ -71,4 +72,4 @@ export const makeTodoMvc = ({
     })
 
     return store
-  }).pipe(provideOtel({ parentSpanContext: otelContext, otelTracer: otelTracer }))
+  }).pipe(provideOtel(omitUndefineds({ parentSpanContext: otelContext, otelTracer: otelTracer })))

package/src/utils/tests/otel.ts

@@ -1,13 +1,17 @@
+import { omitUndefineds } from '@livestore/utils'
 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 = (
+type NestedSpan = { span: ReadableSpan; children: NestedSpan[] }
+
+const buildSimplifiedRootSpans = (
   exporter: InMemorySpanExporter,
+  rootSpanName: string,
   mapAttributes?: (attributes: Attributes) => Attributes,
-): SimplifiedNestedSpan => {
+): SimplifiedNestedSpan[] => {
   const spans = exporter.getFinishedSpans()
   const spansMap = new Map<string, NestedSpan>(spans.map((span) => [span.spanContext().spanId, { span, children: [] }]))
 
@@ -21,14 +25,12 @@ export const getSimplifiedRootSpan = (
     }
   })
 
-  type NestedSpan = { span: ReadableSpan; children: NestedSpan[] }
-  const createStoreSpanData = spans.find((_) => _.name === 'createStore')
-  if (createStoreSpanData === undefined) {
+  const rootSpanDataList = spans.filter((_) => _.name === rootSpanName)
+  if (rootSpanDataList.length === 0) {
     throw new Error(
-      `Could not find the root span named 'createStore'. Available spans: ${spans.map((s) => s.name).join(', ')}`,
+      `Could not find any root spans named '${rootSpanName}'. Available spans: ${spans.map((s) => s.name).join(', ')}`,
     )
   }
-  const rootSpan = spansMap.get(createStoreSpanData.spanContext().spanId)!
 
   const simplifySpanRec = (span: NestedSpan): SimplifiedNestedSpan =>
     omitEmpty({
@@ -40,20 +42,29 @@ export const getSimplifiedRootSpan = (
         .map(simplifySpanRec),
     })
 
-  // console.log('rootSpan', rootSpan.span)
-
-  // console.dir(
-  //   spans.map((_) => [_.spanContext().spanId, _.name, _.attributes, _.parentSpanId]),
-  //   { depth: 10 },
-  // )
-
-  const simplifiedRootSpan = simplifySpanRec(rootSpan)
-
-  // console.log('simplifiedRootSpan', simplifiedRootSpan)
+  return rootSpanDataList.map((rootSpanData) => {
+    const rootSpan = spansMap.get(rootSpanData.spanContext().spanId)!
+    return simplifySpanRec(rootSpan)
+  })
+}
 
-  // writeFileSync('tmp/trace.json', JSON.stringify(toTraceFile(spans), null, 2))
+export const getSimplifiedRootSpan = (
+  exporter: InMemorySpanExporter,
+  rootSpanName: string,
+  mapAttributes?: (attributes: Attributes) => Attributes,
+): SimplifiedNestedSpan => {
+  const results = buildSimplifiedRootSpans(exporter, rootSpanName, mapAttributes)
+  const firstResult = results[0]
+  if (!firstResult) throw new Error(`Could not find the root span named '${rootSpanName}'.`)
+  return firstResult
+}
 
-  return simplifiedRootSpan
+export const getAllSimplifiedRootSpans = (
+  exporter: InMemorySpanExporter,
+  rootSpanName: string,
+  mapAttributes?: (attributes: Attributes) => Attributes,
+): SimplifiedNestedSpan[] => {
+  return buildSimplifiedRootSpans(exporter, rootSpanName, mapAttributes)
 }
 
 // const compareHrTime = (a: [number, numndber], b: [number, number]) => {
@@ -96,7 +107,7 @@ export const toTraceFile = (spans: ReadableSpan[]) => {
             spans: spans.map((span) => ({
               traceId: span.spanContext().traceId,
               spanId: span.spanContext().spanId,
-              ...(span.parentSpanContext?.spanId ? { parentSpanId: span.parentSpanContext.spanId } : {}),
+              ...omitUndefineds({ parentSpanId: span.parentSpanContext?.spanId }),
               // traceState: span.spanContext().traceState ?? '',
               name: span.name,
               kind: 'SPAN_KIND_INTERNAL',

package/dist/store/store-shutdown.test.d.ts

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

package/dist/store/store-shutdown.test.d.ts.map

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

package/dist/store/store-shutdown.test.js

@@ -1,103 +0,0 @@
-import { describe, expect, it } from 'vitest';
-import { StoreAlreadyShutdownError } from '@livestore/common';
-// Mock a minimal store interface for testing
-class MockStore {
-    isShutdown = false;
-    storeId = 'test-store';
-    checkShutdown = (operation) => {
-        if (this.isShutdown) {
-            throw new StoreAlreadyShutdownError({ operation, storeId: this.storeId });
-        }
-    };
-    shutdown = () => {
-        this.isShutdown = true;
-    };
-    // Mock public methods that should throw after shutdown
-    subscribe = () => {
-        this.checkShutdown('subscribe');
-        return () => { }; // mock unsubscribe
-    };
-    query = () => {
-        this.checkShutdown('query');
-        return {};
-    };
-    commit = () => {
-        this.checkShutdown('commit');
-    };
-    setSignal = () => {
-        this.checkShutdown('setSignal');
-    };
-    manualRefresh = () => {
-        this.checkShutdown('manualRefresh');
-    };
-    events = () => {
-        this.checkShutdown('events');
-        return [];
-    };
-    eventsStream = () => {
-        this.checkShutdown('eventsStream');
-        return [];
-    };
-}
-describe('Store shutdown behavior', () => {
-    it('should allow operations before shutdown', () => {
-        const store = new MockStore();
-        // All operations should work before shutdown
-        expect(() => store.subscribe()).not.toThrow();
-        expect(() => store.query()).not.toThrow();
-        expect(() => store.commit()).not.toThrow();
-        expect(() => store.setSignal()).not.toThrow();
-        expect(() => store.manualRefresh()).not.toThrow();
-        expect(() => store.events()).not.toThrow();
-        expect(() => store.eventsStream()).not.toThrow();
-    });
-    it('should throw StoreAlreadyShutdownError for all operations after shutdown', () => {
-        const store = new MockStore();
-        store.shutdown();
-        // All operations should throw after shutdown
-        expect(() => store.subscribe()).toThrow(StoreAlreadyShutdownError);
-        expect(() => store.query()).toThrow(StoreAlreadyShutdownError);
-        expect(() => store.commit()).toThrow(StoreAlreadyShutdownError);
-        expect(() => store.setSignal()).toThrow(StoreAlreadyShutdownError);
-        expect(() => store.manualRefresh()).toThrow(StoreAlreadyShutdownError);
-        expect(() => store.events()).toThrow(StoreAlreadyShutdownError);
-        expect(() => store.eventsStream()).toThrow(StoreAlreadyShutdownError);
-    });
-    it('should include operation name and storeId in error', () => {
-        const store = new MockStore();
-        store.shutdown();
-        try {
-            store.subscribe();
-            expect.fail('Should have thrown');
-        }
-        catch (error) {
-            expect(error).toBeInstanceOf(StoreAlreadyShutdownError);
-            expect(error.operation).toBe('subscribe');
-            expect(error.storeId).toBe('test-store');
-        }
-    });
-    it('should include correct operation name for different methods', () => {
-        const store = new MockStore();
-        store.shutdown();
-        const operations = [
-            ['subscribe', () => store.subscribe()],
-            ['query', () => store.query()],
-            ['commit', () => store.commit()],
-            ['setSignal', () => store.setSignal()],
-            ['manualRefresh', () => store.manualRefresh()],
-            ['events', () => store.events()],
-            ['eventsStream', () => store.eventsStream()],
-        ];
-        for (const [expectedOperation, fn] of operations) {
-            try {
-                fn();
-                expect.fail(`Should have thrown for ${expectedOperation}`);
-            }
-            catch (error) {
-                expect(error).toBeInstanceOf(StoreAlreadyShutdownError);
-                expect(error.operation).toBe(expectedOperation);
-            }
-        }
-    });
-});
-//# sourceMappingURL=store-shutdown.test.js.map

package/dist/store/store-shutdown.test.js.map

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