@evolu/common 1.0.13 → 1.0.15

package/dist/src/Db.d.ts

@@ -1,6 +1,7 @@
 import * as S from "@effect/schema/Schema";
 import { Brand, Context, Effect, ReadonlyRecord } from "effect";
 import * as Kysely from "kysely";
+import { Simplify } from "kysely";
 import { Bip39, Mnemonic, NanoId } from "./Crypto.js";
 import { Id, SqliteBoolean, SqliteDate } from "./Model.js";
 import { Query, Row, Sqlite, Value } from "./Sqlite.js";
@@ -9,9 +10,9 @@ export type TableSchema = ReadonlyRecord.ReadonlyRecord<Value> & {
 };
 export type Schema = ReadonlyRecord.ReadonlyRecord<TableSchema>;
 export type CreateQuery<S extends Schema> = (queryCallback: QueryCallback<S, Row>) => Query;
-export type QueryCallback<S extends Schema, QueryRow> = (db: KyselyWithoutMutation<SchemaForQuery<S>>) => Kysely.SelectQueryBuilder<any, any, QueryRow>;
+export type QueryCallback<S extends Schema, QueryRow> = (db: KyselyWithoutMutation<QuerySchema<S>>) => Kysely.SelectQueryBuilder<any, any, QueryRow>;
 type KyselyWithoutMutation<DB> = Pick<Kysely.Kysely<DB>, "selectFrom" | "fn">;
