kysely 0.28.2 → 0.28.3

package/dist/cjs/query-executor/query-executor-base.js

@@ -32,20 +32,20 @@ class QueryExecutorBase {
         }
         return node;
     }
-    async executeQuery(compiledQuery, queryId) {
+    async executeQuery(compiledQuery) {
         return await this.provideConnection(async (connection) => {
             const result = await connection.executeQuery(compiledQuery);
             if ('numUpdatedOrDeletedRows' in result) {
                 (0, log_once_js_1.logOnce)('kysely:warning: outdated driver/plugin detected! `QueryResult.numUpdatedOrDeletedRows` has been replaced with `QueryResult.numAffectedRows`.');
             }
-            return await this.#transformResult(result, queryId);
+            return await this.#transformResult(result, compiledQuery.queryId);
         });
     }
-    async *stream(compiledQuery, chunkSize, queryId) {
+    async *stream(compiledQuery, chunkSize) {
         const { connection, release } = await (0, provide_controlled_connection_js_1.provideControlledConnection)(this);
         try {
             for await (const result of connection.streamQuery(compiledQuery, chunkSize)) {
-                yield await this.#transformResult(result, queryId);
+                yield await this.#transformResult(result, compiledQuery.queryId);
             }
         }
         finally {

package/dist/cjs/query-executor/query-executor.d.ts

@@ -36,7 +36,7 @@ export interface QueryExecutor extends ConnectionProvider {
      * Executes a compiled query and runs the result through all plugins'
      * `transformResult` method.
      */
-    executeQuery<R>(compiledQuery: CompiledQuery<R>, queryId: QueryId): Promise<QueryResult<R>>;
+    executeQuery<R>(compiledQuery: CompiledQuery<R>): Promise<QueryResult<R>>;
     /**
      * Executes a compiled query and runs the result through all plugins'
      * `transformResult` method. Results are streamead instead of loaded
@@ -47,7 +47,7 @@ export interface QueryExecutor extends ConnectionProvider {
      * How many rows should be pulled from the database at once. Supported
      * only by the postgres driver.
      */
-    chunkSize: number, queryId: QueryId): AsyncIterableIterator<QueryResult<R>>;
+    chunkSize: number): AsyncIterableIterator<QueryResult<R>>;
     /**
      * Returns a copy of this executor with a new connection provider.
      */

package/dist/cjs/raw-builder/raw-builder.js

@@ -42,7 +42,7 @@ class RawBuilderImpl {
     }
     async execute(executorProvider) {
         const executor = this.#getExecutor(executorProvider);
-        return executor.executeQuery(this.#compile(executor), this.#props.queryId);
+        return executor.executeQuery(this.#compile(executor));
     }
     #getExecutor(executorProvider) {
         const executor = executorProvider !== undefined

package/dist/cjs/schema/alter-table-add-foreign-key-constraint-builder.js

@@ -61,7 +61,7 @@ class AlterTableAddForeignKeyConstraintBuilder {
         return this.#props.executor.compileQuery(this.toOperationNode(), this.#props.queryId);
     }
     async execute() {
-        await this.#props.executor.executeQuery(this.compile(), this.#props.queryId);
+        await this.#props.executor.executeQuery(this.compile());
     }
 }
 exports.AlterTableAddForeignKeyConstraintBuilder = AlterTableAddForeignKeyConstraintBuilder;

package/dist/cjs/schema/alter-table-add-index-builder.js

@@ -159,7 +159,7 @@ class AlterTableAddIndexBuilder {
         return this.#props.executor.compileQuery(this.toOperationNode(), this.#props.queryId);
     }
     async execute() {
-        await this.#props.executor.executeQuery(this.compile(), this.#props.queryId);
+        await this.#props.executor.executeQuery(this.compile());
     }
 }
 exports.AlterTableAddIndexBuilder = AlterTableAddIndexBuilder;

package/dist/cjs/schema/alter-table-builder.js

@@ -261,7 +261,7 @@ class AlterTableColumnAlteringBuilder {
         return this.#props.executor.compileQuery(this.toOperationNode(), this.#props.queryId);
     }
     async execute() {
-        await this.#props.executor.executeQuery(this.compile(), this.#props.queryId);
+        await this.#props.executor.executeQuery(this.compile());
     }
 }
 exports.AlterTableColumnAlteringBuilder = AlterTableColumnAlteringBuilder;

package/dist/cjs/schema/alter-table-drop-constraint-builder.js

@@ -53,7 +53,7 @@ class AlterTableDropConstraintBuilder {
         return this.#props.executor.compileQuery(this.toOperationNode(), this.#props.queryId);
     }
     async execute() {
-        await this.#props.executor.executeQuery(this.compile(), this.#props.queryId);
+        await this.#props.executor.executeQuery(this.compile());
     }
 }
 exports.AlterTableDropConstraintBuilder = AlterTableDropConstraintBuilder;

package/dist/cjs/schema/alter-table-executor.js

@@ -14,7 +14,7 @@ class AlterTableExecutor {
         return this.#props.executor.compileQuery(this.toOperationNode(), this.#props.queryId);
     }
     async execute() {
-        await this.#props.executor.executeQuery(this.compile(), this.#props.queryId);
+        await this.#props.executor.executeQuery(this.compile());
     }
 }
 exports.AlterTableExecutor = AlterTableExecutor;

