@evolu/common 1.0.16 → 2.0.0

package/README.md

@@ -28,20 +28,20 @@ Client-server architecture provides us with easy backup and synchronization, but
 To start using Evolu, define tables for your database and export React Hooks.
 
 ```ts
-import * as Schema from "@effect/schema/Schema";
+import * as S from "@effect/schema/Schema";
 import * as Evolu from "@evolu/react";
 
 const TodoId = Evolu.id("Todo");
-type TodoId = Schema.Schema.To<typeof TodoId>;
+type TodoId = S.Schema.To<typeof TodoId>;
 
-const TodoTable = Schema.struct({
+const TodoTable = S.struct({
   id: TodoId,
   title: Evolu.NonEmptyString1000,
   isCompleted: Evolu.SqliteBoolean,
 });
-type TodoTable = Schema.Schema.To<typeof TodoTable>;
+type TodoTable = S.Schema.To<typeof TodoTable>;
 
-const Database = Schema.struct({
+const Database = S.struct({
   todo: TodoTable,
 });
 
@@ -59,10 +59,10 @@ export const {
 Learn more about [Schema](https://github.com/effect-ts/schema).
 
 ```ts
-import * as Schema from "@effect/schema/Schema";
+import * as S from "@effect/schema/Schema";
 import * as Evolu from "@evolu/react";
 
