@livestore/livestore 0.0.29 → 0.0.31

package/dist/schema/table-def.d.ts

@@ -1,95 +1,7 @@
 import { Schema } from '@livestore/utils/effect';
 import type { Nullable, PrettifyFlat } from 'effect-db-schema';
 import { SqliteDsl } from 'effect-db-schema';
-export declare const blob: <TNullable extends boolean = false>(def?: Omit<SqliteDsl.ColumnDefinition<SqliteDsl.FieldType.FieldTypeBlob<Uint8Array>, TNullable>, "type"> | undefined) => {
-    default?: Uint8Array | null | undefined;
-    primaryKey?: boolean | undefined;
-    nullable?: TNullable | undefined;
-    type: SqliteDsl.FieldType.FieldTypeBlob<Uint8Array>;
-}, blobWithSchema: <TDecoded, TNullable extends boolean = false>({ schema, ...def }: {
-    schema: Schema.Schema<Uint8Array, TDecoded>;
-} & Omit<SqliteDsl.ColumnDefinition<SqliteDsl.FieldType.FieldTypeBlob<TDecoded>, TNullable>, "type">) => {
-    default?: TDecoded | null | undefined;
-    primaryKey?: boolean | undefined;
-    nullable?: TNullable | undefined;
-    type: SqliteDsl.FieldType.FieldTypeBlob<TDecoded>;
-}, boolean: <const TDef extends {
-    readonly default?: boolean | null | undefined;
-    readonly primaryKey?: boolean | undefined;
-    readonly nullable?: boolean | undefined;
-}>(def?: TDef | undefined) => SqliteDsl.ColumnDefinition<SqliteDsl.FieldType.FieldTypeBoolean, TDef["nullable"] extends boolean ? TDef["nullable"] : false>, column: <TType extends SqliteDsl.FieldType.FieldColumnType, TEncoded, TDecoded, TNullable extends boolean>(_: SqliteDsl.ColumnDefinition<SqliteDsl.FieldType.FieldType<TType, TEncoded, TDecoded>, TNullable>) => SqliteDsl.ColumnDefinition<SqliteDsl.FieldType.FieldType<TType, TEncoded, TDecoded>, TNullable>, datetime: <const TDef extends {
-    readonly default?: {
-        toString: {};
-        toDateString: {};
-        toTimeString: {};
-        toLocaleString: {};
-        toLocaleDateString: {};
-        toLocaleTimeString: {};
-        valueOf: {};
-        getTime: {};
-        getFullYear: {};
-        getUTCFullYear: {};
-        getMonth: {};
-        getUTCMonth: {};
-        getDate: {};
-        getUTCDate: {};
-        getDay: {};
-        getUTCDay: {};
-        getHours: {};
-        getUTCHours: {};
-        getMinutes: {};
-        getUTCMinutes: {};
-        getSeconds: {};
-        getUTCSeconds: {};
-        getMilliseconds: {};
-        getUTCMilliseconds: {};
-        getTimezoneOffset: {};
-        setTime: {};
-        setMilliseconds: {};
-        setUTCMilliseconds: {};
-        setSeconds: {};
-        setUTCSeconds: {};
-        setMinutes: {};
-        setUTCMinutes: {};
-        setHours: {};
-        setUTCHours: {};
-        setDate: {};
-        setUTCDate: {};
-        setMonth: {};
-        setUTCMonth: {};
-        setFullYear: {};
-        setUTCFullYear: {};
-        toUTCString: {};
-        toISOString: {};
-        toJSON: {};
-        getVarDate: {};
-        [Symbol.toPrimitive]: {};
-    } | null | undefined;
-    readonly primaryKey?: boolean | undefined;
-    readonly nullable?: boolean | undefined;
-}>(def?: TDef | undefined) => SqliteDsl.ColumnDefinition<SqliteDsl.FieldType.FieldTypeDateTime, TDef["nullable"] extends boolean ? TDef["nullable"] : false>, integer: <const TDef extends {
-    readonly default?: number | null | undefined;
-    readonly primaryKey?: boolean | undefined;
-    readonly nullable?: boolean | undefined;
-}>(def?: TDef | undefined) => SqliteDsl.ColumnDefinition<SqliteDsl.FieldType.FieldTypeInteger<number, number>, TDef["nullable"] extends boolean ? TDef["nullable"] : false>, isColumnDefinition: (value: unknown) => value is SqliteDsl.ColumnDefinition<any, any>, json: <TEncoded, TDecoded, const TDef extends {
-    readonly default?: import("effect-db-schema").Prettify<TDecoded> | null | undefined;
-    readonly primaryKey?: boolean | undefined;
-    readonly nullable?: boolean | undefined;
-}>({ schema, ...def }: TDef & {
-    schema: Schema.Schema<TEncoded, TDecoded>;
-}) => SqliteDsl.ColumnDefinition<SqliteDsl.FieldType.FieldTypeJson<TDecoded>, TDef["nullable"] extends boolean ? TDef["nullable"] : false>, real: <const TDef extends {
-    readonly default?: number | null | undefined;
-    readonly primaryKey?: boolean | undefined;
-    readonly nullable?: boolean | undefined;
-}>(def?: TDef | undefined) => SqliteDsl.ColumnDefinition<SqliteDsl.FieldType.FieldTypeReal<number, number>, TDef["nullable"] extends boolean ? TDef["nullable"] : false>, text: <const TDef extends {
-    readonly default?: string | null | undefined;
-    readonly primaryKey?: boolean | undefined;
-    readonly nullable?: boolean | undefined;
-}>(def?: TDef | undefined) => SqliteDsl.ColumnDefinition<SqliteDsl.FieldType.FieldTypeText<string, string>, TDef["nullable"] extends boolean ? TDef["nullable"] : false>, textWithSchema: <TEncoded extends string, TDecoded, const TDef extends {
-    readonly default?: import("effect-db-schema").Prettify<TDecoded> | null | undefined;
-    readonly primaryKey?: boolean | undefined;
-    readonly nullable?: boolean | undefined;
-}>(schema: Schema.Schema<TEncoded, TDecoded>, def?: TDef | undefined) => SqliteDsl.ColumnDefinition<SqliteDsl.FieldType.FieldTypeText<TEncoded, TDecoded>, TDef["nullable"] extends boolean ? TDef["nullable"] : false>;
+export declare const blob: SqliteDsl.ColDefFn<"blob">, boolean: SqliteDsl.SpecializedColDefFn<"integer", false, boolean>, column: <TColumnType extends SqliteDsl.FieldColumnType>(columnType: TColumnType) => SqliteDsl.ColDefFn<TColumnType>, datetime: SqliteDsl.SpecializedColDefFn<"text", false, Date>, integer: SqliteDsl.ColDefFn<"integer">, isColumnDefinition: (value: unknown) => value is SqliteDsl.ColumnDefinition<any, any>, json: SqliteDsl.SpecializedColDefFn<"text", true, unknown>, real: SqliteDsl.ColDefFn<"real">, text: SqliteDsl.ColDefFn<"text">;
 export { type SqliteDsl as __SqliteDsl } from 'effect-db-schema';
 export type StateType = 'singleton' | 'dynamic';
 export type DefaultSqliteTableDef = SqliteDsl.TableDefinition<string, SqliteDsl.Columns>;
