@livestore/adapter-expo 0.3.0-dev.18 → 0.3.0-dev.19

package/dist/make-sqlite-db.js

@@ -0,0 +1,138 @@
+import { shouldNeverHappen } from '@livestore/utils';
+import { Effect } from '@livestore/utils/effect';
+import * as SQLite from 'expo-sqlite';
+export const makeSqliteDb = (input) => Effect.gen(function* () {
+    // console.log('makeSqliteDb', input)
+    if (input._tag === 'in-memory') {
+        // const db = SQLite.openDatabaseSync(':memory:')
+        return makeSqliteDb_({
+            // db,
+            makeDb: () => SQLite.openDatabaseSync(':memory:'),
+            metadata: {
+                _tag: 'expo',
+                dbPointer: 0,
+                persistenceInfo: { fileName: ':memory:' },
+                input,
+            },
+        });
+    }
+    if (input._tag === 'expo') {
+        // const db = SQLite.openDatabaseSync(input.databaseName, {}, input.directory)
+        return makeSqliteDb_({
+            // db,
+            makeDb: () => SQLite.openDatabaseSync(input.databaseName, {}, input.directory),
+            metadata: {
+                _tag: 'expo',
+                dbPointer: 0,
+                persistenceInfo: { fileName: `${input.directory}/${input.databaseName}` },
+                input,
+            },
+        });
+    }
+});
+const makeSqliteDb_ = ({ 
+// db,
+makeDb, metadata, }) => {
+    const stmts = [];
+    const dbRef = { current: makeDb() };
+    const sqliteDb = {
+        metadata,
+        _tag: 'SqliteDb',
+        prepare: (queryStr) => {
+            try {
+                const db = dbRef.current;
+                const dbStmt = db.prepareSync(queryStr);
+                const stmt = {
+                    execute: (bindValues) => {
+                        // console.log('execute', queryStr, bindValues)
+                        const res = dbStmt.executeSync(bindValues ?? []);
+                        res.resetSync();
+                        return () => res.changes;
+                    },
+                    select: (bindValues) => {
+                        const res = dbStmt.executeSync(bindValues ?? []);
+                        try {
+                            return res.getAllSync();
+                        }
+                        finally {
+                            res.resetSync();
+                        }
+                    },
+                    finalize: () => dbStmt.finalizeSync(),
+                    sql: queryStr,
+                };
+                stmts.push(stmt);
+                return stmt;
+            }
+            catch (e) {
+                console.error(`Error preparing statement: ${queryStr}`, e);
+                return shouldNeverHappen(`Error preparing statement: ${queryStr}`);
+            }
+        },
+        execute: (queryStr, bindValues) => {
+            const db = dbRef.current;
+            const stmt = db.prepareSync(queryStr);
+            try {
+                const res = stmt.executeSync(bindValues ?? []);
+                return () => res.changes;
+            }
+            finally {
+                stmt.finalizeSync();
+            }
+        },
+        export: () => {
+            const db = dbRef.current;
+            return db.serializeSync();
+        },
+        select: (queryStr, bindValues) => {
+            const stmt = sqliteDb.prepare(queryStr);
+            const res = stmt.select(bindValues);
+            stmt.finalize();
+            return res;
+        },
+        // TODO
+        destroy: () => {
+            if (metadata.input._tag === 'expo') {
+                SQLite.deleteDatabaseSync(metadata.input.databaseName, metadata.input.directory);
+            }
+        },
+        close: () => {
+            const db = dbRef.current;
+            for (const stmt of stmts) {
+                stmt.finalize();
+            }
+            return db.closeSync();
+        },
+        import: (data) => {
+            if (!(data instanceof Uint8Array)) {
+                throw new TypeError('importing from an existing database is not yet supported in expo');
+            }
+            if (metadata.input._tag === 'expo') {
+                throw new Error('not implemented');
+                // SQLite.importDatabaseSync(metadata.input.databaseName, metadata.input.directory, _data)
+            }
+            else {
+                dbRef.current.closeSync();
+                dbRef.current = SQLite.deserializeDatabaseSync(data);
+            }
+        },
+        session: () => {
+            return {
+                changeset: () => new Uint8Array(),
+                finish: () => { },
+            };
+        },
+        makeChangeset: (data) => {
+            return {
+                invert: () => {
+                    return sqliteDb.makeChangeset(data);
+                },
+                apply: () => {
+                    // TODO
+                },
+            };
+        },
+    };
+    return sqliteDb;
+};
+//# sourceMappingURL=make-sqlite-db.js.map

package/dist/make-sqlite-db.js.map

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

package/dist/shutdown-channel.d.ts

@@ -0,0 +1,3 @@
+import { WebChannel } from '@livestore/utils/effect';
+export declare const makeShutdownChannel: (storeId: string) => import("effect/Effect").Effect<WebChannel.WebChannel<import("@livestore/common/dist/adapter-types.js").UnexpectedError | import("@livestore/common/dist/adapter-types.js").IntentionalShutdownCause, import("@livestore/common/dist/adapter-types.js").UnexpectedError | import("@livestore/common/dist/adapter-types.js").IntentionalShutdownCause, never>, never, import("effect/Scope").Scope>;
+//# sourceMappingURL=shutdown-channel.d.ts.map

package/dist/shutdown-channel.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shutdown-channel.d.ts","sourceRoot":"","sources":["../src/shutdown-channel.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAGpD,eAAO,MAAM,mBAAmB,GAAI,SAAS,MAAM,sYACyC,CAAA"}

