@effect/sql-sqlite-react-native 4.0.0-beta.98 → 4.0.0-rc.108

package/src/SqliteClient.ts

@@ -51,7 +51,7 @@ export type TypeId = "~@effect/sql-sqlite-react-native/SqliteClient"
 /**
  * React Native SQLite client service interface, extending `SqlClient` with its configuration and marking `updateValues` as unsupported for SQLite.
  *
- * @category models
+ * @category services
  * @since 4.0.0
  */
 export interface SqliteClient extends Client.SqlClient {
@@ -93,7 +93,7 @@ export interface SqliteClientConfig {
  * Use to switch React Native SQLite query execution to the asynchronous driver
  * API for a scoped effect.
  *
- * @category fiber refs
+ * @category services
  * @since 4.0.0
  */
 export const AsyncQuery = Context.Reference<boolean>(
@@ -104,7 +104,7 @@ export const AsyncQuery = Context.Reference<boolean>(
 /**
  * Runs an effect with `AsyncQuery` enabled, causing React Native SQLite queries in that effect to use the asynchronous driver API.
  *
- * @category fiber refs
+ * @category providing services
  * @since 4.0.0
  */
 export const withAsyncQuery = <R, E, A>(effect: Effect.Effect<A, E, R>) =>
@@ -143,8 +143,7 @@ export const make = (
 
       const run = (
         sql: string,
-        params: ReadonlyArray<unknown> = [],
-        values = false
+        params: ReadonlyArray<unknown> = []
       ) =>
         Effect.withFiber<Array<any>, SqlError>((fiber) => {
           if (fiber.getRef(AsyncQuery)) {
@@ -154,14 +153,29 @@ export const make = (
                 catch: (cause) =>
                   new SqlError({ reason: classifyError(cause, "Failed to execute statement (async)", "execute") })
               }),
-              (result) => values ? result.rawRows ?? [] : result.rows
+              (result) => result.rows
             )
           }
           return Effect.try({
-            try: () => {
-              const result = db.executeSync(sql, params as Array<any>)
-              return values ? result.rawRows ?? [] : result.rows
-            },
+            try: () => db.executeSync(sql, params as Array<any>).rows,
+            catch: (cause) => new SqlError({ reason: classifyError(cause, "Failed to execute statement", "execute") })
+          })
+        })
+
+      const runValues = (
+        sql: string,
+        params: ReadonlyArray<unknown> = []
+      ) =>
+        Effect.withFiber<Array<any>, SqlError>((fiber) => {
+          if (fiber.getRef(AsyncQuery)) {
+            return Effect.tryPromise({
+              try: () => db.executeRaw(sql, params as Array<any>),
+              catch: (cause) =>
+                new SqlError({ reason: classifyError(cause, "Failed to execute statement (async)", "execute") })
+            })
+          }
+          return Effect.try({
+            try: () => db.executeRawSync(sql, params as Array<any>),
             catch: (cause) => new SqlError({ reason: classifyError(cause, "Failed to execute statement", "execute") })
           })
         })
@@ -176,10 +190,10 @@ export const make = (
           return run(sql, params)
         },
         executeValues(sql, params) {
-          return run(sql, params, true)
+          return runValues(sql, params)
         },
         executeValuesUnprepared(sql, params) {
-          return run(sql, params, true)
+          return runValues(sql, params)
         },
         executeUnprepared(sql, params, transformRows) {
           return this.execute(sql, params, transformRows)

package/src/SqliteMigrator.ts

@@ -33,7 +33,7 @@ export * from "effect/unstable/sql/Migrator"
 /**
  * Runs SQL migrations for a React Native SQLite database using the shared `Migrator` implementation and the current `SqlClient`.
  *
- * @category constructors
+ * @category running
  * @since 4.0.0
  */
 export const run: <R>(
@@ -47,7 +47,7 @@ export const run: <R>(
 /**
  * Creates a layer that runs the configured React Native SQLite migrations during layer construction and provides no services.
  *
- * @category constructors
+ * @category layers
  * @since 4.0.0
  */
 export const layer = <R>(