package/dist/cjs/schema/create-index-builder.js

@@ -196,7 +196,7 @@ class CreateIndexBuilder {
         return this.#props.executor.compileQuery(this.toOperationNode(), this.#props.queryId);
     }
     async execute() {
-        await this.#props.executor.executeQuery(this.compile(), this.#props.queryId);
+        await this.#props.executor.executeQuery(this.compile());
     }
 }
 exports.CreateIndexBuilder = CreateIndexBuilder;

package/dist/cjs/schema/create-schema-builder.js

@@ -28,7 +28,7 @@ class CreateSchemaBuilder {
         return this.#props.executor.compileQuery(this.toOperationNode(), this.#props.queryId);
     }
     async execute() {
-        await this.#props.executor.executeQuery(this.compile(), this.#props.queryId);
+        await this.#props.executor.executeQuery(this.compile());
     }
 }
 exports.CreateSchemaBuilder = CreateSchemaBuilder;

package/dist/cjs/schema/create-table-builder.js

@@ -405,7 +405,7 @@ class CreateTableBuilder {
         return this.#props.executor.compileQuery(this.toOperationNode(), this.#props.queryId);
     }
     async execute() {
-        await this.#props.executor.executeQuery(this.compile(), this.#props.queryId);
+        await this.#props.executor.executeQuery(this.compile());
     }
 }
 exports.CreateTableBuilder = CreateTableBuilder;

package/dist/cjs/schema/create-type-builder.js

@@ -37,7 +37,7 @@ class CreateTypeBuilder {
         return this.#props.executor.compileQuery(this.toOperationNode(), this.#props.queryId);
     }
     async execute() {
-        await this.#props.executor.executeQuery(this.compile(), this.#props.queryId);
+        await this.#props.executor.executeQuery(this.compile());
     }
 }
 exports.CreateTypeBuilder = CreateTypeBuilder;

package/dist/cjs/schema/create-view-builder.js

@@ -92,7 +92,7 @@ class CreateViewBuilder {
         return this.#props.executor.compileQuery(this.toOperationNode(), this.#props.queryId);
     }
     async execute() {
-        await this.#props.executor.executeQuery(this.compile(), this.#props.queryId);
+        await this.#props.executor.executeQuery(this.compile());
     }
 }
 exports.CreateViewBuilder = CreateViewBuilder;

package/dist/cjs/schema/drop-index-builder.js

@@ -51,7 +51,7 @@ class DropIndexBuilder {
         return this.#props.executor.compileQuery(this.toOperationNode(), this.#props.queryId);
     }
     async execute() {
-        await this.#props.executor.executeQuery(this.compile(), this.#props.queryId);
+        await this.#props.executor.executeQuery(this.compile());
     }
 }
 exports.DropIndexBuilder = DropIndexBuilder;

package/dist/cjs/schema/drop-schema-builder.js

@@ -38,7 +38,7 @@ class DropSchemaBuilder {
         return this.#props.executor.compileQuery(this.toOperationNode(), this.#props.queryId);
     }
     async execute() {
-        await this.#props.executor.executeQuery(this.compile(), this.#props.queryId);
+        await this.#props.executor.executeQuery(this.compile());
     }
 }
 exports.DropSchemaBuilder = DropSchemaBuilder;

