Added toCompilableQuery helper.

Author: Chriztiaan

.changeset/silly-lions-vanish.md

@@ -0,0 +1,5 @@
+---
+'@powersync/drizzle-driver': patch
+---
+
+Initial Alpha version.

packages/drizzle-driver/src/index.ts

@@ -1,3 +1,4 @@
 import { wrapPowerSyncWithDrizzle } from './sqlite/db';
+import { toCompilableQuery } from './utils/compilableQuery';
 
-export { wrapPowerSyncWithDrizzle };
+export { wrapPowerSyncWithDrizzle, toCompilableQuery };

packages/drizzle-driver/src/sqlite/sqlite-transaction.ts renamed to packages/drizzle-driver/src/sqlite/sqlite-query.ts

@@ -2,9 +2,7 @@ import { AbstractPowerSyncDatabase, QueryResult } from '@powersync/common';
 import { Column, DriverValueDecoder, getTableName, SQL } from 'drizzle-orm';
 import { entityKind, is } from 'drizzle-orm/entity';
 import type { Logger } from 'drizzle-orm/logger';
-import type { TablesRelationalConfig } from 'drizzle-orm/relations';
 import { fillPlaceholders, type Query } from 'drizzle-orm/sql/sql';
-import { SQLiteTransaction } from 'drizzle-orm/sqlite-core';
 import type { SelectedFieldsOrdered } from 'drizzle-orm/sqlite-core/query-builders/select.types';
 import {
   type PreparedQueryConfig as PreparedQueryConfigBase,
@@ -14,13 +12,6 @@ import {
 
 type PreparedQueryConfig = Omit<PreparedQueryConfigBase, 'statement' | 'run'>;
 
-export class PowerSyncSQLiteTransaction<
-  TFullSchema extends Record<string, unknown>,
-  TSchema extends TablesRelationalConfig
-> extends SQLiteTransaction<'async', QueryResult, TFullSchema, TSchema> {
-  static readonly [entityKind]: string = 'ExpoSQLiteTransaction';
-}
-
 export class PowerSyncSQLitePreparedQuery<
   T extends PreparedQueryConfig = PreparedQueryConfig
 > extends SQLitePreparedQuery<{
@@ -88,7 +79,8 @@ export class PowerSyncSQLitePreparedQuery<
     }
 
     if (customResultMapper) {
-      return customResultMapper(rows) as T['get'];
+      const plain = rows.map((row) => Object.values(row));
+      return customResultMapper(plain) as T['get'];
     }
 
     return mapResultRow(fields!, Object.values(row), joinsNotNullableMap);

packages/drizzle-driver/src/sqlite/sqlite-session.ts

@@ -10,9 +10,10 @@ import {
   type PreparedQueryConfig as PreparedQueryConfigBase,
   type SQLiteExecuteMethod,
   SQLiteSession,
+  SQLiteTransaction,
   type SQLiteTransactionConfig
 } from 'drizzle-orm/sqlite-core/session';
-import { PowerSyncSQLitePreparedQuery, PowerSyncSQLiteTransaction } from './sqlite-transaction';
+import { PowerSyncSQLitePreparedQuery } from './sqlite-query';
 
 export interface ExpoSQLiteSessionOptions {
   logger?: Logger;
@@ -22,6 +23,13 @@ export type PowerSyncSQLiteTransactionConfig = SQLiteTransactionConfig & {
   accessMode?: 'read only' | 'read write';
 };
 
+export class PowerSyncSQLiteTransaction<
+  TFullSchema extends Record<string, unknown>,
+  TSchema extends TablesRelationalConfig
+> extends SQLiteTransaction<'async', QueryResult, TFullSchema, TSchema> {
+  static readonly [entityKind]: string = 'ExpoSQLiteTransaction';
+}
+
 export class PowerSyncSQLiteSession<
   TFullSchema extends Record<string, unknown>,
   TSchema extends TablesRelationalConfig

packages/drizzle-driver/src/utils/compilableQuery.ts

@@ -0,0 +1,21 @@
+import { CompilableQuery } from '@powersync/common';
+import { Query } from 'drizzle-orm';
+
+export function toCompilableQuery<T>(query: {
+  execute: () => Promise<T | T[]>;
+  toSQL: () => Query;
+}): CompilableQuery<T> {
+  return {
+    compile: () => {
+      const sql = query.toSQL();
+      return {
+        sql: sql.sql,
+        parameters: sql.params
+      };
+    },
+    execute: async () => {
+      const result = await query.execute();
+      return Array.isArray(result) ? result : [result];
+    }
+  };
+}