-Schema.parse(Evolu.String1000)(title);
+S.parse(Evolu.String1000)(title);
 ```
 
 ### Mutate Data

package/dist/src/Config.d.ts

@@ -1,17 +1,15 @@
 import { Context, Layer } from "effect";
 export interface Config {
-    /**
-     * Alternate URL to Evolu sync&backup server.
-     */
+    /** Alternate URL to Evolu sync and backup server. */
     readonly syncUrl: string;
     /**
-     * Alternate URL to reload browser tabs after `Owner` reset or restore.
+     * Alternate URL to reload browser tabs after {@link Owner} reset or restore.
      * The default value is `/`.
      */
     readonly reloadUrl: string;
     /**
-     * Maximum physical clock drift allowed in ms.
-     * The default value is 5 * 60 * 1000 (5 minutes).
+     * Maximum physical clock drift allowed in ms. The default value is 5 * 60 *
+     * 1000 (5 minutes).
      */
     readonly maxDrift: number;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["../../src/Config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAExC,MAAM,WAAW,MAAM;IACrB;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB;;;OAGG;IACH,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B;;;OAGG;IACH,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC3B;AAED,eAAO,MAAM,MAAM,6BAAsC,CAAC;AAE1D,eAAO,MAAM,UAAU,YACZ,QAAQ,MAAM,CAAC,KACvB,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,CAShC,CAAC"}
+{"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["../../src/Config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAExC,MAAM,WAAW,MAAM;IACrB,qDAAqD;IACrD,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAEzB;;;OAGG;IACH,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAE3B;;;OAGG;IACH,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC3B;AAED,eAAO,MAAM,MAAM,6BAAwB,CAAC;AAE5C,eAAO,MAAM,UAAU,YACZ,QAAQ,MAAM,CAAC,KACvB,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,CAShC,CAAC"}

package/dist/src/Config.js

@@ -1,5 +1,5 @@
 import { Context, Layer } from "effect";
-export const Config = Context.Tag("evolu/Config");
+export const Config = Context.Tag();
 export const ConfigLive = (config) => Layer.succeed(Config, Config.of({
     syncUrl: "https://evolu.world",
     maxDrift: 5 * 60 * 1000,

package/dist/src/Crdt.d.ts

@@ -1,4 +1,4 @@
-import * as Schema from "@effect/schema/Schema";
+import * as S from "@effect/schema/Schema";
 import { Brand, Context, Effect, Layer, Option } from "effect";
 import { Config } from "./Config.js";
 import { NanoId, NodeId } from "./Crypto.js";
@@ -12,16 +12,17 @@ export declare const AllowedTimeRange: {
     lessThan: number;
 };
 /**
- * Millis represents a time that is valid for usage with the Merkle tree.
- * It must be between Apr 13, 1997, and Nov 05, 2051, to ensure MinutesBase3
- * length equals 16. We can find diff for two Merkle trees only within this range.
- * If the device clock is out of range, Evolu will not store data until it's fixed.
+ * Millis represents a time that is valid for usage with the Merkle tree. It
+ * must be between Apr 13, 1997, and Nov 05, 2051, to ensure MinutesBase3 length
+ * equals 16. We can find diff for two Merkle trees only within this range. If
+ * the device clock is out of range, Evolu will not store data until it's
+ * fixed.
  */
-export declare const Millis: Schema.BrandSchema<number, number & Brand.Brand<"Millis">>;
-export type Millis = Schema.Schema.To<typeof Millis>;
+export declare const Millis: S.BrandSchema<number, number & Brand.Brand<"Millis">>;
+export type Millis = S.Schema.To<typeof Millis>;
 export declare const initialMillis: number & Brand.Brand<"Millis">;
-export declare const Counter: Schema.BrandSchema<number, number & Brand.Brand<"Counter">>;
-export type Counter = Schema.Schema.To<typeof Counter>;
+export declare const Counter: S.BrandSchema<number, number & Brand.Brand<"Counter">>;
+export type Counter = S.Schema.To<typeof Counter>;
 export type TimestampHash = number & Brand.Brand<"TimestampHash">;
 export type TimestampString = string & Brand.Brand<"TimestampString">;
 export declare const timestampToString: (t: Timestamp) => TimestampString;
@@ -34,6 +35,11 @@ export interface Time {
 }
 export declare const Time: Context.Tag<Time, Time>;
 export declare const TimeLive: Layer.Layer<never, never, Time>;
+/**
+ * The TimestampError type represents all Timestamp-related errors. If such an
+ * error happens, the device clock is skewed and should be set to the current
+ * time.
+ */
 export type TimestampError = TimestampDriftError | TimestampCounterOverflowError | TimestampDuplicateNodeError | TimestampTimeOutOfRangeError;
 export interface TimestampDriftError {
     readonly _tag: "TimestampDriftError";

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

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

package/dist/src/Crdt.js

@@ -1,4 +1,4 @@
-import * as Schema from "@effect/schema/Schema";
+import * as S from "@effect/schema/Schema";
 import { Context, Effect, Either, Layer, Number, Option, ReadonlyArray, String, pipe, } from "effect";
 import { Config } from "./Config.js";
 import { NanoId, NodeId } from "./Crypto.js";
@@ -8,15 +8,16 @@ export const AllowedTimeRange = {
     lessThan: 2582803260000,
 };
 /**
- * Millis represents a time that is valid for usage with the Merkle tree.
- * It must be between Apr 13, 1997, and Nov 05, 2051, to ensure MinutesBase3
- * length equals 16. We can find diff for two Merkle trees only within this range.
- * If the device clock is out of range, Evolu will not store data until it's fixed.
+ * Millis represents a time that is valid for usage with the Merkle tree. It
+ * must be between Apr 13, 1997, and Nov 05, 2051, to ensure MinutesBase3 length
+ * equals 16. We can find diff for two Merkle trees only within this range. If
+ * the device clock is out of range, Evolu will not store data until it's
+ * fixed.
  */
-export const Millis = Schema.number.pipe(Schema.greaterThan(AllowedTimeRange.greaterThan), Schema.lessThan(AllowedTimeRange.lessThan), Schema.brand("Millis"));
-export const initialMillis = Schema.parseSync(Millis)(AllowedTimeRange.greaterThan + 1);
-export const Counter = Schema.number.pipe(Schema.between(0, 65535), Schema.brand("Counter"));
-const initialCounter = Schema.parseSync(Counter)(0);
+export const Millis = S.number.pipe(S.greaterThan(AllowedTimeRange.greaterThan), S.lessThan(AllowedTimeRange.lessThan), S.brand("Millis"));
+export const initialMillis = S.parseSync(Millis)(AllowedTimeRange.greaterThan + 1);
+export const Counter = S.number.pipe(S.between(0, 65535), S.brand("Counter"));
+const initialCounter = S.parseSync(Counter)(0);
 export const timestampToString = (t) => [
     new Date(t.millis).toISOString(),
     t.counter.toString(16).toUpperCase().padStart(4, "0"),
@@ -31,7 +32,7 @@ export const unsafeTimestampFromString = (s) => {
     };
 };
 export const timestampToHash = (t) => murmurhash(timestampToString(t));
-const syncNodeId = Schema.parseSync(NodeId)("0000000000000000");
+const syncNodeId = S.parseSync(NodeId)("0000000000000000");
 export const makeSyncTimestamp = (millis = initialMillis) => ({
     millis,
     counter: initialCounter,
@@ -42,9 +43,9 @@ export const makeInitialTimestamp = NanoId.pipe(Effect.flatMap(({ nanoidAsNodeId
     counter: initialCounter,
     node,
 })));
-export const Time = Context.Tag("evolu/Time");
+export const Time = Context.Tag();
 export const TimeLive = Layer.succeed(Time, Time.of({
-    now: Effect.suspend(() => Schema.parse(Millis)(Date.now())).pipe(Effect.catchTag("ParseError", () => Effect.fail({
+    now: Effect.suspend(() => S.parse(Millis)(Date.now())).pipe(Effect.catchTag("ParseError", () => Effect.fail({
         _tag: "TimestampTimeOutOfRangeError",
     }))),
 }));
@@ -61,8 +62,8 @@ const getNextMillis = (millis) => Effect.gen(function* (_) {
         }));
     return next;
 });
-const incrementCounter = (counter) => pipe(Number.increment(counter), Schema.parseEither(Counter), Either.mapLeft(() => ({ _tag: "TimestampCounterOverflowError" })));
-const counterMin = Schema.parseSync(Counter)(0);
+const incrementCounter = (counter) => pipe(Number.increment(counter), S.parseEither(Counter), Either.mapLeft(() => ({ _tag: "TimestampCounterOverflowError" })));
+const counterMin = S.parseSync(Counter)(0);
 export const sendTimestamp = (timestamp) => Effect.gen(function* (_) {
     const millis = yield* _(getNextMillis([timestamp.millis]));
     const counter = millis === timestamp.millis

package/dist/src/Crypto.d.ts

@@ -1,4 +1,4 @@
-import * as Schema from "@effect/schema/Schema";
+import * as S from "@effect/schema/Schema";
 import { Brand, Context, Effect, Layer } from "effect";
 export interface Bip39 {
     readonly make: Effect.Effect<never, never, Mnemonic>;
@@ -12,9 +12,9 @@ export interface InvalidMnemonicError {
 /**
  * Mnemonic is a password generated by Evolu in BIP39 format.
  *
- * A mnemonic, also known as a "seed phrase," is a set of 12 words in a
- * specific order chosen from a predefined list. The purpose of the BIP39
- * mnemonic is to provide a human-readable way of storing a private key.
+ * A mnemonic, also known as a "seed phrase," is a set of 12 words in a specific
+ * order chosen from a predefined list. The purpose of the BIP39 mnemonic is to
+ * provide a human-readable way of storing a private key.
  */
 export type Mnemonic = string & Brand.Brand<"Mnemonic">;
 export interface NanoId {
@@ -22,17 +22,11 @@ export interface NanoId {
     readonly nanoidAsNodeId: Effect.Effect<never, never, NodeId>;
 }
 export declare const NanoId: Context.Tag<NanoId, NanoId>;
-export declare const NodeId: Schema.BrandSchema<string, string & Brand.Brand<"NodeId">>;
-export type NodeId = Schema.Schema.To<typeof NodeId>;
+export declare const NodeId: S.BrandSchema<string, string & Brand.Brand<"NodeId">>;
+export type NodeId = S.Schema.To<typeof NodeId>;
 export declare const NanoIdLive: Layer.Layer<never, never, NanoId>;
-/**
- * SLIP-21 implementation
- * https://github.com/satoshilabs/slips/blob/master/slip-0021.md
- */
 export declare const slip21Derive: (seed: Uint8Array, path: ReadonlyArray<string>) => Effect.Effect<never, never, Uint8Array>;
-/**
- * Alias to xsalsa20poly1305, for compatibility with libsodium / nacl
- */
+/** Alias to xsalsa20poly1305, for compatibility with libsodium/nacl */
 export interface SecretBox {
     readonly seal: (key: Uint8Array, plaintext: Uint8Array) => Effect.Effect<never, never, Uint8Array>;
     readonly open: (key: Uint8Array, ciphertext: Uint8Array) => Effect.Effect<never, never, Uint8Array>;

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

@@ -1 +1 @@
-{"version":3,"file":"Crypto.d.ts","sourceRoot":"","sources":["../../src/Crypto.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAC;AAMhD,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAGvD,MAAM,WAAW,KAAK;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;IAErD,QAAQ,CAAC,MAAM,EAAE,CACf,QAAQ,EAAE,QAAQ,KACf,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;IAE7C,QAAQ,CAAC,KAAK,EAAE,CACd,QAAQ,EAAE,MAAM,KACb,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,oBAAoB,EAAE,QAAQ,CAAC,CAAC;CAC3D;AAED,eAAO,MAAM,KAAK,2BAAoC,CAAC;AAEvD,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,IAAI,EAAE,sBAAsB,CAAC;CACvC;AAED;;;;;;GAMG;AACH,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;AAExD,MAAM,WAAW,MAAM;IACrB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IACrD,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;CAC9D;AAED,eAAO,MAAM,MAAM,6BAAsC,CAAC;AAE1D,eAAO,MAAM,MAAM,EAAE,MAAM,CAAC,WAAW,CACrC,MAAM,EACN,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,CAC6C,CAAC;AAC9E,MAAM,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,MAAM,CAAC,CAAC;AAIrD,eAAO,MAAM,UAAU,mCAMtB,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,YAAY,SACjB,UAAU,QACV,cAAc,MAAM,CAAC,KAC1B,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,UAAU,CAWrC,CAAC;AAEL;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,IAAI,EAAE,CACb,GAAG,EAAE,UAAU,EACf,SAAS,EAAE,UAAU,KAClB,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;IAE7C,QAAQ,CAAC,IAAI,EAAE,CACb,GAAG,EAAE,UAAU,EACf,UAAU,EAAE,UAAU,KACnB,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;CAC9C;AAED,eAAO,MAAM,SAAS,mCAA4C,CAAC;AAEnE,eAAO,MAAM,aAAa,sCAgBzB,CAAC"}
+{"version":3,"file":"Crypto.d.ts","sourceRoot":"","sources":["../../src/Crypto.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,uBAAuB,CAAC;AAM3C,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAIvD,MAAM,WAAW,KAAK;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;IAErD,QAAQ,CAAC,MAAM,EAAE,CACf,QAAQ,EAAE,QAAQ,KACf,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;IAE7C,QAAQ,CAAC,KAAK,EAAE,CACd,QAAQ,EAAE,MAAM,KACb,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,oBAAoB,EAAE,QAAQ,CAAC,CAAC;CAC3D;AAED,eAAO,MAAM,KAAK,2BAAuB,CAAC;AAE1C,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,IAAI,EAAE,sBAAsB,CAAC;CACvC;AAED;;;;;;GAMG;AACH,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;AAExD,MAAM,WAAW,MAAM;IACrB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IACrD,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;CAC9D;AAED,eAAO,MAAM,MAAM,6BAAwB,CAAC;AAE5C,eAAO,MAAM,MAAM,EAAE,CAAC,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,CACb,CAAC;AAC7D,MAAM,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,MAAM,CAAC,CAAC;AAIhD,eAAO,MAAM,UAAU,mCAMtB,CAAC;AAIF,eAAO,MAAM,YAAY,SACjB,UAAU,QACV,cAAc,MAAM,CAAC,KAC1B,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,UAAU,CAWrC,CAAC;AAEL,uEAAuE;AACvE,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,IAAI,EAAE,CACb,GAAG,EAAE,UAAU,EACf,SAAS,EAAE,UAAU,KAClB,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;IAE7C,QAAQ,CAAC,IAAI,EAAE,CACb,GAAG,EAAE,UAAU,EACf,UAAU,EAAE,UAAU,KACnB,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;CAC9C;AAED,eAAO,MAAM,SAAS,mCAA2B,CAAC;AAElD,eAAO,MAAM,aAAa,sCAgBzB,CAAC"}

package/dist/src/Crypto.js

@@ -1,4 +1,4 @@
-import * as Schema from "@effect/schema/Schema";
+import * as S from "@effect/schema/Schema";
 import { secretbox } from "@noble/ciphers/salsa";
 import { concatBytes } from "@noble/ciphers/utils";
 import { hmac } from "@noble/hashes/hmac";
@@ -6,18 +6,16 @@ import { sha512 } from "@noble/hashes/sha512";
 import { randomBytes } from "@noble/hashes/utils";
 import { Context, Effect, Layer } from "effect";
 import { customAlphabet, nanoid } from "nanoid";
-export const Bip39 = Context.Tag("evolu/Bip39");
-export const NanoId = Context.Tag("evolu/NanoId");
-export const NodeId = Schema.string.pipe(Schema.pattern(/^[\w-]{16}$/), Schema.brand("NodeId"));
+export const Bip39 = Context.Tag();
+export const NanoId = Context.Tag();
+export const NodeId = S.string.pipe(S.pattern(/^[\w-]{16}$/), S.brand("NodeId"));
 const nanoidForNodeId = customAlphabet("0123456789abcdef", 16);
 export const NanoIdLive = Layer.succeed(NanoId, NanoId.of({
     nanoid: Effect.sync(() => nanoid()),
     nanoidAsNodeId: Effect.sync(() => nanoidForNodeId()),
 }));
-/**
- * SLIP-21 implementation
- * https://github.com/satoshilabs/slips/blob/master/slip-0021.md
- */
+// SLIP-21 implementation
+// https://github.com/satoshilabs/slips/blob/master/slip-0021.md
 export const slip21Derive = (seed, path) => Effect.sync(() => {
     let m = hmac(sha512, "Symmetric key seed", seed);
     for (let i = 0; i < path.length; i++) {
@@ -29,7 +27,7 @@ export const slip21Derive = (seed, path) => Effect.sync(() => {
     }
     return m.slice(32, 64);
 });
-export const SecretBox = Context.Tag("evolu/SecretBox");
+export const SecretBox = Context.Tag();
 export const SecretBoxLive = Layer.succeed(SecretBox, SecretBox.of({
     seal: (key, plaintext) => Effect.sync(() => {
         const nonce = randomBytes(24);

package/dist/src/Db.d.ts

@@ -1,87 +1,51 @@
 import * as S from "@effect/schema/Schema";
-import { Brand, Context, Effect, ReadonlyRecord } from "effect";
+import { Brand, Context, Effect, Layer, ReadonlyArray, 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";
+import { Id } from "./Model.js";
+import { Owner } from "./Owner.js";
+import { Sqlite, SqliteQuery, Value } from "./Sqlite.js";
+import { Store } from "./Store.js";
+export type Schema = ReadonlyRecord.ReadonlyRecord<TableSchema>;
 export type TableSchema = ReadonlyRecord.ReadonlyRecord<Value> & {
     readonly id: Id;
 };
-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<QuerySchema<S>>) => Kysely.SelectQueryBuilder<any, any, QueryRow>;
-type KyselyWithoutMutation<DB> = Pick<Kysely.Kysely<DB>, "selectFrom" | "fn">;
-type QuerySchema<S extends Schema> = {
-    readonly [Table in keyof S]: NullableExceptOfId<{
-        readonly [Column in keyof S[Table]]: S[Table][Column];
-    } & CommonColumns>;
-};
-export type NullableExceptOfId<T> = {
-    readonly [K in keyof T]: K extends "id" ? T[K] : T[K] | null;
-};
-export interface CommonColumns {
-    readonly createdAt: SqliteDate;
-    readonly updatedAt: SqliteDate;
-    readonly isDeleted: SqliteBoolean;
-}
+declare const __queryBrand: unique symbol;
 /**
- * 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 },
- * );
- * ```
+ * The query is an SQL query serialized as a string with a branded type
+ * representing a row it returns.
  */