package/dist/cjs/schema/drop-table-builder.js

@@ -38,7 +38,7 @@ class DropTableBuilder {
         return this.#props.executor.compileQuery(this.toOperationNode(), this.#props.queryId);
     }
     async execute() {
-        await this.#props.executor.executeQuery(this.compile(), this.#props.queryId);
+        await this.#props.executor.executeQuery(this.compile());
     }
 }
 exports.DropTableBuilder = DropTableBuilder;

package/dist/cjs/schema/drop-type-builder.js

@@ -30,7 +30,7 @@ class DropTypeBuilder {
         return this.#props.executor.compileQuery(this.toOperationNode(), this.#props.queryId);
     }
     async execute() {
-        await this.#props.executor.executeQuery(this.compile(), this.#props.queryId);
+        await this.#props.executor.executeQuery(this.compile());
     }
 }
 exports.DropTypeBuilder = DropTypeBuilder;

package/dist/cjs/schema/drop-view-builder.js

@@ -46,7 +46,7 @@ class DropViewBuilder {
         return this.#props.executor.compileQuery(this.toOperationNode(), this.#props.queryId);
     }
     async execute() {
-        await this.#props.executor.executeQuery(this.compile(), this.#props.queryId);
+        await this.#props.executor.executeQuery(this.compile());
     }
 }
 exports.DropViewBuilder = DropViewBuilder;

package/dist/cjs/schema/refresh-materialized-view-builder.js

@@ -69,7 +69,7 @@ class RefreshMaterializedViewBuilder {
         return this.#props.executor.compileQuery(this.toOperationNode(), this.#props.queryId);
     }
     async execute() {
-        await this.#props.executor.executeQuery(this.compile(), this.#props.queryId);
+        await this.#props.executor.executeQuery(this.compile());
     }
 }
 exports.RefreshMaterializedViewBuilder = RefreshMaterializedViewBuilder;

package/dist/cjs/util/type-utils.d.ts

@@ -169,3 +169,20 @@ export type DrainOuterGeneric<T> = [T] extends [unknown] ? T : never;
 export type ShallowRecord<K extends keyof any, T> = DrainOuterGeneric<{
     [P in K]: T;
 }>;
+/**
+ * Dehydrates any root properties of an object that are not valid JSON types.
+ *
+ * For now, we catch anything in {@link StringsWhenDataTypeNotAvailable} and convert it to `string`.
+ */
+export type ShallowDehydrateObject<O> = {
+    [K in keyof O]: ShallowDehydrateValue<O[K]>;
+};
+/**
+ * Dehydrates a value when it is not a valid JSON type.
+ *
+ * For now, we catch anything in {@link StringsWhenDataTypeNotAvailable} and convert it to `string`.
+ */
+export type ShallowDehydrateValue<T> = [T] extends [
+    (infer U)[] | null | undefined
+] ? Array<ShallowDehydrateValue<U>> | Extract<T, null | undefined> : T extends Exclude<T, StringsWhenDataTypeNotAvailable> ? T : string | Exclude<T, StringsWhenDataTypeNotAvailable>;
+export type StringsWhenDataTypeNotAvailable = ArrayBuffer | bigint | Buffer | Date;

package/dist/esm/dialect/mssql/mssql-driver.d.ts

@@ -4,6 +4,7 @@ import { MssqlDialectConfig, Tedious, TediousConnection } from './mssql-dialect-
 import { CompiledQuery } from '../../query-compiler/compiled-query.js';
 declare const PRIVATE_RESET_METHOD: unique symbol;
 declare const PRIVATE_DESTROY_METHOD: unique symbol;
