drizzle-orm 1.0.0-beta.20-afec359 → 1.0.0-beta.21

package/neon-http/migrator.js.map

@@ -1 +1 @@
-{"version":3,"file":"migrator.js","names":[],"sources":["../../src/neon-http/migrator.ts"],"sourcesContent":["import type { MigrationConfig, MigratorInitFailResponse } from '~/migrator.ts';\nimport { readMigrationFiles } from '~/migrator.ts';\nimport { getMigrationsToRun } from '~/migrator.utils.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport { type SQL, sql } from '~/sql/sql.ts';\nimport { upgradeIfNeeded } from '~/up-migrations/pg.ts';\nimport type { NeonHttpDatabase } from './driver.ts';\n\n/**\n * This function reads migrationFolder and execute each unapplied migration and mark it as executed in database\n *\n * NOTE: The Neon HTTP driver does not support transactions. This means that if any part of a migration fails,\n * no rollback will be executed. Currently, you will need to handle unsuccessful migration yourself.\n * @param db - drizzle db instance\n * @param config - path to migration folder generated by drizzle-kit\n */\nexport async function migrate<TRelations extends AnyRelations>(\n\tdb: NeonHttpDatabase<TRelations>,\n\tconfig: MigrationConfig,\n): Promise<void | MigratorInitFailResponse> {\n\tconst migrations = readMigrationFiles(config);\n\tconst migrationsTable = config.migrationsTable ?? '__drizzle_migrations';\n\tconst migrationsSchema = config.migrationsSchema ?? 'drizzle';\n\n\tawait db.session.execute(sql`CREATE SCHEMA IF NOT EXISTS ${sql.identifier(migrationsSchema)}`);\n\n\tconst { newDb } = await upgradeIfNeeded(migrationsSchema, migrationsTable, db, migrations, 'batch');\n\n\tif (newDb) {\n\t\tconst migrationTableCreate = sql`\n\t\tCREATE TABLE IF NOT EXISTS ${sql.identifier(migrationsSchema)}.${sql.identifier(migrationsTable)} (\n\t\t\tid SERIAL PRIMARY KEY,\n\t\t\thash text NOT NULL,\n\t\t\tcreated_at bigint,\n\t\t\tname text,\n\t\t\tapplied_at timestamp with time zone DEFAULT now()\n\t\t)\n\t`;\n\n\t\tawait db.session.execute(migrationTableCreate);\n\t}\n\n\tconst dbMigrations = await db.session.objects<{ id: number; hash: string; created_at: string; name: string | null }>(\n\t\tsql`select id, hash, created_at, name from ${sql.identifier(migrationsSchema)}.${sql.identifier(migrationsTable)} `,\n\t);\n\n\tif (typeof config === 'object' && config.init) {\n\t\tif (dbMigrations.length) {\n\t\t\treturn { exitCode: 'databaseMigrations' as const };\n\t\t}\n\n\t\tif (migrations.length > 1) {\n\t\t\treturn { exitCode: 'localMigrations' as const };\n\t\t}\n\n\t\tconst [migration] = migrations;\n\n\t\tif (!migration) return;\n\n\t\tawait db.session.execute(\n\t\t\tsql`insert into ${sql.identifier(migrationsSchema)}.${\n\t\t\t\tsql.identifier(migrationsTable)\n\t\t\t} (\"hash\", \"created_at\", \"name\") values(${migration.hash}, ${migration.folderMillis}, ${migration.name})`,\n\t\t);\n\n\t\treturn;\n\t}\n\n\tconst migrationsToRun = getMigrationsToRun({ localMigrations: migrations, dbMigrations });\n\tconst rowsToInsert: SQL[] = [];\n\tfor await (const migration of migrationsToRun) {\n\t\tfor (const stmt of migration.sql) {\n\t\t\tawait db.session.execute(sql.raw(stmt));\n\t\t}\n\n\t\trowsToInsert.push(\n\t\t\tsql`insert into ${sql.identifier(migrationsSchema)}.${\n\t\t\t\tsql.identifier(migrationsTable)\n\t\t\t} (\"hash\", \"created_at\", \"name\") values(${migration.hash}, ${migration.folderMillis}, ${migration.name})`,\n\t\t);\n\t}\n\n\tfor await (const rowToInsert of rowsToInsert) {\n\t\tawait db.session.execute(rowToInsert);\n\t}\n}\n"],"mappings":";;;;;;;;;;;;;;AAgBA,eAAsB,QACrB,IACA,QAC2C;CAC3C,MAAM,aAAa,mBAAmB,OAAO;CAC7C,MAAM,kBAAkB,OAAO,mBAAmB;CAClD,MAAM,mBAAmB,OAAO,oBAAoB;AAEpD,OAAM,GAAG,QAAQ,QAAQ,GAAG,+BAA+B,IAAI,WAAW,iBAAiB,GAAG;CAE9F,MAAM,EAAE,UAAU,MAAM,gBAAgB,kBAAkB,iBAAiB,IAAI,YAAY,QAAQ;AAEnG,KAAI,OAAO;EACV,MAAM,uBAAuB,GAAG;+BACH,IAAI,WAAW,iBAAiB,CAAC,GAAG,IAAI,WAAW,gBAAgB,CAAC;;;;;;;;AASjG,QAAM,GAAG,QAAQ,QAAQ,qBAAqB;;CAG/C,MAAM,eAAe,MAAM,GAAG,QAAQ,QACrC,GAAG,0CAA0C,IAAI,WAAW,iBAAiB,CAAC,GAAG,IAAI,WAAW,gBAAgB,CAAC,GACjH;AAED,KAAI,OAAO,WAAW,YAAY,OAAO,MAAM;AAC9C,MAAI,aAAa,OAChB,QAAO,EAAE,UAAU,sBAA+B;AAGnD,MAAI,WAAW,SAAS,EACvB,QAAO,EAAE,UAAU,mBAA4B;EAGhD,MAAM,CAAC,aAAa;AAEpB,MAAI,CAAC,UAAW;AAEhB,QAAM,GAAG,QAAQ,QAChB,GAAG,eAAe,IAAI,WAAW,iBAAiB,CAAC,GAClD,IAAI,WAAW,gBAAgB,CAC/B,yCAAyC,UAAU,KAAK,IAAI,UAAU,aAAa,IAAI,UAAU,KAAK,GACvG;AAED;;CAGD,MAAM,kBAAkB,mBAAmB;EAAE,iBAAiB;EAAY;EAAc,CAAC;CACzF,MAAM,eAAsB,EAAE;AAC9B,YAAW,MAAM,aAAa,iBAAiB;AAC9C,OAAK,MAAM,QAAQ,UAAU,IAC5B,OAAM,GAAG,QAAQ,QAAQ,IAAI,IAAI,KAAK,CAAC;AAGxC,eAAa,KACZ,GAAG,eAAe,IAAI,WAAW,iBAAiB,CAAC,GAClD,IAAI,WAAW,gBAAgB,CAC/B,yCAAyC,UAAU,KAAK,IAAI,UAAU,aAAa,IAAI,UAAU,KAAK,GACvG;;AAGF,YAAW,MAAM,eAAe,aAC/B,OAAM,GAAG,QAAQ,QAAQ,YAAY"}
+{"version":3,"file":"migrator.js","names":[],"sources":["../../src/neon-http/migrator.ts"],"sourcesContent":["import type { MigrationConfig, MigratorInitFailResponse } from '~/migrator.ts';\nimport { readMigrationFiles } from '~/migrator.ts';\nimport { getMigrationsToRun } from '~/migrator.utils.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport { type SQL, sql } from '~/sql/sql.ts';\nimport { upgradeIfNeeded } from '~/up-migrations/pg.ts';\nimport type { NeonHttpDatabase } from './driver.ts';\n\n/**\n * This function reads migrationFolder and execute each unapplied migration and mark it as executed in database\n *\n * NOTE: The Neon HTTP driver does not support transactions. This means that if any part of a migration fails,\n * no rollback will be executed. Currently, you will need to handle unsuccessful migration yourself.\n * @param db - drizzle db instance\n * @param config - path to migration folder generated by drizzle-kit\n */\nexport async function migrate<TSchema extends Record<string, unknown>, TRelations extends AnyRelations>(\n\tdb: NeonHttpDatabase<TSchema, TRelations>,\n\tconfig: MigrationConfig,\n): Promise<void | MigratorInitFailResponse> {\n\tconst migrations = readMigrationFiles(config);\n\tconst migrationsTable = config.migrationsTable ?? '__drizzle_migrations';\n\tconst migrationsSchema = config.migrationsSchema ?? 'drizzle';\n\n\tawait db.session.execute(sql`CREATE SCHEMA IF NOT EXISTS ${sql.identifier(migrationsSchema)}`);\n\n\tconst { newDb } = await upgradeIfNeeded(migrationsSchema, migrationsTable, db, migrations, 'batch');\n\n\tif (newDb) {\n\t\tconst migrationTableCreate = sql`\n\t\tCREATE TABLE IF NOT EXISTS ${sql.identifier(migrationsSchema)}.${sql.identifier(migrationsTable)} (\n\t\t\tid SERIAL PRIMARY KEY,\n\t\t\thash text NOT NULL,\n\t\t\tcreated_at bigint,\n\t\t\tname text,\n\t\t\tapplied_at timestamp with time zone DEFAULT now()\n\t\t)\n\t`;\n\n\t\tawait db.session.execute(migrationTableCreate);\n\t}\n\n\tconst dbMigrations = await db.session.all<{ id: number; hash: string; created_at: string; name: string | null }>(\n\t\tsql`select id, hash, created_at, name from ${sql.identifier(migrationsSchema)}.${sql.identifier(migrationsTable)} `,\n\t);\n\n\tif (typeof config === 'object' && config.init) {\n\t\tif (dbMigrations.length) {\n\t\t\treturn { exitCode: 'databaseMigrations' as const };\n\t\t}\n\n\t\tif (migrations.length > 1) {\n\t\t\treturn { exitCode: 'localMigrations' as const };\n\t\t}\n\n\t\tconst [migration] = migrations;\n\n\t\tif (!migration) return;\n\n\t\tawait db.session.execute(\n\t\t\tsql`insert into ${sql.identifier(migrationsSchema)}.${\n\t\t\t\tsql.identifier(migrationsTable)\n\t\t\t} (\"hash\", \"created_at\", \"name\") values(${migration.hash}, ${migration.folderMillis}, ${migration.name})`,\n\t\t);\n\n\t\treturn;\n\t}\n\n\tconst migrationsToRun = getMigrationsToRun({ localMigrations: migrations, dbMigrations });\n\tconst rowsToInsert: SQL[] = [];\n\tfor await (const migration of migrationsToRun) {\n\t\tfor (const stmt of migration.sql) {\n\t\t\tawait db.session.execute(sql.raw(stmt));\n\t\t}\n\n\t\trowsToInsert.push(\n\t\t\tsql`insert into ${sql.identifier(migrationsSchema)}.${\n\t\t\t\tsql.identifier(migrationsTable)\n\t\t\t} (\"hash\", \"created_at\", \"name\") values(${migration.hash}, ${migration.folderMillis}, ${migration.name})`,\n\t\t);\n\t}\n\n\tfor await (const rowToInsert of rowsToInsert) {\n\t\tawait db.session.execute(rowToInsert);\n\t}\n}\n"],"mappings":";;;;;;;;;;;;;;AAgBA,eAAsB,QACrB,IACA,QAC2C;CAC3C,MAAM,aAAa,mBAAmB,OAAO;CAC7C,MAAM,kBAAkB,OAAO,mBAAmB;CAClD,MAAM,mBAAmB,OAAO,oBAAoB;AAEpD,OAAM,GAAG,QAAQ,QAAQ,GAAG,+BAA+B,IAAI,WAAW,iBAAiB,GAAG;CAE9F,MAAM,EAAE,UAAU,MAAM,gBAAgB,kBAAkB,iBAAiB,IAAI,YAAY,QAAQ;AAEnG,KAAI,OAAO;EACV,MAAM,uBAAuB,GAAG;+BACH,IAAI,WAAW,iBAAiB,CAAC,GAAG,IAAI,WAAW,gBAAgB,CAAC;;;;;;;;AASjG,QAAM,GAAG,QAAQ,QAAQ,qBAAqB;;CAG/C,MAAM,eAAe,MAAM,GAAG,QAAQ,IACrC,GAAG,0CAA0C,IAAI,WAAW,iBAAiB,CAAC,GAAG,IAAI,WAAW,gBAAgB,CAAC,GACjH;AAED,KAAI,OAAO,WAAW,YAAY,OAAO,MAAM;AAC9C,MAAI,aAAa,OAChB,QAAO,EAAE,UAAU,sBAA+B;AAGnD,MAAI,WAAW,SAAS,EACvB,QAAO,EAAE,UAAU,mBAA4B;EAGhD,MAAM,CAAC,aAAa;AAEpB,MAAI,CAAC,UAAW;AAEhB,QAAM,GAAG,QAAQ,QAChB,GAAG,eAAe,IAAI,WAAW,iBAAiB,CAAC,GAClD,IAAI,WAAW,gBAAgB,CAC/B,yCAAyC,UAAU,KAAK,IAAI,UAAU,aAAa,IAAI,UAAU,KAAK,GACvG;AAED;;CAGD,MAAM,kBAAkB,mBAAmB;EAAE,iBAAiB;EAAY;EAAc,CAAC;CACzF,MAAM,eAAsB,EAAE;AAC9B,YAAW,MAAM,aAAa,iBAAiB;AAC9C,OAAK,MAAM,QAAQ,UAAU,IAC5B,OAAM,GAAG,QAAQ,QAAQ,IAAI,IAAI,KAAK,CAAC;AAGxC,eAAa,KACZ,GAAG,eAAe,IAAI,WAAW,iBAAiB,CAAC,GAClD,IAAI,WAAW,gBAAgB,CAC/B,yCAAyC,UAAU,KAAK,IAAI,UAAU,aAAa,IAAI,UAAU,KAAK,GACvG;;AAGF,YAAW,MAAM,eAAe,aAC/B,OAAM,GAAG,QAAQ,QAAQ,YAAY"}