@@ -114,7 +26,7 @@ export type TableOptions = {
     dynamicRegistration: boolean;
     disableAutomaticIdColumn: boolean;
 };
-export declare const table: <TName extends string, TColumns extends SqliteDsl.Columns | SqliteDsl.ColumnDefinition<any, any>, const TOptionsInput extends Partial<TableOptions & {
+export declare const table: <TName extends string, TColumns extends SqliteDsl.ColumnDefinition<any, any> | SqliteDsl.Columns, const TOptionsInput extends Partial<TableOptions & {
     indexes: SqliteDsl.Index[];
 }> = Partial<TableOptions & {
     indexes: SqliteDsl.Index[];
@@ -122,9 +34,9 @@ export declare const table: <TName extends string, TColumns extends SqliteDsl.Co
     value: TColumns;
 }, WithDefaults<TOptionsInput>>>>, TColumns extends SqliteDsl.ColumnDefinition<any, any> ? true : false, WithDefaults<TOptionsInput>>;
 type WithId<TColumns extends SqliteDsl.Columns, TOptions extends TableOptions> = TColumns & (TOptions['disableAutomaticIdColumn'] extends true ? {} : TOptions['isSingleton'] extends true ? {
-    id: SqliteDsl.ColumnDefinition<SqliteDsl.FieldType.FieldTypeText<'singleton', 'singleton'>, false>;
+    id: SqliteDsl.ColumnDefinition<'singleton', 'singleton'>;
 } : {
-    id: SqliteDsl.ColumnDefinition<SqliteDsl.FieldType.FieldTypeText<string, string>, false>;
+    id: SqliteDsl.ColumnDefinition<string, string>;
 });
 type WithDefaults<TOptionsInput extends TableOptionsInput> = {
     isSingleton: TOptionsInput['isSingleton'] extends true ? true : false;
@@ -135,27 +47,29 @@ export declare namespace FromTable {
     type RowDecoded<TTableDef extends TableDef> = PrettifyFlat<Nullable<Pick<RowDecodedAll<TTableDef>, NullableColumnNames<TTableDef>>> & Omit<RowDecodedAll<TTableDef>, NullableColumnNames<TTableDef>>>;
     type NullableColumnNames<TTableDef extends TableDef> = FromColumns.NullableColumnNames<TTableDef['schema']['columns']>;
     type Columns<TTableDef extends TableDef> = {
-        [K in keyof TTableDef['schema']['columns']]: TTableDef['schema']['columns'][K]['type']['columnType'];
+        [K in keyof TTableDef['schema']['columns']]: TTableDef['schema']['columns'][K]['columnType'];
     };
     type RowEncodeNonNullable<TTableDef extends TableDef> = {
-        [K in keyof TTableDef['schema']['columns']]: Schema.Schema.From<TTableDef['schema']['columns'][K]['type']['codec']>;
+        [K in keyof TTableDef['schema']['columns']]: Schema.Schema.From<TTableDef['schema']['columns'][K]['schema']>;
     };
     type RowEncoded<TTableDef extends TableDef> = PrettifyFlat<Nullable<Pick<RowEncodeNonNullable<TTableDef>, NullableColumnNames<TTableDef>>> & Omit<RowEncodeNonNullable<TTableDef>, NullableColumnNames<TTableDef>>>;
     type RowDecodedAll<TTableDef extends TableDef> = {
-        [K in keyof TTableDef['schema']['columns']]: Schema.Schema.To<TTableDef['schema']['columns'][K]['type']['codec']>;
+        [K in keyof TTableDef['schema']['columns']]: Schema.Schema.To<TTableDef['schema']['columns'][K]['schema']>;
     };
 }
 export declare namespace FromColumns {
     type RowDecoded<TColumns extends SqliteDsl.Columns> = PrettifyFlat<Nullable<Pick<RowDecodedAll<TColumns>, NullableColumnNames<TColumns>>> & Omit<RowDecodedAll<TColumns>, NullableColumnNames<TColumns>>>;
     type RowDecodedAll<TColumns extends SqliteDsl.Columns> = {
-        [K in keyof TColumns]: Schema.Schema.To<TColumns[K]['type']['codec']>;
+        [K in keyof TColumns]: Schema.Schema.To<TColumns[K]['schema']>;
     };
     type RowEncoded<TColumns extends SqliteDsl.Columns> = PrettifyFlat<Nullable<Pick<RowEncodeNonNullable<TColumns>, NullableColumnNames<TColumns>>> & Omit<RowEncodeNonNullable<TColumns>, NullableColumnNames<TColumns>>>;
     type RowEncodeNonNullable<TColumns extends SqliteDsl.Columns> = {
-        [K in keyof TColumns]: Schema.Schema.From<TColumns[K]['type']['codec']>;
+        [K in keyof TColumns]: Schema.Schema.From<TColumns[K]['schema']>;
     };
     type NullableColumnNames<TColumns extends SqliteDsl.Columns> = keyof {
-        [K in keyof TColumns as TColumns[K] extends SqliteDsl.ColumnDefinition<any, true> ? K : never]: {};
+        [K in keyof TColumns as TColumns[K]['default'] extends true ? K : never]: {};
     };
+    type RequiredInsertColumnNames<TColumns extends SqliteDsl.Columns> = SqliteDsl.FromColumns.RequiredInsertColumnNames<TColumns>;
+    type InsertRowDecoded<TColumns extends SqliteDsl.Columns> = SqliteDsl.FromColumns.InsertRowDecoded<TColumns>;
 }
 //# sourceMappingURL=table-def.d.ts.map

package/dist/schema/table-def.d.ts.map

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

package/dist/schema/table-def.js

@@ -1,7 +1,7 @@
 import { shouldNeverHappen } from '@livestore/utils';
 import { ReadonlyRecord, Schema } from '@livestore/utils/effect';
 import { SqliteAst, SqliteDsl } from 'effect-db-schema';
-export const { blob, blobWithSchema, boolean, column, datetime, integer, isColumnDefinition, json, real, text, textWithSchema, } = SqliteDsl;
+export const { blob, boolean, column, datetime, integer, isColumnDefinition, json, real, text } = SqliteDsl;
 import { dynamicallyRegisteredTables } from '../global-state.js';
 export const table = (name, columnOrColumns, 
 // type?: TStateType,
@@ -20,7 +20,7 @@ options) => {
     }
     else if (columns.id === undefined && ReadonlyRecord.some(columns, (_) => _.primaryKey === true) === false) {
         if (options_.isSingleton) {
-            columns.id = SqliteDsl.textWithSchema(Schema.literal('singleton'), { primaryKey: true, default: 'singleton' });
+            columns.id = SqliteDsl.text({ schema: Schema.literal('singleton'), primaryKey: true, default: 'singleton' });
         }
         else {
             columns.id = SqliteDsl.text({ primaryKey: true });
@@ -29,7 +29,7 @@ options) => {
     const schema = SqliteDsl.table(tablePath, columns, options?.indexes ?? []);
     if (options_.isSingleton) {
         for (const column of schema.ast.columns) {
-            if (column.nullable === false && column.default === undefined) {
+            if (column.nullable === false && column.default._tag === 'None') {
                 shouldNeverHappen(`When creating a singleton table, each column must be either nullable or have a default value. Column '${column.name}' is neither.`);
             }
         }

package/dist/schema/table-def.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livestore/livestore",
-  "version": "0.0.29",
+  "version": "0.0.31",
   "type": "module",
   "exports": {
     ".": {
@@ -53,8 +53,9 @@
     "lodash-es": "^4.17.21",
     "sqlite-esm": "3.42.0-build6",
     "uuid": "^9.0.1",
-    "@livestore/utils": "0.0.29",
-    "effect-db-schema": "0.0.29"
+    "@livestore/utils": "0.0.31",
+    "@livestore/sql-queries": "0.0.31",
+    "effect-db-schema": "0.0.31"
   },
   "devDependencies": {
     "@opentelemetry/sdk-trace-base": "1.19.0",

package/src/__tests__/mutations.test.ts

@@ -0,0 +1,43 @@
+import { describe, expect, test } from 'vitest'
+
+import { makeMutations } from '../mutations.js'
+import { schema } from './react/fixture.js'
+
+describe('mutations', () => {
+  const mutations = makeMutations(schema)
+
+  test('basic', () => {
+    expect(mutations.todos.insert({ id: 't1', completed: true, text: 'Task 1' })).toMatchInlineSnapshot(`
+      {
+        "args": {
+          "bindValues": {
+            "completed": 1,
+            "id": "t1",
+            "text": "Task 1",
+          },
+          "sql": "INSERT  INTO todos (id, completed, text) VALUES ($id, $completed, $text)",
+          "writeTables": Set {
+            "todos",
+          },
+        },
+        "eventType": "livestore.RawSql",
+      }
+    `)
+
+    expect(mutations.todos.update({ where: { id: 't1' }, values: { text: 'Task 1 - fixed' } })).toMatchInlineSnapshot(`
+      {
+        "args": {
+          "bindValues": {
+            "update_text": "Task 1 - fixed",
+            "where_id": "t1",
+          },
+          "sql": "UPDATE todos SET text = $update_text WHERE id = $where_id",
+          "writeTables": Set {
+            "todos",
+          },
+        },
+        "eventType": "livestore.RawSql",
+      }
+    `)
+  })
+})

package/src/inMemoryDatabase.ts

@@ -125,6 +125,9 @@ export class InMemoryDatabase {
       while (stmt.step()) {
         tablesUsed.add(stmt.get(0))
       }
+    } catch (e) {
+      console.error('Error getting tables used', e, 'for query', query)
+      return new Set<string>()
     } finally {
       stmt.reset()
     }

package/src/index.ts

@@ -17,6 +17,8 @@ export { dbGraph } from './global-state.js'
 
 export { type RowResult, type RowResultEncoded, type RowQueryArgs, rowQuery } from './row-query.js'
 
+export * from './mutations.js'
+
 export { defineAction, defineActions, makeSchema, DbSchema } from './schema/index.js'
 
 export type {

package/src/migrations.ts

@@ -119,10 +119,10 @@ const toSqliteColumnSpec = (column: SqliteAst.Column) => {
   const columnTypeStr = column.type._tag
   const nullableStr = column.nullable === false ? 'not null' : ''
   const defaultValueStr = (() => {
-    if (column.default === undefined) return ''
+    if (column.default._tag === 'None') return ''
 
-    const encodeValue = EffectSchema.encodeSync(column.codec)
-    const encodedDefaultValue = encodeValue(column.default ?? null)
+    const encodeValue = EffectSchema.encodeSync(column.schema)
+    const encodedDefaultValue = encodeValue(column.default.value)
 
     return columnTypeStr === 'text' ? `default '${encodedDefaultValue}'` : `default ${encodedDefaultValue}`
   })()

package/src/mutations.ts

@@ -0,0 +1,74 @@
+import * as SqlQueries from '@livestore/sql-queries'
+import type { SqliteDsl } from 'effect-db-schema'
+
+import type { RowInsert, RowResult } from './row-query.js'
+import type { LiveStoreSchema } from './schema/index.js'
+import type { TableDef } from './schema/table-def.js'
+
+export const makeMutations = <TDbSchema extends SqliteDsl.DbSchema>(
+  schema: LiveStoreSchema<TDbSchema>,
+): Mutations<TDbSchema> => {
+  return Object.fromEntries(Array.from(schema.tables.values()).map(mutationsForTable)) as any
+}
+
+const mutationsForTable = <TTableDef extends TableDef>(tableDef: TTableDef): [string, Mutation<TTableDef>] => {
+  const table = tableDef.schema
+  const writeTables = new Set([table.name])
+  const api = {
+    insert: (values) => {
+      const [sql, bindValues] = SqlQueries.insertRow({
+        tableName: table.name,
+        columns: table.columns,
+        options: { orReplace: false },
+        values: values as any,
+      })
+      return { eventType: 'livestore.RawSql', args: { sql, bindValues, writeTables } }
+    },
+    update: ({ where, values }) => {
+      const [sql, bindValues] = SqlQueries.updateRows({
+        tableName: table.name,
+        columns: table.columns,
+        where: where,
+        updateValues: values,
+      })
+      return { eventType: 'livestore.RawSql', args: { sql, bindValues, writeTables } }
+    },
+    delete: ({ where }) => {
+      const [sql, bindValues] = SqlQueries.deleteRows({
+        tableName: table.name,
+        columns: table.columns,
+        where: where,
+      })
+      return { eventType: 'livestore.RawSql', args: { sql, bindValues, writeTables } }
+    },
+  } satisfies Mutation<TTableDef>
+
+  return [tableDef.schema.name, api]
+}
+
+export type MutationEvent = {
+  eventType: 'livestore.RawSql'
+  args: { sql: string; bindValues: SqlQueries.BindValues; writeTables: Set<string> }
+}
+
+export type UpdateMutation<TTableDef extends TableDef> = (args: {
+  // TODO also allow `id` if present in `TTableDef`
+  where: Partial<RowResult<TTableDef>>
+  values: Partial<RowResult<TTableDef>>
+}) => MutationEvent
+
+export type InsertMutation<TTableDef extends TableDef> = (values: RowInsert<TTableDef>) => MutationEvent
+
+export type DeleteMutation<TTableDef extends TableDef> = (args: {
+  where: Partial<RowResult<TTableDef>>
+}) => MutationEvent
+
+export type Mutation<TTableDef extends TableDef> = {
+  insert: InsertMutation<TTableDef>
+  update: UpdateMutation<TTableDef>
+  delete: DeleteMutation<TTableDef>
+}
+
+export type Mutations<TDbSchema extends SqliteDsl.DbSchema> = {
+  [TTableName in keyof TDbSchema]: Mutation<TableDef<TDbSchema[TTableName]>>
+}

package/src/react/useRow.ts

@@ -104,7 +104,7 @@ export const useRow: {
         const newValue = typeof newValueOrFn === 'function' ? newValueOrFn(query$Ref.current) : newValueOrFn
         if (query$Ref.current === newValue) return
 
-        const encodedValue = Schema.encodeSync(sqliteTableDef.columns['value']!.type.codec)(newValue)
+        const encodedValue = Schema.encodeSync(sqliteTableDef.columns['value']!.schema)(newValue)
 
         store.applyEvent('livestore.UpdateComponentState', {
           tableName: sqliteTableDef.name,
@@ -124,7 +124,7 @@ export const useRow: {
           // @ts-expect-error TODO fix typing
           if (query$Ref.current[columnName] === newValue) return
 
-          const encodedValue = Schema.encodeSync(column.type.codec)(newValue)
+          const encodedValue = Schema.encodeSync(column.schema)(newValue)
 
           store.applyEvent('livestore.UpdateComponentState', {
             tableName: sqliteTableDef.name,
@@ -150,7 +150,7 @@ export const useRow: {
 
         const columnNames = Object.keys(columnValues)
         const bindValues = mapValues(columnValues, (value, columnName) =>
-          Schema.encodeSync(sqliteTableDef.columns[columnName]!.type.codec)(value),
+          Schema.encodeSync(sqliteTableDef.columns[columnName]!.schema)(value),
         )
 
         store.applyEvent('livestore.UpdateComponentState', {

package/src/row-query.ts

@@ -18,6 +18,7 @@ export type RowQueryArgs<TTableDef extends TableDef> = TTableDef['options']['isS
       store: Store
       otelContext?: otel.Context
       defaultValues: Partial<RowResult<TTableDef>>
+      skipInsertDefaultRow?: boolean
     }
   : {
       table: TTableDef
@@ -25,13 +26,14 @@ export type RowQueryArgs<TTableDef extends TableDef> = TTableDef['options']['isS
       otelContext?: otel.Context
       id: string
       defaultValues: Partial<RowResult<TTableDef>>
+      skipInsertDefaultRow?: boolean
     }
 
 // TODO also allow other where clauses and multiple rows
 export const rowQuery = <TTableDef extends TableDef>(
   args: RowQueryArgs<TTableDef>,
 ): LiveStoreJSQuery<RowResult<TTableDef>> => {
-  const { table, store, defaultValues } = args
+  const { table, store, defaultValues, skipInsertDefaultRow } = args
   const otelContext = args.otelContext ?? store.otel.queriesSpanContext
   const id: string | undefined = (args as any).id
 
@@ -69,14 +71,16 @@ export const rowQuery = <TTableDef extends TableDef>(
     })
   }
 
-  // TODO find a way to only do this if necessary
-  insertRowWithDefaultValuesOrIgnore({
-    db: store._proxyDb,
-    id: id ?? 'singleton',
-    stateSchema,
-    otelContext,
-    defaultValues,
-  })
+  if (skipInsertDefaultRow !== true) {
+    // TODO find a way to only do this if necessary
+    insertRowWithDefaultValuesOrIgnore({
+      db: store._proxyDb,
+      id: id ?? 'singleton',
+      stateSchema,
+      otelContext,
+      defaultValues,
+    })
+  }
 
   const whereClause = id === undefined ? '' : `where id = '${id}'`
   const queryStr = sql`select * from ${componentTableName} ${whereClause} limit 1`
@@ -110,6 +114,10 @@ export type RowResultEncoded<TTableDef extends TableDef> = TTableDef['isSingleCo
   ? GetValForKey<SqliteDsl.FromColumns.RowEncoded<TTableDef['schema']['columns']>, 'value'>
   : SqliteDsl.FromColumns.RowEncoded<TTableDef['schema']['columns']>
 
+export type RowInsert<TTableDef extends TableDef> = TTableDef['isSingleColumn'] extends true
+  ? GetValForKey<SqliteDsl.FromColumns.InsertRowDecoded<TTableDef['schema']['columns']>, 'value'>
+  : SqliteDsl.FromColumns.InsertRowDecoded<TTableDef['schema']['columns']>
+
 const insertRowWithDefaultValuesOrIgnore = ({
   db,
   id,
@@ -135,11 +143,11 @@ const insertRowWithDefaultValuesOrIgnore = ({
     stateSchema.columns,
     ReadonlyRecord.filter((_, key) => key !== 'id'),
     ReadonlyRecord.map((column, columnName) =>
-      column.default === undefined
+      column.default._tag === 'None'
         ? column.nullable === true
           ? null
           : shouldNeverHappen(`Column ${columnName} has no default value and is not nullable`)
-        : Schema.encodeSync(column.type.codec)(column.default ?? null),
+        : Schema.encodeSync(column.schema)(column.default.value),
     ),
     ReadonlyRecord.map((val, columnName) => explicitDefaultValues?.[columnName] ?? val),
   )

package/src/schema/table-def.ts

@@ -3,19 +3,7 @@ import { ReadonlyRecord, Schema } from '@livestore/utils/effect'
 import type { Nullable, PrettifyFlat } from 'effect-db-schema'
 import { SqliteAst, SqliteDsl } from 'effect-db-schema'
 
-export const {
-  blob,
-  blobWithSchema,
-  boolean,
-  column,
-  datetime,
-  integer,
-  isColumnDefinition,
-  json,
-  real,
-  text,
-  textWithSchema,
-} = SqliteDsl
+export const { blob, boolean, column, datetime, integer, isColumnDefinition, json, real, text } = SqliteDsl
 
 export { type SqliteDsl as __SqliteDsl } from 'effect-db-schema'
 
@@ -91,7 +79,7 @@ export const table = <
     }
   } else if (columns.id === undefined && ReadonlyRecord.some(columns, (_) => _.primaryKey === true) === false) {
     if (options_.isSingleton) {
-      columns.id = SqliteDsl.textWithSchema(Schema.literal('singleton'), { primaryKey: true, default: 'singleton' })
+      columns.id = SqliteDsl.text({ schema: Schema.literal('singleton'), primaryKey: true, default: 'singleton' })
     } else {
       columns.id = SqliteDsl.text({ primaryKey: true })
     }
@@ -101,7 +89,7 @@ export const table = <
 
   if (options_.isSingleton) {
     for (const column of schema.ast.columns) {
-      if (column.nullable === false && column.default === undefined) {
+      if (column.nullable === false && column.default._tag === 'None') {
         shouldNeverHappen(
           `When creating a singleton table, each column must be either nullable or have a default value. Column '${column.name}' is neither.`,
         )
@@ -130,10 +118,10 @@ type WithId<TColumns extends SqliteDsl.Columns, TOptions extends TableOptions> =
     ? {}
     : TOptions['isSingleton'] extends true
       ? {
-          id: SqliteDsl.ColumnDefinition<SqliteDsl.FieldType.FieldTypeText<'singleton', 'singleton'>, false>
+          id: SqliteDsl.ColumnDefinition<'singleton', 'singleton'>
         }
       : {
-          id: SqliteDsl.ColumnDefinition<SqliteDsl.FieldType.FieldTypeText<string, string>, false>
+          id: SqliteDsl.ColumnDefinition<string, string>
         })
 
 type WithDefaults<TOptionsInput extends TableOptionsInput> = {
@@ -154,11 +142,11 @@ export namespace FromTable {
   >
 
   export type Columns<TTableDef extends TableDef> = {
-    [K in keyof TTableDef['schema']['columns']]: TTableDef['schema']['columns'][K]['type']['columnType']
+    [K in keyof TTableDef['schema']['columns']]: TTableDef['schema']['columns'][K]['columnType']
   }
 
   export type RowEncodeNonNullable<TTableDef extends TableDef> = {
-    [K in keyof TTableDef['schema']['columns']]: Schema.Schema.From<TTableDef['schema']['columns'][K]['type']['codec']>
+    [K in keyof TTableDef['schema']['columns']]: Schema.Schema.From<TTableDef['schema']['columns'][K]['schema']>
   }
 
   export type RowEncoded<TTableDef extends TableDef> = PrettifyFlat<
@@ -167,7 +155,7 @@ export namespace FromTable {
   >
 
   export type RowDecodedAll<TTableDef extends TableDef> = {
-    [K in keyof TTableDef['schema']['columns']]: Schema.Schema.To<TTableDef['schema']['columns'][K]['type']['codec']>
+    [K in keyof TTableDef['schema']['columns']]: Schema.Schema.To<TTableDef['schema']['columns'][K]['schema']>
   }
 }
 
@@ -179,7 +167,7 @@ export namespace FromColumns {
   >
 
   export type RowDecodedAll<TColumns extends SqliteDsl.Columns> = {
-    [K in keyof TColumns]: Schema.Schema.To<TColumns[K]['type']['codec']>
+    [K in keyof TColumns]: Schema.Schema.To<TColumns[K]['schema']>
   }
 
   export type RowEncoded<TColumns extends SqliteDsl.Columns> = PrettifyFlat<
@@ -188,10 +176,15 @@ export namespace FromColumns {
   >
 
   export type RowEncodeNonNullable<TColumns extends SqliteDsl.Columns> = {
-    [K in keyof TColumns]: Schema.Schema.From<TColumns[K]['type']['codec']>
+    [K in keyof TColumns]: Schema.Schema.From<TColumns[K]['schema']>
   }
 
   export type NullableColumnNames<TColumns extends SqliteDsl.Columns> = keyof {
-    [K in keyof TColumns as TColumns[K] extends SqliteDsl.ColumnDefinition<any, true> ? K : never]: {}
+    [K in keyof TColumns as TColumns[K]['default'] extends true ? K : never]: {}
   }
+
+  export type RequiredInsertColumnNames<TColumns extends SqliteDsl.Columns> =
+    SqliteDsl.FromColumns.RequiredInsertColumnNames<TColumns>
+
+  export type InsertRowDecoded<TColumns extends SqliteDsl.Columns> = SqliteDsl.FromColumns.InsertRowDecoded<TColumns>
 }

package/tsconfig.json

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