+declare const PRIVATE_VALIDATE_METHOD: unique symbol;
 export declare class MssqlDriver implements Driver {
     #private;
     constructor(config: MssqlDialectConfig);
@@ -51,8 +52,8 @@ declare class MssqlConnection implements DatabaseConnection {
     rollbackTransaction(savepointName?: string): Promise<void>;
     savepoint(savepointName: string): Promise<void>;
     streamQuery<O>(compiledQuery: CompiledQuery, chunkSize: number): AsyncIterableIterator<QueryResult<O>>;
-    validate(): Promise<boolean>;
-    [PRIVATE_RESET_METHOD](): Promise<void>;
     [PRIVATE_DESTROY_METHOD](): Promise<void>;
+    [PRIVATE_RESET_METHOD](): Promise<void>;
+    [PRIVATE_VALIDATE_METHOD](): Promise<boolean>;
 }
 export {};

package/dist/esm/dialect/mssql/mssql-driver.js

@@ -6,6 +6,7 @@ import { randomString } from '../../util/random-string.js';
 import { Deferred } from '../../util/deferred.js';
 const PRIVATE_RESET_METHOD = Symbol();
 const PRIVATE_DESTROY_METHOD = Symbol();
+const PRIVATE_VALIDATE_METHOD = Symbol();
 export class MssqlDriver {
     #config;
     #pool;
@@ -27,7 +28,7 @@ export class MssqlDriver {
             validate: validateConnections === false ||
                 deprecatedValidateConnections === false
                 ? undefined
-                : (connection) => connection.validate(),
+                : (connection) => connection[PRIVATE_VALIDATE_METHOD](),
         });
     }
     async init() {
@@ -64,14 +65,12 @@ export class MssqlDriver {
 }
 class MssqlConnection {
     #connection;
+    #hasSocketError;
     #tedious;
     constructor(connection, tedious) {
         this.#connection = connection;
+        this.#hasSocketError = false;
         this.#tedious = tedious;
-        this.#connection.on('error', console.error);
-        this.#connection.once('end', () => {
-            this.#connection.off('error', console.error);
-        });
     }
     async beginTransaction(settings) {
         const { isolationLevel } = settings;
@@ -93,17 +92,28 @@ class MssqlConnection {
         }));
     }
     async connect() {
-        await new Promise((resolve, reject) => {
-            this.#connection.connect((error) => {
-                if (error) {
-                    console.error(error);
-                    reject(error);
-                }
-                else {
-                    resolve(undefined);
-                }
-            });
+        const { promise: waitForConnected, reject, resolve } = new Deferred();
+        this.#connection.connect((error) => {
+            if (error) {
+                return reject(error);
+            }
+            resolve();
         });
+        this.#connection.on('error', (error) => {
+            if (error instanceof Error &&
+                'code' in error &&
+                error.code === 'ESOCKET') {
+                this.#hasSocketError = true;
+            }
+            console.error(error);
+            reject(error);
+        });
+        function endListener() {
+            reject(new Error('The connection ended without ever completing the connection'));
+        }
+        this.#connection.once('end', endListener);
+        await waitForConnected;
+        this.#connection.off('end', endListener);
         return this;
     }
     async executeQuery(compiledQuery) {
@@ -167,22 +177,6 @@ class MssqlConnection {
             await this.#cancelRequest(request);
         }
     }
-    async validate() {
-        try {
-            const deferred = new Deferred();
-            const request = new MssqlRequest({
-                compiledQuery: CompiledQuery.raw('select 1'),
-                onDone: deferred,
-                tedious: this.#tedious,
-            });
-            this.#connection.execSql(request.request);
-            await deferred.promise;
-            return true;
-        }
-        catch {
-            return false;
-        }
-    }
     #getTediousIsolationLevel(isolationLevel) {
         const { ISOLATION_LEVEL } = this.#tedious;
         const mapper = {
@@ -204,27 +198,50 @@ class MssqlConnection {
             const wasCanceled = this.#connection.cancel();
             if (!wasCanceled) {
                 request.request.off('requestCompleted', resolve);
-                resolve(undefined);
+                resolve();
             }
         });
     }
+    [PRIVATE_DESTROY_METHOD]() {
+        if ('closed' in this.#connection && this.#connection.closed) {
+            return Promise.resolve();
+        }
+        return new Promise((resolve) => {
+            this.#connection.once('end', resolve);
+            this.#connection.close();
+        });
+    }
     async [PRIVATE_RESET_METHOD]() {
         await new Promise((resolve, reject) => {
             this.#connection.reset((error) => {
-                if (error)
-                    reject(error);
-                else
-                    resolve(undefined);
+                if (error) {
+                    return reject(error);
+                }
+                resolve();
             });
         });
     }
