@livestore/common 0.0.0-snapshot-a2ca318cc053b3d24df8cc4e8ee8d02736ac62ee → 0.0.0-snapshot-a953343ad2d7468c6573bcb5e26f0eab4302078f

package/src/schema/mod.ts

@@ -1,5 +1,6 @@
 export * from './system-tables.js'
 export * as DbSchema from './table-def.js'
+export { SqliteAst, SqliteDsl } from './db-schema/mod.js'
 export * from './mutations.js'
 export * from './schema-helpers.js'
 export * from './schema.js'

package/src/schema/schema-helpers.ts

@@ -1,7 +1,7 @@
-import { SqliteDsl } from '@livestore/db-schema'
 import { shouldNeverHappen } from '@livestore/utils'
 import { pipe, ReadonlyRecord, Schema } from '@livestore/utils/effect'
 
+import { SqliteDsl } from '../schema/db-schema/mod.js'
 import type { TableDef, TableDefBase } from './table-def.js'
 
 export const getDefaultValuesEncoded = <TTableDef extends TableDef>(

package/src/schema/schema.ts

@@ -1,9 +1,9 @@
-import type { SqliteDsl } from '@livestore/db-schema'
-import { SqliteAst } from '@livestore/db-schema'
 import { isReadonlyArray, shouldNeverHappen } from '@livestore/utils'
 
 import type { MigrationOptions } from '../adapter-types.js'
 import { makeDerivedMutationDefsForTable } from '../derived-mutations.js'
+import type { SqliteDsl } from './db-schema/mod.js'
+import { SqliteAst } from './db-schema/mod.js'
 import {
   type MutationDef,
   type MutationDefMap,

package/src/schema/system-tables.ts

@@ -1,6 +1,6 @@
-import { type SqliteAst as __SqliteAst, SqliteDsl } from '@livestore/db-schema'
 import { Schema } from '@livestore/utils/effect'
 
+import { SqliteDsl } from './db-schema/mod.js'
 import * as EventId from './EventId.js'
 import type { FromTable } from './table-def.js'
 import { table } from './table-def.js'

package/src/schema/table-def.ts

@@ -1,17 +1,16 @@
-import type { Nullable, PrettifyFlat } from '@livestore/db-schema'
-import { SqliteDsl } from '@livestore/db-schema'
+import type { Nullable } from '@livestore/utils'
 import { shouldNeverHappen } from '@livestore/utils'
+import type { Types } from '@livestore/utils/effect'
 import { ReadonlyRecord, Schema } from '@livestore/utils/effect'
 
 import type { DerivedMutationHelperFns } from '../derived-mutations.js'
 import { makeDerivedMutationDefsForTable } from '../derived-mutations.js'
 import type { QueryBuilder } from '../query-builder/mod.js'
 import { makeQueryBuilder } from '../query-builder/mod.js'
+import { SqliteDsl } from './db-schema/mod.js'
 
 export const { blob, boolean, column, datetime, integer, isColumnDefinition, json, real, text } = SqliteDsl
 
-export { SqliteDsl } from '@livestore/db-schema'
-
 export type StateType = 'singleton' | 'dynamic'
 
 export type DefaultSqliteTableDef = SqliteDsl.TableDefinition<string, SqliteDsl.Columns>
@@ -60,7 +59,6 @@ export type TableOptionsInput = Partial<{
   deriveMutations:
     | boolean
     | {
-        enabled: true
         clientOnly?: boolean
       }
 }>
@@ -242,6 +240,8 @@ export const tableIsSingleton = <TTableDef extends TableDefBase>(
   tableDef: TTableDef,
 ): tableDef is TTableDef & { options: { isSingleton: true } } => tableDef.options.isSingleton === true
 
+export type PrettifyFlat<T> = T extends infer U ? { [K in keyof U]: U[K] } : never
+
 type SqliteTableDefForInput<
   TName extends string,
   TColumns extends SqliteDsl.Columns | SqliteDsl.ColumnDefinition<any, any>,
@@ -268,10 +268,10 @@ type WithDefaults<
   isSingleton: TOptionsInput['isSingleton'] extends true ? true : false
   disableAutomaticIdColumn: TOptionsInput['disableAutomaticIdColumn'] extends true ? true : false
   deriveMutations: TOptionsInput['deriveMutations'] extends true
-    ? { enabled: true; clientOnly: boolean }
+    ? { enabled: true; clientOnly: false }
     : TOptionsInput['deriveMutations'] extends false
       ? { enabled: false }
-      : TOptionsInput['deriveMutations'] extends { enabled: true; clientOnly?: boolean }
+      : TOptionsInput['deriveMutations'] extends { clientOnly: boolean }
         ? {
             enabled: true
             clientOnly: TOptionsInput['deriveMutations']['clientOnly'] extends true ? true : false
@@ -283,7 +283,7 @@ type WithDefaults<
 
 export namespace FromTable {
   // TODO this sometimes doesn't preserve the order of columns
-  export type RowDecoded<TTableDef extends TableDefBase> = PrettifyFlat<
+  export type RowDecoded<TTableDef extends TableDefBase> = Types.Simplify<
     Nullable<Pick<RowDecodedAll<TTableDef>, NullableColumnNames<TTableDef>>> &
       Omit<RowDecodedAll<TTableDef>, NullableColumnNames<TTableDef>>
   >
@@ -302,7 +302,7 @@ export namespace FromTable {
     >
   }
 
-  export type RowEncoded<TTableDef extends TableDefBase> = PrettifyFlat<
+  export type RowEncoded<TTableDef extends TableDefBase> = Types.Simplify<
     Nullable<Pick<RowEncodeNonNullable<TTableDef>, NullableColumnNames<TTableDef>>> &
       Omit<RowEncodeNonNullable<TTableDef>, NullableColumnNames<TTableDef>>
   >
@@ -314,7 +314,7 @@ export namespace FromTable {
 
 export namespace FromColumns {
   // TODO this sometimes doesn't preserve the order of columns
-  export type RowDecoded<TColumns extends SqliteDsl.Columns> = PrettifyFlat<
+  export type RowDecoded<TColumns extends SqliteDsl.Columns> = Types.Simplify<
     Nullable<Pick<RowDecodedAll<TColumns>, NullableColumnNames<TColumns>>> &
       Omit<RowDecodedAll<TColumns>, NullableColumnNames<TColumns>>
   >
@@ -323,7 +323,7 @@ export namespace FromColumns {
     [K in keyof TColumns]: Schema.Schema.Type<TColumns[K]['schema']>
   }
 
-  export type RowEncoded<TColumns extends SqliteDsl.Columns> = PrettifyFlat<
+  export type RowEncoded<TColumns extends SqliteDsl.Columns> = Types.Simplify<
     Nullable<Pick<RowEncodeNonNullable<TColumns>, NullableColumnNames<TColumns>>> &
       Omit<RowEncodeNonNullable<TColumns>, NullableColumnNames<TColumns>>
   >

package/src/schema-management/migrations.ts

@@ -1,8 +1,8 @@
-import { SqliteAst, SqliteDsl } from '@livestore/db-schema'
 import { memoizeByStringifyArgs } from '@livestore/utils'
 import { Effect, Schema as EffectSchema } from '@livestore/utils/effect'
 
 import type { MigrationsReport, MigrationsReportEntry, SqliteDb, UnexpectedError } from '../adapter-types.js'
+import { SqliteAst, SqliteDsl } from '../schema/db-schema/mod.js'
 import type { LiveStoreSchema } from '../schema/mod.js'
 import type { SchemaMetaRow, SchemaMutationsMetaRow } from '../schema/system-tables.js'
 import {

package/src/sql-queries/sql-queries.ts

@@ -1,7 +1,7 @@
-import type { SqliteDsl } from '@livestore/db-schema'
 import { shouldNeverHappen } from '@livestore/utils'
 import { pipe, ReadonlyArray, Schema, TreeFormatter } from '@livestore/utils/effect'
 
+import type { SqliteDsl } from '../schema/db-schema/mod.js'
 import { sql } from '../util.js'
 import { objectEntries } from './misc.js'
 import * as ClientTypes from './types.js'

package/src/sql-queries/sql-query-builder.ts

@@ -1,5 +1,4 @@
-import type { SqliteDsl } from '@livestore/db-schema'
-
+import type { SqliteDsl } from '../schema/db-schema/mod.js'
 import type { BindValues } from './sql-queries.js'
 import * as SqlQueries from './sql-queries.js'
 import type * as ClientTypes from './types.js'

package/src/sql-queries/types.ts

@@ -1,6 +1,8 @@
-import type { Prettify, SqliteDsl } from '@livestore/db-schema'
+import type { Prettify } from '@livestore/utils'
 import type { Schema } from '@livestore/utils/effect'
 
+import type { SqliteDsl } from '../schema/db-schema/mod.js'
+
 export type DecodedValuesForTableAll<TSchema extends SqliteDsl.DbSchema, TTableName extends keyof TSchema> = {
   [K in keyof GetColumns<TSchema, TTableName>]: Schema.Schema.Type<GetColumn<TSchema, TTableName, K>['schema']>
 }

package/src/sync/next/test/compact-events.test.ts

@@ -81,17 +81,17 @@ const compact = (events: any[]) => {
 }
 
 describe('compactEvents todo app', () => {
-  it('completeTodo', () => {
+  it('todoCompleted', () => {
     const expected = compact([
       mutations.createTodo({ id: 'A', text: 'buy milk' }), // 0
-      mutations.completeTodo({ id: 'A' }), // 1
-      mutations.completeTodo({ id: 'A' }), // 2
+      mutations.todoCompleted({ id: 'A' }), // 1
+      mutations.todoCompleted({ id: 'A' }), // 2
     ])
 
     expect(expected).toMatchInlineSnapshot(`
       [
         { id: 0, parentId: -1, mutation: "createTodo", args: { id: "A", text: "buy milk" }, clientId: "client-id", sessionId: "session-id", facts: "+todo-exists-A +todo-is-writeable-A=true +todo-completed-A=false" }
-        { id: 2, parentId: 0, mutation: "completeTodo", args: { id: "A" }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A ↖todo-is-writeable-A=true +todo-completed-A=true" }
+        { id: 2, parentId: 0, mutation: "todoCompleted", args: { id: "A" }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A ↖todo-is-writeable-A=true +todo-completed-A=true" }
       ]
     `)
   })
@@ -114,20 +114,20 @@ describe('compactEvents todo app', () => {
     `)
   })
 
-  it('completeTodo / toggleTodo', () => {
+  it('todoCompleted / toggleTodo', () => {
     const expected = compact([
       mutations.createTodo({ id: 'A', text: 'buy milk' }), // 0
       mutations.toggleTodo({ id: 'A' }), // 1
       mutations.toggleTodo({ id: 'A' }), // 2
-      mutations.completeTodo({ id: 'A' }), // 3
-      mutations.completeTodo({ id: 'A' }), // 4
+      mutations.todoCompleted({ id: 'A' }), // 3
+      mutations.todoCompleted({ id: 'A' }), // 4
       mutations.toggleTodo({ id: 'A' }), // 5
     ])
 
     expect(expected).toMatchInlineSnapshot(`
       [
         { id: 0, parentId: -1, mutation: "createTodo", args: { id: "A", text: "buy milk" }, clientId: "client-id", sessionId: "session-id", facts: "+todo-exists-A +todo-is-writeable-A=true +todo-completed-A=false" }
-        { id: 4, parentId: 0, mutation: "completeTodo", args: { id: "A" }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A ↖todo-is-writeable-A=true +todo-completed-A=true" }
+        { id: 4, parentId: 0, mutation: "todoCompleted", args: { id: "A" }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A ↖todo-is-writeable-A=true +todo-completed-A=true" }
         { id: 5, parentId: 4, mutation: "toggleTodo", args: { id: "A" }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A ↖todo-is-writeable-A=true ?todo-completed-A +todo-completed-A=false" }
       ]
     `)
@@ -155,7 +155,7 @@ describe('compactEvents todo app', () => {
     const expected = compact([
       mutations.createTodo({ id: 'A', text: 'buy milk' }), // 0
       mutations.setReadonlyTodo({ id: 'A', readonly: false }), // 1
-      mutations.completeTodo({ id: 'A' }), // 2
+      mutations.todoCompleted({ id: 'A' }), // 2
       mutations.setTextTodo({ id: 'A', text: 'buy soy milk' }), // 3
       mutations.setReadonlyTodo({ id: 'A', readonly: true }), // 4
     ])
@@ -164,7 +164,7 @@ describe('compactEvents todo app', () => {
       [
         { id: 0, parentId: -1, mutation: "createTodo", args: { id: "A", text: "buy milk" }, clientId: "client-id", sessionId: "session-id", facts: "+todo-exists-A +todo-is-writeable-A=true +todo-completed-A=false" }
         { id: 1, parentId: 0, mutation: "setReadonlyTodo", args: { id: "A", readonly: false }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A +todo-is-writeable-A=true" }
-        { id: 2, parentId: 1, mutation: "completeTodo", args: { id: "A" }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A ↖todo-is-writeable-A=true +todo-completed-A=true" }
+        { id: 2, parentId: 1, mutation: "todoCompleted", args: { id: "A" }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A ↖todo-is-writeable-A=true +todo-completed-A=true" }
         { id: 3, parentId: 2, mutation: "setTextTodo", args: { id: "A", text: "buy soy milk" }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A ↖todo-is-writeable-A=true +todo-text-updated-A" }
         { id: 4, parentId: 3, mutation: "setReadonlyTodo", args: { id: "A", readonly: true }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A +todo-is-writeable-A=false" }
       ]
@@ -188,14 +188,14 @@ describe('compactEvents todo app', () => {
     `)
   })
 
-  it('completeTodos', () => {
+  it('todoCompleteds', () => {
     const expected = compact([
       mutations.createTodo({ id: 'A', text: 'buy milk' }), // 0
       mutations.createTodo({ id: 'B', text: 'buy bread' }), // 1
       mutations.createTodo({ id: 'C', text: 'buy cheese' }), // 2
-      mutations.completeTodos({ ids: ['A', 'B', 'C'] }), // 3
+      mutations.todoCompleteds({ ids: ['A', 'B', 'C'] }), // 3
       mutations.toggleTodo({ id: 'A' }), // 4
-      mutations.completeTodo({ id: 'A' }), // 5
+      mutations.todoCompleted({ id: 'A' }), // 5
     ])
 
     expect(expected).toMatchInlineSnapshot(`
@@ -203,21 +203,21 @@ describe('compactEvents todo app', () => {
         { id: 0, parentId: -1, mutation: "createTodo", args: { id: "A", text: "buy milk" }, clientId: "client-id", sessionId: "session-id", facts: "+todo-exists-A +todo-is-writeable-A=true +todo-completed-A=false" }
         { id: 1, parentId: 0, mutation: "createTodo", args: { id: "B", text: "buy bread" }, clientId: "client-id", sessionId: "session-id", facts: "+todo-exists-B +todo-is-writeable-B=true +todo-completed-B=false" }
         { id: 2, parentId: 1, mutation: "createTodo", args: { id: "C", text: "buy cheese" }, clientId: "client-id", sessionId: "session-id", facts: "+todo-exists-C +todo-is-writeable-C=true +todo-completed-C=false" }
-        { id: 3, parentId: 2, mutation: "completeTodos", args: { ids: ["A", "B", "C"] }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A ↖todo-is-writeable-A=true ↖todo-exists-B ↖todo-is-writeable-B=true ↖todo-exists-C ↖todo-is-writeable-C=true +todo-completed-A=true +todo-completed-B=true +todo-completed-C=true" }
-        { id: 5, parentId: 3, mutation: "completeTodo", args: { id: "A" }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A ↖todo-is-writeable-A=true +todo-completed-A=true" }
+        { id: 3, parentId: 2, mutation: "todoCompleteds", args: { ids: ["A", "B", "C"] }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A ↖todo-is-writeable-A=true ↖todo-exists-B ↖todo-is-writeable-B=true ↖todo-exists-C ↖todo-is-writeable-C=true +todo-completed-A=true +todo-completed-B=true +todo-completed-C=true" }
+        { id: 5, parentId: 3, mutation: "todoCompleted", args: { id: "A" }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A ↖todo-is-writeable-A=true +todo-completed-A=true" }
       ]
     `)
   })
 
-  it('completeTodos 2', () => {
+  it('todoCompleteds 2', () => {
     const expected = compact([
       mutations.createTodo({ id: 'A', text: 'buy milk' }), // 0
       mutations.createTodo({ id: 'B', text: 'buy bread' }), // 1
       mutations.createTodo({ id: 'C', text: 'buy cheese' }), // 2
       mutations.toggleTodo({ id: 'A' }), // 3
-      mutations.completeTodos({ ids: ['A', 'B', 'C'] }), // 4
+      mutations.todoCompleteds({ ids: ['A', 'B', 'C'] }), // 4
       mutations.toggleTodo({ id: 'A' }), // 5
-      mutations.completeTodo({ id: 'A' }), // 6
+      mutations.todoCompleted({ id: 'A' }), // 6
     ])
 
     expect(expected).toMatchInlineSnapshot(`
@@ -225,8 +225,8 @@ describe('compactEvents todo app', () => {
         { id: 0, parentId: -1, mutation: "createTodo", args: { id: "A", text: "buy milk" }, clientId: "client-id", sessionId: "session-id", facts: "+todo-exists-A +todo-is-writeable-A=true +todo-completed-A=false" }
         { id: 1, parentId: 0, mutation: "createTodo", args: { id: "B", text: "buy bread" }, clientId: "client-id", sessionId: "session-id", facts: "+todo-exists-B +todo-is-writeable-B=true +todo-completed-B=false" }
         { id: 2, parentId: 1, mutation: "createTodo", args: { id: "C", text: "buy cheese" }, clientId: "client-id", sessionId: "session-id", facts: "+todo-exists-C +todo-is-writeable-C=true +todo-completed-C=false" }
-        { id: 4, parentId: 2, mutation: "completeTodos", args: { ids: ["A", "B", "C"] }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A ↖todo-is-writeable-A=true ↖todo-exists-B ↖todo-is-writeable-B=true ↖todo-exists-C ↖todo-is-writeable-C=true +todo-completed-A=true +todo-completed-B=true +todo-completed-C=true" }
-        { id: 6, parentId: 4, mutation: "completeTodo", args: { id: "A" }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A ↖todo-is-writeable-A=true +todo-completed-A=true" }
+        { id: 4, parentId: 2, mutation: "todoCompleteds", args: { ids: ["A", "B", "C"] }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A ↖todo-is-writeable-A=true ↖todo-exists-B ↖todo-is-writeable-B=true ↖todo-exists-C ↖todo-is-writeable-C=true +todo-completed-A=true +todo-completed-B=true +todo-completed-C=true" }
+        { id: 6, parentId: 4, mutation: "todoCompleted", args: { id: "A" }, clientId: "client-id", sessionId: "session-id", facts: "↖todo-exists-A ↖todo-is-writeable-A=true +todo-completed-A=true" }
       ]
     `)
   })

package/src/sync/next/test/mutation-fixtures.ts

@@ -42,8 +42,8 @@ export const mutations = {
           : { modify: { set: [facts.todoExists(id), facts.todoIsWriteable(id, true), facts.todoTextUpdated(id)] } },
     },
   ),
-  completeTodo: defineMutation(
-    'completeTodo',
+  todoCompleted: defineMutation(
+    'todoCompleted',
     Schema.Struct({ id: Schema.String }),
     // consider `RETURNING` to validate before applying facts
     'UPDATE todos SET completed = true WHERE id = $id',
@@ -58,8 +58,8 @@ export const mutations = {
       }),
     },
   ),
-  uncompleteTodo: defineMutation(
-    'uncompleteTodo',
+  todoUncompleted: defineMutation(
+    'todoUncompleted',
     Schema.Struct({ id: Schema.String }),
     'UPDATE todos SET completed = false WHERE id = $id',
     {
@@ -69,8 +69,8 @@ export const mutations = {
       }),
     },
   ),
-  completeTodos: defineMutation(
-    'completeTodos',
+  todoCompleteds: defineMutation(
+    'todoCompleteds',
     Schema.Struct({ ids: Schema.Array(Schema.String) }),
     'UPDATE todos SET completed = true WHERE id IN ($ids:csv)',
     {

package/src/version.ts

@@ -2,7 +2,7 @@
 // import packageJson from '../package.json' with { type: 'json' }
 // export const liveStoreVersion = packageJson.version
 
-export const liveStoreVersion = '0.3.0-dev.12' as const
+export const liveStoreVersion = '0.3.0-dev.15' as const
 
 /**
  * This version number is incremented whenever the internal storage format changes in a breaking way.

package/tsconfig.json

@@ -7,5 +7,5 @@
     "tsBuildInfoFile": "./dist/.tsbuildinfo"
   },
   "include": ["./src"],
-  "references": [{ "path": "../db-schema" }, { "path": "../utils" }]
+  "references": [{ "path": "../utils" }]
 }