@evolu/react-native 5.0.4 → 6.0.0

package/dist/PlatformLive.d.ts

@@ -1,7 +1,6 @@
-import { AppState, Bip39, FlushSync, PlatformName, SyncLock } from "@evolu/common";
+import { AppState, Bip39, PlatformName, SyncLock } from "@evolu/common";
 import * as Layer from "effect/Layer";
 export declare const PlatformNameLive: Layer.Layer<PlatformName, never, never>;
-export declare const FlushSyncLive: Layer.Layer<FlushSync, never, never>;
 export declare const SyncLockLive: Layer.Layer<SyncLock, never, never>;
 export declare const AppStateLive: Layer.Layer<AppState, never, never>;
 export declare const Bip39Live: Layer.Layer<Bip39, never, never>;

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,EACL,SAAS,EAGT,YAAY,EACZ,QAAQ,EACT,MAAM,eAAe,CAAC;AAUvB,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAItC,eAAO,MAAM,gBAAgB,yCAA8C,CAAC;AAE5E,eAAO,MAAM,aAAa,sCAA+C,CAAC;AAE1E,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,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"}

package/dist/PlatformLive.js

@@ -1,14 +1,12 @@
-import { AppState, Bip39, FlushSync, PlatformName, SyncLock, } from "@evolu/common";
+import { AppState, Bip39, 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";
 import * as Effect from "effect/Effect";
-import * as Function from "effect/Function";
 import * as Layer from "effect/Layer";
 import { reloadAsync } from "expo-updates";
 import { DevSettings, AppState as ReactNativeAppState } from "react-native";
 export const PlatformNameLive = Layer.succeed(PlatformName, "react-native");
-export const FlushSyncLive = Layer.succeed(FlushSync, Function.constVoid);
 export const SyncLockLive = Layer.effect(SyncLock, Effect.sync(() => {
     let hasSyncLock = false;
     return SyncLock.of({

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,EAIP,MAAM,eAAe,CAAC;AAEvB,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AA2BtC,eAAO,MAAM,UAAU,mCAAkC,CAAC"}
+{"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"}

package/dist/SqliteLive.js

@@ -1,23 +1,24 @@
 import { 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";
-const db = SQLite.openDatabase("evolu1.db");
+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 { rows, rowsAffected } = yield* _(Effect.promise(() => db
-        .execAsync([query], false)
-        .then((a) => a[0])
-        .then((result) => {
-        if ("error" in result)
-            throw result.error;
-        return result;
-    })));
-    maybeParseJson(rows);
-    return { rows, changes: rowsAffected };
+    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 });

package/dist/index.d.ts

@@ -1,9 +1,8 @@
 import { InvalidMnemonicError, Mnemonic } from "@evolu/common";
 import * as Effect from "effect/Effect";
-export { Id, NonEmptyString1000, PositiveInt, SqliteBoolean, SqliteDate, String, String1000, canUseDom, cast, database, id, table, } from "@evolu/common";
-export type { EvoluError, ExtractRow, InvalidMnemonicError, Mnemonic, NotNull, Owner, OwnerId, QueryResult, SyncState, Timestamp, TimestampError, UnexpectedError, } from "@evolu/common";
-export { jsonArrayFrom, jsonObjectFrom } from "kysely/helpers/sqlite";
-export * from "@evolu/common-react";
+export * from "@evolu/common/public";
+/** Parse a string to {@link Mnemonic}. */
+export declare const parseMnemonic: (mnemonic: string) => Effect.Effect<Mnemonic, InvalidMnemonicError>;
 /**
  * Create Evolu for React Native.
  *
@@ -21,13 +20,13 @@ export * from "@evolu/common-react";
  *   const TodoId = id("Todo");
  *   type TodoId = S.Schema.To<typeof TodoId>;
  *
- *   const TodoTable = S.struct({
+ *   const TodoTable = table({
  *     id: TodoId,
  *     title: NonEmptyString1000,
  *   });
  *   type TodoTable = S.Schema.To<typeof TodoTable>;
  *
- *   const Database = S.struct({
+ *   const Database = database({
  *     // _todo is local-only table
  *     todo: TodoTable,
  *   });
@@ -36,6 +35,5 @@ export * from "@evolu/common-react";
  *   const evolu = createEvolu(Database);
  */
 export declare const createEvolu: <From, To extends import("@evolu/common").DatabaseSchema>(schema: import("@effect/schema/Schema").Schema<To, From, never>, config?: Partial<import("@evolu/common").Config> | undefined) => import("@evolu/common").Evolu<To>;
-/** Parse a string to {@link Mnemonic}. */
-export declare const parseMnemonic: (mnemonic: string) => Effect.Effect<Mnemonic, InvalidMnemonicError>;
+export * from "@evolu/common-react";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,oBAAoB,EACpB,QAAQ,EAKT,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAcxC,OAAO,EACL,EAAE,EACF,kBAAkB,EAClB,WAAW,EACX,aAAa,EACb,UAAU,EACV,MAAM,EACN,UAAU,EACV,SAAS,EACT,IAAI,EACJ,QAAQ,EACR,EAAE,EACF,KAAK,GACN,MAAM,eAAe,CAAC;AACvB,YAAY,EACV,UAAU,EACV,UAAU,EACV,oBAAoB,EACpB,QAAQ,EACR,OAAO,EACP,KAAK,EACL,OAAO,EACP,WAAW,EACX,SAAS,EACT,SAAS,EACT,cAAc,EACd,eAAe,GAChB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEtE,cAAc,qBAAqB,CAAC;AAWpC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,eAAO,MAAM,WAAW,+NAAmC,CAAC;AAE5D,0CAA0C;AAC1C,eAAO,MAAM,aAAa,EAAE,CAC1B,QAAQ,EAAE,MAAM,KACb,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,oBAAoB,CAG1C,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;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"}

package/dist/index.js

@@ -1,17 +1,11 @@
-import { Bip39, DbWorkerLive, EvoluCommonLive, FetchLive, NanoIdLive, SecretBoxLive, SyncWorkerLive, makeCreateEvolu, } from "@evolu/common";
+import { Bip39, DbWorkerLive, EvoluCommonLive, FetchLive, FlushSyncDefaultLive, NanoIdLive, SecretBoxLive, SyncWorkerLive, makeCreateEvolu, } from "@evolu/common";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
-import { AppStateLive, Bip39Live, FlushSyncLive, SyncLockLive, } from "./PlatformLive.js";
+import { AppStateLive, Bip39Live, PlatformNameLive, SyncLockLive, } from "./PlatformLive.js";
 import { SqliteLive } from "./SqliteLive.js";
-// export * from "@evolu/common/public"
-// https://github.com/facebook/metro/issues/1128
-// So we have to export manually.
-// TODO: Recheck after RN 0.73 release.
-export { Id, NonEmptyString1000, PositiveInt, SqliteBoolean, SqliteDate, String, String1000, canUseDom, cast, database, id, table, } from "@evolu/common";
-export { jsonArrayFrom, jsonObjectFrom } from "kysely/helpers/sqlite";
-export * from "@evolu/common-react";
-/** Evolu for native platform. */
-const EvoluNativeLive = EvoluCommonLive.pipe(Layer.provide(Layer.mergeAll(FlushSyncLive, AppStateLive, DbWorkerLive)), Layer.provide(Layer.mergeAll(Bip39Live, NanoIdLive, SqliteLive, SyncWorkerLive)), Layer.provide(Layer.mergeAll(SecretBoxLive, SyncLockLive, FetchLive)));
+export * from "@evolu/common/public";
+/** Parse a string to {@link Mnemonic}. */
+export const parseMnemonic = Bip39.pipe(Effect.provide(Bip39Live), Effect.runSync).parse;
 /**
  * Create Evolu for React Native.
  *
@@ -29,13 +23,13 @@ const EvoluNativeLive = EvoluCommonLive.pipe(Layer.provide(Layer.mergeAll(FlushS
  *   const TodoId = id("Todo");
  *   type TodoId = S.Schema.To<typeof TodoId>;
  *
- *   const TodoTable = S.struct({
+ *   const TodoTable = table({
  *     id: TodoId,
  *     title: NonEmptyString1000,
  *   });
  *   type TodoTable = S.Schema.To<typeof TodoTable>;
  *
- *   const Database = S.struct({
+ *   const Database = database({
  *     // _todo is local-only table
  *     todo: TodoTable,
  *   });
@@ -43,6 +37,5 @@ const EvoluNativeLive = EvoluCommonLive.pipe(Layer.provide(Layer.mergeAll(FlushS
  *
  *   const evolu = createEvolu(Database);
  */
-export const createEvolu = makeCreateEvolu(EvoluNativeLive);
-/** Parse a string to {@link Mnemonic}. */
-export const parseMnemonic = Bip39.pipe(Effect.provide(Bip39Live), Effect.runSync).parse;
+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 * from "@evolu/common-react";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evolu/react-native",
-  "version": "5.0.4",
+  "version": "6.0.0",
   "description": "Evolu for React Native",
   "keywords": [
     "evolu",
@@ -31,22 +31,22 @@
     "README.md"
   ],
   "dependencies": {
-    "expo-updates": "^0.18.17"
+    "expo-updates": "^0.24.11"
   },
   "devDependencies": {
-    "eslint": "^8.56.0",
-    "expo": "^49.0.21",
-    "expo-sqlite": "~11.3.3",
-    "react-native": "0.72.6",
+    "eslint": "^8.57.0",
+    "expo": "^50.0.7",
+    "expo-sqlite": "~13.2.2",
+    "react-native": "0.73.4",
     "typescript": "^5.3.3",
     "vitest": "^1.3.1",
-    "@evolu/common": "3.1.5",
-    "@evolu/common-react": "5.0.4",
+    "@evolu/common": "3.1.7",
+    "@evolu/common-react": "5.0.5",
     "@evolu/tsconfig": "0.0.2",
     "eslint-config-evolu": "1.0.0"
   },
   "peerDependencies": {
-    "@evolu/common-react": "^5.0.4",
+    "@evolu/common-react": "^5.0.5",
     "expo": "^49.0.20",
     "expo-sqlite": "~11.3.3",
     "react-native": "^0.72.4"

package/src/PlatformLive.ts

@@ -1,7 +1,6 @@
 import {
   AppState,
   Bip39,
-  FlushSync,
   InvalidMnemonicError,
   Mnemonic,
   PlatformName,
@@ -15,15 +14,12 @@ import {
 } from "@scure/bip39";
 import { wordlist } from "@scure/bip39/wordlists/english";
 import * as Effect from "effect/Effect";
-import * as Function from "effect/Function";
 import * as Layer from "effect/Layer";
 import { reloadAsync } from "expo-updates";
 import { DevSettings, AppState as ReactNativeAppState } from "react-native";
 
 export const PlatformNameLive = Layer.succeed(PlatformName, "react-native");
 
-export const FlushSyncLive = Layer.succeed(FlushSync, Function.constVoid);
-
 export const SyncLockLive = Layer.effect(
   SyncLock,
   Effect.sync(() => {

package/src/SqliteLive.ts

@@ -1,14 +1,15 @@
 import {
   Sqlite,
+  SqliteRow,
   ensureSqliteQuery,
   maybeParseJson,
   valuesToSqliteValues,
 } from "@evolu/common";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
-import * as SQLite from "expo-sqlite";
+import * as SQLite from "expo-sqlite/next.js";
 
-const db = SQLite.openDatabase("evolu1.db");
+const db = SQLite.openDatabaseSync("evolu1.db");
 
 const exec: Sqlite["exec"] = (arg) =>
   Effect.gen(function* (_) {
@@ -17,19 +18,24 @@ const exec: Sqlite["exec"] = (arg) =>
       sql: sqliteQuery.sql,
       args: valuesToSqliteValues(sqliteQuery.parameters),
     };
-    const { rows, rowsAffected } = yield* _(
-      Effect.promise(() =>
-        db
-          .execAsync([query], false)
-          .then((a) => a[0])
-          .then((result) => {
-            if ("error" in result) throw result.error;
-            return result;
-          }),
-      ),
+
+    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)),
+      )) as SqliteRow[];
+      maybeParseJson(rows);
+      return { rows, changes: 0 };
+    }
+    const { changes } = yield* _(
+      Effect.promise(() => db.runAsync(query.sql, query.args)),
     );
-    maybeParseJson(rows);
-    return { rows, changes: rowsAffected };
+    return { rows: [], changes };
   });
 
 export const SqliteLive = Layer.succeed(Sqlite, { exec });

package/src/index.ts

@@ -3,6 +3,7 @@ import {
   DbWorkerLive,
   EvoluCommonLive,
   FetchLive,
+  FlushSyncDefaultLive,
   InvalidMnemonicError,
   Mnemonic,
   NanoIdLive,
@@ -15,55 +16,20 @@ import * as Layer from "effect/Layer";
 import {
   AppStateLive,
   Bip39Live,
-  FlushSyncLive,
+  PlatformNameLive,
   SyncLockLive,
 } from "./PlatformLive.js";
 import { SqliteLive } from "./SqliteLive.js";
 
-// export * from "@evolu/common/public"
-// https://github.com/facebook/metro/issues/1128
-// So we have to export manually.
-// TODO: Recheck after RN 0.73 release.
-export {
-  Id,
-  NonEmptyString1000,
-  PositiveInt,
-  SqliteBoolean,
-  SqliteDate,
-  String,
-  String1000,
-  canUseDom,
-  cast,
-  database,
-  id,
-  table,
-} from "@evolu/common";
-export type {
-  EvoluError,
-  ExtractRow,
-  InvalidMnemonicError,
-  Mnemonic,
-  NotNull,
-  Owner,
-  OwnerId,
-  QueryResult,
-  SyncState,
-  Timestamp,
-  TimestampError,
-  UnexpectedError,
-} from "@evolu/common";
-export { jsonArrayFrom, jsonObjectFrom } from "kysely/helpers/sqlite";
+export * from "@evolu/common/public";
 
-export * from "@evolu/common-react";
-
-/** Evolu for native platform. */
-const EvoluNativeLive = EvoluCommonLive.pipe(
-  Layer.provide(Layer.mergeAll(FlushSyncLive, AppStateLive, DbWorkerLive)),
-  Layer.provide(
-    Layer.mergeAll(Bip39Live, NanoIdLive, SqliteLive, SyncWorkerLive),
-  ),
-  Layer.provide(Layer.mergeAll(SecretBoxLive, SyncLockLive, FetchLive)),
-);
+/** Parse a string to {@link Mnemonic}. */
+export const parseMnemonic: (
+  mnemonic: string,
+) => Effect.Effect<Mnemonic, InvalidMnemonicError> = Bip39.pipe(
+  Effect.provide(Bip39Live),
+  Effect.runSync,
+).parse;
 
 /**
  * Create Evolu for React Native.
@@ -82,13 +48,13 @@ const EvoluNativeLive = EvoluCommonLive.pipe(
  *   const TodoId = id("Todo");
  *   type TodoId = S.Schema.To<typeof TodoId>;
  *
- *   const TodoTable = S.struct({
+ *   const TodoTable = table({
  *     id: TodoId,
  *     title: NonEmptyString1000,
  *   });
  *   type TodoTable = S.Schema.To<typeof TodoTable>;
  *
- *   const Database = S.struct({
+ *   const Database = database({
  *     // _todo is local-only table
  *     todo: TodoTable,
  *   });
@@ -96,12 +62,21 @@ const EvoluNativeLive = EvoluCommonLive.pipe(
  *
  *   const evolu = createEvolu(Database);
  */
-export const createEvolu = makeCreateEvolu(EvoluNativeLive);
+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)),
+  ),
+);
 
-/** Parse a string to {@link Mnemonic}. */
-export const parseMnemonic: (
-  mnemonic: string,
-) => Effect.Effect<Mnemonic, InvalidMnemonicError> = Bip39.pipe(
-  Effect.provide(Bip39Live),
-  Effect.runSync,
-).parse;
+export * from "@evolu/common-react";