-    [PRIVATE_DESTROY_METHOD]() {
-        return new Promise((resolve) => {
-            this.#connection.once('end', () => {
-                resolve(undefined);
+    async [PRIVATE_VALIDATE_METHOD]() {
+        if (this.#hasSocketError || this.#isConnectionClosed()) {
+            return false;
+        }
+        try {
+            const deferred = new Deferred();
+            const request = new MssqlRequest({
+                compiledQuery: CompiledQuery.raw('select 1'),
+                onDone: deferred,
+                tedious: this.#tedious,
             });
-            this.#connection.close();
-        });
+            this.#connection.execSql(request.request);
+            await deferred.promise;
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }
+    #isConnectionClosed() {
+        return 'closed' in this.#connection && Boolean(this.#connection.closed);
     }
 }
 class MssqlRequest {
@@ -248,23 +265,19 @@ class MssqlRequest {
                 }
                 delete this.#subscribers[subscriptionKey];
                 if (event === 'error') {
-                    onDone.reject(error);
-                }
-                else {
-                    onDone.resolve({
-                        rowCount: this.#rowCount,
-                        rows: this.#rows,
-                    });
+                    return onDone.reject(error);
                 }
+                onDone.resolve({
+                    rowCount: this.#rowCount,
+                    rows: this.#rows,
+                });
             };
         }
         this.#request = new this.#tedious.Request(compiledQuery.sql, (err, rowCount) => {
             if (err) {
-                Object.values(this.#subscribers).forEach((subscriber) => subscriber('error', err instanceof AggregateError ? err.errors : err));
-            }
-            else {
-                this.#rowCount = rowCount;
+                return Object.values(this.#subscribers).forEach((subscriber) => subscriber('error', err instanceof AggregateError ? err.errors : err));
             }
+            this.#rowCount = rowCount;
         });
         this.#addParametersToRequest(compiledQuery.parameters);
         this.#attachListeners();
@@ -278,11 +291,9 @@ class MssqlRequest {
             this.#subscribers[subscriptionKey] = (event, error) => {
                 delete this.#subscribers[subscriptionKey];
                 if (event === 'error') {
-                    reject(error);
-                }
-                else {
-                    resolve(this.#rows.splice(0, this.#streamChunkSize));
+                    return reject(error);
                 }
+                resolve(this.#rows.splice(0, this.#streamChunkSize));
             };
             this.#request.resume();
         });

package/dist/esm/dialect/postgres/postgres-introspector.js

@@ -46,6 +46,8 @@ export class PostgresIntrospector {
         ])
             .where('ns.nspname', '!~', '^pg_')
             .where('ns.nspname', '!=', 'information_schema')
+            // Filter out internal cockroachdb schema
+            .where('ns.nspname', '!=', 'crdb_internal')
             // No system columns
             .where('a.attnum', '>=', 0)
             .where('a.attisdropped', '!=', true)

package/dist/esm/helpers/mssql.d.ts

@@ -1,6 +1,6 @@
 import { Expression } from '../expression/expression.js';
 import { RawBuilder } from '../raw-builder/raw-builder.js';
-import { Simplify } from '../util/type-utils.js';
+import { ShallowDehydrateObject, ShallowDehydrateValue, Simplify } from '../util/type-utils.js';
 /**
  * An MS SQL Server helper for aggregating a subquery into a JSON array.
  *
@@ -73,7 +73,7 @@ import { Simplify } from '../util/type-utils.js';
  * from "person"
  * ```
  */
-export declare function jsonArrayFrom<O>(expr: Expression<O>): RawBuilder<Simplify<O>[]>;
+export declare function jsonArrayFrom<O>(expr: Expression<O>): RawBuilder<Simplify<ShallowDehydrateObject<O>>[]>;
 /**
  * An MS SQL Server helper for turning a subquery into a JSON object.
  *
@@ -146,7 +146,7 @@ export declare function jsonArrayFrom<O>(expr: Expression<O>): RawBuilder<Simpli
  * from "person"
  * ```
  */