package/neon-http/session.cjs

@@ -1,65 +1,154 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_runtime = require('../_virtual/_rolldown/runtime.cjs');
 let __entity_ts = require("../entity.cjs");
-let __cache_core_index_ts = require("../cache/core/index.cjs");
+let __utils_ts = require("../utils.cjs");
+let __sql_sql_ts = require("../sql/sql.cjs");
 let __logger_ts = require("../logger.cjs");
+let __cache_core_index_ts = require("../cache/core/index.cjs");
 let __pg_core_async_session_ts = require("../pg-core/async/session.cjs");
 
 //#region src/neon-http/session.ts
+const rawQueryConfig = {
+	arrayMode: false,
+	fullResults: true
+};
+const queryConfig = {
+	arrayMode: true,
+	fullResults: true
+};
+var NeonHttpPreparedQuery = class extends __pg_core_async_session_ts.PgAsyncPreparedQuery {
+	static [__entity_ts.entityKind] = "NeonHttpPreparedQuery";
+	clientQuery;
+	constructor(client, query, logger, cache, queryMetadata, cacheConfig, fields, _isResponseInArrayMode, customResultMapper, isRqbV2Query) {
+		super(query, cache, queryMetadata, cacheConfig);
+		this.client = client;
+		this.logger = logger;
+		this.fields = fields;
+		this._isResponseInArrayMode = _isResponseInArrayMode;
+		this.customResultMapper = customResultMapper;
+		this.isRqbV2Query = isRqbV2Query;
+		this.clientQuery = client.query ?? client;
+	}
+	/** @internal */
+	async execute(placeholderValues = {}, token = this.authToken) {
+		if (this.isRqbV2Query) return this.executeRqbV2(placeholderValues, token);
+		const params = (0, __sql_sql_ts.fillPlaceholders)(this.query.params, placeholderValues);
+		this.logger.logQuery(this.query.sql, params);
+		const { fields, clientQuery, query, customResultMapper } = this;
+		if (!fields && !customResultMapper) return this.queryWithCache(query.sql, params, async () => {
+			return clientQuery(query.sql, params, token === void 0 ? rawQueryConfig : {
+				...rawQueryConfig,
+				authToken: token
+			});
+		});
+		const result = await this.queryWithCache(query.sql, params, async () => {
+			return await clientQuery(query.sql, params, token === void 0 ? queryConfig : {
+				...queryConfig,
+				authToken: token
+			});
+		});
+		return this.mapResult(result);
+	}
+	async executeRqbV2(placeholderValues, token) {
+		const params = (0, __sql_sql_ts.fillPlaceholders)(this.query.params, placeholderValues);
+		this.logger.logQuery(this.query.sql, params);
+		const { clientQuery, query, customResultMapper } = this;
+		const rows = (await clientQuery(query.sql, params, token === void 0 ? rawQueryConfig : {
+			...rawQueryConfig,
+			authToken: token
+		})).rows;
+		return customResultMapper(rows);
+	}
+	mapResult(result) {
+		if (!this.fields && !this.customResultMapper) return result;
+		const rows = result.rows;
+		if (this.customResultMapper) return this.customResultMapper(rows);
+		return rows.map((row) => (0, __utils_ts.mapResultRow)(this.fields, row, this.joinsNotNullableMap));
+	}
+	all(placeholderValues = {}) {
+		const params = (0, __sql_sql_ts.fillPlaceholders)(this.query.params, placeholderValues);
+		this.logger.logQuery(this.query.sql, params);
+		return this.clientQuery(this.query.sql, params, this.authToken === void 0 ? rawQueryConfig : {
+			...rawQueryConfig,
+			authToken: this.authToken
+		}).then((result) => result.rows);
+	}
+	/** @internal */
+	values(placeholderValues = {}, token) {
+		const params = (0, __sql_sql_ts.fillPlaceholders)(this.query.params, placeholderValues);
+		this.logger.logQuery(this.query.sql, params);
+		return this.clientQuery(this.query.sql, params, {
+			arrayMode: true,
+			fullResults: true,
+			authToken: token
+		}).then((result) => result.rows);
+	}
+	/** @internal */
+	isResponseInArrayMode() {
+		return this._isResponseInArrayMode;
+	}
+};
 var NeonHttpSession = class extends __pg_core_async_session_ts.PgAsyncSession {
 	static [__entity_ts.entityKind] = "NeonHttpSession";
+	clientQuery;
 	logger;
 	cache;
-	/** @internal */
-	client;
-	constructor(client, dialect, relations, options = {}) {
+	constructor(client, dialect, relations, schema, options = {}) {
 		super(dialect);
+		this.client = client;
 		this.relations = relations;
+		this.schema = schema;
 		this.options = options;
-		this.client = client;
+		this.clientQuery = client.query ?? client;
 		this.logger = options.logger ?? new __logger_ts.NoopLogger();
 		this.cache = options.cache ?? new __cache_core_index_ts.NoopCache();
 	}
-	prepareQuery(query, mode, _name, mapper, queryMetadata, cacheConfig) {
-		const executor = (params) => {
-			const q = this.client.query ?? this.client;
-			if (mode === "raw") return (async () => q(query.sql, params, {
-				arrayMode: false,
-				fullResults: true,
-				authToken: this.options.authToken
-			}))();
-			return q(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);
+	prepareQuery(query, fields, name, isResponseInArrayMode, customResultMapper, queryMetadata, cacheConfig) {
+		return new NeonHttpPreparedQuery(this.client, query, this.logger, this.cache, queryMetadata, cacheConfig, fields, isResponseInArrayMode, customResultMapper);
+	}
+	prepareRelationalQuery(query, fields, name, customResultMapper) {
+		return new NeonHttpPreparedQuery(this.client, query, this.logger, this.cache, void 0, void 0, fields, false, customResultMapper, true);
 	}
 	async batch(queries) {
 		const preparedQueries = [];
 		const builtQueries = [];
-		const q = this.client.query ?? this.client;
 		for (const query of queries) {
 			const preparedQuery = query._prepare();
 			const builtQuery = preparedQuery.getQuery();
 			preparedQueries.push(preparedQuery);
-			builtQueries.push(q(builtQuery.sql, builtQuery.params, {
+			builtQueries.push(this.clientQuery(builtQuery.sql, builtQuery.params, {
 				fullResults: true,
-				arrayMode: preparedQuery.mode === "arrays"
+				arrayMode: preparedQuery.isResponseInArrayMode()
 			}));
 		}
-		return (await this.client.transaction(builtQueries, {
-			authToken: this.options.authToken,
-			fullResults: true,
-			arrayMode: true
-		})).map((result, i) => preparedQueries[i].mapper ? preparedQueries[i].mapper(result.rows) : result);
+		return (await this.client.transaction(builtQueries, queryConfig)).map((result, i) => preparedQueries[i].mapResult(result, true));
+	}
+	async query(query, params) {
+		this.logger.logQuery(query, params);
+		return await this.clientQuery(query, params, {
+			arrayMode: true,
+			fullResults: true
+		});
+	}
+	async queryObjects(query, params) {
+		return this.clientQuery(query, params, {
+			arrayMode: false,
+			fullResults: true
+		});
 	}
 	async transaction(_transaction, _config = {}) {
 		throw new Error("No transactions support in neon-http driver");
 	}
 };
+var NeonTransaction = class extends __pg_core_async_session_ts.PgAsyncTransaction {
+	static [__entity_ts.entityKind] = "NeonHttpTransaction";
+	async transaction(_transaction) {
+		throw new Error("No transactions support in neon-http driver");
+	}
+};
 
 //#endregion
+exports.NeonHttpPreparedQuery = NeonHttpPreparedQuery;
 exports.NeonHttpSession = NeonHttpSession;
+exports.NeonTransaction = NeonTransaction;
 //# sourceMappingURL=session.cjs.map

package/neon-http/session.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"session.cjs","names":["PgAsyncSession","entityKind","NoopLogger","NoopCache","PgAsyncPreparedQuery"],"sources":["../../src/neon-http/session.ts"],"sourcesContent":["import type { FullQueryResults, NeonQueryFunction, NeonQueryPromise } from '@neondatabase/serverless';\nimport type { BatchItem } from '~/batch.ts';\nimport { type Cache, NoopCache } from '~/cache/core/index.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 { PgAsyncPreparedQuery, PgAsyncSession, type PgAsyncTransaction } from '~/pg-core/async/session.ts';\nimport type { PgDialect } from '~/pg-core/dialect.ts';\nimport type { PgQueryResultHKT, PgTransactionConfig, PreparedQueryConfig } from '~/pg-core/session.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport type { Query } from '~/sql/sql.ts';\nimport type { NeonAuthToken } from '~/utils.ts';\n\nexport type NeonHttpClient = NeonQueryFunction<any, any>;\n\nexport interface NeonHttpSessionOptions {\n\tlogger?: Logger;\n\tcache?: Cache;\n\tuseJitMapper?: boolean;\n\tauthToken?: NeonAuthToken;\n}\n\nexport class NeonHttpSession<TRelations extends AnyRelations>\n\textends PgAsyncSession<NeonHttpQueryResultHKT, TRelations>\n{\n\tstatic override readonly [entityKind]: string = 'NeonHttpSession';\n\n\tprivate logger: Logger;\n\tprivate cache: Cache;\n\n\t/** @internal */\n\treadonly client: NeonHttpClient;\n\tconstructor(\n\t\tclient: NeonHttpClient,\n\t\tdialect: PgDialect,\n\t\tprivate relations: AnyRelations,\n\t\treadonly options: NeonHttpSessionOptions = {},\n\t) {\n\t\tsuper(dialect);\n\t\tthis.client = client;\n\t\t// `client.query` is for @neondatabase/serverless v1.0.0 and up, where the\n\t\t// root query function `client` is only usable as a template function;\n\t\t// `client` is a fallback for earlier versions\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\tconst q = ((this.client as any).query ?? this.client as any) as NeonHttpClient;\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\tq(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 q(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.client as any).query ?? this.client as any;\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.client.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\toverride async transaction<T>(\n\t\t_transaction: (tx: PgAsyncTransaction<NeonHttpQueryResultHKT, TRelations>) => Promise<T>,\n\t\t// eslint-disable-next-line @typescript-eslint/no-unused-vars\n\t\t_config: PgTransactionConfig = {},\n\t): Promise<T> {\n\t\tthrow new Error('No transactions support in neon-http driver');\n\t}\n}\n\nexport type NeonHttpQueryResult<T> = Omit<FullQueryResults<false>, 'rows'> & { rows: T[] };\n\nexport interface NeonHttpQueryResultHKT extends PgQueryResultHKT {\n\ttype: NeonHttpQueryResult<this['row']>;\n}\n"],"mappings":";;;;;;;;AAuBA,IAAa,kBAAb,cACSA,0CACT;CACC,QAA0BC,0BAAsB;CAEhD,AAAQ;CACR,AAAQ;;CAGR,AAAS;CACT,YACC,QACA,SACA,AAAQ,WACR,AAAS,UAAkC,EAAE,EAC5C;AACD,QAAM,QAAQ;EAHN;EACC;AAGT,OAAK,SAAS;AAId,OAAK,SAAS,QAAQ,UAAU,IAAIC,wBAAY;AAChD,OAAK,QAAQ,QAAQ,SAAS,IAAIC,iCAAW;;CAG9C,aACC,OACA,MACA,OACA,QACA,eAIA,aAC0B;EAC1B,MAAM,YAAY,WAAuB;GACxC,MAAM,IAAM,KAAK,OAAe,SAAS,KAAK;AAC9C,OAAI,SAAS,MAEZ,SAAQ,YACP,EAAE,MAAM,KAAK,QAAQ;IACpB,WAAW;IACX,aAAa;IACb,WAAW,KAAK,QAAQ;IACxB,CAAC,GAAG;AAGP,UAAO,EAAE,MAAM,KAAK,QAAQ;IAC3B,WAAW,SAAS;IACpB,aAAa;IACb,WAAW,KAAK,QAAQ;IACxB,CAAC,CAAC,MAAM,OAAY,GAAG,KAAK;;AAG9B,SAAO,IAAIC,gDAAqB,UAAU,OAAO,QAAQ,MAAM,KAAK,QAAQ,KAAK,OAAO,eAAe,YAAY;;CAGpH,MAAM,MAAkE,SAAY;EACnF,MAAM,kBAA+C,EAAE;EACvD,MAAM,eAA8C,EAAE;EACtD,MAAM,IAAK,KAAK,OAAe,SAAS,KAAK;AAE7C,OAAK,MAAM,SAAS,SAAS;GAC5B,MAAM,gBAAgB,MAAM,UAAU;GACtC,MAAM,aAAa,cAAc,UAAU;AAC3C,mBAAgB,KAAK,cAAc;AACnC,gBAAa,KACZ,EAAE,WAAW,KAAK,WAAW,QAAQ;IACpC,aAAa;IACb,WAAW,cAAc,SAAS;IAClC,CAAC,CACF;;AAQF,UALqB,MAAM,KAAK,OAAO,YAAY,cAAc;GAChE,WAAW,KAAK,QAAQ;GACxB,aAAa;GACb,WAAW;GACX,CAAC,EACkB,KAAK,QAAQ,MAChC,gBAAgB,GAAI,SAAS,gBAAgB,GAAI,OAAO,OAAO,KAAK,GAAG,OACvE;;CAGF,MAAe,YACd,cAEA,UAA+B,EAAE,EACpB;AACb,QAAM,IAAI,MAAM,8CAA8C"}
+{"version":3,"file":"session.cjs","names":["PgAsyncPreparedQuery","entityKind","PgAsyncSession","NoopLogger","NoopCache","PgAsyncTransaction"],"sources":["../../src/neon-http/session.ts"],"sourcesContent":["import type { FullQueryResults, NeonQueryFunction, NeonQueryPromise } from '@neondatabase/serverless';\nimport type * as V1 from '~/_relations.ts';\nimport type { BatchItem } from '~/batch.ts';\nimport { type Cache, NoopCache } from '~/cache/core/index.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 { 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 { PgQueryResultHKT, PgTransactionConfig, PreparedQueryConfig } from '~/pg-core/session.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport type { PreparedQuery } from '~/session.ts';\nimport { fillPlaceholders, type Query } from '~/sql/sql.ts';\nimport { mapResultRow, type NeonAuthToken } from '~/utils.ts';\n\nexport type NeonHttpClient = NeonQueryFunction<any, any>;\n\nconst rawQueryConfig = {\n\tarrayMode: false,\n\tfullResults: true,\n} as const;\nconst queryConfig = {\n\tarrayMode: true,\n\tfullResults: true,\n} as const;\n\nexport class NeonHttpPreparedQuery<\n\tT extends PreparedQueryConfig,\n\tTIsRqbV2 extends boolean = false,\n> extends PgAsyncPreparedQuery<T> {\n\tstatic override readonly [entityKind]: string = 'NeonHttpPreparedQuery';\n\tprivate clientQuery: (sql: string, params: any[], opts: Record<string, any>) => NeonQueryPromise<any, any>;\n\n\tconstructor(\n\t\tprivate client: NeonHttpClient,\n\t\tquery: Query,\n\t\tprivate logger: Logger,\n\t\tcache: Cache,\n\t\tqueryMetadata: {\n\t\t\ttype: 'select' | 'update' | 'delete' | 'insert';\n\t\t\ttables: string[];\n\t\t} | undefined,\n\t\tcacheConfig: WithCacheConfig | undefined,\n\t\tprivate fields: SelectedFieldsOrdered | undefined,\n\t\tprivate _isResponseInArrayMode: boolean,\n\t\tprivate customResultMapper?: (\n\t\t\trows: TIsRqbV2 extends true ? Record<string, unknown>[] : unknown[][],\n\t\t) => T['execute'],\n\t\tprivate isRqbV2Query?: TIsRqbV2,\n\t) {\n\t\tsuper(query, cache, queryMetadata, cacheConfig);\n\t\t// `client.query` is for @neondatabase/serverless v1.0.0 and up, where the\n\t\t// root query function `client` is only usable as a template function;\n\t\t// `client` is a fallback for earlier versions\n\t\tthis.clientQuery = (client as any).query ?? client as any;\n\t}\n\n\tasync execute(placeholderValues: Record<string, unknown> | undefined): Promise<T['execute']>;\n\t/** @internal */\n\tasync execute(placeholderValues: Record<string, unknown> | undefined, token?: NeonAuthToken): Promise<T['execute']>;\n\t/** @internal */\n\tasync execute(\n\t\tplaceholderValues: Record<string, unknown> | undefined = {},\n\t\ttoken: NeonAuthToken | undefined = this.authToken,\n\t): Promise<T['execute']> {\n\t\tif (this.isRqbV2Query) return this.executeRqbV2(placeholderValues, token);\n\n\t\tconst params = fillPlaceholders(this.query.params, placeholderValues);\n\n\t\tthis.logger.logQuery(this.query.sql, params);\n\n\t\tconst { fields, clientQuery, query, customResultMapper } = this;\n\n\t\tif (!fields && !customResultMapper) {\n\t\t\treturn this.queryWithCache(query.sql, params, async () => {\n\t\t\t\treturn clientQuery(\n\t\t\t\t\tquery.sql,\n\t\t\t\t\tparams,\n\t\t\t\t\ttoken === undefined\n\t\t\t\t\t\t? rawQueryConfig\n\t\t\t\t\t\t: {\n\t\t\t\t\t\t\t...rawQueryConfig,\n\t\t\t\t\t\t\tauthToken: token,\n\t\t\t\t\t\t},\n\t\t\t\t);\n\t\t\t});\n\t\t}\n\n\t\tconst result = await this.queryWithCache(query.sql, params, async () => {\n\t\t\treturn await clientQuery(\n\t\t\t\tquery.sql,\n\t\t\t\tparams,\n\t\t\t\ttoken === undefined\n\t\t\t\t\t? queryConfig\n\t\t\t\t\t: {\n\t\t\t\t\t\t...queryConfig,\n\t\t\t\t\t\tauthToken: token,\n\t\t\t\t\t},\n\t\t\t);\n\t\t});\n\n\t\treturn this.mapResult(result);\n\t}\n\n\tprivate async executeRqbV2(\n\t\tplaceholderValues: Record<string, unknown>,\n\t\ttoken: NeonAuthToken | undefined,\n\t): Promise<T['execute']> {\n\t\tconst params = fillPlaceholders(this.query.params, placeholderValues);\n\n\t\tthis.logger.logQuery(this.query.sql, params);\n\n\t\tconst { clientQuery, query, customResultMapper } = this;\n\n\t\tconst result = await clientQuery(\n\t\t\tquery.sql,\n\t\t\tparams,\n\t\t\ttoken === undefined\n\t\t\t\t? rawQueryConfig\n\t\t\t\t: {\n\t\t\t\t\t...rawQueryConfig,\n\t\t\t\t\tauthToken: token,\n\t\t\t\t},\n\t\t);\n\n\t\tconst rows = (result as FullQueryResults<false>).rows;\n\n\t\treturn (customResultMapper as (rows: Record<string, unknown>[]) => T['execute'])(rows);\n\t}\n\n\toverride mapResult(result: unknown): unknown {\n\t\tif (!this.fields && !this.customResultMapper) {\n\t\t\treturn result;\n\t\t}\n\n\t\tconst rows = (result as FullQueryResults<true>).rows;\n\n\t\tif (this.customResultMapper) {\n\t\t\treturn (this.customResultMapper as (rows: unknown[][]) => T['execute'])(rows);\n\t\t}\n\n\t\treturn rows.map((row) => mapResultRow(this.fields!, row, this.joinsNotNullableMap));\n\t}\n\n\tall(placeholderValues: Record<string, unknown> | undefined = {}): Promise<T['all']> {\n\t\tconst params = fillPlaceholders(this.query.params, placeholderValues);\n\t\tthis.logger.logQuery(this.query.sql, params);\n\t\treturn this.clientQuery(\n\t\t\tthis.query.sql,\n\t\t\tparams,\n\t\t\tthis.authToken === undefined ? rawQueryConfig : {\n\t\t\t\t...rawQueryConfig,\n\t\t\t\tauthToken: this.authToken,\n\t\t\t},\n\t\t).then((result) => result.rows);\n\t}\n\n\tvalues(placeholderValues: Record<string, unknown> | undefined): Promise<T['values']>;\n\t/** @internal */\n\tvalues(placeholderValues: Record<string, unknown> | undefined, token?: NeonAuthToken): Promise<T['values']>;\n\t/** @internal */\n\tvalues(placeholderValues: Record<string, unknown> | undefined = {}, token?: NeonAuthToken): Promise<T['values']> {\n\t\tconst params = fillPlaceholders(this.query.params, placeholderValues);\n\t\tthis.logger.logQuery(this.query.sql, params);\n\t\treturn this.clientQuery(this.query.sql, params, { arrayMode: true, fullResults: true, authToken: token }).then((\n\t\t\tresult,\n\t\t) => result.rows);\n\t}\n\n\t/** @internal */\n\tisResponseInArrayMode() {\n\t\treturn this._isResponseInArrayMode;\n\t}\n}\n\nexport interface NeonHttpSessionOptions {\n\tlogger?: Logger;\n\tcache?: Cache;\n}\n\nexport class NeonHttpSession<\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 = 'NeonHttpSession';\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 client: NeonHttpClient,\n\t\tdialect: PgDialect,\n\t\tprivate relations: AnyRelations,\n\t\tprivate schema: V1.RelationalSchemaConfig<TSchema> | undefined,\n\t\tprivate options: NeonHttpSessionOptions = {},\n\t) {\n\t\tsuper(dialect);\n\t\t// `client.query` is for @neondatabase/serverless v1.0.0 and up, where the\n\t\t// root query function `client` is only usable as a template function;\n\t\t// `client` is a fallback for earlier versions\n\t\tthis.clientQuery = (client as any).query ?? client 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.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\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.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\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.client.transaction(builtQueries, queryConfig);\n\n\t\treturn batchResults.map((result, i) => preparedQueries[i]!.mapResult(result, true)) as any;\n\t}\n\n\t// change return type to QueryRows<true>\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\t// change return type to QueryRows<false>\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\t_transaction: (tx: NeonTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>,\n\t\t// eslint-disable-next-line @typescript-eslint/no-unused-vars\n\t\t_config: PgTransactionConfig = {},\n\t): Promise<T> {\n\t\tthrow new Error('No transactions support in neon-http driver');\n\t}\n}\n\nexport class NeonTransaction<\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 = 'NeonHttpTransaction';\n\n\toverride async transaction<T>(\n\t\t_transaction: (tx: NeonTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>,\n\t): Promise<T> {\n\t\tthrow new Error('No transactions support in neon-http driver');\n\t\t// const savepointName = `sp${this.nestedIndex + 1}`;\n\t\t// const tx = new NeonTransaction(this.dialect, this.session, this.relations, this.schema, this.nestedIndex + 1);\n\t\t// await tx.execute(sql.raw(`savepoint ${savepointName}`));\n\t\t// try {\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\nexport type NeonHttpQueryResult<T> = Omit<FullQueryResults<false>, 'rows'> & { rows: T[] };\n\nexport interface NeonHttpQueryResultHKT extends PgQueryResultHKT {\n\ttype: NeonHttpQueryResult<this['row']>;\n}\n"],"mappings":";;;;;;;;;;AAmBA,MAAM,iBAAiB;CACtB,WAAW;CACX,aAAa;CACb;AACD,MAAM,cAAc;CACnB,WAAW;CACX,aAAa;CACb;AAED,IAAa,wBAAb,cAGUA,gDAAwB;CACjC,QAA0BC,0BAAsB;CAChD,AAAQ;CAER,YACC,AAAQ,QACR,OACA,AAAQ,QACR,OACA,eAIA,aACA,AAAQ,QACR,AAAQ,wBACR,AAAQ,oBAGR,AAAQ,cACP;AACD,QAAM,OAAO,OAAO,eAAe,YAAY;EAhBvC;EAEA;EAOA;EACA;EACA;EAGA;AAMR,OAAK,cAAe,OAAe,SAAS;;;CAO7C,MAAM,QACL,oBAAyD,EAAE,EAC3D,QAAmC,KAAK,WAChB;AACxB,MAAI,KAAK,aAAc,QAAO,KAAK,aAAa,mBAAmB,MAAM;EAEzE,MAAM,4CAA0B,KAAK,MAAM,QAAQ,kBAAkB;AAErE,OAAK,OAAO,SAAS,KAAK,MAAM,KAAK,OAAO;EAE5C,MAAM,EAAE,QAAQ,aAAa,OAAO,uBAAuB;AAE3D,MAAI,CAAC,UAAU,CAAC,mBACf,QAAO,KAAK,eAAe,MAAM,KAAK,QAAQ,YAAY;AACzD,UAAO,YACN,MAAM,KACN,QACA,UAAU,SACP,iBACA;IACD,GAAG;IACH,WAAW;IACX,CACF;IACA;EAGH,MAAM,SAAS,MAAM,KAAK,eAAe,MAAM,KAAK,QAAQ,YAAY;AACvE,UAAO,MAAM,YACZ,MAAM,KACN,QACA,UAAU,SACP,cACA;IACD,GAAG;IACH,WAAW;IACX,CACF;IACA;AAEF,SAAO,KAAK,UAAU,OAAO;;CAG9B,MAAc,aACb,mBACA,OACwB;EACxB,MAAM,4CAA0B,KAAK,MAAM,QAAQ,kBAAkB;AAErE,OAAK,OAAO,SAAS,KAAK,MAAM,KAAK,OAAO;EAE5C,MAAM,EAAE,aAAa,OAAO,uBAAuB;EAanD,MAAM,QAXS,MAAM,YACpB,MAAM,KACN,QACA,UAAU,SACP,iBACA;GACD,GAAG;GACH,WAAW;GACX,CACF,EAEgD;AAEjD,SAAQ,mBAAyE,KAAK;;CAGvF,AAAS,UAAU,QAA0B;AAC5C,MAAI,CAAC,KAAK,UAAU,CAAC,KAAK,mBACzB,QAAO;EAGR,MAAM,OAAQ,OAAkC;AAEhD,MAAI,KAAK,mBACR,QAAQ,KAAK,mBAA2D,KAAK;AAG9E,SAAO,KAAK,KAAK,qCAAqB,KAAK,QAAS,KAAK,KAAK,oBAAoB,CAAC;;CAGpF,IAAI,oBAAyD,EAAE,EAAqB;EACnF,MAAM,4CAA0B,KAAK,MAAM,QAAQ,kBAAkB;AACrE,OAAK,OAAO,SAAS,KAAK,MAAM,KAAK,OAAO;AAC5C,SAAO,KAAK,YACX,KAAK,MAAM,KACX,QACA,KAAK,cAAc,SAAY,iBAAiB;GAC/C,GAAG;GACH,WAAW,KAAK;GAChB,CACD,CAAC,MAAM,WAAW,OAAO,KAAK;;;CAOhC,OAAO,oBAAyD,EAAE,EAAE,OAA6C;EAChH,MAAM,4CAA0B,KAAK,MAAM,QAAQ,kBAAkB;AACrE,OAAK,OAAO,SAAS,KAAK,MAAM,KAAK,OAAO;AAC5C,SAAO,KAAK,YAAY,KAAK,MAAM,KAAK,QAAQ;GAAE,WAAW;GAAM,aAAa;GAAM,WAAW;GAAO,CAAC,CAAC,MACzG,WACI,OAAO,KAAK;;;CAIlB,wBAAwB;AACvB,SAAO,KAAK;;;AASd,IAAa,kBAAb,cAIUC,0CAAyE;CAClF,QAA0BD,0BAAsB;CAEhD,AAAQ;CACR,AAAQ;CACR,AAAQ;CAER,YACC,AAAQ,QACR,SACA,AAAQ,WACR,AAAQ,QACR,AAAQ,UAAkC,EAAE,EAC3C;AACD,QAAM,QAAQ;EANN;EAEA;EACA;EACA;AAMR,OAAK,cAAe,OAAe,SAAS;AAC5C,OAAK,SAAS,QAAQ,UAAU,IAAIE,wBAAY;AAChD,OAAK,QAAQ,QAAQ,SAAS,IAAIC,iCAAW;;CAG9C,aACC,OACA,QACA,MACA,uBACA,oBACA,eAIA,aAC0B;AAC1B,SAAO,IAAI,sBACV,KAAK,QACL,OACA,KAAK,QACL,KAAK,OACL,eACA,aACA,QACA,uBACA,mBACA;;CAGF,uBACC,OACA,QACA,MACA,oBAC0B;AAC1B,SAAO,IAAI,sBACV,KAAK,QACL,OACA,KAAK,QACL,KAAK,OACL,QACA,QACA,QACA,OACA,oBACA,KACA;;CAGF,MAAM,MACL,SACC;EACD,MAAM,kBAAmC,EAAE;EAC3C,MAAM,eAA8C,EAAE;AACtD,OAAK,MAAM,SAAS,SAAS;GAC5B,MAAM,gBAAgB,MAAM,UAAU;GACtC,MAAM,aAAa,cAAc,UAAU;AAC3C,mBAAgB,KAAK,cAAc;AACnC,gBAAa,KACZ,KAAK,YAAY,WAAW,KAAK,WAAW,QAAQ;IACnD,aAAa;IACb,WAAW,cAAc,uBAAuB;IAChD,CAAC,CACF;;AAKF,UAFqB,MAAM,KAAK,OAAO,YAAY,cAAc,YAAY,EAEzD,KAAK,QAAQ,MAAM,gBAAgB,GAAI,UAAU,QAAQ,KAAK,CAAC;;CAIpF,MAAM,MAAM,OAAe,QAAoD;AAC9E,OAAK,OAAO,SAAS,OAAO,OAAO;AAEnC,SADe,MAAM,KAAK,YAAY,OAAO,QAAQ;GAAE,WAAW;GAAM,aAAa;GAAM,CAAC;;CAK7F,MAAM,aACL,OACA,QACmC;AACnC,SAAO,KAAK,YAAY,OAAO,QAAQ;GAAE,WAAW;GAAO,aAAa;GAAM,CAAC;;CAGhF,MAAe,YACd,cAEA,UAA+B,EAAE,EACpB;AACb,QAAM,IAAI,MAAM,8CAA8C;;;AAIhE,IAAa,kBAAb,cAIUC,8CAA6E;CACtF,QAA0BJ,0BAAsB;CAEhD,MAAe,YACd,cACa;AACb,QAAM,IAAI,MAAM,8CAA8C"}

package/neon-http/session.d.cts

@@ -1,37 +1,65 @@
 import { entityKind } from "../entity.cjs";
 import { Query } from "../sql/sql.cjs";
-import { NeonAuthToken } from "../utils.cjs";
+import * as V1 from "../_relations.cjs";
 import { WithCacheConfig } from "../cache/core/types.cjs";
 import { AnyRelations } from "../relations.cjs";
 import { PgDialect } from "../pg-core/dialect.cjs";
 import { PgQueryResultHKT, PgTransactionConfig, PreparedQueryConfig } from "../pg-core/session.cjs";
-import { Logger } from "../logger.cjs";
+import { SelectedFieldsOrdered } from "../pg-core/query-builders/select.types.cjs";
 import { PgAsyncPreparedQuery, PgAsyncSession, PgAsyncTransaction } from "../pg-core/async/session.cjs";
+import { Logger } from "../logger.cjs";
 import { Cache } from "../cache/core/index.cjs";
 import { BatchItem } from "../batch.cjs";
 import { FullQueryResults, NeonQueryFunction } from "@neondatabase/serverless";
 
 //#region src/neon-http/session.d.ts
 type NeonHttpClient = NeonQueryFunction<any, any>;
+declare class NeonHttpPreparedQuery<T extends PreparedQueryConfig, TIsRqbV2 extends boolean = false> extends PgAsyncPreparedQuery<T> {
+  private client;
+  private logger;
+  private fields;
+  private _isResponseInArrayMode;
+  private customResultMapper?;
+  private isRqbV2Query?;
+  static readonly [entityKind]: string;
+  private clientQuery;
+  constructor(client: NeonHttpClient, query: Query, logger: Logger, cache: Cache, queryMetadata: {
+    type: 'select' | 'update' | 'delete' | 'insert';
+    tables: string[];
+  } | undefined, cacheConfig: WithCacheConfig | undefined, fields: SelectedFieldsOrdered | undefined, _isResponseInArrayMode: boolean, customResultMapper?: ((rows: TIsRqbV2 extends true ? Record<string, unknown>[] : unknown[][]) => T["execute"]) | undefined, isRqbV2Query?: TIsRqbV2 | undefined);
+  execute(placeholderValues: Record<string, unknown> | undefined): Promise<T['execute']>;
+  private executeRqbV2;
+  mapResult(result: unknown): unknown;
+  all(placeholderValues?: Record<string, unknown> | undefined): Promise<T['all']>;
+  values(placeholderValues: Record<string, unknown> | undefined): Promise<T['values']>;
+}
 interface NeonHttpSessionOptions {
   logger?: Logger;
   cache?: Cache;
-  useJitMapper?: boolean;
-  authToken?: NeonAuthToken;
 }
-declare class NeonHttpSession<TRelations extends AnyRelations> extends PgAsyncSession<NeonHttpQueryResultHKT, TRelations> {
+declare class NeonHttpSession<TFullSchema extends Record<string, unknown>, TRelations extends AnyRelations, TSchema extends V1.TablesRelationalConfig> extends PgAsyncSession<NeonHttpQueryResultHKT, TFullSchema, TRelations, TSchema> {
+  private client;
   private relations;
-  readonly options: NeonHttpSessionOptions;
+  private schema;
+  private options;
   static readonly [entityKind]: string;
+  private clientQuery;
   private logger;
   private cache;
-  constructor(client: NeonHttpClient, dialect: PgDialect, relations: AnyRelations, options?: NeonHttpSessionOptions);
-  prepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: Query, mode: 'arrays' | 'objects' | 'raw', _name: string | boolean, mapper: ((rows: any[]) => any) | undefined, queryMetadata?: {
+  constructor(client: NeonHttpClient, dialect: PgDialect, relations: AnyRelations, 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?: {
     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>;
-  transaction<T>(_transaction: (tx: PgAsyncTransaction<NeonHttpQueryResultHKT, TRelations>) => Promise<T>, _config?: PgTransactionConfig): Promise<T>;
+  query(query: string, params: unknown[]): Promise<FullQueryResults<true>>;
+  queryObjects(query: string, params: unknown[]): Promise<FullQueryResults<false>>;
+  transaction<T>(_transaction: (tx: NeonTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>, _config?: PgTransactionConfig): Promise<T>;
+}
+declare class NeonTransaction<TFullSchema extends Record<string, unknown>, TRelations extends AnyRelations, TSchema extends V1.TablesRelationalConfig> extends PgAsyncTransaction<NeonHttpQueryResultHKT, TFullSchema, TRelations, TSchema> {
+  static readonly [entityKind]: string;
+  transaction<T>(_transaction: (tx: NeonTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>): Promise<T>;
 }
 type NeonHttpQueryResult<T> = Omit<FullQueryResults<false>, 'rows'> & {
   rows: T[];
@@ -40,5 +68,5 @@ interface NeonHttpQueryResultHKT extends PgQueryResultHKT {
   type: NeonHttpQueryResult<this['row']>;
 }
 //#endregion
-export { NeonHttpClient, NeonHttpQueryResult, NeonHttpQueryResultHKT, NeonHttpSession, NeonHttpSessionOptions };
+export { NeonHttpClient, NeonHttpPreparedQuery, NeonHttpQueryResult, NeonHttpQueryResultHKT, NeonHttpSession, NeonHttpSessionOptions, NeonTransaction };
 //# sourceMappingURL=session.d.cts.map

package/neon-http/session.d.ts

@@ -1,37 +1,65 @@
 import { entityKind } from "../entity.js";
-import { NeonAuthToken } from "../utils.js";
 import { Query } from "../sql/sql.js";
-import { Cache } from "../cache/core/index.js";
+import * as V1 from "../_relations.js";
 import { Logger } from "../logger.js";
-import { PgAsyncPreparedQuery, PgAsyncSession, PgAsyncTransaction } from "../pg-core/async/session.js";
-import { AnyRelations } from "../relations.js";
 import { PgDialect } from "../pg-core/dialect.js";
+import { Cache } from "../cache/core/index.js";
+import { PgAsyncPreparedQuery, PgAsyncSession, PgAsyncTransaction } from "../pg-core/async/session.js";
 import { FullQueryResults, NeonQueryFunction } from "@neondatabase/serverless";
+import { AnyRelations } from "../relations.js";
 import { WithCacheConfig } from "../cache/core/types.js";
 import { PgQueryResultHKT, PgTransactionConfig, PreparedQueryConfig } from "../pg-core/session.js";
+import { SelectedFieldsOrdered } from "../pg-core/query-builders/select.types.js";
 import { BatchItem } from "../batch.js";
 
 //#region src/neon-http/session.d.ts
 type NeonHttpClient = NeonQueryFunction<any, any>;
+declare class NeonHttpPreparedQuery<T extends PreparedQueryConfig, TIsRqbV2 extends boolean = false> extends PgAsyncPreparedQuery<T> {
+  private client;
+  private logger;
+  private fields;
+  private _isResponseInArrayMode;
+  private customResultMapper?;
+  private isRqbV2Query?;
+  static readonly [entityKind]: string;
+  private clientQuery;
+  constructor(client: NeonHttpClient, query: Query, logger: Logger, cache: Cache, queryMetadata: {
+    type: 'select' | 'update' | 'delete' | 'insert';
+    tables: string[];
+  } | undefined, cacheConfig: WithCacheConfig | undefined, fields: SelectedFieldsOrdered | undefined, _isResponseInArrayMode: boolean, customResultMapper?: ((rows: TIsRqbV2 extends true ? Record<string, unknown>[] : unknown[][]) => T["execute"]) | undefined, isRqbV2Query?: TIsRqbV2 | undefined);
+  execute(placeholderValues: Record<string, unknown> | undefined): Promise<T['execute']>;
+  private executeRqbV2;
+  mapResult(result: unknown): unknown;
+  all(placeholderValues?: Record<string, unknown> | undefined): Promise<T['all']>;
+  values(placeholderValues: Record<string, unknown> | undefined): Promise<T['values']>;
+}
 interface NeonHttpSessionOptions {
   logger?: Logger;
   cache?: Cache;
-  useJitMapper?: boolean;
-  authToken?: NeonAuthToken;
 }
-declare class NeonHttpSession<TRelations extends AnyRelations> extends PgAsyncSession<NeonHttpQueryResultHKT, TRelations> {
+declare class NeonHttpSession<TFullSchema extends Record<string, unknown>, TRelations extends AnyRelations, TSchema extends V1.TablesRelationalConfig> extends PgAsyncSession<NeonHttpQueryResultHKT, TFullSchema, TRelations, TSchema> {
+  private client;
   private relations;
-  readonly options: NeonHttpSessionOptions;
+  private schema;
+  private options;
   static readonly [entityKind]: string;
+  private clientQuery;
   private logger;
   private cache;
-  constructor(client: NeonHttpClient, dialect: PgDialect, relations: AnyRelations, options?: NeonHttpSessionOptions);
-  prepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: Query, mode: 'arrays' | 'objects' | 'raw', _name: string | boolean, mapper: ((rows: any[]) => any) | undefined, queryMetadata?: {
+  constructor(client: NeonHttpClient, dialect: PgDialect, relations: AnyRelations, 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?: {
     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>;
-  transaction<T>(_transaction: (tx: PgAsyncTransaction<NeonHttpQueryResultHKT, TRelations>) => Promise<T>, _config?: PgTransactionConfig): Promise<T>;
+  query(query: string, params: unknown[]): Promise<FullQueryResults<true>>;
+  queryObjects(query: string, params: unknown[]): Promise<FullQueryResults<false>>;
+  transaction<T>(_transaction: (tx: NeonTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>, _config?: PgTransactionConfig): Promise<T>;
+}
+declare class NeonTransaction<TFullSchema extends Record<string, unknown>, TRelations extends AnyRelations, TSchema extends V1.TablesRelationalConfig> extends PgAsyncTransaction<NeonHttpQueryResultHKT, TFullSchema, TRelations, TSchema> {
+  static readonly [entityKind]: string;
+  transaction<T>(_transaction: (tx: NeonTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>): Promise<T>;
 }
 type NeonHttpQueryResult<T> = Omit<FullQueryResults<false>, 'rows'> & {
   rows: T[];
@@ -40,5 +68,5 @@ interface NeonHttpQueryResultHKT extends PgQueryResultHKT {
   type: NeonHttpQueryResult<this['row']>;
 }
 //#endregion
-export { NeonHttpClient, NeonHttpQueryResult, NeonHttpQueryResultHKT, NeonHttpSession, NeonHttpSessionOptions };
+export { NeonHttpClient, NeonHttpPreparedQuery, NeonHttpQueryResult, NeonHttpQueryResultHKT, NeonHttpSession, NeonHttpSessionOptions, NeonTransaction };
 //# sourceMappingURL=session.d.ts.map

package/neon-http/session.js

@@ -1,63 +1,150 @@
 import { entityKind } from "../entity.js";
-import { NoopCache } from "../cache/core/index.js";
+import { mapResultRow } from "../utils.js";
+import { fillPlaceholders } from "../sql/sql.js";
 import { NoopLogger } from "../logger.js";
-import { PgAsyncPreparedQuery, PgAsyncSession } from "../pg-core/async/session.js";
+import { NoopCache } from "../cache/core/index.js";
+import { PgAsyncPreparedQuery, PgAsyncSession, PgAsyncTransaction } from "../pg-core/async/session.js";
 
 //#region src/neon-http/session.ts
+const rawQueryConfig = {
+	arrayMode: false,
+	fullResults: true
+};
+const queryConfig = {
+	arrayMode: true,
+	fullResults: true
+};
+var NeonHttpPreparedQuery = class extends PgAsyncPreparedQuery {
+	static [entityKind] = "NeonHttpPreparedQuery";
+	clientQuery;
+	constructor(client, query, logger, cache, queryMetadata, cacheConfig, fields, _isResponseInArrayMode, customResultMapper, isRqbV2Query) {
+		super(query, cache, queryMetadata, cacheConfig);
+		this.client = client;
+		this.logger = logger;
+		this.fields = fields;
+		this._isResponseInArrayMode = _isResponseInArrayMode;
+		this.customResultMapper = customResultMapper;
+		this.isRqbV2Query = isRqbV2Query;
+		this.clientQuery = client.query ?? client;
+	}
+	/** @internal */
+	async execute(placeholderValues = {}, token = this.authToken) {
+		if (this.isRqbV2Query) return this.executeRqbV2(placeholderValues, token);
+		const params = fillPlaceholders(this.query.params, placeholderValues);
+		this.logger.logQuery(this.query.sql, params);
+		const { fields, clientQuery, query, customResultMapper } = this;
+		if (!fields && !customResultMapper) return this.queryWithCache(query.sql, params, async () => {
+			return clientQuery(query.sql, params, token === void 0 ? rawQueryConfig : {
+				...rawQueryConfig,
+				authToken: token
+			});
+		});
+		const result = await this.queryWithCache(query.sql, params, async () => {
+			return await clientQuery(query.sql, params, token === void 0 ? queryConfig : {
+				...queryConfig,
+				authToken: token
+			});
+		});
+		return this.mapResult(result);
+	}
+	async executeRqbV2(placeholderValues, token) {
+		const params = fillPlaceholders(this.query.params, placeholderValues);
+		this.logger.logQuery(this.query.sql, params);
+		const { clientQuery, query, customResultMapper } = this;
+		const rows = (await clientQuery(query.sql, params, token === void 0 ? rawQueryConfig : {
+			...rawQueryConfig,
+			authToken: token
+		})).rows;
+		return customResultMapper(rows);
+	}
+	mapResult(result) {
+		if (!this.fields && !this.customResultMapper) return result;
+		const rows = result.rows;
+		if (this.customResultMapper) return this.customResultMapper(rows);
+		return rows.map((row) => mapResultRow(this.fields, row, this.joinsNotNullableMap));
+	}
+	all(placeholderValues = {}) {
+		const params = fillPlaceholders(this.query.params, placeholderValues);
+		this.logger.logQuery(this.query.sql, params);
+		return this.clientQuery(this.query.sql, params, this.authToken === void 0 ? rawQueryConfig : {
+			...rawQueryConfig,
+			authToken: this.authToken
+		}).then((result) => result.rows);
+	}
+	/** @internal */
+	values(placeholderValues = {}, token) {
+		const params = fillPlaceholders(this.query.params, placeholderValues);
+		this.logger.logQuery(this.query.sql, params);
+		return this.clientQuery(this.query.sql, params, {
+			arrayMode: true,
+			fullResults: true,
+			authToken: token
+		}).then((result) => result.rows);
+	}
+	/** @internal */
+	isResponseInArrayMode() {
+		return this._isResponseInArrayMode;
+	}
+};
 var NeonHttpSession = class extends PgAsyncSession {
 	static [entityKind] = "NeonHttpSession";
+	clientQuery;
 	logger;
 	cache;
-	/** @internal */
-	client;
-	constructor(client, dialect, relations, options = {}) {
+	constructor(client, dialect, relations, schema, options = {}) {
 		super(dialect);
+		this.client = client;
 		this.relations = relations;
+		this.schema = schema;
 		this.options = options;
-		this.client = client;
+		this.clientQuery = client.query ?? client;
 		this.logger = options.logger ?? new NoopLogger();
 		this.cache = options.cache ?? new NoopCache();
 	}
-	prepareQuery(query, mode, _name, mapper, queryMetadata, cacheConfig) {
-		const executor = (params) => {
-			const q = this.client.query ?? this.client;
-			if (mode === "raw") return (async () => q(query.sql, params, {
-				arrayMode: false,
-				fullResults: true,
-				authToken: this.options.authToken
-			}))();
-			return q(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);
+	prepareQuery(query, fields, name, isResponseInArrayMode, customResultMapper, queryMetadata, cacheConfig) {
+		return new NeonHttpPreparedQuery(this.client, query, this.logger, this.cache, queryMetadata, cacheConfig, fields, isResponseInArrayMode, customResultMapper);
+	}
+	prepareRelationalQuery(query, fields, name, customResultMapper) {
+		return new NeonHttpPreparedQuery(this.client, query, this.logger, this.cache, void 0, void 0, fields, false, customResultMapper, true);
 	}
 	async batch(queries) {
 		const preparedQueries = [];
 		const builtQueries = [];
-		const q = this.client.query ?? this.client;
 		for (const query of queries) {
 			const preparedQuery = query._prepare();
 			const builtQuery = preparedQuery.getQuery();
 			preparedQueries.push(preparedQuery);
-			builtQueries.push(q(builtQuery.sql, builtQuery.params, {
+			builtQueries.push(this.clientQuery(builtQuery.sql, builtQuery.params, {
 				fullResults: true,
-				arrayMode: preparedQuery.mode === "arrays"
+				arrayMode: preparedQuery.isResponseInArrayMode()
 			}));
 		}
-		return (await this.client.transaction(builtQueries, {
-			authToken: this.options.authToken,
-			fullResults: true,
-			arrayMode: true
-		})).map((result, i) => preparedQueries[i].mapper ? preparedQueries[i].mapper(result.rows) : result);
+		return (await this.client.transaction(builtQueries, queryConfig)).map((result, i) => preparedQueries[i].mapResult(result, true));
+	}
+	async query(query, params) {
+		this.logger.logQuery(query, params);
+		return await this.clientQuery(query, params, {
+			arrayMode: true,
+			fullResults: true
+		});
+	}
+	async queryObjects(query, params) {
+		return this.clientQuery(query, params, {
+			arrayMode: false,
+			fullResults: true
+		});
 	}
 	async transaction(_transaction, _config = {}) {
 		throw new Error("No transactions support in neon-http driver");
 	}
 };
+var NeonTransaction = class extends PgAsyncTransaction {
+	static [entityKind] = "NeonHttpTransaction";
+	async transaction(_transaction) {
+		throw new Error("No transactions support in neon-http driver");
+	}
+};
 
 //#endregion
-export { NeonHttpSession };
+export { NeonHttpPreparedQuery, NeonHttpSession, NeonTransaction };
 //# sourceMappingURL=session.js.map