@livestore/common 0.0.0-snapshot-2ef046b02334f52613d31dbe06af53487685edc0 → 0.0.0-snapshot-8115ad48d5a57244358c943ecc92bb0a30274b87

package/src/sync/syncstate.ts

@@ -1,9 +1,9 @@
-import { casesHandled, shouldNeverHappen } from '@livestore/utils'
+import { casesHandled, LS_DEV, shouldNeverHappen } from '@livestore/utils'
 import { Match, ReadonlyArray, Schema } from '@livestore/utils/effect'
 
 import { UnexpectedError } from '../adapter-types.js'
 import * as EventId from '../schema/EventId.js'
-import * as MutationEvent from '../schema/MutationEvent.js'
+import * as LiveStoreEvent from '../schema/LiveStoreEvent.js'
 
 /**
  * SyncState represents the current sync state of a sync node relative to an upstream node.
@@ -43,7 +43,7 @@ import * as MutationEvent from '../schema/MutationEvent.js'
  * handling cases such as upstream rebase, advance and local push.
  */
 export class SyncState extends Schema.Class<SyncState>('SyncState')({
-  pending: Schema.Array(MutationEvent.EncodedWithMeta),
+  pending: Schema.Array(LiveStoreEvent.EncodedWithMeta),
   /** What this node expects the next upstream node to have as its own local head */
   upstreamHead: EventId.EventId,
   /** Equivalent to `pending.at(-1)?.id` if there are pending events */
@@ -61,17 +61,17 @@ export class SyncState extends Schema.Class<SyncState>('SyncState')({
  */
 export class PayloadUpstreamRebase extends Schema.TaggedStruct('upstream-rebase', {
   /** Events which need to be rolled back */
-  rollbackEvents: Schema.Array(MutationEvent.EncodedWithMeta),
+  rollbackEvents: Schema.Array(LiveStoreEvent.EncodedWithMeta),
   /** Events which need to be applied after the rollback (already rebased by the upstream node) */
-  newEvents: Schema.Array(MutationEvent.EncodedWithMeta),
+  newEvents: Schema.Array(LiveStoreEvent.EncodedWithMeta),
 }) {}
 
 export class PayloadUpstreamAdvance extends Schema.TaggedStruct('upstream-advance', {
-  newEvents: Schema.Array(MutationEvent.EncodedWithMeta),
+  newEvents: Schema.Array(LiveStoreEvent.EncodedWithMeta),
 }) {}
 
 export class PayloadLocalPush extends Schema.TaggedStruct('local-push', {
-  newEvents: Schema.Array(MutationEvent.EncodedWithMeta),
+  newEvents: Schema.Array(LiveStoreEvent.EncodedWithMeta),
 }) {}
 
 export class Payload extends Schema.Union(PayloadUpstreamRebase, PayloadUpstreamAdvance, PayloadLocalPush) {}
@@ -110,9 +110,9 @@ export class MergeContext extends Schema.Class<MergeContext>('MergeContext')({
 export class MergeResultAdvance extends Schema.Class<MergeResultAdvance>('MergeResultAdvance')({
   _tag: Schema.Literal('advance'),
   newSyncState: SyncState,
-  newEvents: Schema.Array(MutationEvent.EncodedWithMeta),
+  newEvents: Schema.Array(LiveStoreEvent.EncodedWithMeta),
   /** Events which were previously pending but are now confirmed */
-  confirmedEvents: Schema.Array(MutationEvent.EncodedWithMeta),
+  confirmedEvents: Schema.Array(LiveStoreEvent.EncodedWithMeta),
   mergeContext: MergeContext,
 }) {
   toJSON = (): any => {
@@ -129,9 +129,9 @@ export class MergeResultAdvance extends Schema.Class<MergeResultAdvance>('MergeR
 export class MergeResultRebase extends Schema.Class<MergeResultRebase>('MergeResultRebase')({
   _tag: Schema.Literal('rebase'),
   newSyncState: SyncState,
-  newEvents: Schema.Array(MutationEvent.EncodedWithMeta),
+  newEvents: Schema.Array(LiveStoreEvent.EncodedWithMeta),
   /** Events which need to be rolled back */
-  rollbackEvents: Schema.Array(MutationEvent.EncodedWithMeta),
+  rollbackEvents: Schema.Array(LiveStoreEvent.EncodedWithMeta),
   mergeContext: MergeContext,
 }) {
   toJSON = (): any => {
@@ -172,11 +172,16 @@ export class MergeResult extends Schema.Union(
   MergeResultUnexpectedError,
 ) {}
 
-const unexpectedError = (cause: unknown): MergeResultUnexpectedError =>
-  MergeResultUnexpectedError.make({
+const unexpectedError = (cause: unknown): MergeResultUnexpectedError => {
+  if (LS_DEV) {
+    debugger
+  }
+
+  return MergeResultUnexpectedError.make({
     _tag: 'unexpected-error',
     cause: new UnexpectedError({ cause }),
   })
+}
 
 // TODO Idea: call merge recursively through hierarchy levels
 /*
@@ -194,12 +199,13 @@ export const merge = ({
 }: {
   syncState: SyncState
   payload: typeof Payload.Type
-  isClientEvent: (event: MutationEvent.EncodedWithMeta) => boolean
-  isEqualEvent: (a: MutationEvent.EncodedWithMeta, b: MutationEvent.EncodedWithMeta) => boolean
+  isClientEvent: (event: LiveStoreEvent.EncodedWithMeta) => boolean
+  isEqualEvent: (a: LiveStoreEvent.EncodedWithMeta, b: LiveStoreEvent.EncodedWithMeta) => boolean
   /** This is used in the leader which should ignore client events when receiving an upstream-advance payload */
   ignoreClientEvents?: boolean
 }): typeof MergeResult.Type => {
   validateSyncState(syncState)
+  validatePayload(payload)
 
   const mergeContext = MergeContext.make({ payload, syncState })
 
@@ -217,33 +223,37 @@ export const merge = ({
         isClientEvent,
       })
 
-      return MergeResultRebase.make({
-        _tag: 'rebase',
-        newSyncState: new SyncState({
-          pending: rebasedPending,
-          upstreamHead: newUpstreamHead,
-          localHead: rebasedPending.at(-1)?.id ?? newUpstreamHead,
+      return validateMergeResult(
+        MergeResultRebase.make({
+          _tag: 'rebase',
+          newSyncState: new SyncState({
+            pending: rebasedPending,
+            upstreamHead: newUpstreamHead,
+            localHead: rebasedPending.at(-1)?.id ?? newUpstreamHead,
+          }),
+          newEvents: [...payload.newEvents, ...rebasedPending],
+          rollbackEvents,
+          mergeContext,
         }),
-        newEvents: [...payload.newEvents, ...rebasedPending],
-        rollbackEvents,
-        mergeContext,
-      })
+      )
     }
 
     // #region upstream-advance
     case 'upstream-advance': {
       if (payload.newEvents.length === 0) {
-        return MergeResultAdvance.make({
-          _tag: 'advance',
-          newSyncState: new SyncState({
-            pending: syncState.pending,
-            upstreamHead: syncState.upstreamHead,
-            localHead: syncState.localHead,
+        return validateMergeResult(
+          MergeResultAdvance.make({
+            _tag: 'advance',
+            newSyncState: new SyncState({
+              pending: syncState.pending,
+              upstreamHead: syncState.upstreamHead,
+              localHead: syncState.localHead,
+            }),
+            newEvents: [],
+            confirmedEvents: [],
+            mergeContext: mergeContext,
           }),
-          newEvents: [],
-          confirmedEvents: [],
-          mergeContext: mergeContext,
-        })
+        )
       }
 
       // Validate that newEvents are sorted in ascending order by eventId
@@ -265,17 +275,6 @@ export const merge = ({
         )
       }
 
-      // Validate that the parent id of the first incoming event is known
-      const knownEventGlobalIds = [...syncState.pending].flatMap((e) => [e.id.global, e.parentId.global])
-      knownEventGlobalIds.push(syncState.upstreamHead.global)
-      const firstNewEvent = payload.newEvents[0]!
-      const hasUnknownParentId = knownEventGlobalIds.includes(firstNewEvent.parentId.global) === false
-      if (hasUnknownParentId) {
-        return unexpectedError(
-          `Incoming events must have a known parent id. Received: [${payload.newEvents.map((e) => EventId.toString(e.id)).join(', ')}]`,
-        )
-      }
-
       const newUpstreamHead = payload.newEvents.at(-1)!.id
 
       const divergentPendingIndex = findDivergencePoint({
@@ -313,17 +312,19 @@ export const merge = ({
           },
         )
 
-        return MergeResultAdvance.make({
-          _tag: 'advance',
-          newSyncState: new SyncState({
-            pending: pendingRemaining,
-            upstreamHead: newUpstreamHead,
-            localHead: pendingRemaining.at(-1)?.id ?? newUpstreamHead,
+        return validateMergeResult(
+          MergeResultAdvance.make({
+            _tag: 'advance',
+            newSyncState: new SyncState({
+              pending: pendingRemaining,
+              upstreamHead: newUpstreamHead,
+              localHead: pendingRemaining.at(-1)?.id ?? EventId.max(syncState.localHead, newUpstreamHead),
+            }),
+            newEvents,
+            confirmedEvents: pendingMatching,
+            mergeContext: mergeContext,
           }),
-          newEvents,
-          confirmedEvents: pendingMatching,
-          mergeContext: mergeContext,
-        })
+        )
       } else {
         const divergentPending = syncState.pending.slice(divergentPendingIndex)
         const rebasedPending = rebaseEvents({
@@ -340,17 +341,19 @@ export const merge = ({
           ignoreClientEvents,
         })
 
-        return MergeResultRebase.make({
-          _tag: 'rebase',
-          newSyncState: new SyncState({
-            pending: rebasedPending,
-            upstreamHead: newUpstreamHead,
-            localHead: rebasedPending.at(-1)!.id,
+        return validateMergeResult(
+          MergeResultRebase.make({
+            _tag: 'rebase',
+            newSyncState: new SyncState({
+              pending: rebasedPending,
+              upstreamHead: newUpstreamHead,
+              localHead: rebasedPending.at(-1)!.id,
+            }),
+            newEvents: [...payload.newEvents.slice(divergentNewEventsIndex), ...rebasedPending],
+            rollbackEvents: divergentPending,
+            mergeContext,
           }),
-          newEvents: [...payload.newEvents.slice(divergentNewEventsIndex), ...rebasedPending],
-          rollbackEvents: divergentPending,
-          mergeContext,
-        })
+        )
       }
     }
     // #endregion
@@ -358,13 +361,15 @@ export const merge = ({
     // This is the same as what's running in the sync backend
     case 'local-push': {
       if (payload.newEvents.length === 0) {
-        return MergeResultAdvance.make({
-          _tag: 'advance',
-          newSyncState: syncState,
-          newEvents: [],
-          confirmedEvents: [],
-          mergeContext: mergeContext,
-        })
+        return validateMergeResult(
+          MergeResultAdvance.make({
+            _tag: 'advance',
+            newSyncState: syncState,
+            newEvents: [],
+            confirmedEvents: [],
+            mergeContext: mergeContext,
+          }),
+        )
       }
 
       const newEventsFirst = payload.newEvents.at(0)!
@@ -372,23 +377,27 @@ export const merge = ({
 
       if (invalidEventId) {
         const expectedMinimumId = EventId.nextPair(syncState.localHead, true).id
-        return MergeResultReject.make({
-          _tag: 'reject',
-          expectedMinimumId,
-          mergeContext,
-        })
+        return validateMergeResult(
+          MergeResultReject.make({
+            _tag: 'reject',
+            expectedMinimumId,
+            mergeContext,
+          }),
+        )
       } else {
-        return MergeResultAdvance.make({
-          _tag: 'advance',
-          newSyncState: new SyncState({
-            pending: [...syncState.pending, ...payload.newEvents],
-            upstreamHead: syncState.upstreamHead,
-            localHead: payload.newEvents.at(-1)!.id,
+        return validateMergeResult(
+          MergeResultAdvance.make({
+            _tag: 'advance',
+            newSyncState: new SyncState({
+              pending: [...syncState.pending, ...payload.newEvents],
+              upstreamHead: syncState.upstreamHead,
+              localHead: payload.newEvents.at(-1)!.id,
+            }),
+            newEvents: payload.newEvents,
+            confirmedEvents: [],
+            mergeContext: mergeContext,
           }),
-          newEvents: payload.newEvents,
-          confirmedEvents: [],
-          mergeContext: mergeContext,
-        })
+        )
       }
     }
 
@@ -409,10 +418,10 @@ export const findDivergencePoint = ({
   isClientEvent,
   ignoreClientEvents,
 }: {
-  existingEvents: ReadonlyArray<MutationEvent.EncodedWithMeta>
-  incomingEvents: ReadonlyArray<MutationEvent.EncodedWithMeta>
-  isEqualEvent: (a: MutationEvent.EncodedWithMeta, b: MutationEvent.EncodedWithMeta) => boolean
-  isClientEvent: (event: MutationEvent.EncodedWithMeta) => boolean
+  existingEvents: ReadonlyArray<LiveStoreEvent.EncodedWithMeta>
+  incomingEvents: ReadonlyArray<LiveStoreEvent.EncodedWithMeta>
+  isEqualEvent: (a: LiveStoreEvent.EncodedWithMeta, b: LiveStoreEvent.EncodedWithMeta) => boolean
+  isClientEvent: (event: LiveStoreEvent.EncodedWithMeta) => boolean
   ignoreClientEvents: boolean
 }): number => {
   if (ignoreClientEvents) {
@@ -444,10 +453,10 @@ const rebaseEvents = ({
   baseEventId,
   isClientEvent,
 }: {
-  events: ReadonlyArray<MutationEvent.EncodedWithMeta>
+  events: ReadonlyArray<LiveStoreEvent.EncodedWithMeta>
   baseEventId: EventId.EventId
-  isClientEvent: (event: MutationEvent.EncodedWithMeta) => boolean
-}): ReadonlyArray<MutationEvent.EncodedWithMeta> => {
+  isClientEvent: (event: LiveStoreEvent.EncodedWithMeta) => boolean
+}): ReadonlyArray<LiveStoreEvent.EncodedWithMeta> => {
   let prevEventId = baseEventId
   return events.map((event) => {
     const isLocal = isClientEvent(event)
@@ -466,17 +475,30 @@ const rebaseEvents = ({
  */
 const _flattenMergeResults = (_updateResults: ReadonlyArray<MergeResult>) => {}
 
+const validatePayload = (payload: typeof Payload.Type) => {
+  for (let i = 1; i < payload.newEvents.length; i++) {
+    if (EventId.isGreaterThanOrEqual(payload.newEvents[i - 1]!.id, payload.newEvents[i]!.id)) {
+      return unexpectedError(
+        `Events must be ordered in monotonically ascending order by eventId. Received: [${payload.newEvents.map((e) => EventId.toString(e.id)).join(', ')}]`,
+      )
+    }
+  }
+}
+
 const validateSyncState = (syncState: SyncState) => {
   for (let i = 0; i < syncState.pending.length; i++) {
     const event = syncState.pending[i]!
     const nextEvent = syncState.pending[i + 1]
     if (nextEvent === undefined) break // Reached end of chain
 
-    if (EventId.isGreaterThan(event.id, nextEvent.id)) {
-      shouldNeverHappen('Events must be sorted in ascending order by eventId', {
-        event,
-        nextEvent,
-      })
+    if (EventId.isGreaterThanOrEqual(event.id, nextEvent.id)) {
+      shouldNeverHappen(
+        `Events must be ordered in monotonically ascending order by eventId. Received: [${syncState.pending.map((e) => EventId.toString(e.id)).join(', ')}]`,
+        {
+          event,
+          nextEvent,
+        },
+      )
     }
 
     // If the global id has increased, then the client id must be 0
@@ -503,3 +525,43 @@ const validateSyncState = (syncState: SyncState) => {
     }
   }
 }
+
+const validateMergeResult = (mergeResult: typeof MergeResult.Type) => {
+  if (mergeResult._tag === 'unexpected-error' || mergeResult._tag === 'reject') return mergeResult
+
+  validateSyncState(mergeResult.newSyncState)
+
+  // Ensure local head is always greater than or equal to upstream head
+  if (EventId.isGreaterThan(mergeResult.newSyncState.upstreamHead, mergeResult.newSyncState.localHead)) {
+    shouldNeverHappen('Local head must be greater than or equal to upstream head', {
+      localHead: mergeResult.newSyncState.localHead,
+      upstreamHead: mergeResult.newSyncState.upstreamHead,
+    })
+  }
+
+  // Ensure new local head is greater than or equal to the previous local head
+  if (
+    EventId.isGreaterThanOrEqual(mergeResult.newSyncState.localHead, mergeResult.mergeContext.syncState.localHead) ===
+    false
+  ) {
+    shouldNeverHappen('New local head must be greater than or equal to the previous local head', {
+      localHead: mergeResult.newSyncState.localHead,
+      previousLocalHead: mergeResult.mergeContext.syncState.localHead,
+    })
+  }
+
+  // Ensure new upstream head is greater than or equal to the previous upstream head
+  if (
+    EventId.isGreaterThanOrEqual(
+      mergeResult.newSyncState.upstreamHead,
+      mergeResult.mergeContext.syncState.upstreamHead,
+    ) === false
+  ) {
+    shouldNeverHappen('New upstream head must be greater than or equal to the previous upstream head', {
+      upstreamHead: mergeResult.newSyncState.upstreamHead,
+      previousUpstreamHead: mergeResult.mergeContext.syncState.upstreamHead,
+    })
+  }
+
+  return mergeResult
+}

package/src/sync/validate-push-payload.ts

@@ -1,11 +1,11 @@
 import { Effect } from '@livestore/utils/effect'
 
-import type { EventId, MutationEvent } from '../schema/mod.js'
+import type { EventId, LiveStoreEvent } from '../schema/mod.js'
 import { InvalidPushError } from './sync.js'
 
 // TODO proper batch validation
 export const validatePushPayload = (
-  batch: ReadonlyArray<MutationEvent.AnyEncodedGlobal>,
+  batch: ReadonlyArray<LiveStoreEvent.AnyEncodedGlobal>,
   currentEventId: EventId.GlobalEventId,
 ) =>
   Effect.gen(function* () {

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.26' as const
+export const liveStoreVersion = '0.3.0-dev.28' as const
 
 /**
  * This version number is incremented whenever the internal storage format changes in a breaking way.

package/tsconfig.json

@@ -1,6 +1,7 @@
 {
   "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
+    "lib": ["ES2023"], // Needed for `Array.toSorted`
     "outDir": "./dist",
     "rootDir": "./src",
     "resolveJsonModule": true,

package/dist/derived-mutations.d.ts

@@ -1,109 +0,0 @@
-import type { GetValForKey } from '@livestore/utils';
-import type { SqliteDsl } from './schema/db-schema/mod.js';
-import type * as MutationEvent from './schema/MutationEvent.js';
-import type * as DbSchema from './schema/table-def.js';
-export declare const makeDerivedMutationDefsForTable: <TTableDef extends DbSchema.TableDefBase<DbSchema.DefaultSqliteTableDefConstrained, DbSchema.TableOptions & {
-    deriveMutations: {
-        enabled: true;
-    };
-}>>(table: TTableDef) => {
-    insert: import("./schema/mutations.js").MutationDef<`_Derived_Create_${string}`, {
-        readonly [x: string]: any;
-    } & {
-        readonly [x: string]: any;
-    }, {
-        readonly [x: string]: any;
-    } & {
-        readonly [x: string]: any;
-    }>;
-    update: import("./schema/mutations.js").MutationDef<`_Derived_Update_${string}`, {
-        readonly values: {
-            [x: string]: any;
-        };
-        readonly where: {
-            [x: string]: any;
-        };
-    }, {
-        readonly values: {
-            [x: string]: any;
-        };
-        readonly where: {
-            [x: string]: any;
-        };
-    }>;
-    delete: import("./schema/mutations.js").MutationDef<`_Derived_Delete_${string}`, {
-        readonly where: {
-            [x: string]: any;
-        };
-    }, {
-        readonly where: {
-            [x: string]: any;
-        };
-    }>;
-};
-export declare const deriveCreateMutationDef: <TTableDef extends DbSchema.TableDefBase<DbSchema.DefaultSqliteTableDefConstrained, DbSchema.TableOptions & {
-    deriveMutations: {
-        enabled: true;
-    };
-}>>(table: TTableDef) => import("./schema/mutations.js").MutationDef<`_Derived_Create_${string}`, {
-    readonly [x: string]: any;
-} & {
-    readonly [x: string]: any;
-}, {
-    readonly [x: string]: any;
-} & {
-    readonly [x: string]: any;
-}>;
-export declare const deriveUpdateMutationDef: <TTableDef extends DbSchema.TableDefBase<DbSchema.DefaultSqliteTableDefConstrained, DbSchema.TableOptions & {
-    deriveMutations: {
-        enabled: true;
-    };
-}>>(table: TTableDef) => import("./schema/mutations.js").MutationDef<`_Derived_Update_${string}`, {
-    readonly values: {
-        [x: string]: any;
-    };
-    readonly where: {
-        [x: string]: any;
-    };
-}, {
-    readonly values: {
-        [x: string]: any;
-    };
-    readonly where: {
-        [x: string]: any;
-    };
-}>;
-export declare const deriveDeleteMutationDef: <TTableDef extends DbSchema.TableDefBase<DbSchema.DefaultSqliteTableDefConstrained, DbSchema.TableOptions & {
-    deriveMutations: {
-        enabled: true;
-    };
-}>>(table: TTableDef) => import("./schema/mutations.js").MutationDef<`_Derived_Delete_${string}`, {
-    readonly where: {
-        [x: string]: any;
-    };
-}, {
-    readonly where: {
-        [x: string]: any;
-    };
-}>;
-/**
- * Convenience helper functions on top of the derived mutation definitions.
- */
-export type DerivedMutationHelperFns<TColumns extends SqliteDsl.ConstraintColumns, TOptions extends DbSchema.TableOptions> = {
-    insert: DerivedMutationHelperFns.InsertMutationFn<TColumns, TOptions>;
-    update: DerivedMutationHelperFns.UpdateMutationFn<TColumns, TOptions>;
-    delete: DerivedMutationHelperFns.DeleteMutationFn<TColumns, TOptions>;
-};
-export declare namespace DerivedMutationHelperFns {
-    export type InsertMutationFn<TColumns extends SqliteDsl.ConstraintColumns, TOptions extends DbSchema.TableOptions> = SqliteDsl.AnyIfConstained<TColumns, UseShortcut<TOptions> extends true ? (values?: GetValForKey<SqliteDsl.FromColumns.InsertRowDecoded<TColumns>, 'value'>) => MutationEvent.PartialAnyDecoded : (values: SqliteDsl.FromColumns.InsertRowDecoded<TColumns>) => MutationEvent.PartialAnyDecoded>;
-    export type UpdateMutationFn<TColumns extends SqliteDsl.ConstraintColumns, TOptions extends DbSchema.TableOptions> = SqliteDsl.AnyIfConstained<TColumns, UseShortcut<TOptions> extends true ? (values: Partial<GetValForKey<SqliteDsl.FromColumns.RowDecoded<TColumns>, 'value'>>) => MutationEvent.PartialAnyDecoded : (args: {
-        where: Partial<SqliteDsl.FromColumns.RowDecoded<TColumns>>;
-        values: Partial<SqliteDsl.FromColumns.RowDecoded<TColumns>>;
-    }) => MutationEvent.PartialAnyDecoded>;
-    export type DeleteMutationFn<TColumns extends SqliteDsl.ConstraintColumns, _TOptions extends DbSchema.TableOptions> = (args: {
-        where: Partial<SqliteDsl.FromColumns.RowDecoded<TColumns>>;
-    }) => MutationEvent.PartialAnyDecoded;
-    type UseShortcut<TOptions extends DbSchema.TableOptions> = TOptions['isSingleColumn'] extends true ? TOptions['isSingleton'] extends true ? true : false : false;
-    export {};
-}
-//# sourceMappingURL=derived-mutations.d.ts.map

package/dist/derived-mutations.d.ts.map

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

package/dist/derived-mutations.js

@@ -1,54 +0,0 @@
-import { ReadonlyRecord, Schema } from '@livestore/utils/effect';
-import { defineMutation } from './schema/mutations.js';
-import { getDefaultValuesDecoded } from './schema/schema-helpers.js';
-import { deleteRows, insertRow, updateRows } from './sql-queries/sql-queries.js';
-export const makeDerivedMutationDefsForTable = (table) => ({
-    insert: deriveCreateMutationDef(table),
-    update: deriveUpdateMutationDef(table),
-    delete: deriveDeleteMutationDef(table),
-});
-export const deriveCreateMutationDef = (table) => {
-    const tableName = table.sqliteDef.name;
-    const [optionalFields, requiredColumns] = ReadonlyRecord.partition(table.sqliteDef.columns, (col) => col.nullable === false && col.default._tag === 'None');
-    const insertSchema = Schema.Struct(ReadonlyRecord.map(requiredColumns, (col) => col.schema))
-        .pipe(Schema.extend(Schema.partial(Schema.Struct(ReadonlyRecord.map(optionalFields, (col) => col.schema)))))
-        .annotations({ title: `${tableName}:Insert` });
-    return defineMutation(`_Derived_Create_${tableName}`, insertSchema, ({ id, ...explicitDefaultValues }) => {
-        const defaultValues = getDefaultValuesDecoded(table, explicitDefaultValues);
-        const [sql, bindValues] = insertRow({
-            tableName: table.sqliteDef.name,
-            columns: table.sqliteDef.columns,
-            values: { ...defaultValues, id },
-        });
-        return { sql, bindValues, writeTables: new Set([tableName]) };
-    }, { clientOnly: table.options.deriveMutations.clientOnly });
-};
-export const deriveUpdateMutationDef = (table) => {
-    const tableName = table.sqliteDef.name;
-    return defineMutation(`_Derived_Update_${tableName}`, Schema.Struct({
-        where: Schema.partial(table.schema),
-        values: Schema.partial(table.schema),
-    }).annotations({ title: `${tableName}:Update` }), ({ where, values }) => {
-        const [sql, bindValues] = updateRows({
-            tableName: table.sqliteDef.name,
-            columns: table.sqliteDef.columns,
-            where,
-            updateValues: values,
-        });
-        return { sql, bindValues, writeTables: new Set([tableName]) };
-    }, { clientOnly: table.options.deriveMutations.clientOnly });
-};
-export const deriveDeleteMutationDef = (table) => {
-    const tableName = table.sqliteDef.name;
-    return defineMutation(`_Derived_Delete_${tableName}`, Schema.Struct({
-        where: Schema.partial(table.schema),
-    }), ({ where }) => {
-        const [sql, bindValues] = deleteRows({
-            tableName: table.sqliteDef.name,
-            columns: table.sqliteDef.columns,
-            where,
-        });
-        return { sql, bindValues, writeTables: new Set([tableName]) };
-    }, { clientOnly: table.options.deriveMutations.clientOnly });
-};
-//# sourceMappingURL=derived-mutations.js.map

package/dist/derived-mutations.js.map

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

package/dist/derived-mutations.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=derived-mutations.test.d.ts.map

package/dist/derived-mutations.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"derived-mutations.test.d.ts","sourceRoot":"","sources":["../src/derived-mutations.test.ts"],"names":[],"mappings":""}