-type SchemaForQuery<S extends Schema> = {
+type QuerySchema<S extends Schema> = {
     readonly [Table in keyof S]: NullableExceptOfId<{
         readonly [Column in keyof S[Table]]: S[Table][Column];
     } & CommonColumns>;
@@ -24,12 +25,45 @@ export interface CommonColumns {
     readonly updatedAt: SqliteDate;
     readonly isDeleted: SqliteBoolean;
 }
+/**
+ * Filter and map array items in one step with the correct return type and
+ * without unreliable TypeScript type guards.
+ *
+ * ### Examples
+ *
+ * ```
+ * useQuery(
+ *   (db) => db.selectFrom("todo").selectAll(),
+ *   // Filter and map nothing.
+ *   (row) => row,
+ * );
+ *
+ * useQuery(
+ *   (db) => db.selectFrom("todo").selectAll(),
+ *   // Filter items with title != null.
+ *   // Note the title type isn't nullable anymore in rows.
+ *   ({ title, ...rest }) => title != null && { title, ...rest },
+ * );
+ * ```
+ */
+export type FilterMap<QueryRow extends Row, FilterMapRow extends Row> = (row: QueryRow) => FilterMapRow | null | false;
+export interface QueryResult<FilterMapRow extends Row> {
+    /**
+     * Rows from the database. They can be filtered and mapped by `filterMap`.
+     */
+    readonly rows: ReadonlyArray<Readonly<Simplify<ExcludeNullAndFalse<FilterMapRow>>>>;
+    /**
+     * The first row from `rows`. For empty rows, it's null.
+     */
+    readonly firstRow: Readonly<Simplify<ExcludeNullAndFalse<FilterMapRow>>> | null;
+}
+type ExcludeNullAndFalse<T> = Exclude<T, null | false>;
 export interface Table {
     readonly name: string;
     readonly columns: ReadonlyArray<string>;
 }
 export type Tables = ReadonlyArray<Table>;
-export declare const makeCreateQuery: <T extends Schema>() => CreateQuery<T>;
+export declare const makeCreateQuery: <S extends Schema>() => CreateQuery<S>;
 export declare const schemaToTables: (schema: S.Schema<any, any>) => Tables;
 /**
  * `Owner` represents the Evolu database owner. Evolu auto-generates `Owner`
@@ -52,9 +86,16 @@ export declare const transaction: <R, E, A>(effect: Effect.Effect<R, E, A>) => E
 export interface NoSuchTableOrColumnError {
     readonly _tag: "NoSuchTableOrColumnError";
 }
+export declare const SqliteNoSuchTableOrColumnError: S.Schema<{
+    readonly message: string;
+}, {
+    readonly message: string;
+}>;
+export type SqliteNoSuchTableOrColumnError = S.Schema.To<typeof SqliteNoSuchTableOrColumnError>;
 export declare const someDefectToNoSuchTableOrColumnError: <R, E, A>(self: Effect.Effect<R, E, A>) => Effect.Effect<R, NoSuchTableOrColumnError | E, A>;
 export declare const makeOwner: (mnemonic?: Mnemonic) => Effect.Effect<Bip39, never, Owner>;
 export declare const lazyInit: (mnemonic?: Mnemonic) => Effect.Effect<Sqlite | Bip39 | NanoId, never, Owner>;
 export declare const ensureSchema: (tables: Tables) => Effect.Effect<Sqlite, never, void>;
+export declare const makeCacheFilterMap: () => <QueryRow extends Row, FilterMapRow extends Row>(filterMap: FilterMap<QueryRow, FilterMapRow>) => FilterMap<QueryRow, FilterMapRow>;
 export {};
 //# sourceMappingURL=Db.d.ts.map

package/dist/src/Db.d.ts.map

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

package/dist/src/Db.js

@@ -1,4 +1,5 @@
 import * as AST from "@effect/schema/AST";
+import * as S from "@effect/schema/Schema";
 import { make } from "@effect/schema/Schema";
 import { bytesToHex } from "@noble/ciphers/utils";
 import { Context, Effect, Exit, Option, Predicate, ReadonlyArray, ReadonlyRecord, String, pipe, } from "effect";
@@ -41,20 +42,14 @@ schema) => pipe(getPropertySignatures(schema), ReadonlyRecord.toEntries, Readonl
 })));
 export const Owner = Context.Tag("evolu/Owner");
 export const transaction = (effect) => Effect.flatMap(Sqlite, (sqlite) => Effect.acquireUseRelease(sqlite.exec("BEGIN"), () => effect, (_, exit) => Exit.isFailure(exit) ? sqlite.exec("ROLLBACK") : sqlite.exec("END")));
-export const someDefectToNoSuchTableOrColumnError = Effect.catchSomeDefect((error) => {
-    if (typeof error === "object" &&
-        error != null &&
-        "message" in error &&
-        typeof error.message === "string" &&
-        error.message.includes("code 1") &&
-        (error.message.includes("no such table") ||
-            error.message.includes("no such column") ||
-            error.message.includes("has no column")))
-        return Option.some(Effect.fail({
-            _tag: "NoSuchTableOrColumnError",
-        }));
-    return Option.none();
+export const SqliteNoSuchTableOrColumnError = S.struct({
+    message: S.union(S.string.pipe(S.includes("no such table")), S.string.pipe(S.includes("no such column")), S.string.pipe(S.includes("has no column"))),
 });
+export const someDefectToNoSuchTableOrColumnError = Effect.catchSomeDefect((error) => S.is(SqliteNoSuchTableOrColumnError)(error)
+    ? Option.some(Effect.fail({
+        _tag: "NoSuchTableOrColumnError",
+    }))
+    : Option.none());
 export const makeOwner = (mnemonic) => Effect.gen(function* (_) {
     const bip39 = yield* _(Bip39);
     if (mnemonic == null)
@@ -115,3 +110,14 @@ const createTable = ({ name, columns, }) => Effect.flatMap(Sqlite, (sqlite) => s
 export const ensureSchema = (tables) => Effect.flatMap(getTables, (existingTables) => Effect.forEach(tables, (tableDefinition) => existingTables.includes(tableDefinition.name)
     ? updateTable(tableDefinition)
     : createTable(tableDefinition), { discard: true }));
+export const makeCacheFilterMap = () => {
+    const cache = new WeakMap();
+    return (filterMap) => (row) => {
+        let cachedRow = cache.get(row);
+        if (cachedRow === undefined) {
+            cachedRow = filterMap(row);
+            cache.set(row, cachedRow);
+        }
+        return cachedRow;
+    };
+};

package/dist/src/DbWorker.d.ts

@@ -1,4 +1,4 @@
-import { Brand, Context, Layer, ReadonlyArray, ReadonlyRecord } from "effect";
+import { Brand, Context, Effect, Layer, ReadonlyArray, ReadonlyRecord } from "effect";
 import { Config } from "./Config.js";
 import { Bip39, Mnemonic, NanoId } from "./Crypto.js";
 import { Owner, Tables } from "./Db.js";
@@ -73,7 +73,8 @@ export interface MutateItem {
     readonly onCompleteId: OnCompleteId | null;
 }
 export type RowsCacheMap = ReadonlyMap<Query, ReadonlyArray<Row>>;
-export declare const mutateItemsToNewMessages: (items: readonly [MutateItem, ...MutateItem[]]) => readonly [NewMessage, ...NewMessage[]];
+export declare const mutateItemsToNewMessages: (items: ReadonlyArray<MutateItem>) => ReadonlyArray<NewMessage>;
+export declare const upsertValueIntoTableRowColumn: (message: NewMessage, messages: ReadonlyArray<NewMessage>) => Effect.Effect<Sqlite, never, void>;
 export declare const DbWorkerLive: Layer.Layer<Bip39 | NanoId | Sqlite | SyncWorker, never, DbWorker>;
 export {};
 //# sourceMappingURL=DbWorker.d.ts.map

package/dist/src/DbWorker.d.ts.map

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

package/dist/src/DbWorker.js

@@ -7,14 +7,14 @@ import { Owner, ensureSchema, lazyInit, someDefectToNoSuchTableOrColumnError, tr
 import { makePatches } from "./Diff.js";
 import { makeUnexpectedError } from "./Errors.js";
 import { cast } from "./Model.js";
-import { insertIntoMessagesIfNew, insertValueIntoTableRowColumn, selectLastTimestampForTableRowColumn, selectMessagesToSync, selectOwner, selectOwnerTimestampAndMerkleTree, updateOwnerTimestampAndMerkleTree, } from "./Sql.js";
+import * as Sql from "./Sql.js";
 import { Sqlite, queryObjectFromQuery } from "./Sqlite.js";
 import { NewMessageEquivalence, SyncWorker, SyncWorkerPostMessage, } from "./SyncWorker.js";
 export const DbWorker = Context.Tag("evolu/DbWorker");
 const DbWorkerOnMessage = Context.Tag("evolu/DbWorkerOnMessage");
 const init = (input) => Effect.gen(function* (_) {
     const sqlite = yield* _(Sqlite);
-    return yield* _(sqlite.exec(selectOwner), Effect.map(({ rows: [row] }) => ({
+    return yield* _(sqlite.exec(Sql.selectOwner), Effect.map(({ rows: [row] }) => ({
         id: row.id,
         mnemonic: row.mnemonic,
         // expo-sqlite 11.3.2 doesn't support Uint8Array
@@ -37,11 +37,11 @@ const query = ({ queries, onCompleteIds = [], }) => Effect.gen(function* (_) {
     }));
     dbWorkerOnMessage({ _tag: "onQuery", queriesPatches, onCompleteIds });
 });
-const readTimestampAndMerkleTree = Sqlite.pipe(Effect.flatMap((sqlite) => sqlite.exec(selectOwnerTimestampAndMerkleTree)), Effect.map((result) => result.rows), Effect.map(([{ timestamp, merkleTree }]) => ({
+const readTimestampAndMerkleTree = Sqlite.pipe(Effect.flatMap((sqlite) => sqlite.exec(Sql.selectOwnerTimestampAndMerkleTree)), Effect.map((result) => result.rows), Effect.map(([{ timestamp, merkleTree }]) => ({
     timestamp: unsafeTimestampFromString(timestamp),
     merkleTree: merkleTree,
 })));
-export const mutateItemsToNewMessages = (items) => pipe(items, ReadonlyArray.mapNonEmpty(({ id, isInsert, now, table, values }) => pipe(Object.entries(values), ReadonlyArray.filterMap(([key, value]) => 
+export const mutateItemsToNewMessages = (items) => pipe(items, ReadonlyArray.map(({ id, isInsert, now, table, values }) => pipe(Object.entries(values), ReadonlyArray.filterMap(([key, value]) => 
 // The value can be undefined if exactOptionalPropertyTypes isn't true.
 // Don't insert nulls because null is the default value.
 value === undefined || (isInsert && value == null)
@@ -53,13 +53,13 @@ value === undefined || (isInsert && value == null)
         : value instanceof Date
             ? cast(value)
             : value,
-]), ReadonlyArray.append([isInsert ? "createdAt" : "updatedAt", now]), ReadonlyArray.mapNonEmpty(([key, value]) => ({
+]), ReadonlyArray.append([isInsert ? "createdAt" : "updatedAt", now]), ReadonlyArray.map(([key, value]) => ({
     table,
     row: id,
     column: key,
     value,
-})))), ReadonlyArray.flattenNonEmpty, ReadonlyArray.dedupeNonEmptyWith(NewMessageEquivalence));
-const ensureSchemaByMessages = (messages) => Effect.gen(function* (_) {
+})))), ReadonlyArray.flatten, ReadonlyArray.dedupeWith(NewMessageEquivalence));
+const ensureSchemaByNewMessages = (messages) => Effect.gen(function* (_) {
     const tablesMap = new Map();
     messages.forEach((message) => {
         const table = tablesMap.get(message.table);
@@ -79,23 +79,29 @@ const ensureSchemaByMessages = (messages) => Effect.gen(function* (_) {
     });
     yield* _(ensureSchema(Array.from(tablesMap.values())));
 });
+export const upsertValueIntoTableRowColumn = (message, messages) => Effect.gen(function* (_) {
+    const sqlite = yield* _(Sqlite);
+    const insert = sqlite.exec({
+        sql: Sql.upsertValueIntoTableRowColumn(message.table, message.column),
+        parameters: [message.row, message.value, message.value],
+    });
+    yield* _(insert, someDefectToNoSuchTableOrColumnError, Effect.catchTag("NoSuchTableOrColumnError", () => 
+    // If one message fails, we ensure schema for all messages.
+    ensureSchemaByNewMessages(messages).pipe(Effect.zipRight(insert))));
+});
 const applyMessages = ({ merkleTree, messages, }) => Effect.gen(function* (_) {
     const sqlite = yield* _(Sqlite);
     for (const message of messages) {
         const timestamp = yield* _(sqlite.exec({
-            sql: selectLastTimestampForTableRowColumn,
+            sql: Sql.selectLastTimestampForTableRowColumn,
             parameters: [message.table, message.row, message.column],
         }), Effect.map((result) => result.rows), Effect.flatMap(ReadonlyArray.head), Effect.map((row) => row.timestamp), Effect.catchTag("NoSuchElementException", () => Effect.succeed(null)));
         if (timestamp == null || timestamp < message.timestamp) {
-            const insert = sqlite.exec({
-                sql: insertValueIntoTableRowColumn(message.table, message.column),
-                parameters: [message.row, message.value, message.value],
-            });
-            yield* _(insert, someDefectToNoSuchTableOrColumnError, Effect.catchTag("NoSuchTableOrColumnError", () => ensureSchemaByMessages(messages).pipe(Effect.flatMap(() => insert))));
+            yield* _(upsertValueIntoTableRowColumn(message, messages));
         }
         if (timestamp == null || timestamp !== message.timestamp) {
             const { changes } = yield* _(sqlite.exec({
-                sql: insertIntoMessagesIfNew,
+                sql: Sql.insertIntoMessagesIfNew,
                 parameters: [
                     message.timestamp,
                     message.table,
@@ -104,50 +110,52 @@ const applyMessages = ({ merkleTree, messages, }) => Effect.gen(function* (_) {
                     message.value,
                 ],
             }));
-            if (changes > 0)
-                merkleTree = insertIntoMerkleTree(unsafeTimestampFromString(message.timestamp))(merkleTree);
+            if (changes > 0) {
+                const timestamp = unsafeTimestampFromString(message.timestamp);
+                merkleTree = insertIntoMerkleTree(timestamp)(merkleTree);
+            }
         }
     }
     return merkleTree;
 });
 const writeTimestampAndMerkleTree = ({ timestamp, merkleTree, }) => Effect.flatMap(Sqlite, (sqlite) => sqlite.exec({
-    sql: updateOwnerTimestampAndMerkleTree,
+    sql: Sql.updateOwnerTimestampAndMerkleTree,
     parameters: [
         timestampToString(timestamp),
         merkleTreeToString(merkleTree),
     ],
 }));
 const mutate = ({ items, queries, }) => Effect.gen(function* (_) {
-    const owner = yield* _(Owner);
-    let { timestamp, merkleTree } = yield* _(readTimestampAndMerkleTree);
-    const messages = yield* _(mutateItemsToNewMessages(items), Effect.forEach((newMessage) => Effect.map(sendTimestamp(timestamp), (nextTimestamp) => {
-        timestamp = nextTimestamp;
-        return {
-            ...newMessage,
-            timestamp: timestampToString(timestamp),
-        };
-    })));
-    if (ReadonlyArray.isNonEmptyReadonlyArray(messages)) {
+    const [toSync, localOnlyItems] = ReadonlyArray.partition(items, (item) => item.table.startsWith("_"));
+    const [toUpsert, toDelete] = ReadonlyArray.partition(localOnlyItems, (item) => mutateItemsToNewMessages([item]).some((message) => message.column === "isDeleted" && message.value === 1)).map(mutateItemsToNewMessages);
+    yield* _(Effect.forEach(toUpsert, (message) => upsertValueIntoTableRowColumn(message, toUpsert)));
+    const { exec } = yield* _(Sqlite);
+    yield* _(Effect.forEach(toDelete, ({ table, row }) => exec({ sql: Sql.deleteTableRow(table), parameters: [row] })));
+    if (toSync.length > 0) {
+        let { timestamp, merkleTree } = yield* _(readTimestampAndMerkleTree);
+        const messages = yield* _(mutateItemsToNewMessages(toSync), Effect.forEach((message) => Effect.map(sendTimestamp(timestamp), (nextTimestamp) => {
+            timestamp = nextTimestamp;
+            return { ...message, timestamp: timestampToString(timestamp) };
+        })));
         merkleTree = yield* _(applyMessages({ merkleTree, messages }));
         yield* _(writeTimestampAndMerkleTree({ timestamp, merkleTree }));
+        (yield* _(SyncWorkerPostMessage))({
+            _tag: "sync",
+            syncUrl: (yield* _(Config)).syncUrl,
+            messages,
+            timestamp,
+            merkleTree,
+            owner: yield* _(Owner),
+            syncLoopCount: 0,
+        });
     }
     const onCompleteIds = ReadonlyArray.filterMap(items, (item) => Option.fromNullable(item.onCompleteId));
     if (queries.length > 0 || onCompleteIds.length > 0)
         yield* _(query({ queries, onCompleteIds }));
-    const [config, syncWorkerPostMessage] = yield* _(Effect.all([Config, SyncWorkerPostMessage]));
-    syncWorkerPostMessage({
-        _tag: "sync",
-        syncUrl: config.syncUrl,
-        messages,
-        timestamp,
-        merkleTree,
-        owner,
-        syncLoopCount: 0,
-    });
 });
 const handleSyncResponse = ({ messages, ...response }) => Effect.gen(function* (_) {
     let { timestamp, merkleTree } = yield* _(readTimestampAndMerkleTree);
-    if (ReadonlyArray.isNonEmptyReadonlyArray(messages)) {
+    if (messages.length > 0) {
         for (const message of messages)
             timestamp = yield* _(unsafeTimestampFromString(message.timestamp), (remote) => receiveTimestamp({ local: timestamp, remote }));
         merkleTree = yield* _(applyMessages({ merkleTree, messages }));
@@ -170,7 +178,7 @@ const handleSyncResponse = ({ messages, ...response }) => Effect.gen(function* (
     }
     const [sqlite, config, owner] = yield* _(Effect.all([Sqlite, Config, Owner]));
     const messagesToSync = yield* _(sqlite.exec({
-        sql: selectMessagesToSync,
+        sql: Sql.selectMessagesToSync,
         parameters: [timestampToString(makeSyncTimestamp(diff.value))],
     }), Effect.map(({ rows }) => rows));
     syncWorkerPostMessage({

package/dist/src/Evolu.d.ts

@@ -27,7 +27,7 @@ export interface Evolu<S extends Schema> {
     readonly ownerActions: OwnerActions;
     readonly ensureSchema: (tables: Tables) => void;
 }
-export declare const Evolu: <T extends Schema>() => Context.Tag<Evolu<T>, Evolu<T>>;
+export declare const Evolu: <S extends Schema>() => Context.Tag<Evolu<S>, Evolu<S>>;
 type ErrorStore = Store<EvoluError | null>;
 type OwnerStore = Store<Owner | null>;
 interface QueryStore {
@@ -65,7 +65,7 @@ interface RestoreOwnerError {
     readonly _tag: "RestoreOwnerError";
 }
 export declare const loadingPromisesPromiseProp = "rows";
-export declare const EvoluLive: <T extends Schema>(tables: Tables) => Layer.Layer<Config | Bip39 | NanoId | Time | FlushSync | AppState | DbWorker, never, Evolu<T>>;
-export declare const makeEvoluForPlatform: <T extends Schema>(PlatformLayer: Layer.Layer<never, never, DbWorker | Bip39 | NanoId | FlushSync | AppState>, tables: Tables, config?: Partial<Config>) => Evolu<T>;
+export declare const EvoluLive: <S extends Schema>(tables: Tables) => Layer.Layer<Config | Bip39 | NanoId | Time | FlushSync | AppState | DbWorker, never, Evolu<S>>;
+export declare const makeEvoluForPlatform: <S extends Schema>(PlatformLayer: Layer.Layer<never, never, DbWorker | Bip39 | NanoId | FlushSync | AppState>, tables: Tables, config?: Partial<Config>) => Evolu<S>;
 export {};
 //# sourceMappingURL=Evolu.d.ts.map

package/dist/src/Model.d.ts

@@ -1,6 +1,5 @@
 import * as Schema from "@effect/schema/Schema";
 import { Brand } from "effect";
-import { Row } from "./Sqlite.js";
 /**
  * Branded Id Schema for any table Id.
  * To create Id Schema for a specific table, use {@link id}.
@@ -116,28 +115,4 @@ export type NonEmptyString1000 = Schema.Schema.To<typeof NonEmptyString1000>;
  */
 export declare const PositiveInt: Schema.BrandSchema<number, number & Brand.Brand<"PositiveInt">>;
 export type PositiveInt = Schema.Schema.To<typeof PositiveInt>;
-/**
- * Filter and map array items in one step with the correct return type and
- * without unreliable TypeScript type guards.
- *
- * ### Examples
- *
- * ```
- * useQuery(
- *   (db) => db.selectFrom("todo").selectAll(),
- *   // Filter and map nothing.
- *   (row) => row,
- * );
- *
- * useQuery(
- *   (db) => db.selectFrom("todo").selectAll(),
- *   // Filter items with title != null.
- *   // Note the title type isn't nullable anymore in rows.
- *   ({ title, ...rest }) => title != null && { title, ...rest },
- * );
- * ```
- */
-export type FilterMap<QueryRow extends Row, FilterMapRow extends Row> = (row: QueryRow) => OrNullOrFalse<FilterMapRow>;
-export type OrNullOrFalse<T> = T | null | false;
-export type ExcludeNullAndFalse<T> = Exclude<T, null | false>;
 //# sourceMappingURL=Model.d.ts.map

package/dist/src/Model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Model.d.ts","sourceRoot":"","sources":["../../src/Model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC/B,OAAO,EAAE,GAAG,EAAa,MAAM,aAAa,CAAC;AAE7C;;;GAGG;AACH,eAAO,MAAM,EAAE,wDAGd,CAAC;AACF,MAAM,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;AAE7C;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,EAAE,yGAGe,CAAC;AAE/B;;;;GAIG;AACH,eAAO,MAAM,UAAU,gEAGtB,CAAC;AACF,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,UAAU,CAAC,CAAC;AAE7D;;;;GAIG;AACH,eAAO,MAAM,aAAa,mEAIzB,CAAC;AACF,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,aAAa,CAAC,CAAC;AAEnE;;;;;;GAMG;AACH,MAAM,MAAM,iBAAiB,CAAC,CAAC,IAAI;IACjC,QAAQ,EAAE,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,aAAa,GAC/C,OAAO,GAAG,aAAa,GACvB,CAAC,CAAC,CAAC,CAAC,SAAS,IAAI,GAAG,aAAa,GACjC,IAAI,GAAG,OAAO,GAAG,aAAa,GAC9B,CAAC,CAAC,CAAC,CAAC,SAAS,UAAU,GACvB,IAAI,GAAG,UAAU,GACjB,CAAC,CAAC,CAAC,CAAC,SAAS,IAAI,GAAG,UAAU,GAC9B,IAAI,GAAG,IAAI,GAAG,UAAU,GACxB,CAAC,CAAC,CAAC,CAAC;CACT,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,wBAAgB,IAAI,CAAC,KAAK,EAAE,OAAO,GAAG,aAAa,CAAC;AACpD,wBAAgB,IAAI,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC;AACpD,wBAAgB,IAAI,CAAC,KAAK,EAAE,IAAI,GAAG,UAAU,CAAC;AAC9C,wBAAgB,IAAI,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI,CAAC;AAW9C;;;;;GAKG;AACH,eAAO,MAAM,MAAM,4DAclB,CAAC;AACF,MAAM,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,MAAM,CAAC,CAAC;AAErD;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,UAAU,wFAGtB,CAAC;AACF,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,UAAU,CAAC,CAAC;AAE7D;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,kBAAkB,gGAI9B,CAAC;AACF,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAE7E;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,WAAW,iEAIvB,CAAC;AACF,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,WAAW,CAAC,CAAC;AAE/D;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,MAAM,SAAS,CAAC,QAAQ,SAAS,GAAG,EAAE,YAAY,SAAS,GAAG,IAAI,CACtE,GAAG,EAAE,QAAQ,KACV,aAAa,CAAC,YAAY,CAAC,CAAC;AAEjC,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI,CAAC,GAAG,IAAI,GAAG,KAAK,CAAC;AAEhD,MAAM,MAAM,mBAAmB,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,EAAE,IAAI,GAAG,KAAK,CAAC,CAAC"}
+{"version":3,"file":"Model.d.ts","sourceRoot":"","sources":["../../src/Model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAG/B;;;GAGG;AACH,eAAO,MAAM,EAAE,wDAGd,CAAC;AACF,MAAM,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;AAE7C;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,EAAE,yGAGe,CAAC;AAE/B;;;;GAIG;AACH,eAAO,MAAM,UAAU,gEAGtB,CAAC;AACF,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,UAAU,CAAC,CAAC;AAE7D;;;;GAIG;AACH,eAAO,MAAM,aAAa,mEAIzB,CAAC;AACF,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,aAAa,CAAC,CAAC;AAEnE;;;;;;GAMG;AACH,MAAM,MAAM,iBAAiB,CAAC,CAAC,IAAI;IACjC,QAAQ,EAAE,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,aAAa,GAC/C,OAAO,GAAG,aAAa,GACvB,CAAC,CAAC,CAAC,CAAC,SAAS,IAAI,GAAG,aAAa,GACjC,IAAI,GAAG,OAAO,GAAG,aAAa,GAC9B,CAAC,CAAC,CAAC,CAAC,SAAS,UAAU,GACvB,IAAI,GAAG,UAAU,GACjB,CAAC,CAAC,CAAC,CAAC,SAAS,IAAI,GAAG,UAAU,GAC9B,IAAI,GAAG,IAAI,GAAG,UAAU,GACxB,CAAC,CAAC,CAAC,CAAC;CACT,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,wBAAgB,IAAI,CAAC,KAAK,EAAE,OAAO,GAAG,aAAa,CAAC;AACpD,wBAAgB,IAAI,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC;AACpD,wBAAgB,IAAI,CAAC,KAAK,EAAE,IAAI,GAAG,UAAU,CAAC;AAC9C,wBAAgB,IAAI,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI,CAAC;AAW9C;;;;;GAKG;AACH,eAAO,MAAM,MAAM,4DAclB,CAAC;AACF,MAAM,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,MAAM,CAAC,CAAC;AAErD;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,UAAU,wFAGtB,CAAC;AACF,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,UAAU,CAAC,CAAC;AAE7D;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,kBAAkB,gGAI9B,CAAC;AACF,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAE7E;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,WAAW,iEAIvB,CAAC;AACF,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,WAAW,CAAC,CAAC"}

package/dist/src/Sql.d.ts

@@ -5,7 +5,8 @@ export declare const createOwnerTable = "\nCREATE TABLE\n  \"evolu_owner\" (\n
 export declare const insertOwner = "\nINSERT INTO\n  \"evolu_owner\" (\n    \"id\",\n    \"mnemonic\",\n    \"encryptionKey\",\n    \"timestamp\",\n    \"merkleTree\"\n  )\nVALUES\n  (?, ?, ?, ?, ?);\n";
 export declare const selectOwnerTimestampAndMerkleTree = "\nSELECT\n  \"timestamp\",\n  \"merkleTree\"\nFROM\n  \"evolu_owner\"\n";
 export declare const selectLastTimestampForTableRowColumn = "\nSELECT\n  \"timestamp\"\nFROM\n  \"evolu_message\"\nWHERE\n  \"table\" = ?\n  AND \"row\" = ?\n  AND \"column\" = ?\nORDER BY\n  \"timestamp\" DESC\nLIMIT\n  1\n";
-export declare const insertValueIntoTableRowColumn: (table: string, column: string) => string;
+export declare const upsertValueIntoTableRowColumn: (table: string, column: string) => string;
+export declare const deleteTableRow: (table: string) => string;
 export declare const insertIntoMessagesIfNew = "\nINSERT INTO\n  \"evolu_message\" (\"timestamp\", \"table\", \"row\", \"column\", \"value\")\nVALUES\n  (?, ?, ?, ?, ?)\nON CONFLICT DO NOTHING\n";
 export declare const updateOwnerTimestampAndMerkleTree = "\nUPDATE \"evolu_owner\"\nSET\n  \"timestamp\" = ?,\n  \"merkleTree\" = ?\n";
 export declare const selectMessagesToSync = "\nSELECT\n  *\nFROM\n  \"evolu_message\"\nWHERE\n  \"timestamp\" >= ?\nORDER BY\n  \"timestamp\"\n";

package/dist/src/Sql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Sql.d.ts","sourceRoot":"","sources":["../../src/Sql.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,WAAW,yFAOvB,CAAC;AAEF,eAAO,MAAM,kBAAkB,yKAS9B,CAAC;AAEF,eAAO,MAAM,uBAAuB,yHAInC,CAAC;AAEF,eAAO,MAAM,gBAAgB,yKAS5B,CAAC;AAEF,eAAO,MAAM,WAAW,0KAWvB,CAAC;AAEF,eAAO,MAAM,iCAAiC,4EAM7C,CAAC;AAEF,eAAO,MAAM,oCAAoC,wKAahD,CAAC;AAEF,eAAO,MAAM,6BAA6B,UACjC,MAAM,UACL,MAAM,KACb,MAOF,CAAC;AAEF,eAAO,MAAM,uBAAuB,uJAMnC,CAAC;AAEF,eAAO,MAAM,iCAAiC,gFAK7C,CAAC;AAEF,eAAO,MAAM,oBAAoB,uGAShC,CAAC"}
+{"version":3,"file":"Sql.d.ts","sourceRoot":"","sources":["../../src/Sql.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,WAAW,yFAOvB,CAAC;AAEF,eAAO,MAAM,kBAAkB,yKAS9B,CAAC;AAEF,eAAO,MAAM,uBAAuB,yHAInC,CAAC;AAEF,eAAO,MAAM,gBAAgB,yKAS5B,CAAC;AAEF,eAAO,MAAM,WAAW,0KAWvB,CAAC;AAEF,eAAO,MAAM,iCAAiC,4EAM7C,CAAC;AAEF,eAAO,MAAM,oCAAoC,wKAahD,CAAC;AAEF,eAAO,MAAM,6BAA6B,UACjC,MAAM,UACL,MAAM,KACb,MAOF,CAAC;AAEF,eAAO,MAAM,cAAc,UAAW,MAAM,KAAG,MAI9C,CAAC;AAEF,eAAO,MAAM,uBAAuB,uJAMnC,CAAC;AAEF,eAAO,MAAM,iCAAiC,gFAK7C,CAAC;AAEF,eAAO,MAAM,oBAAoB,uGAShC,CAAC"}

package/dist/src/Sql.js

@@ -67,7 +67,7 @@ ORDER BY
 LIMIT
   1
 `;
-export const insertValueIntoTableRowColumn = (table, column) => `
+export const upsertValueIntoTableRowColumn = (table, column) => `
 INSERT INTO
   "${table}" ("id", "${column}")
 VALUES
@@ -75,6 +75,11 @@ VALUES
 ON CONFLICT DO UPDATE SET
   "${column}" = ?
 `;
+export const deleteTableRow = (table) => `
+DELETE FROM "${table}"
+WHERE
+  "id" = ?;
+`;
 export const insertIntoMessagesIfNew = `
 INSERT INTO
   "evolu_message" ("timestamp", "table", "row", "column", "value")

package/dist/src/index.d.ts

@@ -4,14 +4,11 @@ export * from "./Crdt.js";
 export * from "./Crypto.js";
 export * from "./Db.js";
 export * from "./DbWorker.js";
-export * from "./Diff.js";
 export * from "./Errors.js";
 export * from "./Evolu.js";
 export * from "./Model.js";
-export * from "./Murmurhash.js";
 export * from "./Platform.js";
 export * from "./Protobuf.js";
-export * from "./Sql.js";
 export * from "./Sqlite.js";
 export * from "./Store.js";
 export * from "./SyncWorker.js";

package/dist/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACtE,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,cAAc,eAAe,CAAC;AAC9B,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACtE,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,iBAAiB,CAAC"}

package/dist/src/index.js

@@ -4,14 +4,11 @@ export * from "./Crdt.js";
 export * from "./Crypto.js";
 export * from "./Db.js";
 export * from "./DbWorker.js";
-export * from "./Diff.js";
 export * from "./Errors.js";
 export * from "./Evolu.js";
 export * from "./Model.js";
-export * from "./Murmurhash.js";
 export * from "./Platform.js";
 export * from "./Protobuf.js";
-export * from "./Sql.js";
 export * from "./Sqlite.js";
 export * from "./Store.js";
 export * from "./SyncWorker.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evolu/common",
-  "version": "1.0.13",
+  "version": "1.0.15",
   "description": "Local-first platform designed for privacy, ease of use, and no vendor lock-in to sync and backup people's lifetime data",
   "keywords": [
     "evolu",
@@ -42,11 +42,12 @@
     "nanoid": "^5.0.2"
   },
   "devDependencies": {
-    "@effect/schema": "0.45.5",
+    "@effect/schema": "0.46.1",
     "@protobuf-ts/plugin": "^2.9.1",
     "@protobuf-ts/protoc": "^2.9.1",
     "array-shuffle": "^3.0.0",
-    "effect": "2.0.0-next.50",
+    "better-sqlite3": "^9.0.0",
+    "effect": "2.0.0-next.52",
     "eslint": "^8.52.0",
     "typescript": "^5.2.2",
     "vitest": "^0.34.6",
@@ -54,8 +55,8 @@
     "eslint-config-evolu": "0.0.2"
   },
   "peerDependencies": {
-    "@effect/schema": "0.45.5",
-    "effect": "2.0.0-next.50"
+    "@effect/schema": "0.46.1",
+    "effect": "2.0.0-next.52"
   },
   "publishConfig": {
     "access": "public"

package/src/Db.ts

@@ -15,6 +15,7 @@ import {
   pipe,
 } from "effect";
 import * as Kysely from "kysely";
+import { Simplify } from "kysely";
 import { urlAlphabet } from "nanoid";
 import {
   initialMerkleTree,
@@ -50,13 +51,13 @@ export type CreateQuery<S extends Schema> = (
 ) => Query;
 
 export type QueryCallback<S extends Schema, QueryRow> = (
-  db: KyselyWithoutMutation<SchemaForQuery<S>>,
+  db: KyselyWithoutMutation<QuerySchema<S>>,
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
 ) => Kysely.SelectQueryBuilder<any, any, QueryRow>;
 
 type KyselyWithoutMutation<DB> = Pick<Kysely.Kysely<DB>, "selectFrom" | "fn">;
 
-type SchemaForQuery<S extends Schema> = {
+type QuerySchema<S extends Schema> = {
   readonly [Table in keyof S]: NullableExceptOfId<
     {
       readonly [Column in keyof S[Table]]: S[Table][Column];
@@ -74,6 +75,48 @@ export interface CommonColumns {
   readonly isDeleted: SqliteBoolean;
 }
 
+/**
+ * Filter and map array items in one step with the correct return type and
+ * without unreliable TypeScript type guards.
+ *
+ * ### Examples
+ *
+ * ```
+ * useQuery(
+ *   (db) => db.selectFrom("todo").selectAll(),
+ *   // Filter and map nothing.
+ *   (row) => row,
+ * );
+ *
+ * useQuery(
+ *   (db) => db.selectFrom("todo").selectAll(),
+ *   // Filter items with title != null.
+ *   // Note the title type isn't nullable anymore in rows.
+ *   ({ title, ...rest }) => title != null && { title, ...rest },
+ * );
+ * ```
+ */
+export type FilterMap<QueryRow extends Row, FilterMapRow extends Row> = (
+  row: QueryRow,
+) => FilterMapRow | null | false;
+
+export interface QueryResult<FilterMapRow extends Row> {
+  /**
+   * Rows from the database. They can be filtered and mapped by `filterMap`.
+   */
+  readonly rows: ReadonlyArray<
+    Readonly<Simplify<ExcludeNullAndFalse<FilterMapRow>>>
+  >;
+  /**
+   * The first row from `rows`. For empty rows, it's null.
+   */
+  readonly firstRow: Readonly<
+    Simplify<ExcludeNullAndFalse<FilterMapRow>>
+  > | null;
+}
+
+type ExcludeNullAndFalse<T> = Exclude<T, null | false>;
+
 export interface Table {
   readonly name: string;
   readonly columns: ReadonlyArray<string>;
@@ -83,7 +126,7 @@ export type Tables = ReadonlyArray<Table>;
 
 const commonColumns = ["createdAt", "updatedAt", "isDeleted"];
 
-const kysely: Kysely.Kysely<SchemaForQuery<Schema>> = new Kysely.Kysely({
+const kysely: Kysely.Kysely<QuerySchema<Schema>> = new Kysely.Kysely({
   dialect: {
     createAdapter: () => new Kysely.SqliteAdapter(),
     createDriver: () => new Kysely.DummyDriver(),
@@ -95,7 +138,7 @@ const kysely: Kysely.Kysely<SchemaForQuery<Schema>> = new Kysely.Kysely({
 });
 
 export const makeCreateQuery =
-  <T extends Schema>(): CreateQuery<T> =>
+  <S extends Schema>(): CreateQuery<S> =>
   (queryCallback) =>
     queryObjectToQuery(queryCallback(kysely as never).compile() as QueryObject);
 
@@ -169,26 +212,26 @@ export interface NoSuchTableOrColumnError {
   readonly _tag: "NoSuchTableOrColumnError";
 }
 
-export const someDefectToNoSuchTableOrColumnError = Effect.catchSomeDefect(
-  (error) => {
-    if (
-      typeof error === "object" &&
-      error != null &&
-      "message" in error &&
-      typeof error.message === "string" &&
-      error.message.includes("code 1") &&
-      (error.message.includes("no such table") ||
-        error.message.includes("no such column") ||
-        error.message.includes("has no column"))
-    )
-      return Option.some(
-        Effect.fail<NoSuchTableOrColumnError>({
-          _tag: "NoSuchTableOrColumnError",
-        }),
-      );
+export const SqliteNoSuchTableOrColumnError = S.struct({
+  message: S.union(
+    S.string.pipe(S.includes("no such table")),
+    S.string.pipe(S.includes("no such column")),
+    S.string.pipe(S.includes("has no column")),
+  ),
+});
+export type SqliteNoSuchTableOrColumnError = S.Schema.To<
+  typeof SqliteNoSuchTableOrColumnError
+>;
 
-    return Option.none();
-  },
+export const someDefectToNoSuchTableOrColumnError = Effect.catchSomeDefect(
+  (error) =>
+    S.is(SqliteNoSuchTableOrColumnError)(error)
+      ? Option.some(
+          Effect.fail<NoSuchTableOrColumnError>({
+            _tag: "NoSuchTableOrColumnError",
+          }),
+        )
+      : Option.none(),
 );
 
 export const makeOwner = (
@@ -325,3 +368,24 @@ export const ensureSchema = (
       { discard: true },
     ),
   );
+
+export const makeCacheFilterMap = (): (<
+  QueryRow extends Row,
+  FilterMapRow extends Row,
+>(
+  filterMap: FilterMap<QueryRow, FilterMapRow>,
+) => FilterMap<QueryRow, FilterMapRow>) => {
+  const cache = new WeakMap<Row, Row | null | false>();
+
+  return <QueryRow extends Row, FilterMapRow extends Row>(
+      filterMap: FilterMap<QueryRow, FilterMapRow>,
+    ): FilterMap<QueryRow, FilterMapRow> =>
+    (row: QueryRow) => {
+      let cachedRow = cache.get(row);
+      if (cachedRow === undefined) {
+        cachedRow = filterMap(row);
+        cache.set(row, cachedRow);
+      }
+      return cachedRow as FilterMapRow | null | false;
+    };
+};

package/src/DbWorker.ts

@@ -45,15 +45,7 @@ import {
 import { QueryPatches, makePatches } from "./Diff.js";
 import { EvoluError, UnexpectedError, makeUnexpectedError } from "./Errors.js";
 import { Id, SqliteDate, cast } from "./Model.js";
-import {
-  insertIntoMessagesIfNew,
-  insertValueIntoTableRowColumn,
-  selectLastTimestampForTableRowColumn,
-  selectMessagesToSync,
-  selectOwner,
-  selectOwnerTimestampAndMerkleTree,
-  updateOwnerTimestampAndMerkleTree,
-} from "./Sql.js";
+import * as Sql from "./Sql.js";
 import { Query, Row, Sqlite, Value, queryObjectFromQuery } from "./Sqlite.js";
 import {
   Message,
@@ -179,7 +171,7 @@ const init = (
     const sqlite = yield* _(Sqlite);
 
     return yield* _(
-      sqlite.exec(selectOwner),
+      sqlite.exec(Sql.selectOwner),
       Effect.map(
         ({ rows: [row] }): Owner => ({
           id: row.id as OwnerId,
@@ -237,7 +229,9 @@ interface TimestampAndMerkleTree {
 }
 
 const readTimestampAndMerkleTree = Sqlite.pipe(
-  Effect.flatMap((sqlite) => sqlite.exec(selectOwnerTimestampAndMerkleTree)),
+  Effect.flatMap((sqlite) =>
+    sqlite.exec(Sql.selectOwnerTimestampAndMerkleTree),
+  ),
   Effect.map((result) => result.rows),
   Effect.map(
     ([{ timestamp, merkleTree }]): TimestampAndMerkleTree => ({
@@ -248,11 +242,11 @@ const readTimestampAndMerkleTree = Sqlite.pipe(
 );
 
 export const mutateItemsToNewMessages = (
-  items: ReadonlyArray.NonEmptyReadonlyArray<MutateItem>,
-): ReadonlyArray.NonEmptyReadonlyArray<NewMessage> =>
+  items: ReadonlyArray<MutateItem>,
+): ReadonlyArray<NewMessage> =>
   pipe(
     items,
-    ReadonlyArray.mapNonEmpty(({ id, isInsert, now, table, values }) =>
+    ReadonlyArray.map(({ id, isInsert, now, table, values }) =>
       pipe(
         Object.entries(values),
         ReadonlyArray.filterMap(([key, value]) =>
@@ -274,7 +268,7 @@ export const mutateItemsToNewMessages = (
             ] as const,
         ),
         ReadonlyArray.append([isInsert ? "createdAt" : "updatedAt", now]),
-        ReadonlyArray.mapNonEmpty(
+        ReadonlyArray.map(
           ([key, value]): NewMessage => ({
             table,
             row: id,
@@ -284,12 +278,12 @@ export const mutateItemsToNewMessages = (
         ),
       ),
     ),
-    ReadonlyArray.flattenNonEmpty,
-    ReadonlyArray.dedupeNonEmptyWith(NewMessageEquivalence),
+    ReadonlyArray.flatten,
+    ReadonlyArray.dedupeWith(NewMessageEquivalence),
   );
 
-const ensureSchemaByMessages = (
-  messages: ReadonlyArray.NonEmptyReadonlyArray<Message>,
+const ensureSchemaByNewMessages = (
+  messages: ReadonlyArray<NewMessage>,
 ): Effect.Effect<Sqlite, never, void> =>
   Effect.gen(function* (_) {
     const tablesMap = new Map<string, Table>();
@@ -311,12 +305,34 @@ const ensureSchemaByMessages = (
     yield* _(ensureSchema(Array.from(tablesMap.values())));
   });
 
+export const upsertValueIntoTableRowColumn = (
+  message: NewMessage,
+  messages: ReadonlyArray<NewMessage>,
+): Effect.Effect<Sqlite, never, void> =>
+  Effect.gen(function* (_) {
+    const sqlite = yield* _(Sqlite);
+
+    const insert = sqlite.exec({
+      sql: Sql.upsertValueIntoTableRowColumn(message.table, message.column),
+      parameters: [message.row, message.value, message.value],
+    });
+
+    yield* _(
+      insert,
+      someDefectToNoSuchTableOrColumnError,
+      Effect.catchTag("NoSuchTableOrColumnError", () =>
+        // If one message fails, we ensure schema for all messages.
+        ensureSchemaByNewMessages(messages).pipe(Effect.zipRight(insert)),
+      ),
+    );
+  });
+
 const applyMessages = ({
   merkleTree,
   messages,
 }: {
   merkleTree: MerkleTree;
-  messages: ReadonlyArray.NonEmptyReadonlyArray<Message>;
+  messages: ReadonlyArray<Message>;
 }): Effect.Effect<Sqlite, never, MerkleTree> =>
   Effect.gen(function* (_) {
     const sqlite = yield* _(Sqlite);
@@ -324,7 +340,7 @@ const applyMessages = ({
     for (const message of messages) {
       const timestamp: TimestampString | null = yield* _(
         sqlite.exec({
-          sql: selectLastTimestampForTableRowColumn,
+          sql: Sql.selectLastTimestampForTableRowColumn,
           parameters: [message.table, message.row, message.column],
         }),
         Effect.map((result) => result.rows),
@@ -334,23 +350,13 @@ const applyMessages = ({
       );
 
       if (timestamp == null || timestamp < message.timestamp) {
-        const insert = sqlite.exec({
-          sql: insertValueIntoTableRowColumn(message.table, message.column),
-          parameters: [message.row, message.value, message.value],
-        });
-        yield* _(
-          insert,
-          someDefectToNoSuchTableOrColumnError,
-          Effect.catchTag("NoSuchTableOrColumnError", () =>
-            ensureSchemaByMessages(messages).pipe(Effect.flatMap(() => insert)),
-          ),
-        );
+        yield* _(upsertValueIntoTableRowColumn(message, messages));
       }
 
       if (timestamp == null || timestamp !== message.timestamp) {
         const { changes } = yield* _(
           sqlite.exec({
-            sql: insertIntoMessagesIfNew,
+            sql: Sql.insertIntoMessagesIfNew,
             parameters: [
               message.timestamp,
               message.table,
@@ -360,11 +366,10 @@ const applyMessages = ({
             ],
           }),
         );
-
-        if (changes > 0)
-          merkleTree = insertIntoMerkleTree(
-            unsafeTimestampFromString(message.timestamp),
-          )(merkleTree);
+        if (changes > 0) {
+          const timestamp = unsafeTimestampFromString(message.timestamp);
+          merkleTree = insertIntoMerkleTree(timestamp)(merkleTree);
+        }
       }
     }
 
@@ -377,7 +382,7 @@ const writeTimestampAndMerkleTree = ({
 }: TimestampAndMerkleTree): Effect.Effect<Sqlite, never, void> =>
   Effect.flatMap(Sqlite, (sqlite) =>
     sqlite.exec({
-      sql: updateOwnerTimestampAndMerkleTree,
+      sql: Sql.updateOwnerTimestampAndMerkleTree,
       parameters: [
         timestampToString(timestamp),
         merkleTreeToString(merkleTree),
@@ -402,47 +407,63 @@ const mutate = ({
   void
 > =>
   Effect.gen(function* (_) {
-    const owner = yield* _(Owner);
-    let { timestamp, merkleTree } = yield* _(readTimestampAndMerkleTree);
+    const [toSync, localOnlyItems] = ReadonlyArray.partition(items, (item) =>
+      item.table.startsWith("_"),
+    );
+    const [toUpsert, toDelete] = ReadonlyArray.partition(
+      localOnlyItems,
+      (item) =>
+        mutateItemsToNewMessages([item]).some(
+          (message) => message.column === "isDeleted" && message.value === 1,
+        ),
+    ).map(mutateItemsToNewMessages);
 
-    const messages = yield* _(
-      mutateItemsToNewMessages(items),
-      Effect.forEach((newMessage) =>
-        Effect.map(sendTimestamp(timestamp), (nextTimestamp): Message => {
-          timestamp = nextTimestamp;
-          return {
-            ...newMessage,
-            timestamp: timestampToString(timestamp),
-          };
-        }),
+    yield* _(
+      Effect.forEach(toUpsert, (message) =>
+        upsertValueIntoTableRowColumn(message, toUpsert),
       ),
     );
 
-    if (ReadonlyArray.isNonEmptyReadonlyArray(messages)) {
+    const { exec } = yield* _(Sqlite);
+    yield* _(
+      Effect.forEach(toDelete, ({ table, row }) =>
+        exec({ sql: Sql.deleteTableRow(table), parameters: [row] }),
+      ),
+    );
+
+    if (toSync.length > 0) {
+      let { timestamp, merkleTree } = yield* _(readTimestampAndMerkleTree);
+
+      const messages = yield* _(
+        mutateItemsToNewMessages(toSync),
+        Effect.forEach((message) =>
+          Effect.map(sendTimestamp(timestamp), (nextTimestamp): Message => {
+            timestamp = nextTimestamp;
+            return { ...message, timestamp: timestampToString(timestamp) };
+          }),
+        ),
+      );
+
       merkleTree = yield* _(applyMessages({ merkleTree, messages }));
+
       yield* _(writeTimestampAndMerkleTree({ timestamp, merkleTree }));
+
+      (yield* _(SyncWorkerPostMessage))({
+        _tag: "sync",
+        syncUrl: (yield* _(Config)).syncUrl,
+        messages,
+        timestamp,
+        merkleTree,
+        owner: yield* _(Owner),
+        syncLoopCount: 0,
+      });
     }
 
     const onCompleteIds = ReadonlyArray.filterMap(items, (item) =>
       Option.fromNullable(item.onCompleteId),
     );
-
     if (queries.length > 0 || onCompleteIds.length > 0)
       yield* _(query({ queries, onCompleteIds }));
-
-    const [config, syncWorkerPostMessage] = yield* _(
-      Effect.all([Config, SyncWorkerPostMessage]),
-    );
-
-    syncWorkerPostMessage({
-      _tag: "sync",
-      syncUrl: config.syncUrl,
-      messages,
-      timestamp,
-      merkleTree,
-      owner,
-      syncLoopCount: 0,
-    });
   });
 
 const handleSyncResponse = ({
@@ -456,7 +477,7 @@ const handleSyncResponse = ({
   Effect.gen(function* (_) {
     let { timestamp, merkleTree } = yield* _(readTimestampAndMerkleTree);
 
-    if (ReadonlyArray.isNonEmptyReadonlyArray(messages)) {
+    if (messages.length > 0) {
       for (const message of messages)
         timestamp = yield* _(
           unsafeTimestampFromString(message.timestamp),
@@ -490,7 +511,7 @@ const handleSyncResponse = ({
     );
     const messagesToSync = yield* _(
       sqlite.exec({
-        sql: selectMessagesToSync,
+        sql: Sql.selectMessagesToSync,
         parameters: [timestampToString(makeSyncTimestamp(diff.value))],
       }),
       Effect.map(({ rows }) => rows as unknown as ReadonlyArray<Message>),

package/src/Evolu.ts

@@ -60,8 +60,8 @@ export interface Evolu<S extends Schema> {
   readonly ensureSchema: (tables: Tables) => void;
 }
 
-export const Evolu = <T extends Schema>(): Context.Tag<Evolu<T>, Evolu<T>> =>
-  Context.Tag<Evolu<T>>("evolu/Evolu");
+export const Evolu = <S extends Schema>(): Context.Tag<Evolu<S>, Evolu<S>> =>
+  Context.Tag<Evolu<S>>("evolu/Evolu");
 
 type ErrorStore = Store<EvoluError | null>;
 
@@ -118,8 +118,8 @@ type Mutate<S extends Schema> = <
   readonly id: U[T]["id"];
 };
 
-const Mutate = <T extends Schema>(): Context.Tag<Mutate<T>, Mutate<T>> =>
-  Context.Tag<Mutate<T>>("evolu/Mutate");
+const Mutate = <S extends Schema>(): Context.Tag<Mutate<S>, Mutate<S>> =>
+  Context.Tag<Mutate<S>>("evolu/Mutate");
 
 type SchemaForMutate<S extends Schema> = {
   readonly [Table in keyof S]: NullableExceptOfId<
@@ -297,13 +297,13 @@ const QueryStoreLive = Layer.effect(
   }),
 );
 
-const MutateLive = <T extends Schema>(): Layer.Layer<
+const MutateLive = <S extends Schema>(): Layer.Layer<
   NanoId | OnCompletes | Time | SubscribedQueries | LoadingPromises | DbWorker,
   never,
-  Mutate<T>
+  Mutate<S>
 > =>
   Layer.effect(
-    Mutate<T>(),
+    Mutate<S>(),
     Effect.gen(function* (_) {
       const nanoid = yield* _(NanoId);
       const onCompletes = yield* _(OnCompletes);
@@ -314,7 +314,7 @@ const MutateLive = <T extends Schema>(): Layer.Layer<
 
       const queue: Array<MutateItem> = [];
 
-      return Mutate<T>().of((table, { id, ...values }, onComplete) => {
+      return Mutate<S>().of((table, { id, ...values }, onComplete) => {
         const isInsert = id == null;
         if (isInsert) id = Effect.runSync(nanoid.nanoid) as never;
 
@@ -381,15 +381,15 @@ const OwnerActionsLive = Layer.effect(
   }),
 );
 
-export const EvoluLive = <T extends Schema>(
+export const EvoluLive = <S extends Schema>(
   tables: Tables,
 ): Layer.Layer<
   DbWorker | Bip39 | Config | FlushSync | NanoId | Time | AppState,
   never,
-  Evolu<T>
+  Evolu<S>
 > =>
   Layer.effect(
-    Evolu<T>(),
+    Evolu<S>(),
     Effect.gen(function* (_) {
       const dbWorker = yield* _(DbWorker);
       const appState = yield* _(AppState);
@@ -425,8 +425,8 @@ export const EvoluLive = <T extends Schema>(
       ).pipe(Effect.runSync);
 
       const mutate = Effect.provide(
-        Mutate<T>(),
-        Layer.use(MutateLive<T>(), Layers),
+        Mutate<S>(),
+        Layer.use(MutateLive<S>(), Layers),
       ).pipe(Effect.runSync);
 
       const ownerActions = Effect.provide(
@@ -434,7 +434,7 @@ export const EvoluLive = <T extends Schema>(
         Layer.use(OwnerActionsLive, Layers),
       ).pipe(Effect.runSync);
 
-      const ensureSchema: Evolu<T>["ensureSchema"] = (tables) => {
+      const ensureSchema: Evolu<S>["ensureSchema"] = (tables) => {
         dbWorker.postMessage({ _tag: "ensureSchema", tables });
       };
 
@@ -486,14 +486,14 @@ export const EvoluLive = <T extends Schema>(
       appState.onReconnect(sync);
       sync();
 
-      return Evolu<T>().of({
+      return Evolu<S>().of({
         subscribeError: errorStore.subscribe,
         getError: errorStore.getState,
 
         subscribeOwner: ownerStore.subscribe,
         getOwner: ownerStore.getState,
 
-        createQuery: makeCreateQuery<T>(),
+        createQuery: makeCreateQuery<S>(),
         subscribeQuery: queryStore.subscribe,
         getQuery: queryStore.getState,
         loadQuery: queryStore.loadQuery,
@@ -501,15 +501,15 @@ export const EvoluLive = <T extends Schema>(
         subscribeSyncState: syncStateStore.subscribe,
         getSyncState: syncStateStore.getState,
 
-        create: mutate as Create<T>,
-        update: mutate as Update<T>,
+        create: mutate as Create<S>,
+        update: mutate as Update<S>,
         ownerActions,
         ensureSchema,
       });
     }),
   );
 
-export const makeEvoluForPlatform = <T extends Schema>(
+export const makeEvoluForPlatform = <S extends Schema>(
   PlatformLayer: Layer.Layer<
     never,
     never,
@@ -517,11 +517,11 @@ export const makeEvoluForPlatform = <T extends Schema>(
   >,
   tables: Tables,
   config?: Partial<Config>,
-): Evolu<T> =>
+): Evolu<S> =>
   Effect.provide(
-    Evolu<T>(),
+    Evolu<S>(),
     Layer.use(
-      EvoluLive<T>(tables),
+      EvoluLive<S>(tables),
       Layer.mergeAll(PlatformLayer, ConfigLive(config), TimeLive),
     ),
   ).pipe(Effect.runSync);

package/src/Model.ts

@@ -1,6 +1,6 @@
 import * as Schema from "@effect/schema/Schema";
 import { Brand } from "effect";
-import { Row, maybeJson } from "./Sqlite.js";
+import { maybeJson } from "./Sqlite.js";
 
 /**
  * Branded Id Schema for any table Id.
@@ -181,32 +181,3 @@ export const PositiveInt = Schema.number.pipe(
   Schema.brand("PositiveInt"),
 );
 export type PositiveInt = Schema.Schema.To<typeof PositiveInt>;
-
-/**
- * Filter and map array items in one step with the correct return type and
- * without unreliable TypeScript type guards.
- *
- * ### Examples
- *
- * ```
- * useQuery(
- *   (db) => db.selectFrom("todo").selectAll(),
- *   // Filter and map nothing.
- *   (row) => row,
- * );
- *
- * useQuery(
- *   (db) => db.selectFrom("todo").selectAll(),
- *   // Filter items with title != null.
- *   // Note the title type isn't nullable anymore in rows.
- *   ({ title, ...rest }) => title != null && { title, ...rest },
- * );
- * ```
- */
-export type FilterMap<QueryRow extends Row, FilterMapRow extends Row> = (
-  row: QueryRow,
-) => OrNullOrFalse<FilterMapRow>;
-
-export type OrNullOrFalse<T> = T | null | false;
-
-export type ExcludeNullAndFalse<T> = Exclude<T, null | false>;

package/src/Sql.ts

@@ -75,7 +75,7 @@ LIMIT
   1
 `;
 
-export const insertValueIntoTableRowColumn = (
+export const upsertValueIntoTableRowColumn = (
   table: string,
   column: string,
 ): string => `
@@ -87,6 +87,12 @@ ON CONFLICT DO UPDATE SET
   "${column}" = ?
 `;
 
+export const deleteTableRow = (table: string): string => `
+DELETE FROM "${table}"
+WHERE
+  "id" = ?;
+`;
+
 export const insertIntoMessagesIfNew = `
 INSERT INTO
   "evolu_message" ("timestamp", "table", "row", "column", "value")

package/src/index.ts

@@ -4,14 +4,11 @@ export * from "./Crdt.js";
 export * from "./Crypto.js";
 export * from "./Db.js";
 export * from "./DbWorker.js";
-export * from "./Diff.js";
 export * from "./Errors.js";
 export * from "./Evolu.js";
 export * from "./Model.js";
-export * from "./Murmurhash.js";
 export * from "./Platform.js";
 export * from "./Protobuf.js";
-export * from "./Sql.js";
 export * from "./Sqlite.js";
 export * from "./Store.js";
 export * from "./SyncWorker.js";