-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>>>>;
+export type Query<R extends Row = Row> = string & Brand.Brand<"Query"> & {
+    readonly [__queryBrand]: R;
+};
+export type Queries<R extends Row = Row> = ReadonlyArray<Query<R>>;
+export declare const serializeQuery: <R extends Row>({ sql, parameters, }: SqliteQuery) => Query<R>;
+export declare const deserializeQuery: <R extends Row>(query: Query<R>) => SqliteQuery;
+export type Row = ReadonlyRecord.ReadonlyRecord<Value | Row | ReadonlyArray<Row>>;
+export declare const emptyRows: <R extends Row>() => readonly R[];
+/** An object with rows and row properties. */
+export interface QueryResult<R extends Row = Row> {
+    /** An array containing all the rows returned by the query. */
+    readonly rows: ReadonlyArray<Readonly<Kysely.Simplify<R>>>;
     /**
-     * The first row from `rows`. For empty rows, it's null.
+     * The first row returned by the query, or null if no rows were returned. This
+     * property is useful for queries that are expected to return a single row.
      */
-    readonly firstRow: Readonly<Simplify<ExcludeNullAndFalse<FilterMapRow>>> | null;
+    readonly row: Readonly<Kysely.Simplify<R>> | null;
 }
-type ExcludeNullAndFalse<T> = Exclude<T, null | false>;
+export type QueryResultsFromQueries<Q extends Queries> = {
+    [P in keyof Q]: Q[P] extends Query<infer R> ? QueryResult<R> : never;
+};
+export type QueryResultsPromisesFromQueries<Q extends Queries> = {
+    [P in keyof Q]: Q[P] extends Query<infer R> ? Promise<QueryResult<R>> : never;
+};
+export declare const queryResultFromRows: <R extends Row>(rows: readonly R[]) => QueryResult<R>;
+export type Tables = ReadonlyArray<Table>;
 export interface Table {
     readonly name: string;
     readonly columns: ReadonlyArray<string>;
 }