-export declare function jsonObjectFrom<O>(expr: Expression<O>): RawBuilder<Simplify<O> | null>;
+export declare function jsonObjectFrom<O>(expr: Expression<O>): RawBuilder<Simplify<ShallowDehydrateObject<O>> | null>;
 /**
  * The MS SQL Server `json_query` function, single argument variant.
  *
@@ -208,5 +208,5 @@ export declare function jsonObjectFrom<O>(expr: Expression<O>): RawBuilder<Simpl
  * ```
  */
 export declare function jsonBuildObject<O extends Record<string, Expression<unknown>>>(obj: O): RawBuilder<Simplify<{
-    [K in keyof O]: O[K] extends Expression<infer V> ? V : never;
+    [K in keyof O]: O[K] extends Expression<infer V> ? ShallowDehydrateValue<V> : never;
 }>>;

package/dist/esm/helpers/mysql.d.ts

@@ -1,7 +1,7 @@
 import { Expression } from '../expression/expression.js';
 import { SelectQueryBuilderExpression } from '../query-builder/select-query-builder-expression.js';
 import { RawBuilder } from '../raw-builder/raw-builder.js';
-import { Simplify } from '../util/type-utils.js';
+import { ShallowDehydrateObject, ShallowDehydrateValue, Simplify } from '../util/type-utils.js';
 /**
  * A MySQL helper for aggregating a subquery into a JSON array.
  *
@@ -50,7 +50,7 @@ import { Simplify } from '../util/type-utils.js';
  * from `person`
  * ```
  */
-export declare function jsonArrayFrom<O>(expr: SelectQueryBuilderExpression<O>): RawBuilder<Simplify<O>[]>;
+export declare function jsonArrayFrom<O>(expr: SelectQueryBuilderExpression<O>): RawBuilder<Simplify<ShallowDehydrateObject<O>>[]>;
 /**
  * A MySQL helper for turning a subquery into a JSON object.
  *
@@ -101,7 +101,7 @@ export declare function jsonArrayFrom<O>(expr: SelectQueryBuilderExpression<O>):
  * from `person`
  * ```
  */
-export declare function jsonObjectFrom<O>(expr: SelectQueryBuilderExpression<O>): RawBuilder<Simplify<O> | null>;
+export declare function jsonObjectFrom<O>(expr: SelectQueryBuilderExpression<O>): RawBuilder<Simplify<ShallowDehydrateObject<O>> | null>;
 /**
  * The MySQL `json_object` function.
  *
@@ -143,5 +143,5 @@ export declare function jsonObjectFrom<O>(expr: SelectQueryBuilderExpression<O>)
  * ```
  */
 export declare function jsonBuildObject<O extends Record<string, Expression<unknown>>>(obj: O): RawBuilder<Simplify<{
-    [K in keyof O]: O[K] extends Expression<infer V> ? V : never;
+    [K in keyof O]: O[K] extends Expression<infer V> ? ShallowDehydrateValue<V> : never;
 }>>;

package/dist/esm/helpers/postgres.d.ts

@@ -1,6 +1,6 @@
 import { Expression } from '../expression/expression.js';
 import { RawBuilder } from '../raw-builder/raw-builder.js';
-import { Simplify } from '../util/type-utils.js';
+import { ShallowDehydrateValue, ShallowDehydrateObject, Simplify } from '../util/type-utils.js';
 /**
  * A postgres helper for aggregating a subquery (or other expression) into a JSONB array.
  *
@@ -50,7 +50,7 @@ import { Simplify } from '../util/type-utils.js';
  * from "person"
  * ```
  */
-export declare function jsonArrayFrom<O>(expr: Expression<O>): RawBuilder<Simplify<O>[]>;
+export declare function jsonArrayFrom<O>(expr: Expression<O>): RawBuilder<Simplify<ShallowDehydrateObject<O>>[]>;
 /**
  * A postgres helper for turning a subquery (or other expression) into a JSON object.
  *
@@ -102,7 +102,7 @@ export declare function jsonArrayFrom<O>(expr: Expression<O>): RawBuilder<Simpli
  * from "person"
  * ```
  */
