@evolu/react-native 6.0.2 → 7.0.0

package/dist/PlatformLive.d.ts

@@ -1,7 +1,8 @@
-import { AppState, Bip39, PlatformName, SyncLock } from "@evolu/common";
+import { AppState, Bip39, DbWorkerLock, PlatformName, SyncLock } from "@evolu/common";
 import * as Layer from "effect/Layer";
 export declare const PlatformNameLive: Layer.Layer<PlatformName, never, never>;
 export declare const SyncLockLive: Layer.Layer<SyncLock, never, never>;
+export declare const DbWorkerLockLive: Layer.Layer<DbWorkerLock, never, never>;
 export declare const AppStateLive: Layer.Layer<AppState, never, never>;
 export declare const Bip39Live: Layer.Layer<Bip39, never, never>;
 //# sourceMappingURL=PlatformLive.d.ts.map

package/dist/PlatformLive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PlatformLive.d.ts","sourceRoot":"","sources":["../src/PlatformLive.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,KAAK,EAGL,YAAY,EACZ,QAAQ,EACT,MAAM,eAAe,CAAC;AASvB,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAItC,eAAO,MAAM,gBAAgB,yCAA8C,CAAC;AAE5E,eAAO,MAAM,YAAY,qCAexB,CAAC;AAEF,eAAO,MAAM,YAAY,qCA4BxB,CAAC;AAEF,eAAO,MAAM,SAAS,kCAYrB,CAAC"}
+{"version":3,"file":"PlatformLive.d.ts","sourceRoot":"","sources":["../src/PlatformLive.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,KAAK,EACL,YAAY,EAGZ,YAAY,EACZ,QAAQ,EACT,MAAM,eAAe,CAAC;AASvB,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAItC,eAAO,MAAM,gBAAgB,yCAA8C,CAAC;AAE5E,eAAO,MAAM,YAAY,qCAexB,CAAC;AAEF,eAAO,MAAM,gBAAgB,yCAQ5B,CAAC;AAEF,eAAO,MAAM,YAAY,qCA4BxB,CAAC;AAEF,eAAO,MAAM,SAAS,kCAYrB,CAAC"}

package/dist/PlatformLive.js

@@ -1,4 +1,4 @@
-import { AppState, Bip39, PlatformName, SyncLock, } from "@evolu/common";
+import { AppState, Bip39, DbWorkerLock, PlatformName, SyncLock, } from "@evolu/common";
 import NetInfo from "@react-native-community/netinfo";
 import { generateMnemonic, mnemonicToSeed, validateMnemonic, } from "@scure/bip39";
 import { wordlist } from "@scure/bip39/wordlists/english";
@@ -21,6 +21,12 @@ export const SyncLockLive = Layer.effect(SyncLock, Effect.sync(() => {
         }),
     });
 }));
