@evolu/common 3.1.8 → 4.0.0

package/dist/src/Platform.js

@@ -5,6 +5,7 @@ export const PlatformName = Context.GenericTag("@services/PlatformName");
 export const FlushSync = Context.GenericTag("@services/FlushSync");
 export const FlushSyncDefaultLive = Layer.succeed(FlushSync, (callback) => callback());
 export const SyncLock = Context.GenericTag("@services/SyncLock");
+export const DbWorkerLock = Context.GenericTag("@services/DbWorkerLock");
 export const Fetch = Context.GenericTag("@services/Fetch");
 export const FetchLive = Layer.succeed(Fetch, Fetch.of((url, body) => Effect.tryPromise({
     try: () => fetch(url, {

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,cAAc,UAAW,MAAM,KAAG,MAI9C,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,MAQF,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

@@ -69,11 +69,12 @@ LIMIT
 `;
 export const upsertValueIntoTableRowColumn = (table, column) => `
 INSERT INTO
-  "${table}" ("id", "${column}")
+  "${table}" ("id", "${column}", "createdAt", "updatedAt")
 VALUES
-  (?, ?)
+  (?, ?, ?, ?)
 ON CONFLICT DO UPDATE SET
-  "${column}" = ?
+  "${column}" = ?,
+  "updatedAt" = ?
 `;
 export const deleteTableRow = (table) => `
 DELETE FROM "${table}"

package/dist/src/Sqlite.d.ts

@@ -2,7 +2,7 @@ import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
 import * as Predicate from "effect/Predicate";
 export interface Sqlite {
-    readonly exec: (arg: string | SqliteQuery) => Effect.Effect<ExecResult>;
+    readonly exec: (arg: string | SqliteQuery) => Effect.Effect<SqliteExecResult>;
 }
 export declare const Sqlite: Context.Tag<Sqlite, Sqlite>;
 export interface SqliteQuery {
@@ -18,7 +18,7 @@ type JsonObject = {
 type JsonArray = ReadonlyArray<Json>;
 type JsonPrimitive = string | number | boolean | null;
 type Json = JsonPrimitive | JsonObject | JsonArray;
-interface ExecResult {
+export interface SqliteExecResult {
     readonly rows: SqliteRow[];
     readonly changes: number;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"Sqlite.d.ts","sourceRoot":"","sources":["../../src/Sqlite.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAC1C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,SAAS,MAAM,kBAAkB,CAAC;AAE9C,MAAM,WAAW,MAAM;IACrB,QAAQ,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,KAAK,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;CACzE;AAED,eAAO,MAAM,MAAM,6BAAiD,CAAC;AAErE,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,UAAU,EAAE,KAAK,EAAE,CAAC;CAC9B;AAED,MAAM,MAAM,KAAK,GAAG,WAAW,GAAG,iBAAiB,CAAC;AACpD,MAAM,MAAM,WAAW,GAAG,IAAI,GAAG,MAAM,GAAG,MAAM,GAAG,UAAU,CAAC;AAC9D,MAAM,MAAM,iBAAiB,GAAG,UAAU,GAAG,SAAS,CAAC;AACvD,KAAK,UAAU,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC;AAC1C,KAAK,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;AACrC,KAAK,aAAa,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,CAAC;AACtD,KAAK,IAAI,GAAG,aAAa,GAAG,UAAU,GAAG,SAAS,CAAC;AAEnD,UAAU,UAAU;IAClB,QAAQ,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AAEpD,eAAO,MAAM,mBAAmB,EAAE,SAAS,CAAC,UAAU,CACpD,KAAK,EACL,iBAAiB,CAE4D,CAAC;AAEhF,eAAO,MAAM,oBAAoB,WACvB,cAAc,KAAK,CAAC,KAC3B,WAAW,EAGX,CAAC;AAEJ,eAAO,MAAM,iBAAiB,QAAS,MAAM,GAAG,WAAW,KAAG,WAG7D,CAAC;AAEF,eAAO,MAAM,cAAc,SAAU,SAAS,EAAE,KAAG,SAAS,EAC1C,CAAC;AA0BnB,eAAO,MAAM,SAAS,EAAE,SAAS,CAAC,SAAS,CAAC,MAAM,CACpB,CAAC"}
+{"version":3,"file":"Sqlite.d.ts","sourceRoot":"","sources":["../../src/Sqlite.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAC1C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,SAAS,MAAM,kBAAkB,CAAC;AAE9C,MAAM,WAAW,MAAM;IACrB,QAAQ,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,KAAK,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;CAC/E;AAED,eAAO,MAAM,MAAM,6BAAiD,CAAC;AAErE,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,UAAU,EAAE,KAAK,EAAE,CAAC;CAC9B;AAED,MAAM,MAAM,KAAK,GAAG,WAAW,GAAG,iBAAiB,CAAC;AACpD,MAAM,MAAM,WAAW,GAAG,IAAI,GAAG,MAAM,GAAG,MAAM,GAAG,UAAU,CAAC;AAC9D,MAAM,MAAM,iBAAiB,GAAG,UAAU,GAAG,SAAS,CAAC;AACvD,KAAK,UAAU,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC;AAC1C,KAAK,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;AACrC,KAAK,aAAa,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,CAAC;AACtD,KAAK,IAAI,GAAG,aAAa,GAAG,UAAU,GAAG,SAAS,CAAC;AAEnD,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AAEpD,eAAO,MAAM,mBAAmB,EAAE,SAAS,CAAC,UAAU,CACpD,KAAK,EACL,iBAAiB,CAE4D,CAAC;AAEhF,eAAO,MAAM,oBAAoB,WACvB,cAAc,KAAK,CAAC,KAC3B,WAAW,EAGX,CAAC;AAEJ,eAAO,MAAM,iBAAiB,QAAS,MAAM,GAAG,WAAW,KAAG,WAG7D,CAAC;AAEF,eAAO,MAAM,cAAc,SAAU,SAAS,EAAE,KAAG,SAAS,EAC1C,CAAC;AA0BnB,eAAO,MAAM,SAAS,EAAE,SAAS,CAAC,SAAS,CAAC,MAAM,CACpB,CAAC"}

package/dist/src/SyncWorker.d.ts

@@ -8,9 +8,8 @@ import { Id } from "./Model.js";
 import { Owner } from "./Owner.js";
 import { Fetch, SyncLock } from "./Platform.js";
 import { Value } from "./Sqlite.js";
-export interface SyncWorker {
-    readonly postMessage: (input: SyncWorkerInput) => void;
-    onMessage: (output: SyncWorkerOutput) => void;
+import { Messaging } from "./Types.js";
+export interface SyncWorker extends Messaging<SyncWorkerInput, SyncWorkerOutput> {
 }
 export declare const SyncWorker: Context.Tag<SyncWorker, SyncWorker>;
 export type SyncWorkerPostMessage = SyncWorker["postMessage"];
@@ -76,6 +75,6 @@ export interface SyncStateServerError {
 export interface SyncStatePaymentRequiredError {
     readonly _tag: "PaymentRequiredError";
 }
-export declare const SyncWorkerLive: Layer.Layer<SyncWorker, never, SecretBox | SyncLock | Fetch>;
+export declare const SyncWorkerCommonLive: Layer.Layer<SyncWorker, never, SecretBox | SyncLock | Fetch>;
 export {};
 //# sourceMappingURL=SyncWorker.d.ts.map

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

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

package/dist/src/SyncWorker.js

@@ -131,7 +131,7 @@ const sync = (input) => Effect.gen(function* (_) {
         syncLoopCount: input.syncLoopCount,
     })))), Effect.tapError(() => syncLock.release), Effect.merge, Effect.map(syncWorkerOnMessage));
 });
-export const SyncWorkerLive = Layer.effect(SyncWorker, Effect.gen(function* (_) {
+export const SyncWorkerCommonLive = Layer.effect(SyncWorker, Effect.gen(function* (_) {
     const syncLock = yield* _(SyncLock);
     const onError = (error) => Effect.sync(() => {
         syncWorker.onMessage(error);

package/dist/src/Types.d.ts

@@ -0,0 +1,13 @@
+/**
+ * Add types for WebWorker and BroadcastChannel. Messages must have a `_tag`
+ * property.
+ */
+export interface Messaging<Input extends {
+    _tag: string;
+}, Output extends {
+    _tag: string;
+}> {
+    readonly postMessage: (input: Input) => void;
+    onMessage: (output: Output) => void;
+}
+//# sourceMappingURL=Types.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"Types.d.ts","sourceRoot":"","sources":["../../src/Types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,WAAW,SAAS,CACxB,KAAK,SAAS;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,EAC9B,MAAM,SAAS;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE;IAE/B,QAAQ,CAAC,WAAW,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IAC7C,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;CACrC"}

package/dist/src/Types.js

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evolu/common",
-  "version": "3.1.8",
+  "version": "4.0.0",
   "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",
@@ -52,11 +52,11 @@
     "nanoid": "^5.0.6"
   },
   "devDependencies": {
-    "@effect/schema": "^0.63.0",
+    "@effect/schema": "^0.63.2",
     "@protobuf-ts/plugin": "^2.9.3",
     "@protobuf-ts/protoc": "^2.9.3",
     "array-shuffle": "^3.0.0",
-    "effect": "2.4.0",
+    "effect": "2.4.1",
     "eslint": "^8.57.0",
     "typescript": "^5.3.3",
     "vitest": "^1.3.1",
@@ -64,8 +64,8 @@
     "eslint-config-evolu": "1.0.0"
   },
   "peerDependencies": {
-    "@effect/schema": "^0.63.0",
-    "effect": "2.4.0"
+    "@effect/schema": "^0.63.2",
+    "effect": "2.4.1"
   },
   "publishConfig": {
     "access": "public"

package/src/Config.ts

@@ -16,6 +16,13 @@ export interface Config {
    * 1000 (5 minutes).
    */
   readonly maxDrift: number;
+
+  /**
+   * Evolu application name. For now, this is only useful for localhost
+   * development, where we want each application to have its own database. The
+   * default value is: "Evolu".
+   */
+  readonly name: string;
 }
 
 export const Config = Context.GenericTag<Config>("@services/Config");
@@ -27,6 +34,7 @@ export const ConfigLive = (config?: Partial<Config>): Layer.Layer<Config> =>
       syncUrl: "https://evolu.world",
       maxDrift: 5 * 60 * 1000,
       reloadUrl: "/",
+      name: "Evolu",
       ...config,
     }),
   );

package/src/Crdt.ts

@@ -10,7 +10,7 @@ import * as Option from "effect/Option";
 import * as ReadonlyArray from "effect/ReadonlyArray";
 import * as String from "effect/String";
 import { Config } from "./Config.js";
-import { NanoId, NodeId } from "./Crypto.js";
+import { NanoIdGenerator, NodeId } from "./Crypto.js";
 import { murmurhash } from "./Murmurhash.js";
 
 // https://muratbuffalo.blogspot.com/2014/07/hybrid-logical-clocks.html
@@ -86,7 +86,7 @@ export const makeSyncTimestamp = (
   node: syncNodeId,
 });
 
-export const makeInitialTimestamp = NanoId.pipe(
+export const makeInitialTimestamp = NanoIdGenerator.pipe(
   Effect.flatMap(({ nanoidAsNodeId }) => nanoidAsNodeId),
   Effect.map(
     (node): Timestamp => ({

package/src/Crypto.ts

@@ -36,12 +36,16 @@ export interface InvalidMnemonicError {
  */
 export type Mnemonic = string & Brand.Brand<"Mnemonic">;
 
-export interface NanoId {
-  readonly nanoid: Effect.Effect<string>;
+export interface NanoIdGenerator {
+  readonly nanoid: Effect.Effect<NanoId>;
   readonly nanoidAsNodeId: Effect.Effect<NodeId>;
 }
 
-export const NanoId = Context.GenericTag<NanoId>("@services/NanoId");
+export const NanoIdGenerator = Context.GenericTag<NanoIdGenerator>(
+  "@services/NanoIdGenerator",
+);
+
+export type NanoId = string & Brand.Brand<"NanoId">;
 
 export const NodeId = S.string.pipe(
   S.pattern(/^[\w-]{16}$/),
@@ -51,10 +55,10 @@ export type NodeId = S.Schema.To<typeof NodeId>;
 
 const nanoidForNodeId = customAlphabet("0123456789abcdef", 16);
 
-export const NanoIdLive = Layer.succeed(
-  NanoId,
-  NanoId.of({
-    nanoid: Effect.sync(() => nanoid()),
+export const NanoIdGeneratorLive = Layer.succeed(
+  NanoIdGenerator,
+  NanoIdGenerator.of({
+    nanoid: Effect.sync(() => nanoid() as NanoId),
     nanoidAsNodeId: Effect.sync(() => nanoidForNodeId() as NodeId),
   }),
 );

package/src/Db.ts

@@ -1,7 +1,6 @@
 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 * as Brand from "effect/Brand";
 import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
@@ -21,7 +20,7 @@ import {
   merkleTreeToString,
   timestampToString,
 } from "./Crdt.js";
-import { Bip39, Mnemonic, NanoId } from "./Crypto.js";
+import { Bip39, Mnemonic, NanoIdGenerator } from "./Crypto.js";
 import { EvoluTypeError } from "./ErrorStore.js";
 import { Id, SqliteBoolean, SqliteDate } from "./Model.js";
 import { Owner, makeOwner } from "./Owner.js";
@@ -323,7 +322,7 @@ export const someDefectToNoSuchTableOrColumnError = Effect.catchSomeDefect(
 
 export const lazyInit = (
   mnemonic?: Mnemonic,
-): Effect.Effect<Owner, never, Sqlite | Bip39 | NanoId> =>
+): Effect.Effect<Owner, never, Sqlite | Bip39 | NanoIdGenerator> =>
   Effect.gen(function* (_) {
     const [owner, sqlite, initialTimestampString] = yield* _(
       Effect.all([makeOwner(mnemonic), Sqlite, makeInitialTimestamp], {
@@ -341,8 +340,7 @@ export const lazyInit = (
           parameters: [
             owner.id,
             owner.mnemonic,
-            // expo-sqlite 11.3.2 doesn't support Uint8Array
-            bytesToHex(owner.encryptionKey),
+            owner.encryptionKey,
             timestampToString(initialTimestampString),
             merkleTreeToString(initialMerkleTree),
           ],

package/src/DbWorker.ts

@@ -1,4 +1,3 @@
-import { hexToBytes } from "@noble/ciphers/utils";
 import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
 import * as Function from "effect/Function";
@@ -11,6 +10,7 @@ import * as ReadonlyRecord from "effect/ReadonlyRecord";
 import { Config, ConfigLive } from "./Config.js";
 import {
   MerkleTree,
+  Millis,
   Time,
   TimeLive,
   Timestamp,
@@ -28,7 +28,7 @@ import {
   timestampToString,
   unsafeTimestampFromString,
 } from "./Crdt.js";
-import { Bip39, Mnemonic, NanoId } from "./Crypto.js";
+import { Bip39, Mnemonic, NanoIdGenerator } from "./Crypto.js";
 import {
   Queries,
   Query,
@@ -44,9 +44,10 @@ import {
 } from "./Db.js";
 import { QueryPatches, makePatches } from "./Diff.js";
 import { EvoluError, makeUnexpectedError } from "./ErrorStore.js";
-import { Id, SqliteDate, cast } from "./Model.js";
+import { Id, cast } from "./Model.js";
 import { OnCompleteId } from "./OnCompletes.js";
 import { Owner, OwnerId } from "./Owner.js";
+import { DbWorkerLock } from "./Platform.js";
 import * as Sql from "./Sql.js";
 import { Sqlite, Value } from "./Sqlite.js";
 import {
@@ -58,12 +59,9 @@ import {
   SyncWorkerOutputSyncResponse,
   SyncWorkerPostMessage,
 } from "./SyncWorker.js";
+import { Messaging } from "./Types.js";
 
-export interface DbWorker {
-  readonly postMessage: (input: DbWorkerInput) => void;
-  onMessage: (output: DbWorkerOutput) => void;
-}
-
+export interface DbWorker extends Messaging<DbWorkerInput, DbWorkerOutput> {}
 export const DbWorker = Context.GenericTag<DbWorker>("@services/DbWorker");
 
 export type DbWorkerInput =
@@ -157,7 +155,6 @@ export interface Mutation {
     Value | Date | boolean | undefined
   >;
   readonly isInsert: boolean;
-  readonly now: SqliteDate;
   readonly onCompleteId: OnCompleteId | null;
 }
 
@@ -170,8 +167,7 @@ const init = Effect.gen(function* (_) {
       ({ rows: [row] }): Owner => ({
         id: row.id as OwnerId,
         mnemonic: row.mnemonic as Mnemonic,
-        // expo-sqlite 11.3.2 doesn't support Uint8Array
-        encryptionKey: hexToBytes(row.encryptionKey as string),
+        encryptionKey: row.encryptionKey as Uint8Array,
       }),
     ),
     someDefectToNoSuchTableOrColumnError,
@@ -222,9 +218,8 @@ const readTimestampAndMerkleTree = Sqlite.pipe(
   Effect.flatMap((sqlite) =>
     sqlite.exec(Sql.selectOwnerTimestampAndMerkleTree),
   ),
-  Effect.map((result) => result.rows),
   Effect.map(
-    ([{ timestamp, merkleTree }]): TimestampAndMerkleTree => ({
+    ({ rows: [{ timestamp, merkleTree }] }): TimestampAndMerkleTree => ({
       timestamp: unsafeTimestampFromString(timestamp as TimestampString),
       merkleTree: merkleTree as MerkleTree,
     }),
@@ -236,9 +231,10 @@ export const mutationsToNewMessages = (
 ): ReadonlyArray<NewMessage> =>
   pipe(
     mutations,
-    ReadonlyArray.map(({ id, isInsert, now, table, values }) =>
+    ReadonlyArray.map(({ id, isInsert, table, values }) =>
       pipe(
         Object.entries(values),
+        // Filter 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.
@@ -246,6 +242,7 @@ export const mutationsToNewMessages = (
             ? Option.none()
             : Option.some([key, value] as const),
         ),
+        // Cast values.
         ReadonlyArray.map(
           ([key, value]) =>
             [
@@ -257,7 +254,6 @@ export const mutationsToNewMessages = (
                   : value,
             ] as const,
         ),
-        ReadonlyArray.append([isInsert ? "createdAt" : "updatedAt", now]),
         ReadonlyArray.map(
           ([key, value]): NewMessage => ({
             table,
@@ -282,7 +278,7 @@ const ensureSchemaByNewMessages = (
       if (table == null) {
         tablesMap.set(message.table, {
           name: message.table,
-          columns: [message.column],
+          columns: [message.column, "createdAt", "updatedAt"],
         });
         return;
       }
@@ -298,13 +294,21 @@ const ensureSchemaByNewMessages = (
 export const upsertValueIntoTableRowColumn = (
   message: NewMessage,
   messages: ReadonlyArray<NewMessage>,
+  millis: Millis,
 ): Effect.Effect<void, never, Sqlite> =>
   Effect.gen(function* (_) {
     const sqlite = yield* _(Sqlite);
-
+    const createdAtOrUpdatedAt = cast(new Date(millis));
     const insert = sqlite.exec({
       sql: Sql.upsertValueIntoTableRowColumn(message.table, message.column),
-      parameters: [message.row, message.value, message.value],
+      parameters: [
+        message.row,
+        message.value,
+        createdAtOrUpdatedAt,
+        createdAtOrUpdatedAt,
+        message.value,
+        createdAtOrUpdatedAt,
+      ],
     });
 
     yield* _(
@@ -340,7 +344,8 @@ const applyMessages = ({
       );
 
       if (timestamp == null || timestamp < message.timestamp) {
-        yield* _(upsertValueIntoTableRowColumn(message, messages));
+        const { millis } = unsafeTimestampFromString(message.timestamp);
+        yield* _(upsertValueIntoTableRowColumn(message, messages, millis));
       }
 
       if (timestamp == null || timestamp !== message.timestamp) {
@@ -406,11 +411,11 @@ const mutate = ({
       ),
     ).map(mutationsToNewMessages);
 
-    yield* _(
-      Effect.forEach(toUpsert, (message) =>
-        upsertValueIntoTableRowColumn(message, toUpsert),
-      ),
-    );
+    const time = yield* _(Time);
+    for (const messageToUpsert of toUpsert) {
+      const now = yield* _(time.now);
+      yield* _(upsertValueIntoTableRowColumn(messageToUpsert, toUpsert, now));
+    }
 
     const { exec } = yield* _(Sqlite);
     yield* _(
@@ -537,8 +542,8 @@ const sync = ({
 > =>
   Effect.gen(function* (_) {
     if (queries.length > 0) yield* _(query({ queries }));
-
-    (yield* _(SyncWorkerPostMessage))({
+    const syncWorkerPostMessage = yield* _(SyncWorkerPostMessage);
+    syncWorkerPostMessage({
       _tag: "sync",
       ...(yield* _(readTimestampAndMerkleTree)),
       syncUrl: (yield* _(Config)).syncUrl,
@@ -550,7 +555,11 @@ const sync = ({
 
 const reset = (
   input: DbWorkerInputReset,
-): Effect.Effect<void, never, Sqlite | Bip39 | NanoId | DbWorkerOnMessage> =>
+): Effect.Effect<
+  void,
+  never,
+  Sqlite | Bip39 | NanoIdGenerator | DbWorkerOnMessage
+> =>
   Effect.gen(function* (_) {
     const sqlite = yield* _(Sqlite);
 
@@ -575,7 +584,7 @@ const reset = (
     onMessage({ _tag: "onResetOrRestore" });
   });
 
-export const DbWorkerLive = Layer.effect(
+export const DbWorkerCommonLive = Layer.effect(
   DbWorker,
   Effect.gen(function* (_) {
     const syncWorker = yield* _(SyncWorker);
@@ -591,7 +600,7 @@ export const DbWorkerLive = Layer.effect(
           onError(output).pipe(Effect.runSync);
           break;
         case "SyncWorkerOutputSyncResponse":
-          postMessage(output);
+          dbWorker.postMessage(output);
           break;
         default:
           dbWorker.onMessage({ _tag: "onSyncState", state: output });
@@ -601,7 +610,7 @@ export const DbWorkerLive = Layer.effect(
     const runContext = Context.empty().pipe(
       Context.add(Sqlite, yield* _(Sqlite)),
       Context.add(Bip39, yield* _(Bip39)),
-      Context.add(NanoId, yield* _(NanoId)),
+      Context.add(NanoIdGenerator, yield* _(NanoIdGenerator)),
       Context.add(DbWorkerOnMessage, (output) => {
         dbWorker.onMessage(output);
       }),
@@ -611,7 +620,7 @@ export const DbWorkerLive = Layer.effect(
       effect: Effect.Effect<
         void,
         EvoluError,
-        Sqlite | Bip39 | NanoId | DbWorkerOnMessage
+        Sqlite | Bip39 | NanoIdGenerator | DbWorkerOnMessage
       >,
     ): Promise<void> =>
       effect.pipe(
@@ -622,15 +631,18 @@ export const DbWorkerLive = Layer.effect(
         Effect.runPromise,
       );
 
-    type Write = (input: DbWorkerInput) => Promise<void>;
+    type HandleInput = (input: DbWorkerInput) => Promise<void>;
 
-    // Write for reset only in case init fails.
-    const writeForInitFail: Write = (input): Promise<void> => {
+    /** If init fails, we have to allow reset at least. */
+    const handleInputForInitFail: HandleInput = (input): Promise<void> => {
       if (input._tag !== "reset") return Promise.resolve(undefined);
       return reset(input).pipe(run);
     };
 
-    const makeWriteForInitSuccess = (config: Config, owner: Owner): Write => {
+    const makeHandleInputForInitSuccess = (
+      config: Config,
+      owner: Owner,
+    ): HandleInput => {
       let skipAllBecauseOfReset = false;
 
       const layer = Layer.mergeAll(
@@ -663,27 +675,25 @@ export const DbWorkerLive = Layer.effect(
       };
     };
 
-    let write: Write = (input) => {
+    let handleInput: HandleInput = (input) => {
       if (input._tag !== "init")
         return run(makeUnexpectedError(new Error("init must be called first")));
-      write = writeForInitFail;
+      handleInput = handleInputForInitFail;
       return init.pipe(
         Effect.map((owner) => {
           dbWorker.onMessage({ _tag: "onOwner", owner });
-          write = makeWriteForInitSuccess(input.config, owner);
+          handleInput = makeHandleInputForInitSuccess(input.config, owner);
         }),
         run,
       );
     };
 
-    let messageQueue: Promise<void> = Promise.resolve(undefined);
-
-    const postMessage: DbWorker["postMessage"] = (input) => {
-      messageQueue = messageQueue.then(() => write(input));
-    };
+    const dbWorkerLock = yield* _(DbWorkerLock);
 
     const dbWorker: DbWorker = {
-      postMessage,
+      postMessage: (input) => {
+        dbWorkerLock(() => handleInput(input));
+      },
       onMessage: Function.constVoid,
     };
 

package/src/Evolu.ts

@@ -10,8 +10,7 @@ import * as Number from "effect/Number";
 import * as ReadonlyArray from "effect/ReadonlyArray";
 import * as Kysely from "kysely";
 import { Config, ConfigLive } from "./Config.js";
-import { Time, TimeLive } from "./Crdt.js";
-import { Mnemonic, NanoId, NanoIdLive } from "./Crypto.js";
+import { Mnemonic, NanoIdGenerator, NanoIdGeneratorLive } from "./Crypto.js";
 import {
   DatabaseSchema,
   Queries,
@@ -29,7 +28,7 @@ import {
 import { DbWorker, DbWorkerOutputOnQuery, Mutation } from "./DbWorker.js";
 import { applyPatches } from "./Diff.js";
 import { EvoluError, makeErrorStore } from "./ErrorStore.js";
-import { SqliteBoolean, SqliteDate, cast } from "./Model.js";
+import { SqliteBoolean, SqliteDate } from "./Model.js";
 import { OnCompletes, OnCompletesLive } from "./OnCompletes.js";
 import { Owner } from "./Owner.js";
 import { AppState, FlushSync, PlatformName } from "./Platform.js";
@@ -323,13 +322,15 @@ type QueryCallback<S extends DatabaseSchema, R extends Row> = (
 ) => Kysely.SelectQueryBuilder<any, any, R>;
 
 type QuerySchema<S extends DatabaseSchema> = {
-  readonly [Table in keyof S]: NullableExceptId<{
+  readonly [Table in keyof S]: NullableExceptForIdAndAutomaticColumns<{
     readonly [Column in keyof S[Table]]: S[Table][Column];
   }>;
 };
 
-type NullableExceptId<T> = {
-  readonly [K in keyof T]: K extends "id" ? T[K] : T[K] | null;
+type NullableExceptForIdAndAutomaticColumns<T> = {
+  readonly [K in keyof T]: K extends "id" | "createdAt" | "updatedAt"
+    ? T[K]
+    : T[K] | null;
 };
 
 const kysely = new Kysely.Kysely<QuerySchema<DatabaseSchema>>({
@@ -643,9 +644,8 @@ type Castable<T> = {
 const MutateLive = Layer.effect(
   Mutate,
   Effect.gen(function* (_) {
-    const nanoid = yield* _(NanoId);
+    const { nanoid } = yield* _(NanoIdGenerator);
     const onCompletes = yield* _(OnCompletes);
-    const time = yield* _(Time);
     const subscribedQueries = yield* _(SubscribedQueries);
     const loadingPromises = yield* _(LoadingPromises);
     const dbWorker = yield* _(DbWorker);
@@ -653,7 +653,7 @@ const MutateLive = Layer.effect(
 
     return Mutate.of((table, { id, ...values }, onComplete) => {
       const isInsert = id == null;
-      if (isInsert) id = Effect.runSync(nanoid.nanoid) as never;
+      if (isInsert) id = Effect.runSync(nanoid) as never;
 
       const onCompleteId = onComplete
         ? onCompletes.add(onComplete).pipe(Effect.runSync)
@@ -666,7 +666,6 @@ const MutateLive = Layer.effect(
           id,
           values,
           isInsert,
-          now: cast(new Date(Effect.runSync(time.now))),
           onCompleteId,
         },
       ];
@@ -785,9 +784,8 @@ const EvoluCommon = Layer.effect(
   Layer.provide(Layer.merge(RowsStoreLive, OnCompletesLive)),
 );
 
-/** EvoluCommonLive has only platform independent side-effects. */
 export const EvoluCommonLive = EvoluCommon.pipe(
-  Layer.provide(Layer.merge(TimeLive, NanoIdLive)),
+  Layer.provide(NanoIdGeneratorLive),
 );
 
 /**

package/src/OnCompletes.ts

@@ -4,7 +4,7 @@ import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
 import * as ReadonlyArray from "effect/ReadonlyArray";
-import { NanoId } from "./Crypto.js";
+import { NanoId, NanoIdGenerator } from "./Crypto.js";
 
 export interface OnCompletes {
   readonly add: (onComplete: OnComplete) => Effect.Effect<OnCompleteId>;
@@ -16,7 +16,7 @@ export interface OnCompletes {
 
 export type OnComplete = () => void;
 
-export type OnCompleteId = string & Brand.Brand<"OnCompleteId">;
+export type OnCompleteId = NanoId & Brand.Brand<"OnCompleteId">;
 
 export const OnCompletes = Context.GenericTag<OnCompletes>(
   "@services/OnCompletes",
@@ -25,12 +25,12 @@ export const OnCompletes = Context.GenericTag<OnCompletes>(
 export const OnCompletesLive = Layer.effect(
   OnCompletes,
   Effect.gen(function* (_) {
-    const nanoid = yield* _(NanoId);
+    const { nanoid } = yield* _(NanoIdGenerator);
     const map = new Map<OnCompleteId, OnComplete>();
 
     return OnCompletes.of({
       add: (onComplete) =>
-        nanoid.nanoid.pipe(
+        nanoid.pipe(
           Effect.map((nanoid) => {
             const id = nanoid as OnCompleteId;
             map.set(id, onComplete);