@evolu/common 1.0.14 → 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`
@@ -62,5 +96,6 @@ export declare const someDefectToNoSuchTableOrColumnError: <R, E, A>(self: Effec
 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

@@ -110,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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evolu/common",
-  "version": "1.0.14",
+  "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,12 +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",
     "better-sqlite3": "^9.0.0",
-    "effect": "2.0.0-next.50",
+    "effect": "2.0.0-next.52",
     "eslint": "^8.52.0",
     "typescript": "^5.2.2",
     "vitest": "^0.34.6",
@@ -55,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);
 
@@ -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/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>;