+export const DbWorkerLockLive = Layer.effect(DbWorkerLock, Effect.sync(() => {
+    let queue = Promise.resolve(undefined);
+    return DbWorkerLock.of((callback) => {
+        queue = queue.then(callback);
+    });
+}));
 export const AppStateLive = Layer.succeed(AppState, AppState.of({
     init: ({ onRequestSync }) => {
         let appStateStatus = ReactNativeAppState.currentState;

package/dist/SqliteLive.d.ts

@@ -1,4 +1,4 @@
-import { Sqlite } from "@evolu/common";
+import { Config, Sqlite } from "@evolu/common";
 import * as Layer from "effect/Layer";
-export declare const SqliteLive: Layer.Layer<Sqlite, never, never>;
+export declare const SqliteLive: Layer.Layer<Sqlite, never, Config>;
 //# sourceMappingURL=SqliteLive.d.ts.map

package/dist/SqliteLive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SqliteLive.d.ts","sourceRoot":"","sources":["../src/SqliteLive.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EAKP,MAAM,eAAe,CAAC;AAEvB,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAgCtC,eAAO,MAAM,UAAU,mCAAkC,CAAC"}
+{"version":3,"file":"SqliteLive.d.ts","sourceRoot":"","sources":["../src/SqliteLive.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,MAAM,EAKP,MAAM,eAAe,CAAC;AAEvB,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAGtC,eAAO,MAAM,UAAU,oCAmCtB,CAAC"}

package/dist/SqliteLive.js

@@ -1,24 +1,28 @@
-import { Sqlite, ensureSqliteQuery, maybeParseJson, valuesToSqliteValues, } from "@evolu/common";
+import { Config, Sqlite, ensureSqliteQuery, maybeParseJson, valuesToSqliteValues, } from "@evolu/common";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
-import * as SQLite from "expo-sqlite/next.js";
-const db = SQLite.openDatabaseSync("evolu1.db");
-const exec = (arg) => Effect.gen(function* (_) {
-    const sqliteQuery = ensureSqliteQuery(arg);
-    const query = {
-        sql: sqliteQuery.sql,
-        args: valuesToSqliteValues(sqliteQuery.parameters),
-    };
-    const isSelectOrPragma = query.sql.trimStart().toLowerCase().startsWith("select") ||
-        query.sql.trimStart().toLowerCase().startsWith("pragma");
-    // Expo can log only strings.
-    // console.log(JSON.stringify(isSelect), sql);
-    if (isSelectOrPragma) {
-        const rows = (yield* _(Effect.promise(() => db.getAllAsync(query.sql, query.args))));
-        maybeParseJson(rows);
-        return { rows, changes: 0 };
-    }
-    const { changes } = yield* _(Effect.promise(() => db.runAsync(query.sql, query.args)));
-    return { rows: [], changes };
-});
-export const SqliteLive = Layer.succeed(Sqlite, { exec });
+import * as ExpoSQLite from "expo-sqlite/next.js";
+export const SqliteLive = Layer.effect(Sqlite, Effect.gen(function* (_) {
+    const config = yield* _(Config);
+    const db = ExpoSQLite.openDatabaseSync(`evolu1-${config.name}.db`);
+    return Sqlite.of({
+        exec: (arg) => Effect.gen(function* (_) {
+            const sqliteQuery = ensureSqliteQuery(arg);
+            const query = {
+                sql: sqliteQuery.sql,
+                args: valuesToSqliteValues(sqliteQuery.parameters),
+            };
+            const isSelectOrPragma = query.sql.trimStart().toLowerCase().startsWith("select") ||
+                query.sql.trimStart().toLowerCase().startsWith("pragma");
+            // Expo can log only strings.
+            // console.log(JSON.stringify(isSelect), sql);
+            if (isSelectOrPragma) {
+                const rows = (yield* _(Effect.promise(() => db.getAllAsync(query.sql, query.args))));
+                maybeParseJson(rows);
+                return { rows, changes: 0 };
+            }
+            const { changes } = yield* _(Effect.promise(() => db.runAsync(query.sql, query.args)));
+            return { rows: [], changes };
+        }),
+    });
+}));

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,oBAAoB,EACpB,QAAQ,EAKT,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAUxC,cAAc,sBAAsB,CAAC;AAErC,0CAA0C;AAC1C,eAAO,MAAM,aAAa,EAAE,CAC1B,QAAQ,EAAE,MAAM,KACb,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,oBAAoB,CAG1C,CAAC;AAER;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,eAAO,MAAM,WAAW,+NAevB,CAAC;AAEF,cAAc,qBAAqB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,oBAAoB,EACpB,QAAQ,EAKT,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAWxC,cAAc,sBAAsB,CAAC;AAErC,0CAA0C;AAC1C,eAAO,MAAM,aAAa,EAAE,CAC1B,QAAQ,EAAE,MAAM,KACb,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,oBAAoB,CAG1C,CAAC;AAER;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,eAAO,MAAM,WAAW,+NAqBvB,CAAC;AAEF,cAAc,qBAAqB,CAAC"}

package/dist/index.js

@@ -1,7 +1,7 @@
-import { Bip39, DbWorkerLive, EvoluCommonLive, FetchLive, FlushSyncDefaultLive, NanoIdLive, SecretBoxLive, SyncWorkerLive, makeCreateEvolu, } from "@evolu/common";
+import { Bip39, DbWorkerCommonLive, EvoluCommonLive, FetchLive, FlushSyncDefaultLive, NanoIdGeneratorLive, SecretBoxLive, SyncWorkerCommonLive, makeCreateEvolu, } from "@evolu/common";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
-import { AppStateLive, Bip39Live, PlatformNameLive, SyncLockLive, } from "./PlatformLive.js";
+import { AppStateLive, Bip39Live, DbWorkerLockLive, PlatformNameLive, SyncLockLive, } from "./PlatformLive.js";
 import { SqliteLive } from "./SqliteLive.js";
 export * from "@evolu/common/public";
 /** Parse a string to {@link Mnemonic}. */
@@ -37,5 +37,5 @@ export const parseMnemonic = Bip39.pipe(Effect.provide(Bip39Live), Effect.runSyn
  *
  *   const evolu = createEvolu(Database);
  */
-export const createEvolu = makeCreateEvolu(EvoluCommonLive.pipe(Layer.provide(Layer.mergeAll(FlushSyncDefaultLive, AppStateLive, DbWorkerLive, PlatformNameLive)), Layer.provide(Layer.mergeAll(Bip39Live, NanoIdLive, SqliteLive, SyncWorkerLive)), Layer.provide(Layer.mergeAll(SecretBoxLive, SyncLockLive, FetchLive))));
+export const createEvolu = makeCreateEvolu(EvoluCommonLive.pipe(Layer.provide(Layer.mergeAll(FlushSyncDefaultLive, AppStateLive, DbWorkerCommonLive, PlatformNameLive)), Layer.provide(Layer.mergeAll(Bip39Live, NanoIdGeneratorLive, SqliteLive, SyncWorkerCommonLive, DbWorkerLockLive)), Layer.provide(Layer.mergeAll(SecretBoxLive, SyncLockLive, FetchLive))));
 export * from "@evolu/common-react";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evolu/react-native",
-  "version": "6.0.2",
+  "version": "7.0.0",
   "description": "Evolu for React Native",
   "keywords": [
     "evolu",
@@ -40,13 +40,13 @@
     "react-native": "0.73.4",
     "typescript": "^5.3.3",
     "vitest": "^1.3.1",
-    "@evolu/common": "3.1.8",
-    "@evolu/common-react": "5.0.7",
+    "@evolu/common": "4.0.0",
+    "@evolu/common-react": "6.0.0",
     "@evolu/tsconfig": "0.0.2",
     "eslint-config-evolu": "1.0.0"
   },
   "peerDependencies": {
-    "@evolu/common-react": "^5.0.7",
+    "@evolu/common-react": "^6.0.0",
     "expo": "^50.0.7",
     "expo-sqlite": "~13.2.2",
     "react-native": "0.73.4"

package/src/PlatformLive.ts

@@ -1,6 +1,7 @@
 import {
   AppState,
   Bip39,
+  DbWorkerLock,
   InvalidMnemonicError,
   Mnemonic,
   PlatformName,
@@ -37,6 +38,16 @@ export const SyncLockLive = Layer.effect(
   }),
 );
 
+export const DbWorkerLockLive = Layer.effect(
+  DbWorkerLock,
+  Effect.sync(() => {
+    let queue: Promise<void> = Promise.resolve(undefined);
+    return DbWorkerLock.of((callback) => {
+      queue = queue.then(callback);
+    });
+  }),
+);
+
 export const AppStateLive = Layer.succeed(
   AppState,
   AppState.of({

package/src/SqliteLive.ts

@@ -1,4 +1,5 @@
 import {
+  Config,
   Sqlite,
   SqliteRow,
   ensureSqliteQuery,
@@ -7,35 +8,41 @@ import {
 } from "@evolu/common";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
-import * as SQLite from "expo-sqlite/next.js";
+import * as ExpoSQLite from "expo-sqlite/next.js";
 
-const db = SQLite.openDatabaseSync("evolu1.db");
-
-const exec: Sqlite["exec"] = (arg) =>
+export const SqliteLive = Layer.effect(
+  Sqlite,
   Effect.gen(function* (_) {
-    const sqliteQuery = ensureSqliteQuery(arg);
-    const query = {
-      sql: sqliteQuery.sql,
-      args: valuesToSqliteValues(sqliteQuery.parameters),
-    };
+    const config = yield* _(Config);
+    const db = ExpoSQLite.openDatabaseSync(`evolu1-${config.name}.db`);
 
-    const isSelectOrPragma =
-      query.sql.trimStart().toLowerCase().startsWith("select") ||
-      query.sql.trimStart().toLowerCase().startsWith("pragma");
-    // Expo can log only strings.
-    // console.log(JSON.stringify(isSelect), sql);
+    return Sqlite.of({
+      exec: (arg) =>
+        Effect.gen(function* (_) {
+          const sqliteQuery = ensureSqliteQuery(arg);
+          const query = {
+            sql: sqliteQuery.sql,
+            args: valuesToSqliteValues(sqliteQuery.parameters),
+          };
 
-    if (isSelectOrPragma) {
-      const rows = (yield* _(
-        Effect.promise(() => db.getAllAsync(query.sql, query.args)),
-      )) as SqliteRow[];
-      maybeParseJson(rows);
-      return { rows, changes: 0 };
-    }
-    const { changes } = yield* _(
-      Effect.promise(() => db.runAsync(query.sql, query.args)),
-    );
-    return { rows: [], changes };
-  });
+          const isSelectOrPragma =
+            query.sql.trimStart().toLowerCase().startsWith("select") ||
+            query.sql.trimStart().toLowerCase().startsWith("pragma");
+          // Expo can log only strings.
+          // console.log(JSON.stringify(isSelect), sql);
 
-export const SqliteLive = Layer.succeed(Sqlite, { exec });
+          if (isSelectOrPragma) {
+            const rows = (yield* _(
+              Effect.promise(() => db.getAllAsync(query.sql, query.args)),
+            )) as SqliteRow[];
+            maybeParseJson(rows);
+            return { rows, changes: 0 };
+          }
+          const { changes } = yield* _(
+            Effect.promise(() => db.runAsync(query.sql, query.args)),
+          );
+          return { rows: [], changes };
+        }),
+    });
+  }),
+);

package/src/index.ts

@@ -1,14 +1,14 @@
 import {
   Bip39,
-  DbWorkerLive,
+  DbWorkerCommonLive,
   EvoluCommonLive,
   FetchLive,
   FlushSyncDefaultLive,
   InvalidMnemonicError,
   Mnemonic,
-  NanoIdLive,
+  NanoIdGeneratorLive,
   SecretBoxLive,
-  SyncWorkerLive,
+  SyncWorkerCommonLive,
   makeCreateEvolu,
 } from "@evolu/common";
 import * as Effect from "effect/Effect";
@@ -16,6 +16,7 @@ import * as Layer from "effect/Layer";
 import {
   AppStateLive,
   Bip39Live,
+  DbWorkerLockLive,
   PlatformNameLive,
   SyncLockLive,
 } from "./PlatformLive.js";
@@ -68,12 +69,18 @@ export const createEvolu = makeCreateEvolu(
       Layer.mergeAll(
         FlushSyncDefaultLive,
         AppStateLive,
-        DbWorkerLive,
+        DbWorkerCommonLive,
         PlatformNameLive,
       ),
     ),
     Layer.provide(
-      Layer.mergeAll(Bip39Live, NanoIdLive, SqliteLive, SyncWorkerLive),
+      Layer.mergeAll(
+        Bip39Live,
+        NanoIdGeneratorLive,
+        SqliteLive,
+        SyncWorkerCommonLive,
+        DbWorkerLockLive,
+      ),
     ),
     Layer.provide(Layer.mergeAll(SecretBoxLive, SyncLockLive, FetchLive)),
   ),