@livestore/livestore 0.0.40 → 0.0.41-dev.1

package/src/row-query.ts

@@ -1,5 +1,5 @@
 import { shouldNeverHappen } from '@livestore/utils'
-import { pipe, ReadonlyRecord, Schema, TreeFormatter } from '@livestore/utils/effect'
+import { Schema, TreeFormatter } from '@livestore/utils/effect'
 import type * as otel from '@opentelemetry/api'
 import { SqliteAst, SqliteDsl } from 'effect-db-schema'
 
@@ -138,10 +138,7 @@ const insertRowWithDefaultValuesOrIgnore = ({
   otelContext: otel.Context
   defaultValues: Partial<RowResult<TableDef>> | undefined
 }) => {
-  const defaultValues = pipe(
-    getDefaultValuesEncoded(table),
-    ReadonlyRecord.map((val, columnName) => explicitDefaultValues?.[columnName] ?? val),
-  )
+  const defaultValues = getDefaultValuesEncoded(table, explicitDefaultValues)
 
   const defaultColumnNames = [...Object.keys(defaultValues), 'id']
   const columnValues = defaultColumnNames.map((name) => `$${name}`).join(', ')

package/src/schema/table-def.ts

@@ -156,19 +156,25 @@ export const tableIsSingleton = <TTableDef extends TableDef>(
   tableDef: TTableDef,
 ): tableDef is TTableDef & { options: { isSingleton: true } } => tableDef.options.isSingleton === true
 
-export const getDefaultValuesEncoded = <TTableDef extends TableDef>(tableDef: TTableDef) =>
+export const getDefaultValuesEncoded = <TTableDef extends TableDef>(
+  tableDef: TTableDef,
+  fallbackValues?: Record<string, any>,
+) =>
   pipe(
     tableDef.sqliteDef.columns,
-    ReadonlyRecord.filter((_, key) => key !== 'id'),
-    ReadonlyRecord.filter(
-      (col) => col!.default._tag === 'None' || SqliteDsl.isSqlDefaultValue(col!.default.value) === false,
-    ),
+    ReadonlyRecord.filter((col, key) => {
+      if (fallbackValues?.[key] !== undefined) return true
+      if (key === 'id') return false
+      return col!.default._tag === 'None' || SqliteDsl.isSqlDefaultValue(col!.default.value) === false
+    }),
     ReadonlyRecord.map((column, columnName) =>
-      column!.default._tag === 'None'
-        ? column!.nullable === true
-          ? null
-          : shouldNeverHappen(`Column ${columnName} has no default value and is not nullable`)
-        : Schema.encodeSync(column!.schema)(column!.default.value),
+      fallbackValues?.[columnName] === undefined
+        ? column!.default._tag === 'None'
+          ? column!.nullable === true
+            ? null
+            : shouldNeverHappen(`Column ${columnName} has no default value and is not nullable`)
+          : Schema.encodeSync(column!.schema)(column!.default.value)
+        : fallbackValues[columnName],
     ),
   )