-export declare function jsonObjectFrom<O>(expr: Expression<O>): RawBuilder<Simplify<O> | null>;
+export declare function jsonObjectFrom<O>(expr: Expression<O>): RawBuilder<Simplify<ShallowDehydrateObject<O>> | null>;
 /**
  * The PostgreSQL `json_build_object` function.
  *
@@ -147,7 +147,7 @@ export declare function jsonObjectFrom<O>(expr: Expression<O>): RawBuilder<Simpl
  * ```
  */
 export declare function jsonBuildObject<O extends Record<string, Expression<unknown>>>(obj: O): RawBuilder<Simplify<{
-    [K in keyof O]: O[K] extends Expression<infer V> ? V : never;
+    [K in keyof O]: O[K] extends Expression<infer V> ? ShallowDehydrateValue<V> : never;
 }>>;
 export type MergeAction = 'INSERT' | 'UPDATE' | 'DELETE';
 /**

package/dist/esm/helpers/sqlite.d.ts

@@ -1,7 +1,7 @@
 import { Expression } from '../expression/expression.js';
 import { SelectQueryBuilderExpression } from '../query-builder/select-query-builder-expression.js';
 import { RawBuilder } from '../raw-builder/raw-builder.js';
-import { Simplify } from '../util/type-utils.js';
+import { ShallowDehydrateObject, ShallowDehydrateValue, Simplify } from '../util/type-utils.js';
 /**
  * A SQLite helper for aggregating a subquery into a JSON array.
  *
@@ -63,7 +63,7 @@ import { Simplify } from '../util/type-utils.js';
  * from "person"
  * ```
  */
-export declare function jsonArrayFrom<O>(expr: SelectQueryBuilderExpression<O>): RawBuilder<Simplify<O>[]>;
+export declare function jsonArrayFrom<O>(expr: SelectQueryBuilderExpression<O>): RawBuilder<Simplify<ShallowDehydrateObject<O>>[]>;
 /**
  * A SQLite helper for turning a subquery into a JSON object.
  *
@@ -127,7 +127,7 @@ export declare function jsonArrayFrom<O>(expr: SelectQueryBuilderExpression<O>):
  * from "person";
  * ```
  */
-export declare function jsonObjectFrom<O>(expr: SelectQueryBuilderExpression<O>): RawBuilder<Simplify<O> | null>;
+export declare function jsonObjectFrom<O>(expr: SelectQueryBuilderExpression<O>): RawBuilder<Simplify<ShallowDehydrateObject<O>> | null>;
 /**
  * The SQLite `json_object` function.
  *
@@ -185,5 +185,5 @@ export declare function jsonObjectFrom<O>(expr: SelectQueryBuilderExpression<O>)
  * ```
  */
 export declare function jsonBuildObject<O extends Record<string, Expression<unknown>>>(obj: O): RawBuilder<Simplify<{
-    [K in keyof O]: O[K] extends Expression<infer V> ? V : never;
+    [K in keyof O]: O[K] extends Expression<infer V> ? ShallowDehydrateValue<V> : never;
 }>>;

package/dist/esm/index.d.ts

@@ -204,7 +204,7 @@ export * from './util/compilable.js';
 export * from './util/explainable.js';
 export * from './util/streamable.js';
 export * from './util/log.js';
-export { AnyAliasedColumn, AnyAliasedColumnWithTable, AnyColumn, AnyColumnWithTable, Equals, UnknownRow, Simplify, SqlBool, Nullable, NotNull, } from './util/type-utils.js';
+export { AnyAliasedColumn, AnyAliasedColumnWithTable, AnyColumn, AnyColumnWithTable, Equals, UnknownRow, Simplify, SqlBool, Nullable, NotNull, ShallowDehydrateObject, ShallowDehydrateValue, StringsWhenDataTypeNotAvailable, } from './util/type-utils.js';
 export * from './util/infer-result.js';
 export { logOnce } from './util/log-once.js';
 export { createQueryId, QueryId } from './util/query-id.js';

package/dist/esm/kysely.d.ts

@@ -18,6 +18,10 @@ import { Expression } from './expression/expression.js';
 import { DrainOuterGeneric } from './util/type-utils.js';
 import { ReleaseSavepoint, RollbackToSavepoint } from './parser/savepoint-parser.js';
 import { ControlledConnection } from './util/provide-controlled-connection.js';
+declare global {
+    interface AsyncDisposable {
+    }
+}
 /**
  * The main Kysely class.
  *