@livestore/livestore 0.3.0-dev.28 → 0.3.0-dev.29

package/dist/utils/tests/fixture.d.ts

@@ -1,7 +1,5 @@
-import type { FromInputSchema } from '@livestore/common/schema';
-import type { Store } from '@livestore/livestore';
-import { DbSchema } from '@livestore/livestore';
-import { Effect } from '@livestore/utils/effect';
+import { State } from '@livestore/livestore';
+import { Effect, Schema } from '@livestore/utils/effect';
 import type * as otel from '@opentelemetry/api';
 export type Todo = {
     id: string;
@@ -13,26 +11,26 @@ export type AppState = {
     newTodoText: string;
     filter: Filter;
 };
-export declare const todos: DbSchema.TableDef<{
+export declare const todos: State.SQLite.TableDef<{
     name: "todos";
     columns: {
-        id: {
+        readonly id: {
             columnType: "text";
-            schema: import("effect/Schema").Schema<string, string, never>;
+            schema: Schema.Schema<string, string, never>;
             default: import("effect/Option").None<never>;
             nullable: false;
             primaryKey: true;
         };
-        text: {
+        readonly text: {
             columnType: "text";
-            schema: import("effect/Schema").Schema<string, string, never>;
+            schema: Schema.Schema<string, string, never>;
             default: import("effect/Option").Some<"">;
             nullable: false;
             primaryKey: false;
         };
-        completed: {
+        readonly completed: {
             columnType: "integer";
-            schema: import("effect/Schema").Schema<boolean, number, never>;
+            schema: Schema.Schema<boolean, number, never>;
             default: import("effect/Option").Some<false>;
             nullable: false;
             primaryKey: false;
@@ -41,15 +39,9 @@ export declare const todos: DbSchema.TableDef<{
     indexes?: ReadonlyArray<import("@livestore/common/dist/schema/db-schema/dsl/mod.js").Index>;
     ast: import("@livestore/common/dist/schema/db-schema/ast/sqlite.js").Table;
 }, {
-    isSingleton: false;
-    disableAutomaticIdColumn: false;
-    deriveMutations: {
-        enabled: true;
-        clientOnly: false;
-    };
-    isSingleColumn: false;
+    isClientDocumentTable: false;
     requiredInsertColumnNames: "id";
-}, import("effect/Schema").Schema<{
+}, Schema.Schema<{
     readonly id: string;
     readonly text: string;
     readonly completed: boolean;
@@ -58,69 +50,43 @@ export declare const todos: DbSchema.TableDef<{
     readonly text: string;
     readonly completed: number;
 }, never>>;
-export declare const app: DbSchema.TableDef<{
-    name: "app";
-    columns: {
-        id: {
-            columnType: "text";
-            schema: import("effect/Schema").Schema<string, string, never>;
-            default: import("effect/Option").Some<"static">;
-            nullable: false;
-            primaryKey: true;
-        };
-        newTodoText: {
-            columnType: "text";
-            schema: import("effect/Schema").Schema<string | null, string | null, never>;
-            default: import("effect/Option").Some<"">;
-            nullable: true;
-            primaryKey: false;
-        };
-        filter: {
-            columnType: "text";
-            schema: import("effect/Schema").Schema<string, string, never>;
-            default: import("effect/Option").Some<"all">;
-            nullable: false;
-            primaryKey: false;
-        };
-    };
-    indexes?: ReadonlyArray<import("@livestore/common/dist/schema/db-schema/dsl/mod.js").Index>;
-    ast: import("@livestore/common/dist/schema/db-schema/ast/sqlite.js").Table;
-}, {
-    isSingleton: true;
-    disableAutomaticIdColumn: false;
-    deriveMutations: never;
-    isSingleColumn: false;
-    requiredInsertColumnNames: never;
-}, import("effect/Schema").Schema<{
-    readonly id: string;
-    readonly newTodoText: string | null;
+export declare const app: State.SQLite.ClientDocumentTableDef<"app", {
     readonly filter: string;
+    readonly newTodoText: string;
 }, {
-    readonly id: string;
-    readonly newTodoText: string | null;
     readonly filter: string;
-}, never>>;
+    readonly newTodoText: string;
+}, {
+    partialSet: true;
+    default: {
+        id: undefined;
+        value: {
+            readonly newTodoText: "";
+            readonly filter: "all";
+        };
+    };
+}>;
 export declare const tables: {
-    todos: DbSchema.TableDef<{
+    todos: State.SQLite.TableDef<{
         name: "todos";
         columns: {
-            id: {
+            readonly id: {
                 columnType: "text";
-                schema: import("effect/Schema").Schema<string, string, never>;
+                schema: Schema.Schema<string, string, never>;
                 default: import("effect/Option").None<never>;
                 nullable: false;
                 primaryKey: true;
             };
-            text: {
+            readonly text: {
                 columnType: "text";
-                schema: import("effect/Schema").Schema<string, string, never>;
+                schema: Schema.Schema<string, string, never>;
                 default: import("effect/Option").Some<"">;
                 nullable: false;
                 primaryKey: false;
             };
-            completed: {
+            readonly completed: {
                 columnType: "integer";
-                schema: import("effect/Schema").Schema<boolean, number, never>;
+                schema: Schema.Schema<boolean, number, never>;
                 default: import("effect/Option").Some<false>;
                 nullable: false;
                 primaryKey: false;
@@ -129,15 +95,9 @@ export declare const tables: {
         indexes?: ReadonlyArray<import("@livestore/common/dist/schema/db-schema/dsl/mod.js").Index>;
         ast: import("@livestore/common/dist/schema/db-schema/ast/sqlite.js").Table;
     }, {
-        isSingleton: false;
-        disableAutomaticIdColumn: false;
-        deriveMutations: {
-            enabled: true;
-            clientOnly: false;
-        };
-        isSingleColumn: false;
+        isClientDocumentTable: false;
         requiredInsertColumnNames: "id";
-    }, import("effect/Schema").Schema<{
+    }, Schema.Schema<{
         readonly id: string;
         readonly text: string;
         readonly completed: boolean;
@@ -146,146 +106,33 @@ export declare const tables: {
         readonly text: string;
         readonly completed: number;
     }, never>>;
-    app: DbSchema.TableDef<{
-        name: "app";
-        columns: {
-            id: {
-                columnType: "text";
-                schema: import("effect/Schema").Schema<string, string, never>;
-                default: import("effect/Option").Some<"static">;
-                nullable: false;
-                primaryKey: true;
-            };
-            newTodoText: {
-                columnType: "text";
-                schema: import("effect/Schema").Schema<string | null, string | null, never>;
-                default: import("effect/Option").Some<"">;
-                nullable: true;
-                primaryKey: false;
-            };
-            filter: {
-                columnType: "text";
-                schema: import("effect/Schema").Schema<string, string, never>;
-                default: import("effect/Option").Some<"all">;
-                nullable: false;
-                primaryKey: false;
-            };
-        };
-        indexes?: ReadonlyArray<import("@livestore/common/dist/schema/db-schema/dsl/mod.js").Index>;
-        ast: import("@livestore/common/dist/schema/db-schema/ast/sqlite.js").Table;
-    }, {
-        isSingleton: true;
-        disableAutomaticIdColumn: false;
-        deriveMutations: never;
-        isSingleColumn: false;
-        requiredInsertColumnNames: never;
-    }, import("effect/Schema").Schema<{
-        readonly id: string;
-        readonly newTodoText: string | null;
+    app: State.SQLite.ClientDocumentTableDef<"app", {
         readonly filter: string;
+        readonly newTodoText: string;
     }, {
-        readonly id: string;
-        readonly newTodoText: string | null;
         readonly filter: string;
-    }, never>>;
-};
-export declare const schema: FromInputSchema.DeriveSchema<{
-    tables: {
-        todos: DbSchema.TableDef<{
-            name: "todos";
-            columns: {
-                id: {
-                    columnType: "text";
-                    schema: import("effect/Schema").Schema<string, string, never>;
-                    default: import("effect/Option").None<never>;
-                    nullable: false;
-                    primaryKey: true;
-                };
-                text: {
-                    columnType: "text";
-                    schema: import("effect/Schema").Schema<string, string, never>;
-                    default: import("effect/Option").Some<"">;
-                    nullable: false;
-                    primaryKey: false;
-                };
-                completed: {
-                    columnType: "integer";
-                    schema: import("effect/Schema").Schema<boolean, number, never>;
-                    default: import("effect/Option").Some<false>;
-                    nullable: false;
-                    primaryKey: false;
-                };
-            };
-            indexes?: ReadonlyArray<import("@livestore/common/dist/schema/db-schema/dsl/mod.js").Index>;
-            ast: import("@livestore/common/dist/schema/db-schema/ast/sqlite.js").Table;
-        }, {
-            isSingleton: false;
-            disableAutomaticIdColumn: false;
-            deriveMutations: {
-                enabled: true;
-                clientOnly: false;
-            };
-            isSingleColumn: false;
-            requiredInsertColumnNames: "id";
-        }, import("effect/Schema").Schema<{
-            readonly id: string;
-            readonly text: string;
-            readonly completed: boolean;
-        }, {
-            readonly id: string;
-            readonly text: string;
-            readonly completed: number;
-        }, never>>;
-        app: DbSchema.TableDef<{
-            name: "app";
-            columns: {
-                id: {
-                    columnType: "text";
-                    schema: import("effect/Schema").Schema<string, string, never>;
-                    default: import("effect/Option").Some<"static">;
-                    nullable: false;
-                    primaryKey: true;
-                };
-                newTodoText: {
-                    columnType: "text";
-                    schema: import("effect/Schema").Schema<string | null, string | null, never>;
-                    default: import("effect/Option").Some<"">;
-                    nullable: true;
-                    primaryKey: false;
-                };
-                filter: {
-                    columnType: "text";
-                    schema: import("effect/Schema").Schema<string, string, never>;
-                    default: import("effect/Option").Some<"all">;
-                    nullable: false;
-                    primaryKey: false;
-                };
+        readonly newTodoText: string;
+    }, {
+        partialSet: true;
+        default: {
+            id: undefined;
+            value: {
+                readonly newTodoText: "";
+                readonly filter: "all";
             };
-            indexes?: ReadonlyArray<import("@livestore/common/dist/schema/db-schema/dsl/mod.js").Index>;
-            ast: import("@livestore/common/dist/schema/db-schema/ast/sqlite.js").Table;
-        }, {
-            isSingleton: true;
-            disableAutomaticIdColumn: false;
-            deriveMutations: never;
-            isSingleColumn: false;
-            requiredInsertColumnNames: never;
-        }, import("effect/Schema").Schema<{
-            readonly id: string;
-            readonly newTodoText: string | null;
-            readonly filter: string;
-        }, {
-            readonly id: string;
-            readonly newTodoText: string | null;
-            readonly filter: string;
-        }, never>>;
-    };
+        };
+    }>;
+};
+export declare const state: import("@livestore/common/dist/schema/schema.js").State;
+export declare const schema: import("@livestore/livestore").FromInputSchema.DeriveSchema<{
+    state: import("@livestore/common/dist/schema/schema.js").State;
+    events: {};
 }>;
-export interface FixtureSchema extends FromInputSchema.DeriveSchema<{
-    tables: typeof tables;
-}> {
-}
 export declare const makeTodoMvc: ({ otelTracer, otelContext, }?: {
     otelTracer?: otel.Tracer;
     otelContext?: otel.Context;
-}) => Effect.Effect<Store<FixtureSchema, {}>, import("@livestore/common").UnexpectedError, import("effect/Scope").Scope>;
+}) => Effect.Effect<import("@livestore/livestore").Store<import("@livestore/livestore").FromInputSchema.DeriveSchema<{
+    state: import("@livestore/common/dist/schema/schema.js").State;
+    events: {};
+}>, {}>, import("@livestore/common").UnexpectedError, import("effect/Scope").Scope>;
 //# sourceMappingURL=fixture.d.ts.map

package/dist/utils/tests/fixture.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fixture.d.ts","sourceRoot":"","sources":["../../../src/utils/tests/fixture.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAC/D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAe,QAAQ,EAAc,MAAM,sBAAsB,CAAA;AACxE,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAChD,OAAO,KAAK,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAE/C,MAAM,MAAM,IAAI,GAAG;IACjB,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,MAAM,MAAM,MAAM,GAAG,KAAK,GAAG,QAAQ,GAAG,WAAW,CAAA;AAEnD,MAAM,MAAM,QAAQ,GAAG;IACrB,WAAW,EAAE,MAAM,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAED,eAAO,MAAM,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UAQjB,CAAA;AAED,eAAO,MAAM,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UAQf,CAAA;AAED,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAAiB,CAAA;AACpC,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAAyB,CAAA;AAE5C,MAAM,WAAW,aAAc,SAAQ,eAAe,CAAC,YAAY,CAAC;IAAE,MAAM,EAAE,OAAO,MAAM,CAAA;CAAE,CAAC;CAAG;AAEjG,eAAO,MAAM,WAAW,GAAI,+BAGzB;IACD,UAAU,CAAC,EAAE,IAAI,CAAC,MAAM,CAAA;IACxB,WAAW,CAAC,EAAE,IAAI,CAAC,OAAO,CAAA;CACtB,uHAU4E,CAAA"}
+{"version":3,"file":"fixture.d.ts","sourceRoot":"","sources":["../../../src/utils/tests/fixture.ts"],"names":[],"mappings":"AAEA,OAAO,EAA2B,KAAK,EAAE,MAAM,sBAAsB,CAAA;AACrE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,KAAK,IAAI,MAAM,oBAAoB,CAAA;AAE/C,MAAM,MAAM,IAAI,GAAG;IACjB,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,MAAM,MAAM,MAAM,GAAG,KAAK,GAAG,QAAQ,GAAG,WAAW,CAAA;AAEnD,MAAM,MAAM,QAAQ,GAAG;IACrB,WAAW,EAAE,MAAM,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAED,eAAO,MAAM,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;UAOhB,CAAA;AAEF,eAAO,MAAM,GAAG;;;;;;;;;;;;;;;EAOd,CAAA;AAEF,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAAiB,CAAA;AAEpC,eAAO,MAAM,KAAK,yDAAwD,CAAA;AAC1E,eAAO,MAAM,MAAM;;;EAAoC,CAAA;AAEvD,eAAO,MAAM,WAAW,GAAI,+BAGzB;IACD,UAAU,CAAC,EAAE,IAAI,CAAC,MAAM,CAAA;IACxB,WAAW,CAAC,EAAE,IAAI,CAAC,OAAO,CAAA;CACtB;;;mFAU4E,CAAA"}

package/dist/utils/tests/fixture.js

@@ -1,19 +1,26 @@
 import { makeInMemoryAdapter } from '@livestore/adapter-web';
 import { provideOtel } from '@livestore/common';
-import { createStore, DbSchema, makeSchema } from '@livestore/livestore';
-import { Effect } from '@livestore/utils/effect';
-export const todos = DbSchema.table('todos', {
-    id: DbSchema.text({ primaryKey: true }),
-    text: DbSchema.text({ default: '', nullable: false }),
-    completed: DbSchema.boolean({ default: false, nullable: false }),
-}, { deriveMutations: true, isSingleton: false });
-export const app = DbSchema.table('app', {
-    id: DbSchema.text({ primaryKey: true, default: 'static' }),
-    newTodoText: DbSchema.text({ default: '', nullable: true }),
-    filter: DbSchema.text({ default: 'all', nullable: false }),
-}, { isSingleton: true });
+import { createStore, makeSchema, State } from '@livestore/livestore';
+import { Effect, Schema } from '@livestore/utils/effect';
+export const todos = State.SQLite.table({
+    name: 'todos',
+    columns: {
+        id: State.SQLite.text({ primaryKey: true }),
+        text: State.SQLite.text({ default: '', nullable: false }),
+        completed: State.SQLite.boolean({ default: false, nullable: false }),
+    },
+});
+export const app = State.SQLite.clientDocument({
+    name: 'app',
+    schema: Schema.Struct({
+        newTodoText: Schema.String,
+        filter: Schema.String,
+    }),
+    default: { value: { newTodoText: '', filter: 'all' } },
+});
 export const tables = { todos, app };
-export const schema = makeSchema({ tables });
+export const state = State.SQLite.makeState({ tables, materializers: {} });
+export const schema = makeSchema({ state, events: {} });
 export const makeTodoMvc = ({ otelTracer, otelContext, } = {}) => Effect.gen(function* () {
     const store = yield* createStore({
         schema,

package/dist/utils/tests/fixture.js.map

@@ -1 +1 @@
-{"version":3,"file":"fixture.js","sourceRoot":"","sources":["../../../src/utils/tests/fixture.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAG/C,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACxE,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAgBhD,MAAM,CAAC,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CACjC,OAAO,EACP;IACE,EAAE,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;IACvC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;IACrD,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;CACjE,EACD,EAAE,eAAe,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,CAC9C,CAAA;AAED,MAAM,CAAC,MAAM,GAAG,GAAG,QAAQ,CAAC,KAAK,CAC/B,KAAK,EACL;IACE,EAAE,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC;IAC1D,WAAW,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC3D,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;CAC3D,EACD,EAAE,WAAW,EAAE,IAAI,EAAE,CACtB,CAAA;AAED,MAAM,CAAC,MAAM,MAAM,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,CAAA;AACpC,MAAM,CAAC,MAAM,MAAM,GAAG,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC,CAAA;AAI5C,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,EAC1B,UAAU,EACV,WAAW,MAIT,EAAE,EAAE,EAAE,CACR,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,KAAK,GAAyB,KAAK,CAAC,CAAC,WAAW,CAAC;QACrD,MAAM;QACN,OAAO,EAAE,SAAS;QAClB,OAAO,EAAE,mBAAmB,EAAE;QAC9B,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE;KAC9B,CAAC,CAAA;IAEF,OAAO,KAAK,CAAA;AACd,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,iBAAiB,EAAE,WAAW,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC,CAAC,CAAA"}
+{"version":3,"file":"fixture.js","sourceRoot":"","sources":["../../../src/utils/tests/fixture.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAA;AACrE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAgBxD,MAAM,CAAC,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC;IACtC,IAAI,EAAE,OAAO;IACb,OAAO,EAAE;QACP,EAAE,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;QAC3C,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;QACzD,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;KACrE;CACF,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,GAAG,GAAG,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC;IAC7C,IAAI,EAAE,KAAK;IACX,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC;QACpB,WAAW,EAAE,MAAM,CAAC,MAAM;QAC1B,MAAM,EAAE,MAAM,CAAC,MAAM;KACtB,CAAC;IACF,OAAO,EAAE,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE;CACvD,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,MAAM,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,CAAA;AAEpC,MAAM,CAAC,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC,CAAA;AAC1E,MAAM,CAAC,MAAM,MAAM,GAAG,UAAU,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAA;AAEvD,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,EAC1B,UAAU,EACV,WAAW,MAIT,EAAE,EAAE,EAAE,CACR,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,WAAW,CAAC;QAC/B,MAAM;QACN,OAAO,EAAE,SAAS;QAClB,OAAO,EAAE,mBAAmB,EAAE;QAC9B,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE;KAC9B,CAAC,CAAA;IAEF,OAAO,KAAK,CAAA;AACd,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,iBAAiB,EAAE,WAAW,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC,CAAC,CAAA"}

package/dist/utils/tests/otel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"otel.d.ts","sourceRoot":"","sources":["../../../src/utils/tests/otel.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AACpD,OAAO,KAAK,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AACvF,KAAK,oBAAoB,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,GAAG,CAAC;IAAC,QAAQ,EAAE,oBAAoB,EAAE,CAAA;CAAE,CAAA;AAEhG,eAAO,MAAM,qBAAqB,GAChC,UAAU,oBAAoB,EAC9B,gBAAgB,CAAC,UAAU,EAAE,UAAU,KAAK,UAAU,KACrD,oBAwCF,CAAA;AAqBD,eAAO,MAAM,WAAW,GAAI,OAAO,YAAY,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyDhD,CAAA"}
+{"version":3,"file":"otel.d.ts","sourceRoot":"","sources":["../../../src/utils/tests/otel.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AACpD,OAAO,KAAK,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AACvF,KAAK,oBAAoB,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,GAAG,CAAC;IAAC,QAAQ,EAAE,oBAAoB,EAAE,CAAA;CAAE,CAAA;AAEhG,eAAO,MAAM,qBAAqB,GAChC,UAAU,oBAAoB,EAC9B,gBAAgB,CAAC,UAAU,EAAE,UAAU,KAAK,UAAU,KACrD,oBA+CF,CAAA;AAqBD,eAAO,MAAM,WAAW,GAAI,OAAO,YAAY,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyDhD,CAAA"}

package/dist/utils/tests/otel.js

@@ -4,12 +4,17 @@ export const getSimplifiedRootSpan = (exporter, mapAttributes) => {
     const spansMap = new Map(spans.map((span) => [span.spanContext().spanId, { span, children: [] }]));
     const mapAttributesfn = mapAttributes ?? identity;
     spansMap.forEach((nestedSpan) => {
-        const parentSpan = nestedSpan.span.parentSpanId ? spansMap.get(nestedSpan.span.parentSpanId) : undefined;
+        const parentId = nestedSpan.span.parentSpanContext?.spanId;
+        const parentSpan = parentId ? spansMap.get(parentId) : undefined;
         if (parentSpan) {
             parentSpan.children.push(nestedSpan);
         }
     });
-    const rootSpan = spansMap.get(spans.find((_) => _.name === 'createStore').spanContext().spanId);
+    const createStoreSpanData = spans.find((_) => _.name === 'createStore');
+    if (createStoreSpanData === undefined) {
+        throw new Error("Could not find the root span named 'createStore'. Available spans: " + spans.map((s) => s.name).join(', '));
+    }
+    const rootSpan = spansMap.get(createStoreSpanData.spanContext().spanId);
     const simplifySpanRec = (span) => omitEmpty({
         _name: span.span.name,
         attributes: mapAttributesfn(span.span.attributes),
@@ -64,7 +69,7 @@ export const toTraceFile = (spans) => {
                         spans: spans.map((span) => ({
                             traceId: span.spanContext().traceId,
                             spanId: span.spanContext().spanId,
-                            ...(span.parentSpanId ? { parentSpanId: span.parentSpanId } : {}),
+                            ...(span.parentSpanContext?.spanId ? { parentSpanId: span.parentSpanContext.spanId } : {}),
                             // traceState: span.spanContext().traceState ?? '',
                             name: span.name,
                             kind: 'SPAN_KIND_INTERNAL',

package/dist/utils/tests/otel.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livestore/livestore",
-  "version": "0.3.0-dev.28",
+  "version": "0.3.0-dev.29",
   "type": "module",
   "sideEffects": false,
   "exports": {
@@ -37,16 +37,16 @@
   },
   "dependencies": {
     "@opentelemetry/api": "1.9.0",
-    "@livestore/common": "0.3.0-dev.28",
-    "@livestore/utils": "0.3.0-dev.28"
+    "@livestore/common": "0.3.0-dev.29",
+    "@livestore/utils": "0.3.0-dev.29"
   },
   "devDependencies": {
-    "@opentelemetry/sdk-trace-base": "^1.30.1",
+    "@opentelemetry/sdk-trace-base": "^2.0.0",
     "jsdom": "^26.0.0",
-    "typescript": "^5.8.2",
+    "typescript": "^5.8.3",
     "vite": "^6.2.1",
-    "vitest": "^3.0.8",
-    "@livestore/adapter-web": "0.3.0-dev.28"
+    "vitest": "^3.1.1",
+    "@livestore/adapter-web": "0.3.0-dev.29"
   },
   "publishConfig": {
     "access": "public"

package/src/SqliteDbWrapper.ts

@@ -17,7 +17,7 @@ import {
   sql,
   SqliteError,
 } from '@livestore/common'
-import { isDevEnv } from '@livestore/utils'
+import { isDevEnv, LS_DEV } from '@livestore/utils'
 import type * as otel from '@opentelemetry/api'
 
 import QueryCache from './QueryCache.js'
@@ -212,6 +212,9 @@ export class SqliteDbWrapper implements SqliteDb {
         } catch (cause: any) {
           span.recordException(cause)
           span.end()
+          if (LS_DEV) {
+            debugger
+          }
           throw new SqliteError({ cause, query: { bindValues: bindValues ?? {}, sql: queryStr } })
         }
       },

package/src/live-queries/__snapshots__/db-query.test.ts.snap

@@ -32,15 +32,15 @@ exports[`otel > otel 3`] = `
       "_name": "LiveStore:sync",
     },
     {
-      "_name": "LiveStore:mutations",
+      "_name": "LiveStore:commits",
       "children": [
         {
           "_name": "LiveStore:commit",
           "attributes": {
-            "livestore.mutationEventTags": [
+            "livestore.eventTags": [
               "livestore.RawSql",
             ],
-            "livestore.mutationEventsCount": 1,
+            "livestore.eventsCount": 1,
           },
           "children": [
             {
@@ -300,15 +300,15 @@ exports[`otel > with thunks 7`] = `
       "_name": "LiveStore:sync",
     },
     {
-      "_name": "LiveStore:mutations",
+      "_name": "LiveStore:commits",
       "children": [
         {
           "_name": "LiveStore:commit",
           "attributes": {
-            "livestore.mutationEventTags": [
+            "livestore.eventTags": [
               "livestore.RawSql",
             ],
-            "livestore.mutationEventsCount": 1,
+            "livestore.eventsCount": 1,
           },
           "children": [
             {
@@ -402,15 +402,15 @@ exports[`otel > with thunks with query builder and without labels 3`] = `
       "_name": "LiveStore:sync",
     },
     {
-      "_name": "LiveStore:mutations",
+      "_name": "LiveStore:commits",
       "children": [
         {
           "_name": "LiveStore:commit",
           "attributes": {
-            "livestore.mutationEventTags": [
+            "livestore.eventTags": [
               "livestore.RawSql",
             ],
-            "livestore.mutationEventsCount": 1,
+            "livestore.eventsCount": 1,
           },
           "children": [
             {

package/src/live-queries/base-class.ts

@@ -1,4 +1,3 @@
-import type { QueryInfo } from '@livestore/common'
 import { isNotNil } from '@livestore/utils'
 import type * as otel from '@opentelemetry/api'
 
@@ -24,11 +23,7 @@ export type ReactivityGraphContext = {
 }
 
 export type GetResult<TQuery extends LiveQueryDef.Any | LiveQuery.Any> =
-  TQuery extends LiveQuery<infer TResult, infer _1>
-    ? TResult
-    : TQuery extends LiveQueryDef<infer TResult, infer _1>
-      ? TResult
-      : unknown
+  TQuery extends LiveQuery<infer TResult> ? TResult : TQuery extends LiveQueryDef<infer TResult> ? TResult : unknown
 
 let queryIdCounter = 0
 
@@ -65,23 +60,22 @@ export const depsToString = (deps: DepKey): string => {
   return deps.filter(isNotNil).join(',')
 }
 
-export interface LiveQueryDef<TResult, TQueryInfo extends QueryInfo = QueryInfo.None> {
+export interface LiveQueryDef<TResult> {
   _tag: 'def'
   /** Creates a new LiveQuery instance bound to a specific store/reactivityGraph */
-  make: (ctx: ReactivityGraphContext, otelContext?: otel.Context) => RcRef<LiveQuery<TResult, TQueryInfo>>
+  make: (ctx: ReactivityGraphContext, otelContext?: otel.Context) => RcRef<LiveQuery<TResult>>
   label: string
   hash: string
-  queryInfo: TQueryInfo
 }
 
 export namespace LiveQueryDef {
-  export type Any = LiveQueryDef<any, any>
+  export type Any = LiveQueryDef<any>
 }
 
 /**
  * A LiveQuery is stateful
  */
-export interface LiveQuery<TResult, TQueryInfo extends QueryInfo = QueryInfo.None> {
+export interface LiveQuery<TResult> {
   id: number
   _tag: 'computed' | 'db' | 'graphql'
   [TypeId]: TypeId
@@ -109,20 +103,16 @@ export interface LiveQuery<TResult, TQueryInfo extends QueryInfo = QueryInfo.Non
 
   activeSubscriptions: Set<StackInfo>
 
-  queryInfo: TQueryInfo
-
   runs: number
 
   executionTimes: number[]
 }
 
 export namespace LiveQuery {
-  export type Any = LiveQuery<any, any>
+  export type Any = LiveQuery<any>
 }
 
-export abstract class LiveStoreQueryBase<TResult, TQueryInfo extends QueryInfo>
-  implements LiveQuery<TResult, TQueryInfo>
-{
+export abstract class LiveStoreQueryBase<TResult> implements LiveQuery<TResult> {
   '__result!'!: TResult
   id = queryIdCounter++;
   [TypeId]: TypeId = TypeId
@@ -137,8 +127,6 @@ export abstract class LiveStoreQueryBase<TResult, TQueryInfo extends QueryInfo>
 
   abstract readonly reactivityGraph: ReactivityGraph
 
-  abstract queryInfo: TQueryInfo
-
   get runs() {
     return this.results$.recomputations
   }
@@ -165,12 +153,7 @@ export abstract class LiveStoreQueryBase<TResult, TQueryInfo extends QueryInfo>
 }
 
 export type GetAtomResult = <T>(
-  atom:
-    | RG.Atom<T, any, RefreshReason>
-    | LiveQueryDef<T, any>
-    | LiveQuery<T, any>
-    | ILiveQueryRef<T>
-    | ILiveQueryRefDef<T>,
+  atom: RG.Atom<T, any, RefreshReason> | LiveQueryDef<T> | LiveQuery<T> | ILiveQueryRef<T> | ILiveQueryRefDef<T>,
   otelContext?: otel.Context | undefined,
   debugRefreshReason?: RefreshReason | undefined,
 ) => T