package/dist/shutdown-channel.js

@@ -0,0 +1,8 @@
+import { WebChannel } from '@livestore/utils/effect';
+// TODO find an actual implementation for Expo
+export const makeShutdownChannel = (storeId) => WebChannel.noopChannel();
+// WebChannel.broadcastChannel({
+//   channelName: `livestore.shutdown.${storeId}`,
+//   schema: ShutdownChannel.All,
+// })
+//# sourceMappingURL=shutdown-channel.js.map

package/dist/shutdown-channel.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"shutdown-channel.js","sourceRoot":"","sources":["../src/shutdown-channel.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAEpD,8CAA8C;AAC9C,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,OAAe,EAAE,EAAE,CACrD,UAAU,CAAC,WAAW,EAAoE,CAAA;AAC5F,gCAAgC;AAChC,kDAAkD;AAClD,iCAAiC;AACjC,KAAK"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livestore/adapter-expo",
-  "version": "0.3.0-dev.18",
+  "version": "0.3.0-dev.19",
   "type": "module",
   "sideEffects": false,
   "exports": {
@@ -12,22 +12,27 @@
   "types": "./dist/index.d.ts",
   "dependencies": {
     "@opentelemetry/api": "1.9.0",
-    "@livestore/common": "0.3.0-dev.18",
-    "@livestore/devtools-expo-common": "0.3.0-dev.18",
-    "@livestore/utils": "0.3.0-dev.18"
+    "@livestore/common": "0.3.0-dev.19",
+    "@livestore/devtools-expo-common": "0.3.0-dev.19",
+    "@livestore/utils": "0.3.0-dev.19",
+    "@livestore/webmesh": "0.3.0-dev.19"
   },
   "devDependencies": {
     "expo-file-system": "*",
-    "expo-sqlite": "^15.0.3"
+    "expo-sqlite": "^15.1.2"
   },
   "peerDependencies": {
     "expo-file-system": "*",
-    "expo-sqlite": "~15.0.3"
+    "expo-sqlite": "^15.1.2"
   },
   "publishConfig": {
     "access": "public"
   },
+  "scripts_": {
+    "postinstall": "This is needed to avoid a Expo/PNPM related issue"
+  },
   "scripts": {
+    "postinstall": "rm -f node_modules/expo-sqlite",
     "test": "echo No tests yet"
   }
 }

package/src/common.ts

@@ -1,95 +1,9 @@
-import type { PreparedStatement, SqliteDb } from '@livestore/common'
-import { base64, shouldNeverHappen } from '@livestore/utils'
+import type { SqliteDb } from '@livestore/common'
+import { base64 } from '@livestore/utils'
 import { Effect } from '@livestore/utils/effect'
 import * as ExpoFS from 'expo-file-system'
 import type * as SQLite from 'expo-sqlite'
 
-export const makeSqliteDb = (db: SQLite.SQLiteDatabase): SqliteDb => {
-  const stmts: PreparedStatement[] = []
-
-  const sqliteDb: SqliteDb<any> = {
-    metadata: { fileName: db.databasePath },
-    _tag: 'SqliteDb',
-    prepare: (queryStr) => {
-      try {
-        const dbStmt = db.prepareSync(queryStr)
-        const stmt = {
-          execute: (bindValues) => {
-            // console.log('execute', queryStr, bindValues)
-            const res = dbStmt.executeSync(bindValues ?? ([] as any))
-            res.resetSync()
-            return () => res.changes
-          },
-          select: (bindValues) => {
-            const res = dbStmt.executeSync(bindValues ?? ([] as any))
-            try {
-              return res.getAllSync() as any
-            } finally {
-              res.resetSync()
-            }
-          },
-          finalize: () => dbStmt.finalizeSync(),
-          sql: queryStr,
-        } satisfies PreparedStatement
-        stmts.push(stmt)
-        return stmt
-      } catch (e) {
-        console.error(`Error preparing statement: ${queryStr}`, e)
-        return shouldNeverHappen(`Error preparing statement: ${queryStr}`)
-      }
-    },
-    execute: (queryStr, bindValues) => {
-      const stmt = db.prepareSync(queryStr)
-      try {
-        const res = stmt.executeSync(bindValues ?? ([] as any))
-        return () => res.changes
-      } finally {
-        stmt.finalizeSync()
-      }
-    },
-    export: () => {
-      return db.serializeSync()
-    },
-    select: (queryStr, bindValues) => {
-      const stmt = sqliteDb.prepare(queryStr)
-      const res = stmt.select(bindValues)
-      stmt.finalize()
-      return res as any
-    },
-    // TODO
-    destroy: () => {},
-    close: () => {
-      for (const stmt of stmts) {
-        stmt.finalize()
-      }
-      return db.closeSync()
-    },
-    import: () => {
-      throw new Error('Not implemented')
-      // TODO properly implement this as it seems to require importing to a temporary in-memory db,
-      // save it to a file, and then reopen the DB from that file? (see `overwriteDbFile` below)
-    },
-    session: () => {
-      return {
-        changeset: () => new Uint8Array(),
-        finish: () => {},
-      }
-    },
-    makeChangeset: (data) => {
-      return {
-        invert: () => {
-          return sqliteDb.makeChangeset(data)
-        },
-        apply: () => {
-          // TODO
-        },
-      }
-    },
-  } satisfies SqliteDb
-
-  return sqliteDb
-}
-
 export type DbPairRef = {
   current:
     | {