-export type Tables = ReadonlyArray<Table>;
-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`
- * on the first run. `Owner` can be reset on the current device and restored
- * on a different one.
- */
-export interface Owner {
-    /** The `Mnemonic` associated with `Owner`. */
-    readonly mnemonic: Mnemonic;
-    /** The unique identifier of `Owner` safely derived from its `Mnemonic`. */
-    readonly id: OwnerId;
-    readonly encryptionKey: Uint8Array;
-}
-export declare const Owner: Context.Tag<Owner, Owner>;
-/**
- * The unique identifier of `Owner` safely derived from its `Mnemonic`.
- */
-export type OwnerId = Id & Brand.Brand<"Owner">;
 export declare const transaction: <R, E, A>(effect: Effect.Effect<R, E, A>) => Effect.Effect<Sqlite | R, E, A>;
 export interface NoSuchTableOrColumnError {
     readonly _tag: "NoSuchTableOrColumnError";
@@ -93,9 +57,11 @@ export declare const SqliteNoSuchTableOrColumnError: S.Schema<{
 }>;
 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 type RowsStore = Store<RowsStoreValue>;
+export declare const RowsStore: Context.Tag<RowsStore, RowsStore>;
+type RowsStoreValue = ReadonlyMap<Query, ReadonlyArray<Row>>;
+export declare const RowsStoreLive: Layer.Layer<never, never, RowsStore>;
 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":"AACA,OAAO,KAAK,CAAC,MAAM,uBAAuB,CAAC;AAG3C,OAAO,EACL,KAAK,EACL,OAAO,EACP,MAAM,EAKN,cAAc,EAGf,MAAM,QAAQ,CAAC;AAChB,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAQlC,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAgB,MAAM,aAAa,CAAC;AACpE,OAAO,EAAE,EAAE,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAO3D,OAAO,EACL,KAAK,EAEL,GAAG,EACH,MAAM,EACN,KAAK,EAEN,MAAM,aAAa,CAAC;AAErB,MAAM,MAAM,WAAW,GAAG,cAAc,CAAC,cAAc,CAAC,KAAK,CAAC,GAAG;IAC/D,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,MAAM,GAAG,cAAc,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;AAEhE,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,MAAM,IAAI,CAC1C,aAAa,EAAE,aAAa,CAAC,CAAC,EAAE,GAAG,CAAC,KACjC,KAAK,CAAC;AAEX,MAAM,MAAM,aAAa,CAAC,CAAC,SAAS,MAAM,EAAE,QAAQ,IAAI,CACtD,EAAE,EAAE,qBAAqB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,KAEtC,MAAM,CAAC,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;AAEnD,KAAK,qBAAqB,CAAC,EAAE,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,YAAY,GAAG,IAAI,CAAC,CAAC;AAE9E,KAAK,WAAW,CAAC,CAAC,SAAS,MAAM,IAAI;IACnC,QAAQ,EAAE,KAAK,IAAI,MAAM,CAAC,GAAG,kBAAkB,CAC7C;QACE,QAAQ,EAAE,MAAM,IAAI,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC;KACtD,GAAG,aAAa,CAClB;CACF,CAAC;AAEF,MAAM,MAAM,kBAAkB,CAAC,CAAC,IAAI;IAClC,QAAQ,EAAE,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,SAAS,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI;CAC7D,CAAC;AAEF,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC;IAC/B,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC;IAC/B,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAC;CACnC;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,MAAM,SAAS,CAAC,QAAQ,SAAS,GAAG,EAAE,YAAY,SAAS,GAAG,IAAI,CACtE,GAAG,EAAE,QAAQ,KACV,YAAY,GAAG,IAAI,GAAG,KAAK,CAAC;AAEjC,MAAM,WAAW,WAAW,CAAC,YAAY,SAAS,GAAG;IACnD;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,aAAa,CAC1B,QAAQ,CAAC,QAAQ,CAAC,mBAAmB,CAAC,YAAY,CAAC,CAAC,CAAC,CACtD,CAAC;IACF;;OAEG;IACH,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CACzB,QAAQ,CAAC,mBAAmB,CAAC,YAAY,CAAC,CAAC,CAC5C,GAAG,IAAI,CAAC;CACV;AAED,KAAK,mBAAmB,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,EAAE,IAAI,GAAG,KAAK,CAAC,CAAC;AAEvD,MAAM,WAAW,KAAK;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;CACzC;AAED,MAAM,MAAM,MAAM,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;AAe1C,eAAO,MAAM,eAAe,wCAGmD,CAAC;AAkBhF,eAAO,MAAM,cAAc,WAEjB,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,WAazB,CAAC;AAEJ;;;;GAIG;AACH,MAAM,WAAW,KAAK;IACpB,8CAA8C;IAC9C,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAC5B,2EAA2E;IAC3E,QAAQ,CAAC,EAAE,EAAE,OAAO,CAAC;IAErB,QAAQ,CAAC,aAAa,EAAE,UAAU,CAAC;CACpC;AAED,eAAO,MAAM,KAAK,2BAAoC,CAAC;AAEvD;;GAEG;AACH,MAAM,MAAM,OAAO,GAAG,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;AAEhD,eAAO,MAAM,WAAW,8EAUrB,CAAC;AAEJ,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,IAAI,EAAE,0BAA0B,CAAC;CAC3C;AAED,eAAO,MAAM,8BAA8B;;;;EAMzC,CAAC;AACH,MAAM,MAAM,8BAA8B,GAAG,CAAC,CAAC,MAAM,CAAC,EAAE,CACtD,OAAO,8BAA8B,CACtC,CAAC;AAEF,eAAO,MAAM,oCAAoC,8FAShD,CAAC;AAEF,eAAO,MAAM,SAAS,cACT,QAAQ,KAClB,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CA0BhC,CAAC;AAEL,eAAO,MAAM,QAAQ,cACR,QAAQ,KAClB,aAAa,CAAC,MAAM,GAAG,KAAK,GAAG,MAAM,EAAE,KAAK,EAAE,KAAK,CA4BlD,CAAC;AA6DL,eAAO,MAAM,YAAY,sBAEtB,aAAa,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAUjC,CAAC;AAEJ,eAAO,MAAM,kBAAkB,2IAmB9B,CAAC"}
+{"version":3,"file":"Db.d.ts","sourceRoot":"","sources":["../../src/Db.ts"],"names":[],"mappings":"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"}

package/dist/src/Db.js

@@ -2,45 +2,64 @@ 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";
-import * as Kysely from "kysely";
-import { urlAlphabet } from "nanoid";
+import { Context, Effect, Exit, Layer, Option, Predicate, ReadonlyArray, ReadonlyRecord, String, pipe, } from "effect";
 import { initialMerkleTree, makeInitialTimestamp, merkleTreeToString, timestampToString, } from "./Crdt.js";
-import { Bip39, slip21Derive } from "./Crypto.js";
+import { makeOwner } from "./Owner.js";
 import { createMessageTable, createMessageTableIndex, createOwnerTable, insertOwner, } from "./Sql.js";
-import { Sqlite, queryObjectToQuery, } from "./Sqlite.js";
-const commonColumns = ["createdAt", "updatedAt", "isDeleted"];
-const kysely = new Kysely.Kysely({
-    dialect: {
-        createAdapter: () => new Kysely.SqliteAdapter(),
-        createDriver: () => new Kysely.DummyDriver(),
-        createIntrospector() {
-            throw "Not implemeneted";
-        },
-        createQueryCompiler: () => new Kysely.SqliteQueryCompiler(),
-    },
-});
-export const makeCreateQuery = () => (queryCallback) => queryObjectToQuery(queryCallback(kysely).compile());
+import { Sqlite, isJsonObjectOrArray, } from "./Sqlite.js";
+import { makeStore } from "./Store.js";
+// We use queries as keys, hence JSON.stringify.
+export const serializeQuery = ({ sql, parameters, }) => {
+    const query = {
+        sql,
+        parameters: parameters.map((p) => {
+            return Predicate.isUint8Array(p)
+                ? Array.from(p)
+                : isJsonObjectOrArray(p)
+                    ? { json: p }
+                    : p;
+        }),
+    };
+    return JSON.stringify(query);
+};
+export const deserializeQuery = (query) => {
+    const serializedSqliteQuery = JSON.parse(query);
+    return {
+        ...serializedSqliteQuery,
+        parameters: serializedSqliteQuery.parameters.map((p) => Array.isArray(p)
+            ? new Uint8Array(p)
+            : typeof p === "object" && p != null
+                ? p.json
+                : p),
+    };
+};
+const _emptyRows = [];
+export const emptyRows = () => _emptyRows;
+const queryResultCache = new WeakMap();
+export const queryResultFromRows = (rows) => {
+    let queryResult = queryResultCache.get(rows);
+    if (queryResult == null) {
+        queryResult = { rows, row: rows[0] };
+        queryResultCache.set(rows, queryResult);
+    }
+    return queryResult;
+};
 // https://github.com/Effect-TS/schema/releases/tag/v0.18.0
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 const getPropertySignatures = (schema) => {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const out = {};
     const propertySignatures = AST.getPropertySignatures(schema.ast);
     for (let i = 0; i < propertySignatures.length; i++) {
         const propertySignature = propertySignatures[i];
         out[propertySignature.name] = make(propertySignature.type);
     }
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-explicit-any
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return out;
 };
-export const schemaToTables = (
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-schema) => pipe(getPropertySignatures(schema), ReadonlyRecord.toEntries, ReadonlyArray.map(([name, schema]) => ({
+const commonColumns = ["createdAt", "updatedAt", "isDeleted"];
+export const schemaToTables = (schema) => pipe(getPropertySignatures(schema), ReadonlyRecord.toEntries, ReadonlyArray.map(([name, schema]) => ({
     name,
     columns: Object.keys(getPropertySignatures(schema)).concat(commonColumns),
 })));
-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 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"))),
@@ -50,22 +69,6 @@ export const someDefectToNoSuchTableOrColumnError = Effect.catchSomeDefect((erro
         _tag: "NoSuchTableOrColumnError",
     }))
     : Option.none());
-export const makeOwner = (mnemonic) => Effect.gen(function* (_) {
-    const bip39 = yield* _(Bip39);
-    if (mnemonic == null)
-        mnemonic = yield* _(bip39.make);
-    const seed = yield* _(bip39.toSeed(mnemonic));
-    const id = yield* _(slip21Derive(seed, ["Evolu", "Owner Id"]).pipe(Effect.map((key) => {
-        // convert key to nanoid
-        let id = "";
-        for (let i = 0; i < 21; i++) {
-            id += urlAlphabet[key[i] & 63];
-        }
-        return id;
-    })));
-    const encryptionKey = yield* _(slip21Derive(seed, ["Evolu", "Encryption Key"]));
-    return { mnemonic, id, encryptionKey };
-});
 export const lazyInit = (mnemonic) => Effect.gen(function* (_) {
     const [owner, sqlite, initialTimestampString] = yield* _(Effect.all([makeOwner(mnemonic), Sqlite, makeInitialTimestamp], {
         concurrency: "unbounded",
@@ -110,14 +113,5 @@ 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;
-    };
-};
+export const RowsStore = Context.Tag();
+export const RowsStoreLive = Layer.effect(RowsStore, makeStore(new Map()));