@livestore/livestore 0.0.41-dev.0 → 0.0.41-dev.2

package/src/reactiveQueries/sql.ts

@@ -14,7 +14,7 @@ import { LiveStoreQueryBase, makeGetAtomResult } from './base-class.js'
 
 export type MapRows<TResult, TRaw = any> =
   | ((rows: ReadonlyArray<TRaw>) => TResult)
-  | Schema.Schema<never, ReadonlyArray<TRaw>, TResult>
+  | Schema.Schema<TResult, ReadonlyArray<TRaw>>
 
 export const querySQL = <TResult, TRaw = any>(
   query: string | ((get: GetAtomResult) => string),
@@ -96,7 +96,7 @@ export class LiveStoreSQLQuery<TResult, TQueryInfo extends QueryInfo = QueryInfo
         ? (rows: any) => rows as TResult
         : Schema.isSchema(map)
           ? (rows: any) => {
-              const parseResult = Schema.decodeEither(map as Schema.Schema<never, ReadonlyArray<any>, TResult>)(rows)
+              const parseResult = Schema.decodeEither(map as Schema.Schema<TResult, ReadonlyArray<any>>)(rows)
               if (parseResult._tag === 'Left') {
                 console.error(`Error parsing SQL query result: ${TreeFormatter.formatError(parseResult.left)}`)
                 return shouldNeverHappen(`Error parsing SQL query result: ${parseResult.left}`)

package/src/schema/mutations.ts

@@ -19,7 +19,7 @@ export type InternalMutationSchema<TRecord extends MutationDefRecord = MutationD
 
 export type MutationDef<TName extends string, TFrom, TTo> = {
   name: TName
-  schema: Schema.Schema<never, TFrom, TTo>
+  schema: Schema.Schema<TTo, TFrom>
   sql:
     | string
     | ((args: TTo) =>
@@ -42,7 +42,7 @@ export namespace MutationDef {
 // TODO possibly also allow for mutation event subsumption behaviour
 export const defineMutation = <TName extends string, TFrom, TTo>(
   name: TName,
-  schema: Schema.Schema<never, TFrom, TTo>,
+  schema: Schema.Schema<TTo, TFrom>,
   sql: string | ((args: TTo) => string | { sql: string; bindValues: BindValues; writeTables?: ReadonlySet<string> }),
 ): MutationDef<TName, TFrom, TTo> => {
   const makeEvent = (args: TTo) => ({ mutation: name, args, id: cuid() })
@@ -98,18 +98,17 @@ export namespace MutationEvent {
 }
 
 export type MutationEventSchema<TMutationsDefRecord extends MutationDefRecord> = Schema.Schema<
-  never,
   {
     [K in keyof TMutationsDefRecord]: {
       mutation: K
-      args: Schema.Schema.From<TMutationsDefRecord[K]['schema']>
+      args: Schema.Schema.To<TMutationsDefRecord[K]['schema']>
       id: string
     }
   }[keyof TMutationsDefRecord],
   {
     [K in keyof TMutationsDefRecord]: {
       mutation: K
-      args: Schema.Schema.To<TMutationsDefRecord[K]['schema']>
+      args: Schema.Schema.From<TMutationsDefRecord[K]['schema']>
       id: string
     }
   }[keyof TMutationsDefRecord]

package/src/schema/table-def.ts

@@ -18,7 +18,7 @@ export type DefaultSqliteTableDefConstrained = SqliteDsl.TableDefinition<string,
 //   TSqliteDef extends DefaultSqliteTableDef = DefaultSqliteTableDef,
 //   TIsSingleColumn extends boolean = boolean,
 //   TOptions extends TableOptions = TableOptions,
-// > = TableDefBase<TSqliteDef, TIsSingleColumn, TOptions> & { schema: Schema.Schema<never, any, any> }
+// > = TableDefBase<TSqliteDef, TIsSingleColumn, TOptions> & { schema: Schema.Schema<any> }
 
 // /**
 //  * NOTE in the past we used to have a single `TableDef` but there are some TS issues when indroducing
@@ -44,14 +44,13 @@ export type TableDef<
   // NOTE we're not using `SqliteDsl.StructSchemaForColumns<TSqliteDef['columns']>`
   // as we don't want the alias type for users to show up
   TSchema = Schema.Schema<
-    never,
     SqliteDsl.AnyIfConstained<
       TSqliteDef['columns'],
-      { readonly [K in keyof TSqliteDef['columns']]: Schema.Schema.From<TSqliteDef['columns'][K]['schema']> }
+      { readonly [K in keyof TSqliteDef['columns']]: Schema.Schema.To<TSqliteDef['columns'][K]['schema']> }
     >,
     SqliteDsl.AnyIfConstained<
       TSqliteDef['columns'],
-      { readonly [K in keyof TSqliteDef['columns']]: Schema.Schema.To<TSqliteDef['columns'][K]['schema']> }
+      { readonly [K in keyof TSqliteDef['columns']]: Schema.Schema.From<TSqliteDef['columns'][K]['schema']> }
     >
   >,
 > = {