drizzle-orm 1.0.0-beta.21 → 1.0.0-beta.21-4fa69ab

package/netlify-db/session.cjs

@@ -3,11 +3,11 @@ const require_runtime = require('../_virtual/_rolldown/runtime.cjs');
 let __entity_ts = require("../entity.cjs");
 let __sql_sql_ts = require("../sql/sql.cjs");
 let __logger_ts = require("../logger.cjs");
+let __pg_core_dialect_ts = require("../pg-core/dialect.cjs");
 let __pg_core_async_session_ts = require("../pg-core/async/session.cjs");
 let __cache_core_cache_ts = require("../cache/core/cache.cjs");
 let _neondatabase_serverless = require("@neondatabase/serverless");
-let __neon_http_session_ts = require("../neon-http/session.cjs");
-let __neon_serverless_session_ts = require("../neon-serverless/session.cjs");
+let __query_name_generator_ts = require("../query-name-generator.cjs");
 
 //#region src/netlify-db/session.ts
 /**
@@ -20,45 +20,54 @@ function ensureWebSocket() {
 	if (_neondatabase_serverless.neonConfig.webSocketConstructor) return;
 	if (typeof WebSocket !== "undefined") _neondatabase_serverless.neonConfig.webSocketConstructor = WebSocket;
 }
-const queryConfig = {
-	arrayMode: true,
-	fullResults: true
-};
 var NetlifyDbSession = class extends __pg_core_async_session_ts.PgAsyncSession {
 	static [__entity_ts.entityKind] = "NetlifyDbSession";
 	clientQuery;
 	logger;
 	cache;
-	constructor(httpClient, pool, dialect, relations, schema, options = {}) {
+	constructor(httpClient, pool, dialect, relations, options) {
 		super(dialect);
 		this.httpClient = httpClient;
 		this.pool = pool;
 		this.relations = relations;
-		this.schema = schema;
 		this.options = options;
 		this.clientQuery = httpClient.query ?? httpClient;
 		this.logger = options.logger ?? new __logger_ts.NoopLogger();
 		this.cache = options.cache ?? new __cache_core_cache_ts.NoopCache();
 	}
-	prepareQuery(query, fields, name, isResponseInArrayMode, customResultMapper, queryMetadata, cacheConfig) {
-		return new __neon_http_session_ts.NeonHttpPreparedQuery(this.httpClient, query, this.logger, this.cache, queryMetadata, cacheConfig, fields, isResponseInArrayMode, customResultMapper);
-	}
-	prepareRelationalQuery(query, fields, name, customResultMapper) {
-		return new __neon_http_session_ts.NeonHttpPreparedQuery(this.httpClient, query, this.logger, this.cache, void 0, void 0, fields, false, customResultMapper, true);
+	prepareQuery(query, mode, _name, mapper, queryMetadata, cacheConfig) {
+		const executor = (params) => {
+			if (mode === "raw") return (async () => this.httpClient(query.sql, params, {
+				arrayMode: false,
+				fullResults: true,
+				authToken: this.options.authToken
+			}))();
+			return this.httpClient(query.sql, params, {
+				arrayMode: mode === "arrays",
+				fullResults: true,
+				authToken: this.options.authToken
+			}).then((it) => it.rows);
+		};
+		return new __pg_core_async_session_ts.PgAsyncPreparedQuery(executor, query, mapper, mode, this.logger, this.cache, queryMetadata, cacheConfig);
 	}
 	async batch(queries) {
 		const preparedQueries = [];
 		const builtQueries = [];
+		const q = this.httpClient;
 		for (const query of queries) {
 			const preparedQuery = query._prepare();
 			const builtQuery = preparedQuery.getQuery();
 			preparedQueries.push(preparedQuery);
-			builtQueries.push(this.clientQuery(builtQuery.sql, builtQuery.params, {
+			builtQueries.push(q(builtQuery.sql, builtQuery.params, {
 				fullResults: true,
-				arrayMode: preparedQuery.isResponseInArrayMode()
+				arrayMode: preparedQuery.mode === "arrays"
 			}));
 		}
-		return (await this.httpClient.transaction(builtQueries, queryConfig)).map((result, i) => preparedQueries[i].mapResult(result, true));
+		return (await this.httpClient.transaction(builtQueries, {
+			authToken: this.options.authToken,
+			fullResults: true,
+			arrayMode: true
+		})).map((result, i) => preparedQueries[i].mapper ? preparedQueries[i].mapper(result.rows) : result);
 	}
 	async query(query, params) {
 		this.logger.logQuery(query, params);
@@ -76,8 +85,12 @@ var NetlifyDbSession = class extends __pg_core_async_session_ts.PgAsyncSession {
 	async transaction(transaction, config = {}) {
 		ensureWebSocket();
 		const poolClient = await this.pool.connect();
-		const session = new NetlifyDbWsSession(poolClient, this.dialect, this.relations, this.schema, this.options);
-		const tx = new NetlifyDbTransaction(this.dialect, session, this.relations, this.schema);
+		const dialect = new __pg_core_dialect_ts.PgDialect({
+			casing: this.options.casing,
+			useJitMappers: this.options.useJitMapper,
+			codecs: this.options.transactionCodecs
+		});
+		const tx = new NetlifyDbTransaction(dialect, new NetlifyDbWsSession(poolClient, dialect, this.relations, this.options), this.relations, void 0, false);
 		await tx.execute(__sql_sql_ts.sql`begin ${tx.getTransactionConfigSQL(config)}`);
 		try {
 			const result = await transaction(tx);
@@ -91,6 +104,21 @@ var NetlifyDbSession = class extends __pg_core_async_session_ts.PgAsyncSession {
 		}
 	}
 };
+const noop = (val) => val;
+const typeConfig = { getTypeParser: ((typeId, format) => {
+	switch (typeId) {
+		case _neondatabase_serverless.types.builtins.TIMESTAMPTZ:
+		case _neondatabase_serverless.types.builtins.TIMESTAMP:
+		case _neondatabase_serverless.types.builtins.DATE:
+		case _neondatabase_serverless.types.builtins.INTERVAL:
+		case 1231:
+		case 1115:
+		case 1185:
+		case 1187:
+		case 1182: return noop;
+		default: return _neondatabase_serverless.types.getTypeParser(typeId, format);
+	}
+}) };
 /**
 * Internal WebSocket-based session used only within transactions.
 * Delegates all queries to a PoolClient over WebSocket, using
@@ -100,30 +128,24 @@ var NetlifyDbWsSession = class extends __pg_core_async_session_ts.PgAsyncSession
 	static [__entity_ts.entityKind] = "NetlifyDbWsSession";
 	logger;
 	cache;
-	constructor(client, dialect, relations, schema, options = {}) {
+	constructor(client, dialect, relations, options = {}) {
 		super(dialect);
 		this.client = client;
 		this.relations = relations;
-		this.schema = schema;
 		this.logger = options.logger ?? new __logger_ts.NoopLogger();
 		this.cache = options.cache ?? new __cache_core_cache_ts.NoopCache();
 	}
-	prepareQuery(query, fields, name, isResponseInArrayMode, customResultMapper, queryMetadata, cacheConfig) {
-		return new __neon_serverless_session_ts.NeonPreparedQuery(this.client, query, this.logger, this.cache, queryMetadata, cacheConfig, fields, name, isResponseInArrayMode, customResultMapper);
-	}
-	prepareRelationalQuery(query, fields, name, customResultMapper) {
-		return new __neon_serverless_session_ts.NeonPreparedQuery(this.client, query, this.logger, this.cache, void 0, void 0, fields, name, false, customResultMapper, true);
-	}
-	async query(query, params) {
-		this.logger.logQuery(query, params);
-		return await this.client.query({
-			rowMode: "array",
-			text: query,
-			values: params
-		});
-	}
-	async queryObjects(query, params) {
-		return this.client.query(query, params);
+	prepareQuery(query, mode, name, mapper, queryMetadata, cacheConfig) {
+		const queryName = typeof name === "string" ? name : name === true ? (0, __query_name_generator_ts.preparedStatementName)(query.sql, query.params) : void 0;
+		const executor = async (params) => {
+			return this.client.query({
+				name: queryName,
+				rowMode: mode === "arrays" ? "array" : void 0,
+				text: query.sql,
+				types: typeConfig
+			}, params).then((r) => mode === "raw" ? r : r.rows);
+		};
+		return new __pg_core_async_session_ts.PgAsyncPreparedQuery(executor, query, mapper, mode, this.logger, this.cache, queryMetadata, cacheConfig);
 	}
 	async transaction(_transaction, _config) {
 		throw new Error("Nested transactions are handled by NetlifyDbTransaction via savepoints");
@@ -131,9 +153,9 @@ var NetlifyDbWsSession = class extends __pg_core_async_session_ts.PgAsyncSession
 };
 var NetlifyDbTransaction = class NetlifyDbTransaction extends __pg_core_async_session_ts.PgAsyncTransaction {
 	static [__entity_ts.entityKind] = "NetlifyDbTransaction";
-	async transaction(transaction) {
+	transaction = async (transaction) => {
 		const savepointName = `sp${this.nestedIndex + 1}`;
-		const tx = new NetlifyDbTransaction(this.dialect, this.session, this.relations, this.schema, this.nestedIndex + 1);
+		const tx = new NetlifyDbTransaction(this.dialect, this.session, this._.relations, this.nestedIndex + 1, false);
 		await tx.execute(__sql_sql_ts.sql.raw(`savepoint ${savepointName}`));
 		try {
 			const result = await transaction(tx);
@@ -143,7 +165,7 @@ var NetlifyDbTransaction = class NetlifyDbTransaction extends __pg_core_async_se
 			await tx.execute(__sql_sql_ts.sql.raw(`rollback to savepoint ${savepointName}`));
 			throw e;
 		}
-	}
+	};
 };
 
 //#endregion

package/netlify-db/session.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"session.cjs","names":["neonConfig","PgAsyncSession","entityKind","NoopLogger","NoopCache","NeonHttpPreparedQuery","NeonPreparedQuery","PgAsyncTransaction","sql"],"sources":["../../src/netlify-db/session.ts"],"sourcesContent":["import type {\n\tFullQueryResults,\n\tNeonQueryPromise,\n\tPool,\n\tPoolClient,\n\tQueryResult,\n\tQueryResultRow,\n} from '@neondatabase/serverless';\nimport { neonConfig } from '@neondatabase/serverless';\nimport type * as V1 from '~/_relations.ts';\nimport type { BatchItem } from '~/batch.ts';\nimport type { Cache } from '~/cache/core/cache.ts';\nimport { NoopCache } from '~/cache/core/cache.ts';\nimport type { WithCacheConfig } from '~/cache/core/types.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { Logger } from '~/logger.ts';\nimport { NoopLogger } from '~/logger.ts';\nimport type { NeonHttpClient, NeonHttpQueryResultHKT, NeonHttpSessionOptions } from '~/neon-http/session.ts';\nimport { NeonHttpPreparedQuery } from '~/neon-http/session.ts';\nimport { NeonPreparedQuery } from '~/neon-serverless/session.ts';\nimport { type PgAsyncPreparedQuery, PgAsyncSession, PgAsyncTransaction } from '~/pg-core/async/session.ts';\nimport type { PgDialect } from '~/pg-core/dialect.ts';\nimport type { SelectedFieldsOrdered } from '~/pg-core/query-builders/select.types.ts';\nimport type { PgTransactionConfig, PreparedQueryConfig } from '~/pg-core/session.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport type { PreparedQuery } from '~/session.ts';\nimport type { Query } from '~/sql/sql.ts';\nimport { sql } from '~/sql/sql.ts';\n\n/**\n * Ensures a WebSocket implementation is available for Neon's\n * serverless driver. The Neon driver checks for a global WebSocket\n * automatically, but this sets it on neonConfig explicitly so the\n * check only happens once.\n */\nfunction ensureWebSocket(): void {\n\tif (neonConfig.webSocketConstructor) return;\n\n\tif (typeof WebSocket !== 'undefined') {\n\t\tneonConfig.webSocketConstructor = WebSocket as any;\n\t}\n}\n\nexport type NetlifyDbClient = {\n\thttp: NeonHttpClient;\n\tpool: Pool;\n};\n\nconst queryConfig = {\n\tarrayMode: true,\n\tfullResults: true,\n} as const;\n\nexport class NetlifyDbSession<\n\tTFullSchema extends Record<string, unknown>,\n\tTRelations extends AnyRelations,\n\tTSchema extends V1.TablesRelationalConfig,\n> extends PgAsyncSession<NeonHttpQueryResultHKT, TFullSchema, TRelations, TSchema> {\n\tstatic override readonly [entityKind]: string = 'NetlifyDbSession';\n\n\tprivate clientQuery: (sql: string, params: any[], opts: Record<string, any>) => NeonQueryPromise<any, any>;\n\tprivate logger: Logger;\n\tprivate cache: Cache;\n\n\tconstructor(\n\t\tprivate httpClient: NeonHttpClient,\n\t\tprivate pool: Pool,\n\t\tdialect: PgDialect,\n\t\tprivate relations: TRelations,\n\t\tprivate schema: V1.RelationalSchemaConfig<TSchema> | undefined,\n\t\tprivate options: NeonHttpSessionOptions = {},\n\t) {\n\t\tsuper(dialect);\n\t\t// `httpClient.query` is for @neondatabase/serverless v1.0.0 and up, where the\n\t\t// root query function `httpClient` is only usable as a template function;\n\t\t// `httpClient` is a fallback for earlier versions\n\t\tthis.clientQuery = (httpClient as any).query ?? httpClient as any;\n\t\tthis.logger = options.logger ?? new NoopLogger();\n\t\tthis.cache = options.cache ?? new NoopCache();\n\t}\n\n\tprepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(\n\t\tquery: Query,\n\t\tfields: SelectedFieldsOrdered | undefined,\n\t\tname: string | undefined,\n\t\tisResponseInArrayMode: boolean,\n\t\tcustomResultMapper?: (rows: unknown[][]) => T['execute'],\n\t\tqueryMetadata?: {\n\t\t\ttype: 'select' | 'update' | 'delete' | 'insert';\n\t\t\ttables: string[];\n\t\t},\n\t\tcacheConfig?: WithCacheConfig,\n\t): PgAsyncPreparedQuery<T> {\n\t\treturn new NeonHttpPreparedQuery(\n\t\t\tthis.httpClient,\n\t\t\tquery,\n\t\t\tthis.logger,\n\t\t\tthis.cache,\n\t\t\tqueryMetadata,\n\t\t\tcacheConfig,\n\t\t\tfields,\n\t\t\tisResponseInArrayMode,\n\t\t\tcustomResultMapper,\n\t\t);\n\t}\n\n\tprepareRelationalQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(\n\t\tquery: Query,\n\t\tfields: SelectedFieldsOrdered | undefined,\n\t\tname: string | undefined,\n\t\tcustomResultMapper: (rows: Record<string, unknown>[]) => T['execute'],\n\t): PgAsyncPreparedQuery<T> {\n\t\treturn new NeonHttpPreparedQuery(\n\t\t\tthis.httpClient,\n\t\t\tquery,\n\t\t\tthis.logger,\n\t\t\tthis.cache,\n\t\t\tundefined,\n\t\t\tundefined,\n\t\t\tfields,\n\t\t\tfalse,\n\t\t\tcustomResultMapper,\n\t\t\ttrue,\n\t\t);\n\t}\n\n\tasync batch<U extends BatchItem<'pg'>, T extends Readonly<[U, ...U[]]>>(\n\t\tqueries: T,\n\t) {\n\t\tconst preparedQueries: PreparedQuery[] = [];\n\t\tconst builtQueries: NeonQueryPromise<any, true>[] = [];\n\t\tfor (const query of queries) {\n\t\t\tconst preparedQuery = query._prepare();\n\t\t\tconst builtQuery = preparedQuery.getQuery();\n\t\t\tpreparedQueries.push(preparedQuery);\n\t\t\tbuiltQueries.push(\n\t\t\t\tthis.clientQuery(builtQuery.sql, builtQuery.params, {\n\t\t\t\t\tfullResults: true,\n\t\t\t\t\tarrayMode: preparedQuery.isResponseInArrayMode(),\n\t\t\t\t}),\n\t\t\t);\n\t\t}\n\n\t\tconst batchResults = await this.httpClient.transaction(builtQueries, queryConfig);\n\n\t\treturn batchResults.map((result, i) => preparedQueries[i]!.mapResult(result, true)) as any;\n\t}\n\n\tasync query(query: string, params: unknown[]): Promise<FullQueryResults<true>> {\n\t\tthis.logger.logQuery(query, params);\n\t\tconst result = await this.clientQuery(query, params, { arrayMode: true, fullResults: true });\n\t\treturn result;\n\t}\n\n\tasync queryObjects(\n\t\tquery: string,\n\t\tparams: unknown[],\n\t): Promise<FullQueryResults<false>> {\n\t\treturn this.clientQuery(query, params, { arrayMode: false, fullResults: true });\n\t}\n\n\toverride async transaction<T>(\n\t\ttransaction: (tx: NetlifyDbTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>,\n\t\tconfig: PgTransactionConfig = {},\n\t): Promise<T> {\n\t\tensureWebSocket();\n\t\tconst poolClient = await this.pool.connect();\n\t\tconst session = new NetlifyDbWsSession<TFullSchema, TRelations, TSchema>(\n\t\t\tpoolClient,\n\t\t\tthis.dialect,\n\t\t\tthis.relations,\n\t\t\tthis.schema,\n\t\t\tthis.options,\n\t\t);\n\t\tconst tx = new NetlifyDbTransaction<TFullSchema, TRelations, TSchema>(\n\t\t\tthis.dialect,\n\t\t\tsession,\n\t\t\tthis.relations,\n\t\t\tthis.schema,\n\t\t);\n\t\tawait tx.execute(sql`begin ${tx.getTransactionConfigSQL(config)}`);\n\t\ttry {\n\t\t\tconst result = await transaction(tx);\n\t\t\tawait tx.execute(sql`commit`);\n\t\t\treturn result;\n\t\t} catch (error) {\n\t\t\tawait tx.execute(sql`rollback`);\n\t\t\tthrow error;\n\t\t} finally {\n\t\t\tpoolClient.release();\n\t\t}\n\t}\n}\n\n/**\n * Internal WebSocket-based session used only within transactions.\n * Delegates all queries to a PoolClient over WebSocket, using\n * NeonPreparedQuery from the neon-serverless adapter.\n */\nexport class NetlifyDbWsSession<\n\tTFullSchema extends Record<string, unknown>,\n\tTRelations extends AnyRelations,\n\tTSchema extends V1.TablesRelationalConfig,\n> extends PgAsyncSession<NeonHttpQueryResultHKT, TFullSchema, TRelations, TSchema> {\n\tstatic override readonly [entityKind]: string = 'NetlifyDbWsSession';\n\n\tprivate logger: Logger;\n\tprivate cache: Cache;\n\n\tconstructor(\n\t\tprivate client: PoolClient,\n\t\tdialect: PgDialect,\n\t\tprivate relations: TRelations,\n\t\tprivate schema: V1.RelationalSchemaConfig<TSchema> | undefined,\n\t\toptions: NeonHttpSessionOptions = {},\n\t) {\n\t\tsuper(dialect);\n\t\tthis.logger = options.logger ?? new NoopLogger();\n\t\tthis.cache = options.cache ?? new NoopCache();\n\t}\n\n\tprepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(\n\t\tquery: Query,\n\t\tfields: SelectedFieldsOrdered | undefined,\n\t\tname: string | undefined,\n\t\tisResponseInArrayMode: boolean,\n\t\tcustomResultMapper?: (rows: unknown[][]) => T['execute'],\n\t\tqueryMetadata?: {\n\t\t\ttype: 'select' | 'update' | 'delete' | 'insert';\n\t\t\ttables: string[];\n\t\t},\n\t\tcacheConfig?: WithCacheConfig,\n\t): PgAsyncPreparedQuery<T> {\n\t\treturn new NeonPreparedQuery(\n\t\t\tthis.client,\n\t\t\tquery,\n\t\t\tthis.logger,\n\t\t\tthis.cache,\n\t\t\tqueryMetadata,\n\t\t\tcacheConfig,\n\t\t\tfields,\n\t\t\tname,\n\t\t\tisResponseInArrayMode,\n\t\t\tcustomResultMapper,\n\t\t);\n\t}\n\n\tprepareRelationalQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(\n\t\tquery: Query,\n\t\tfields: SelectedFieldsOrdered | undefined,\n\t\tname: string | undefined,\n\t\tcustomResultMapper?: (rows: Record<string, unknown>[]) => T['execute'],\n\t): PgAsyncPreparedQuery<T> {\n\t\treturn new NeonPreparedQuery(\n\t\t\tthis.client,\n\t\t\tquery,\n\t\t\tthis.logger,\n\t\t\tthis.cache,\n\t\t\tundefined,\n\t\t\tundefined,\n\t\t\tfields,\n\t\t\tname,\n\t\t\tfalse,\n\t\t\tcustomResultMapper,\n\t\t\ttrue,\n\t\t);\n\t}\n\n\tasync query(query: string, params: unknown[]): Promise<QueryResult> {\n\t\tthis.logger.logQuery(query, params);\n\t\tconst result = await this.client.query({\n\t\t\trowMode: 'array',\n\t\t\ttext: query,\n\t\t\tvalues: params,\n\t\t});\n\t\treturn result;\n\t}\n\n\tasync queryObjects<T extends QueryResultRow>(\n\t\tquery: string,\n\t\tparams: unknown[],\n\t): Promise<QueryResult<T>> {\n\t\treturn this.client.query<T>(query, params);\n\t}\n\n\toverride async transaction<T>(\n\t\t_transaction: (tx: NetlifyDbTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>,\n\t\t_config?: PgTransactionConfig,\n\t): Promise<T> {\n\t\tthrow new Error('Nested transactions are handled by NetlifyDbTransaction via savepoints');\n\t}\n}\n\nexport class NetlifyDbTransaction<\n\tTFullSchema extends Record<string, unknown>,\n\tTRelations extends AnyRelations,\n\tTSchema extends V1.TablesRelationalConfig,\n> extends PgAsyncTransaction<NeonHttpQueryResultHKT, TFullSchema, TRelations, TSchema> {\n\tstatic override readonly [entityKind]: string = 'NetlifyDbTransaction';\n\n\toverride async transaction<T>(\n\t\ttransaction: (tx: NetlifyDbTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>,\n\t): Promise<T> {\n\t\tconst savepointName = `sp${this.nestedIndex + 1}`;\n\t\tconst tx = new NetlifyDbTransaction<TFullSchema, TRelations, TSchema>(\n\t\t\tthis.dialect,\n\t\t\tthis.session,\n\t\t\tthis.relations,\n\t\t\tthis.schema,\n\t\t\tthis.nestedIndex + 1,\n\t\t);\n\t\tawait tx.execute(sql.raw(`savepoint ${savepointName}`));\n\t\ttry {\n\t\t\tconst result = await transaction(tx);\n\t\t\tawait tx.execute(sql.raw(`release savepoint ${savepointName}`));\n\t\t\treturn result;\n\t\t} catch (e) {\n\t\t\tawait tx.execute(sql.raw(`rollback to savepoint ${savepointName}`));\n\t\t\tthrow e;\n\t\t}\n\t}\n}\n"],"mappings":"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"}
+{"version":3,"file":"session.cjs","names":["neonConfig","PgAsyncSession","entityKind","NoopLogger","NoopCache","PgAsyncPreparedQuery","PgDialect","types","PgAsyncTransaction","sql"],"sources":["../../src/netlify-db/session.ts"],"sourcesContent":["import type { CustomTypesConfig, FullQueryResults, NeonQueryPromise, Pool, PoolClient } from '@neondatabase/serverless';\nimport { neonConfig, types } from '@neondatabase/serverless';\nimport type { BatchItem } from '~/batch.ts';\nimport type { Cache } from '~/cache/core/cache.ts';\nimport { NoopCache } from '~/cache/core/cache.ts';\nimport type { WithCacheConfig } from '~/cache/core/types.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { Logger } from '~/logger.ts';\nimport { NoopLogger } from '~/logger.ts';\nimport type { NeonHttpClient, NeonHttpQueryResultHKT, NeonHttpSessionOptions } from '~/neon-http/session.ts';\nimport { PgAsyncPreparedQuery, PgAsyncSession, PgAsyncTransaction } from '~/pg-core/async/session.ts';\nimport type { PgCodecs } from '~/pg-core/codecs.ts';\nimport { PgDialect } from '~/pg-core/dialect.ts';\nimport type { PgTransactionConfig, PreparedQueryConfig } from '~/pg-core/session.ts';\nimport { preparedStatementName } from '~/query-name-generator.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport type { Query } from '~/sql/sql.ts';\nimport { sql } from '~/sql/sql.ts';\nimport type { Casing } from '~/utils.ts';\n\n/**\n * Ensures a WebSocket implementation is available for Neon's\n * serverless driver. The Neon driver checks for a global WebSocket\n * automatically, but this sets it on neonConfig explicitly so the\n * check only happens once.\n */\nfunction ensureWebSocket(): void {\n\tif (neonConfig.webSocketConstructor) return;\n\n\tif (typeof WebSocket !== 'undefined') {\n\t\tneonConfig.webSocketConstructor = WebSocket as any;\n\t}\n}\n\nexport type NetlifyDbClient = {\n\thttp: NeonHttpClient;\n\tpool: Pool;\n};\n\nexport interface NetlifyDbSessionOptions extends NeonHttpSessionOptions {\n\tuseJitMappers?: boolean | undefined;\n\tcasing?: Casing | undefined;\n\ttransactionCodecs?: PgCodecs | undefined;\n}\n\nexport class NetlifyDbSession<TRelations extends AnyRelations>\n\textends PgAsyncSession<NeonHttpQueryResultHKT, TRelations>\n{\n\tstatic override readonly [entityKind]: string = 'NetlifyDbSession';\n\n\tprivate clientQuery: (sql: string, params: any[], opts: Record<string, any>) => NeonQueryPromise<any, any>;\n\tprivate logger: Logger;\n\tprivate cache: Cache;\n\n\tconstructor(\n\t\treadonly httpClient: NeonHttpClient,\n\t\treadonly pool: Pool,\n\t\tdialect: PgDialect,\n\t\tprivate relations: TRelations,\n\t\treadonly options: NetlifyDbSessionOptions,\n\t) {\n\t\tsuper(dialect);\n\t\t// `httpClient.query` is for @neondatabase/serverless v1.0.0 and up, where the\n\t\t// root query function `httpClient` is only usable as a template function;\n\t\t// `httpClient` is a fallback for earlier versions\n\t\tthis.clientQuery = (httpClient as any).query ?? httpClient as any;\n\t\tthis.logger = options.logger ?? new NoopLogger();\n\t\tthis.cache = options.cache ?? new NoopCache();\n\t}\n\n\tprepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(\n\t\tquery: Query,\n\t\tmode: 'arrays' | 'objects' | 'raw',\n\t\t_name: string | boolean,\n\t\tmapper: ((rows: any[]) => any) | undefined,\n\t\tqueryMetadata?: {\n\t\t\ttype: 'select' | 'update' | 'delete' | 'insert';\n\t\t\ttables: string[];\n\t\t},\n\t\tcacheConfig?: WithCacheConfig,\n\t): PgAsyncPreparedQuery<T> {\n\t\tconst executor = (params?: unknown[]) => {\n\t\t\tif (mode === 'raw') {\n\t\t\t\t// otherwise raw queries with .then crash due to .then not existing on raw mode queries\n\t\t\t\treturn (async () =>\n\t\t\t\t\tthis.httpClient(query.sql, params, {\n\t\t\t\t\t\tarrayMode: false,\n\t\t\t\t\t\tfullResults: true,\n\t\t\t\t\t\tauthToken: this.options.authToken,\n\t\t\t\t\t}))();\n\t\t\t}\n\n\t\t\treturn this.httpClient(query.sql, params, {\n\t\t\t\tarrayMode: mode === 'arrays',\n\t\t\t\tfullResults: true,\n\t\t\t\tauthToken: this.options.authToken,\n\t\t\t}).then((it: any) => it.rows);\n\t\t};\n\n\t\treturn new PgAsyncPreparedQuery(executor, query, mapper, mode, this.logger, this.cache, queryMetadata, cacheConfig);\n\t}\n\n\tasync batch<U extends BatchItem<'pg'>, T extends Readonly<[U, ...U[]]>>(queries: T) {\n\t\tconst preparedQueries: PgAsyncPreparedQuery<any>[] = [];\n\t\tconst builtQueries: NeonQueryPromise<any, true>[] = [];\n\t\tconst q = this.httpClient;\n\n\t\tfor (const query of queries) {\n\t\t\tconst preparedQuery = query._prepare() as PgAsyncPreparedQuery<any>;\n\t\t\tconst builtQuery = preparedQuery.getQuery();\n\t\t\tpreparedQueries.push(preparedQuery);\n\t\t\tbuiltQueries.push(\n\t\t\t\tq(builtQuery.sql, builtQuery.params, {\n\t\t\t\t\tfullResults: true,\n\t\t\t\t\tarrayMode: preparedQuery.mode === 'arrays',\n\t\t\t\t}),\n\t\t\t);\n\t\t}\n\n\t\tconst batchResults = await this.httpClient.transaction(builtQueries, {\n\t\t\tauthToken: this.options.authToken,\n\t\t\tfullResults: true,\n\t\t\tarrayMode: true,\n\t\t});\n\t\treturn batchResults.map((result, i) =>\n\t\t\tpreparedQueries[i]!.mapper ? preparedQueries[i]!.mapper(result.rows) : result\n\t\t) as any;\n\t}\n\n\tasync query(query: string, params: unknown[]): Promise<FullQueryResults<true>> {\n\t\tthis.logger.logQuery(query, params);\n\t\tconst result = await this.clientQuery(query, params, { arrayMode: true, fullResults: true });\n\t\treturn result;\n\t}\n\n\tasync queryObjects(\n\t\tquery: string,\n\t\tparams: unknown[],\n\t): Promise<FullQueryResults<false>> {\n\t\treturn this.clientQuery(query, params, { arrayMode: false, fullResults: true });\n\t}\n\n\toverride async transaction<T>(\n\t\ttransaction: (tx: NetlifyDbTransaction<TRelations>) => Promise<T>,\n\t\tconfig: PgTransactionConfig = {},\n\t): Promise<T> {\n\t\tensureWebSocket();\n\t\tconst poolClient = await this.pool.connect();\n\t\tconst dialect = new PgDialect({\n\t\t\tcasing: this.options.casing,\n\t\t\tuseJitMappers: this.options.useJitMapper,\n\t\t\tcodecs: this.options.transactionCodecs,\n\t\t});\n\t\tconst session = new NetlifyDbWsSession<TRelations>(\n\t\t\tpoolClient,\n\t\t\tdialect,\n\t\t\tthis.relations,\n\t\t\tthis.options,\n\t\t);\n\t\tconst tx = new NetlifyDbTransaction<TRelations>(\n\t\t\tdialect,\n\t\t\tsession,\n\t\t\tthis.relations,\n\t\t\tundefined,\n\t\t\tfalse,\n\t\t);\n\t\tawait tx.execute(sql`begin ${tx.getTransactionConfigSQL(config)}`);\n\t\ttry {\n\t\t\tconst result = await transaction(tx);\n\t\t\tawait tx.execute(sql`commit`);\n\t\t\treturn result;\n\t\t} catch (error) {\n\t\t\tawait tx.execute(sql`rollback`);\n\t\t\tthrow error;\n\t\t} finally {\n\t\t\tpoolClient.release();\n\t\t}\n\t}\n}\n\nconst noop = (val: any) => val;\nconst typeConfig: CustomTypesConfig = {\n\tgetTypeParser: <CustomTypesConfig['getTypeParser']> ((typeId, format) => {\n\t\tswitch (typeId as number) {\n\t\t\tcase types.builtins.TIMESTAMPTZ:\n\t\t\tcase types.builtins.TIMESTAMP:\n\t\t\tcase types.builtins.DATE:\n\t\t\tcase types.builtins.INTERVAL:\n\t\t\tcase 1231: // numeric[]\n\t\t\tcase 1115: // timestamp[]\n\t\t\tcase 1185: // timestamp with timezone[]\n\t\t\tcase 1187: // interval[]\n\t\t\tcase 1182: // date[]\n\t\t\t\treturn noop;\n\t\t\tdefault:\n\t\t\t\treturn types.getTypeParser(typeId, format as any);\n\t\t}\n\t}),\n};\n\n/**\n * Internal WebSocket-based session used only within transactions.\n * Delegates all queries to a PoolClient over WebSocket, using\n * NeonPreparedQuery from the neon-serverless adapter.\n */\nexport class NetlifyDbWsSession<TRelations extends AnyRelations>\n\textends PgAsyncSession<NeonHttpQueryResultHKT, TRelations>\n{\n\tstatic override readonly [entityKind]: string = 'NetlifyDbWsSession';\n\n\tprivate logger: Logger;\n\tprivate cache: Cache;\n\n\tconstructor(\n\t\tprivate client: PoolClient,\n\t\tdialect: PgDialect,\n\t\tprivate relations: TRelations,\n\t\toptions: NeonHttpSessionOptions = {},\n\t) {\n\t\tsuper(dialect);\n\t\tthis.logger = options.logger ?? new NoopLogger();\n\t\tthis.cache = options.cache ?? new NoopCache();\n\t}\n\n\tprepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(\n\t\tquery: Query,\n\t\tmode: 'arrays' | 'objects' | 'raw',\n\t\tname: string | boolean,\n\t\tmapper: ((rows: any[]) => any) | undefined,\n\t\tqueryMetadata?: {\n\t\t\ttype: 'select' | 'update' | 'delete' | 'insert';\n\t\t\ttables: string[];\n\t\t},\n\t\tcacheConfig?: WithCacheConfig,\n\t): PgAsyncPreparedQuery<T> {\n\t\tconst queryName = typeof name === 'string'\n\t\t\t? name\n\t\t\t: name === true\n\t\t\t? preparedStatementName(query.sql, query.params)\n\t\t\t: undefined;\n\n\t\tconst executor = async (params?: unknown[]) => {\n\t\t\treturn this.client.query({\n\t\t\t\tname: queryName,\n\t\t\t\trowMode: mode === 'arrays' ? 'array' : undefined as any,\n\t\t\t\ttext: query.sql,\n\t\t\t\ttypes: typeConfig,\n\t\t\t}, params).then((r) => mode === 'raw' ? r : r.rows);\n\t\t};\n\n\t\treturn new PgAsyncPreparedQuery<T>(\n\t\t\texecutor,\n\t\t\tquery,\n\t\t\tmapper,\n\t\t\tmode,\n\t\t\tthis.logger,\n\t\t\tthis.cache,\n\t\t\tqueryMetadata,\n\t\t\tcacheConfig,\n\t\t);\n\t}\n\toverride async transaction<T>(\n\t\t_transaction: (tx: NetlifyDbTransaction<TRelations>) => Promise<T>,\n\t\t_config?: PgTransactionConfig,\n\t): Promise<T> {\n\t\tthrow new Error('Nested transactions are handled by NetlifyDbTransaction via savepoints');\n\t}\n}\n\nexport class NetlifyDbTransaction<TRelations extends AnyRelations>\n\textends PgAsyncTransaction<NeonHttpQueryResultHKT, TRelations>\n{\n\tstatic override readonly [entityKind]: string = 'NetlifyDbTransaction';\n\n\toverride transaction = async <T>(\n\t\ttransaction: (tx: NetlifyDbTransaction<TRelations>) => Promise<T>,\n\t): Promise<T> => {\n\t\tconst savepointName = `sp${this.nestedIndex + 1}`;\n\t\tconst tx = new NetlifyDbTransaction<TRelations>(\n\t\t\tthis.dialect,\n\t\t\tthis.session,\n\t\t\tthis._.relations,\n\t\t\tthis.nestedIndex + 1,\n\t\t\tfalse,\n\t\t);\n\t\tawait tx.execute(sql.raw(`savepoint ${savepointName}`));\n\t\ttry {\n\t\t\tconst result = await transaction(tx);\n\t\t\tawait tx.execute(sql.raw(`release savepoint ${savepointName}`));\n\t\t\treturn result;\n\t\t} catch (e) {\n\t\t\tawait tx.execute(sql.raw(`rollback to savepoint ${savepointName}`));\n\t\t\tthrow e;\n\t\t}\n\t};\n}\n"],"mappings":"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"}

package/netlify-db/session.d.cts

@@ -1,14 +1,14 @@
 import { entityKind } from "../entity.cjs";
 import { Query } from "../sql/sql.cjs";
-import * as V1 from "../_relations.cjs";
+import { Casing } from "../utils.cjs";
 import { WithCacheConfig } from "../cache/core/types.cjs";
 import { AnyRelations } from "../relations.cjs";
 import { PgDialect } from "../pg-core/dialect.cjs";
 import { PgTransactionConfig, PreparedQueryConfig } from "../pg-core/session.cjs";
-import { SelectedFieldsOrdered } from "../pg-core/query-builders/select.types.cjs";
 import { PgAsyncPreparedQuery, PgAsyncSession, PgAsyncTransaction } from "../pg-core/async/session.cjs";
+import { PgCodecs } from "../pg-core/codecs.cjs";
 import { BatchItem } from "../batch.cjs";
-import { FullQueryResults, Pool, PoolClient, QueryResult, QueryResultRow } from "@neondatabase/serverless";
+import { FullQueryResults, Pool, PoolClient } from "@neondatabase/serverless";
 import { NeonHttpClient, NeonHttpQueryResultHKT, NeonHttpSessionOptions } from "../neon-http/session.cjs";
 
 //#region src/netlify-db/session.d.ts
@@ -16,53 +16,52 @@ type NetlifyDbClient = {
   http: NeonHttpClient;
   pool: Pool;
 };
-declare class NetlifyDbSession<TFullSchema extends Record<string, unknown>, TRelations extends AnyRelations, TSchema extends V1.TablesRelationalConfig> extends PgAsyncSession<NeonHttpQueryResultHKT, TFullSchema, TRelations, TSchema> {
-  private httpClient;
-  private pool;
+interface NetlifyDbSessionOptions extends NeonHttpSessionOptions {
+  useJitMappers?: boolean | undefined;
+  casing?: Casing | undefined;
+  transactionCodecs?: PgCodecs | undefined;
+}
+declare class NetlifyDbSession<TRelations extends AnyRelations> extends PgAsyncSession<NeonHttpQueryResultHKT, TRelations> {
+  readonly httpClient: NeonHttpClient;
+  readonly pool: Pool;
   private relations;
-  private schema;
-  private options;
+  readonly options: NetlifyDbSessionOptions;
   static readonly [entityKind]: string;
   private clientQuery;
   private logger;
   private cache;
-  constructor(httpClient: NeonHttpClient, pool: Pool, dialect: PgDialect, relations: TRelations, schema: V1.RelationalSchemaConfig<TSchema> | undefined, options?: NeonHttpSessionOptions);
-  prepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: Query, fields: SelectedFieldsOrdered | undefined, name: string | undefined, isResponseInArrayMode: boolean, customResultMapper?: (rows: unknown[][]) => T['execute'], queryMetadata?: {
+  constructor(httpClient: NeonHttpClient, pool: Pool, dialect: PgDialect, relations: TRelations, options: NetlifyDbSessionOptions);
+  prepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: Query, mode: 'arrays' | 'objects' | 'raw', _name: string | boolean, mapper: ((rows: any[]) => any) | undefined, queryMetadata?: {
     type: 'select' | 'update' | 'delete' | 'insert';
     tables: string[];
   }, cacheConfig?: WithCacheConfig): PgAsyncPreparedQuery<T>;
-  prepareRelationalQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: Query, fields: SelectedFieldsOrdered | undefined, name: string | undefined, customResultMapper: (rows: Record<string, unknown>[]) => T['execute']): PgAsyncPreparedQuery<T>;
   batch<U extends BatchItem<'pg'>, T extends Readonly<[U, ...U[]]>>(queries: T): Promise<any>;
   query(query: string, params: unknown[]): Promise<FullQueryResults<true>>;
   queryObjects(query: string, params: unknown[]): Promise<FullQueryResults<false>>;
-  transaction<T>(transaction: (tx: NetlifyDbTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>, config?: PgTransactionConfig): Promise<T>;
+  transaction<T>(transaction: (tx: NetlifyDbTransaction<TRelations>) => Promise<T>, config?: PgTransactionConfig): Promise<T>;
 }
 /**
  * Internal WebSocket-based session used only within transactions.
  * Delegates all queries to a PoolClient over WebSocket, using
  * NeonPreparedQuery from the neon-serverless adapter.
  */
-declare class NetlifyDbWsSession<TFullSchema extends Record<string, unknown>, TRelations extends AnyRelations, TSchema extends V1.TablesRelationalConfig> extends PgAsyncSession<NeonHttpQueryResultHKT, TFullSchema, TRelations, TSchema> {
+declare class NetlifyDbWsSession<TRelations extends AnyRelations> extends PgAsyncSession<NeonHttpQueryResultHKT, TRelations> {
   private client;
   private relations;
-  private schema;
   static readonly [entityKind]: string;
   private logger;
   private cache;
-  constructor(client: PoolClient, dialect: PgDialect, relations: TRelations, schema: V1.RelationalSchemaConfig<TSchema> | undefined, options?: NeonHttpSessionOptions);
-  prepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: Query, fields: SelectedFieldsOrdered | undefined, name: string | undefined, isResponseInArrayMode: boolean, customResultMapper?: (rows: unknown[][]) => T['execute'], queryMetadata?: {
+  constructor(client: PoolClient, dialect: PgDialect, relations: TRelations, options?: NeonHttpSessionOptions);
+  prepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: Query, mode: 'arrays' | 'objects' | 'raw', name: string | boolean, mapper: ((rows: any[]) => any) | undefined, queryMetadata?: {
     type: 'select' | 'update' | 'delete' | 'insert';
     tables: string[];
   }, cacheConfig?: WithCacheConfig): PgAsyncPreparedQuery<T>;
-  prepareRelationalQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: Query, fields: SelectedFieldsOrdered | undefined, name: string | undefined, customResultMapper?: (rows: Record<string, unknown>[]) => T['execute']): PgAsyncPreparedQuery<T>;
-  query(query: string, params: unknown[]): Promise<QueryResult>;
-  queryObjects<T extends QueryResultRow>(query: string, params: unknown[]): Promise<QueryResult<T>>;
-  transaction<T>(_transaction: (tx: NetlifyDbTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>, _config?: PgTransactionConfig): Promise<T>;
+  transaction<T>(_transaction: (tx: NetlifyDbTransaction<TRelations>) => Promise<T>, _config?: PgTransactionConfig): Promise<T>;
 }
-declare class NetlifyDbTransaction<TFullSchema extends Record<string, unknown>, TRelations extends AnyRelations, TSchema extends V1.TablesRelationalConfig> extends PgAsyncTransaction<NeonHttpQueryResultHKT, TFullSchema, TRelations, TSchema> {
+declare class NetlifyDbTransaction<TRelations extends AnyRelations> extends PgAsyncTransaction<NeonHttpQueryResultHKT, TRelations> {
   static readonly [entityKind]: string;
-  transaction<T>(transaction: (tx: NetlifyDbTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>): Promise<T>;
+  transaction: <T>(transaction: (tx: NetlifyDbTransaction<TRelations>) => Promise<T>) => Promise<T>;
 }
 //#endregion
-export { NetlifyDbClient, NetlifyDbSession, NetlifyDbTransaction, NetlifyDbWsSession };
+export { NetlifyDbClient, NetlifyDbSession, NetlifyDbSessionOptions, NetlifyDbTransaction, NetlifyDbWsSession };
 //# sourceMappingURL=session.d.cts.map

package/netlify-db/session.d.ts

@@ -1,68 +1,67 @@
 import { entityKind } from "../entity.js";
+import { Casing } from "../utils.js";
 import { Query } from "../sql/sql.js";
-import * as V1 from "../_relations.js";
+import { PgCodecs } from "../pg-core/codecs.js";
 import { PgDialect } from "../pg-core/dialect.js";
 import { PgAsyncPreparedQuery, PgAsyncSession, PgAsyncTransaction } from "../pg-core/async/session.js";
-import { FullQueryResults, Pool, PoolClient, QueryResult, QueryResultRow } from "@neondatabase/serverless";
 import { AnyRelations } from "../relations.js";
-import { NeonHttpClient, NeonHttpQueryResultHKT, NeonHttpSessionOptions } from "../neon-http/session.js";
+import { FullQueryResults, Pool, PoolClient } from "@neondatabase/serverless";
 import { WithCacheConfig } from "../cache/core/types.js";
 import { PgTransactionConfig, PreparedQueryConfig } from "../pg-core/session.js";
-import { SelectedFieldsOrdered } from "../pg-core/query-builders/select.types.js";
 import { BatchItem } from "../batch.js";
+import { NeonHttpClient, NeonHttpQueryResultHKT, NeonHttpSessionOptions } from "../neon-http/session.js";
 
 //#region src/netlify-db/session.d.ts
 type NetlifyDbClient = {
   http: NeonHttpClient;
   pool: Pool;
 };
-declare class NetlifyDbSession<TFullSchema extends Record<string, unknown>, TRelations extends AnyRelations, TSchema extends V1.TablesRelationalConfig> extends PgAsyncSession<NeonHttpQueryResultHKT, TFullSchema, TRelations, TSchema> {
-  private httpClient;
-  private pool;
+interface NetlifyDbSessionOptions extends NeonHttpSessionOptions {
+  useJitMappers?: boolean | undefined;
+  casing?: Casing | undefined;
+  transactionCodecs?: PgCodecs | undefined;
+}
+declare class NetlifyDbSession<TRelations extends AnyRelations> extends PgAsyncSession<NeonHttpQueryResultHKT, TRelations> {
+  readonly httpClient: NeonHttpClient;
+  readonly pool: Pool;
   private relations;
-  private schema;
-  private options;
+  readonly options: NetlifyDbSessionOptions;
   static readonly [entityKind]: string;
   private clientQuery;
   private logger;
   private cache;
-  constructor(httpClient: NeonHttpClient, pool: Pool, dialect: PgDialect, relations: TRelations, schema: V1.RelationalSchemaConfig<TSchema> | undefined, options?: NeonHttpSessionOptions);
-  prepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: Query, fields: SelectedFieldsOrdered | undefined, name: string | undefined, isResponseInArrayMode: boolean, customResultMapper?: (rows: unknown[][]) => T['execute'], queryMetadata?: {
+  constructor(httpClient: NeonHttpClient, pool: Pool, dialect: PgDialect, relations: TRelations, options: NetlifyDbSessionOptions);
+  prepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: Query, mode: 'arrays' | 'objects' | 'raw', _name: string | boolean, mapper: ((rows: any[]) => any) | undefined, queryMetadata?: {
     type: 'select' | 'update' | 'delete' | 'insert';
     tables: string[];
   }, cacheConfig?: WithCacheConfig): PgAsyncPreparedQuery<T>;
-  prepareRelationalQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: Query, fields: SelectedFieldsOrdered | undefined, name: string | undefined, customResultMapper: (rows: Record<string, unknown>[]) => T['execute']): PgAsyncPreparedQuery<T>;
   batch<U extends BatchItem<'pg'>, T extends Readonly<[U, ...U[]]>>(queries: T): Promise<any>;
   query(query: string, params: unknown[]): Promise<FullQueryResults<true>>;
   queryObjects(query: string, params: unknown[]): Promise<FullQueryResults<false>>;
-  transaction<T>(transaction: (tx: NetlifyDbTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>, config?: PgTransactionConfig): Promise<T>;
+  transaction<T>(transaction: (tx: NetlifyDbTransaction<TRelations>) => Promise<T>, config?: PgTransactionConfig): Promise<T>;
 }
 /**
  * Internal WebSocket-based session used only within transactions.
  * Delegates all queries to a PoolClient over WebSocket, using
  * NeonPreparedQuery from the neon-serverless adapter.
  */
-declare class NetlifyDbWsSession<TFullSchema extends Record<string, unknown>, TRelations extends AnyRelations, TSchema extends V1.TablesRelationalConfig> extends PgAsyncSession<NeonHttpQueryResultHKT, TFullSchema, TRelations, TSchema> {
+declare class NetlifyDbWsSession<TRelations extends AnyRelations> extends PgAsyncSession<NeonHttpQueryResultHKT, TRelations> {
   private client;
   private relations;
-  private schema;
   static readonly [entityKind]: string;
   private logger;
   private cache;
-  constructor(client: PoolClient, dialect: PgDialect, relations: TRelations, schema: V1.RelationalSchemaConfig<TSchema> | undefined, options?: NeonHttpSessionOptions);
-  prepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: Query, fields: SelectedFieldsOrdered | undefined, name: string | undefined, isResponseInArrayMode: boolean, customResultMapper?: (rows: unknown[][]) => T['execute'], queryMetadata?: {
+  constructor(client: PoolClient, dialect: PgDialect, relations: TRelations, options?: NeonHttpSessionOptions);
+  prepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: Query, mode: 'arrays' | 'objects' | 'raw', name: string | boolean, mapper: ((rows: any[]) => any) | undefined, queryMetadata?: {
     type: 'select' | 'update' | 'delete' | 'insert';
     tables: string[];
   }, cacheConfig?: WithCacheConfig): PgAsyncPreparedQuery<T>;
-  prepareRelationalQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: Query, fields: SelectedFieldsOrdered | undefined, name: string | undefined, customResultMapper?: (rows: Record<string, unknown>[]) => T['execute']): PgAsyncPreparedQuery<T>;
-  query(query: string, params: unknown[]): Promise<QueryResult>;
-  queryObjects<T extends QueryResultRow>(query: string, params: unknown[]): Promise<QueryResult<T>>;
-  transaction<T>(_transaction: (tx: NetlifyDbTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>, _config?: PgTransactionConfig): Promise<T>;
+  transaction<T>(_transaction: (tx: NetlifyDbTransaction<TRelations>) => Promise<T>, _config?: PgTransactionConfig): Promise<T>;
 }
-declare class NetlifyDbTransaction<TFullSchema extends Record<string, unknown>, TRelations extends AnyRelations, TSchema extends V1.TablesRelationalConfig> extends PgAsyncTransaction<NeonHttpQueryResultHKT, TFullSchema, TRelations, TSchema> {
+declare class NetlifyDbTransaction<TRelations extends AnyRelations> extends PgAsyncTransaction<NeonHttpQueryResultHKT, TRelations> {
   static readonly [entityKind]: string;
-  transaction<T>(transaction: (tx: NetlifyDbTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>): Promise<T>;
+  transaction: <T>(transaction: (tx: NetlifyDbTransaction<TRelations>) => Promise<T>) => Promise<T>;
 }
 //#endregion
-export { NetlifyDbClient, NetlifyDbSession, NetlifyDbTransaction, NetlifyDbWsSession };
+export { NetlifyDbClient, NetlifyDbSession, NetlifyDbSessionOptions, NetlifyDbTransaction, NetlifyDbWsSession };
 //# sourceMappingURL=session.d.ts.map

package/netlify-db/session.js

@@ -1,11 +1,11 @@
 import { entityKind } from "../entity.js";
 import { sql } from "../sql/sql.js";
 import { NoopLogger } from "../logger.js";
-import { PgAsyncSession, PgAsyncTransaction } from "../pg-core/async/session.js";
+import { PgDialect } from "../pg-core/dialect.js";
+import { PgAsyncPreparedQuery, PgAsyncSession, PgAsyncTransaction } from "../pg-core/async/session.js";
 import { NoopCache } from "../cache/core/cache.js";
-import { neonConfig } from "@neondatabase/serverless";
-import { NeonHttpPreparedQuery } from "../neon-http/session.js";
-import { NeonPreparedQuery } from "../neon-serverless/session.js";
+import { neonConfig, types } from "@neondatabase/serverless";
+import { preparedStatementName } from "../query-name-generator.js";
 
 //#region src/netlify-db/session.ts
 /**
@@ -18,45 +18,54 @@ function ensureWebSocket() {
 	if (neonConfig.webSocketConstructor) return;
 	if (typeof WebSocket !== "undefined") neonConfig.webSocketConstructor = WebSocket;
 }
-const queryConfig = {
-	arrayMode: true,
-	fullResults: true
-};
 var NetlifyDbSession = class extends PgAsyncSession {
 	static [entityKind] = "NetlifyDbSession";
 	clientQuery;
 	logger;
 	cache;
-	constructor(httpClient, pool, dialect, relations, schema, options = {}) {
+	constructor(httpClient, pool, dialect, relations, options) {
 		super(dialect);
 		this.httpClient = httpClient;
 		this.pool = pool;
 		this.relations = relations;
-		this.schema = schema;
 		this.options = options;
 		this.clientQuery = httpClient.query ?? httpClient;
 		this.logger = options.logger ?? new NoopLogger();
 		this.cache = options.cache ?? new NoopCache();
 	}
-	prepareQuery(query, fields, name, isResponseInArrayMode, customResultMapper, queryMetadata, cacheConfig) {
-		return new NeonHttpPreparedQuery(this.httpClient, query, this.logger, this.cache, queryMetadata, cacheConfig, fields, isResponseInArrayMode, customResultMapper);
-	}
-	prepareRelationalQuery(query, fields, name, customResultMapper) {
-		return new NeonHttpPreparedQuery(this.httpClient, query, this.logger, this.cache, void 0, void 0, fields, false, customResultMapper, true);
+	prepareQuery(query, mode, _name, mapper, queryMetadata, cacheConfig) {
+		const executor = (params) => {
+			if (mode === "raw") return (async () => this.httpClient(query.sql, params, {
+				arrayMode: false,
+				fullResults: true,
+				authToken: this.options.authToken
+			}))();
+			return this.httpClient(query.sql, params, {
+				arrayMode: mode === "arrays",
+				fullResults: true,
+				authToken: this.options.authToken
+			}).then((it) => it.rows);
+		};
+		return new PgAsyncPreparedQuery(executor, query, mapper, mode, this.logger, this.cache, queryMetadata, cacheConfig);
 	}
 	async batch(queries) {
 		const preparedQueries = [];
 		const builtQueries = [];
+		const q = this.httpClient;
 		for (const query of queries) {
 			const preparedQuery = query._prepare();
 			const builtQuery = preparedQuery.getQuery();
 			preparedQueries.push(preparedQuery);
-			builtQueries.push(this.clientQuery(builtQuery.sql, builtQuery.params, {
+			builtQueries.push(q(builtQuery.sql, builtQuery.params, {
 				fullResults: true,
-				arrayMode: preparedQuery.isResponseInArrayMode()
+				arrayMode: preparedQuery.mode === "arrays"
 			}));
 		}
-		return (await this.httpClient.transaction(builtQueries, queryConfig)).map((result, i) => preparedQueries[i].mapResult(result, true));
+		return (await this.httpClient.transaction(builtQueries, {
+			authToken: this.options.authToken,
+			fullResults: true,
+			arrayMode: true
+		})).map((result, i) => preparedQueries[i].mapper ? preparedQueries[i].mapper(result.rows) : result);
 	}
 	async query(query, params) {
 		this.logger.logQuery(query, params);
@@ -74,8 +83,12 @@ var NetlifyDbSession = class extends PgAsyncSession {
 	async transaction(transaction, config = {}) {
 		ensureWebSocket();
 		const poolClient = await this.pool.connect();
-		const session = new NetlifyDbWsSession(poolClient, this.dialect, this.relations, this.schema, this.options);
-		const tx = new NetlifyDbTransaction(this.dialect, session, this.relations, this.schema);
+		const dialect = new PgDialect({
+			casing: this.options.casing,
+			useJitMappers: this.options.useJitMapper,
+			codecs: this.options.transactionCodecs
+		});
+		const tx = new NetlifyDbTransaction(dialect, new NetlifyDbWsSession(poolClient, dialect, this.relations, this.options), this.relations, void 0, false);
 		await tx.execute(sql`begin ${tx.getTransactionConfigSQL(config)}`);
 		try {
 			const result = await transaction(tx);
@@ -89,6 +102,21 @@ var NetlifyDbSession = class extends PgAsyncSession {
 		}
 	}
 };
+const noop = (val) => val;
+const typeConfig = { getTypeParser: ((typeId, format) => {
+	switch (typeId) {
+		case types.builtins.TIMESTAMPTZ:
+		case types.builtins.TIMESTAMP:
+		case types.builtins.DATE:
+		case types.builtins.INTERVAL:
+		case 1231:
+		case 1115:
+		case 1185:
+		case 1187:
+		case 1182: return noop;
+		default: return types.getTypeParser(typeId, format);
+	}
+}) };
 /**
 * Internal WebSocket-based session used only within transactions.
 * Delegates all queries to a PoolClient over WebSocket, using
@@ -98,30 +126,24 @@ var NetlifyDbWsSession = class extends PgAsyncSession {
 	static [entityKind] = "NetlifyDbWsSession";
 	logger;
 	cache;
-	constructor(client, dialect, relations, schema, options = {}) {
+	constructor(client, dialect, relations, options = {}) {
 		super(dialect);
 		this.client = client;
 		this.relations = relations;
-		this.schema = schema;
 		this.logger = options.logger ?? new NoopLogger();
 		this.cache = options.cache ?? new NoopCache();
 	}
-	prepareQuery(query, fields, name, isResponseInArrayMode, customResultMapper, queryMetadata, cacheConfig) {
-		return new NeonPreparedQuery(this.client, query, this.logger, this.cache, queryMetadata, cacheConfig, fields, name, isResponseInArrayMode, customResultMapper);
-	}
-	prepareRelationalQuery(query, fields, name, customResultMapper) {
-		return new NeonPreparedQuery(this.client, query, this.logger, this.cache, void 0, void 0, fields, name, false, customResultMapper, true);
-	}
-	async query(query, params) {
-		this.logger.logQuery(query, params);
-		return await this.client.query({
-			rowMode: "array",
-			text: query,
-			values: params
-		});
-	}
-	async queryObjects(query, params) {
-		return this.client.query(query, params);
+	prepareQuery(query, mode, name, mapper, queryMetadata, cacheConfig) {
+		const queryName = typeof name === "string" ? name : name === true ? preparedStatementName(query.sql, query.params) : void 0;
+		const executor = async (params) => {
+			return this.client.query({
+				name: queryName,
+				rowMode: mode === "arrays" ? "array" : void 0,
+				text: query.sql,
+				types: typeConfig
+			}, params).then((r) => mode === "raw" ? r : r.rows);
+		};
+		return new PgAsyncPreparedQuery(executor, query, mapper, mode, this.logger, this.cache, queryMetadata, cacheConfig);
 	}
 	async transaction(_transaction, _config) {
 		throw new Error("Nested transactions are handled by NetlifyDbTransaction via savepoints");
@@ -129,9 +151,9 @@ var NetlifyDbWsSession = class extends PgAsyncSession {
 };
 var NetlifyDbTransaction = class NetlifyDbTransaction extends PgAsyncTransaction {
 	static [entityKind] = "NetlifyDbTransaction";
-	async transaction(transaction) {
+	transaction = async (transaction) => {
 		const savepointName = `sp${this.nestedIndex + 1}`;
-		const tx = new NetlifyDbTransaction(this.dialect, this.session, this.relations, this.schema, this.nestedIndex + 1);
+		const tx = new NetlifyDbTransaction(this.dialect, this.session, this._.relations, this.nestedIndex + 1, false);
 		await tx.execute(sql.raw(`savepoint ${savepointName}`));
 		try {
 			const result = await transaction(tx);
@@ -141,7 +163,7 @@ var NetlifyDbTransaction = class NetlifyDbTransaction extends PgAsyncTransaction
 			await tx.execute(sql.raw(`rollback to savepoint ${savepointName}`));
 			throw e;
 		}
-	}
+	};
 };
 
 //#endregion