drizzle-orm 1.0.0-beta.21 → 1.0.0-beta.21-af6b4cb

package/neon-http/session.js

@@ -1,150 +1,63 @@
 import { entityKind } from "../entity.js";
-import { mapResultRow } from "../utils.js";
-import { fillPlaceholders } from "../sql/sql.js";
-import { NoopLogger } from "../logger.js";
 import { NoopCache } from "../cache/core/index.js";
-import { PgAsyncPreparedQuery, PgAsyncSession, PgAsyncTransaction } from "../pg-core/async/session.js";
+import { NoopLogger } from "../logger.js";
+import { PgAsyncPreparedQuery, PgAsyncSession } 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;
-	constructor(client, dialect, relations, schema, options = {}) {
+	/** @internal */
+	client;
+	constructor(client, dialect, relations, options = {}) {
 		super(dialect);
-		this.client = client;
 		this.relations = relations;
-		this.schema = schema;
 		this.options = options;
-		this.clientQuery = client.query ?? client;
+		this.client = client;
 		this.logger = options.logger ?? new NoopLogger();
 		this.cache = options.cache ?? new NoopCache();
 	}
-	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);
+	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);
 	}
 	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(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.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
-		});
+		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);
 	}
 	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 { NeonHttpPreparedQuery, NeonHttpSession, NeonTransaction };
+export { NeonHttpSession };
 //# sourceMappingURL=session.js.map

package/neon-http/session.js.map

@@ -1 +1 @@
-{"version":3,"file":"session.js","names":[],"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,cAGU,qBAAwB;CACjC,QAA0B,cAAsB;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,SAAS,iBAAiB,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,SAAS,iBAAiB,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,QAAQ,aAAa,KAAK,QAAS,KAAK,KAAK,oBAAoB,CAAC;;CAGpF,IAAI,oBAAyD,EAAE,EAAqB;EACnF,MAAM,SAAS,iBAAiB,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,SAAS,iBAAiB,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,cAIU,eAAyE;CAClF,QAA0B,cAAsB;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,IAAI,YAAY;AAChD,OAAK,QAAQ,QAAQ,SAAS,IAAI,WAAW;;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,cAIU,mBAA6E;CACtF,QAA0B,cAAsB;CAEhD,MAAe,YACd,cACa;AACb,QAAM,IAAI,MAAM,8CAA8C"}
+{"version":3,"file":"session.js","names":[],"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\t// `client.query` is for @neondatabase/serverless v1.0.0 and up, where the\n\t\t\t// root query function `httpClient` is only usable as a template function;\n\t\t\t// `client` is a fallback for earlier versions\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,cACS,eACT;CACC,QAA0B,cAAsB;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,IAAI,YAAY;AAChD,OAAK,QAAQ,QAAQ,SAAS,IAAI,WAAW;;CAG9C,aACC,OACA,MACA,OACA,QACA,eAIA,aAC0B;EAC1B,MAAM,YAAY,WAAuB;GAIxC,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,IAAI,qBAAqB,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"}

package/neon-serverless/driver.cjs

@@ -2,50 +2,32 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_runtime = require('../_virtual/_rolldown/runtime.cjs');
 const require_neon_serverless_session = require('./session.cjs');
 let __entity_ts = require("../entity.cjs");
-let ___relations_ts = require("../_relations.cjs");
-___relations_ts = require_runtime.__toESM(___relations_ts);
 let __logger_ts = require("../logger.cjs");
 let __pg_core_async_db_ts = require("../pg-core/async/db.cjs");
+let __pg_core_codecs_ts = require("../pg-core/codecs.cjs");
 let __pg_core_dialect_ts = require("../pg-core/dialect.cjs");
 let _neondatabase_serverless = require("@neondatabase/serverless");
 
 //#region src/neon-serverless/driver.ts
-var NeonDriver = class {
-	static [__entity_ts.entityKind] = "NeonDriver";
-	constructor(client, dialect, options = {}) {
-		this.client = client;
-		this.dialect = dialect;
-		this.options = options;
-	}
-	createSession(relations, schema) {
-		return new require_neon_serverless_session.NeonSession(this.client, this.dialect, relations, schema, {
-			logger: this.options.logger,
-			cache: this.options.cache
-		});
-	}
-};
 var NeonDatabase = class extends __pg_core_async_db_ts.PgAsyncDatabase {
 	static [__entity_ts.entityKind] = "NeonServerlessDatabase";
 };
+const neonServerlessCodecs = (0, __pg_core_codecs_ts.refineGenericPgCodecs)();
 function construct(client, config = {}) {
-	const dialect = new __pg_core_dialect_ts.PgDialect({ casing: config.casing });
+	const dialect = new __pg_core_dialect_ts.PgDialect({
+		casing: config.casing,
+		useJitMappers: config.useJitMappers,
+		codecs: config.codecs ?? neonServerlessCodecs
+	});
 	let logger;
 	if (config.logger === true) logger = new __logger_ts.DefaultLogger();
 	else if (config.logger !== false) logger = config.logger;
-	let schema;
-	if (config.schema) {
-		const tablesConfig = ___relations_ts.extractTablesRelationalConfig(config.schema, ___relations_ts.createTableRelationsHelpers);
-		schema = {
-			fullSchema: config.schema,
-			schema: tablesConfig.tables,
-			tableNamesMap: tablesConfig.tableNamesMap
-		};
-	}
 	const relations = config.relations ?? {};
-	const db = new NeonDatabase(dialect, new NeonDriver(client, dialect, {
+	const db = new NeonDatabase(dialect, new require_neon_serverless_session.NeonSession(client, dialect, relations, {
 		logger,
+		useJitMapper: config.useJitMappers ?? false,
 		cache: config.cache
-	}).createSession(relations, schema), relations, schema);
+	}), relations);
 	db.$client = client;
 	db.$cache = config.cache;
 	if (db.$cache) db.$cache["invalidate"] = config.cache?.onMutate;
@@ -53,10 +35,10 @@ function construct(client, config = {}) {
 }
 function drizzle(...params) {
 	if (typeof params[0] === "string") return construct(new _neondatabase_serverless.Pool({ connectionString: params[0] }), params[1]);
-	const { connection, client, ws, ...drizzleConfig } = params[0];
+	const { connection, client, ws, ...DrizzlePgConfig } = params[0];
 	if (ws) _neondatabase_serverless.neonConfig.webSocketConstructor = ws;
-	if (client) return construct(client, drizzleConfig);
-	return construct(typeof connection === "string" ? new _neondatabase_serverless.Pool({ connectionString: connection }) : new _neondatabase_serverless.Pool(connection), drizzleConfig);
+	if (client) return construct(client, DrizzlePgConfig);
+	return construct(typeof connection === "string" ? new _neondatabase_serverless.Pool({ connectionString: connection }) : new _neondatabase_serverless.Pool(connection), DrizzlePgConfig);
 }
 (function(_drizzle) {
 	function mock(config) {
@@ -67,11 +49,11 @@ function drizzle(...params) {
 
 //#endregion
 exports.NeonDatabase = NeonDatabase;
-exports.NeonDriver = NeonDriver;
 Object.defineProperty(exports, 'drizzle', {
   enumerable: true,
   get: function () {
     return drizzle;
   }
 });
+exports.neonServerlessCodecs = neonServerlessCodecs;
 //# sourceMappingURL=driver.cjs.map

package/neon-serverless/driver.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"driver.cjs","names":["entityKind","NeonSession","PgAsyncDatabase","PgDialect","DefaultLogger","V1","Pool"],"sources":["../../src/neon-serverless/driver.ts"],"sourcesContent":["import { neonConfig, Pool, type PoolConfig } from '@neondatabase/serverless';\nimport * as V1 from '~/_relations.ts';\nimport type { Cache } from '~/cache/core/cache.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { Logger } from '~/logger.ts';\nimport { DefaultLogger } from '~/logger.ts';\nimport { PgAsyncDatabase } from '~/pg-core/async/db.ts';\nimport { PgDialect } from '~/pg-core/dialect.ts';\nimport type { AnyRelations, EmptyRelations } from '~/relations.ts';\nimport type { DrizzleConfig } from '~/utils.ts';\nimport type { NeonClient, NeonQueryResultHKT } from './session.ts';\nimport { NeonSession } from './session.ts';\n\nexport interface NeonDriverOptions {\n\tlogger?: Logger;\n\tcache?: Cache;\n}\n\nexport class NeonDriver {\n\tstatic readonly [entityKind]: string = 'NeonDriver';\n\n\tconstructor(\n\t\tprivate client: NeonClient,\n\t\tprivate dialect: PgDialect,\n\t\tprivate options: NeonDriverOptions = {},\n\t) {\n\t}\n\n\tcreateSession(\n\t\trelations: AnyRelations,\n\t\tschema: V1.RelationalSchemaConfig<V1.TablesRelationalConfig> | undefined,\n\t): NeonSession<Record<string, unknown>, AnyRelations, V1.TablesRelationalConfig> {\n\t\treturn new NeonSession(this.client, this.dialect, relations, schema, {\n\t\t\tlogger: this.options.logger,\n\t\t\tcache: this.options.cache,\n\t\t});\n\t}\n}\n\nexport class NeonDatabase<\n\tTSchema extends Record<string, unknown> = Record<string, never>,\n\tTRelations extends AnyRelations = EmptyRelations,\n> extends PgAsyncDatabase<NeonQueryResultHKT, TSchema, TRelations> {\n\tstatic override readonly [entityKind]: string = 'NeonServerlessDatabase';\n}\n\nfunction construct<\n\tTSchema extends Record<string, unknown> = Record<string, never>,\n\tTRelations extends AnyRelations = EmptyRelations,\n\tTClient extends NeonClient = NeonClient,\n>(\n\tclient: TClient,\n\tconfig: DrizzleConfig<TSchema, TRelations> = {},\n): NeonDatabase<TSchema, TRelations> & {\n\t$client: NeonClient extends TClient ? Pool : TClient;\n} {\n\tconst dialect = new PgDialect({ casing: config.casing });\n\tlet logger;\n\tif (config.logger === true) {\n\t\tlogger = new DefaultLogger();\n\t} else if (config.logger !== false) {\n\t\tlogger = config.logger;\n\t}\n\n\tlet schema: V1.RelationalSchemaConfig<V1.TablesRelationalConfig> | undefined;\n\tif (config.schema) {\n\t\tconst tablesConfig = V1.extractTablesRelationalConfig(\n\t\t\tconfig.schema,\n\t\t\tV1.createTableRelationsHelpers,\n\t\t);\n\t\tschema = {\n\t\t\tfullSchema: config.schema,\n\t\t\tschema: tablesConfig.tables,\n\t\t\ttableNamesMap: tablesConfig.tableNamesMap,\n\t\t};\n\t}\n\n\tconst relations = config.relations ?? {} as TRelations;\n\tconst driver = new NeonDriver(client, dialect, { logger, cache: config.cache });\n\tconst session = driver.createSession(relations, schema);\n\tconst db = new NeonDatabase(dialect, session, relations, schema as V1.RelationalSchemaConfig<any>) as NeonDatabase<\n\t\tTSchema\n\t>;\n\t(<any> db).$client = client;\n\t(<any> db).$cache = config.cache;\n\tif ((<any> db).$cache) {\n\t\t(<any> db).$cache['invalidate'] = config.cache?.onMutate;\n\t}\n\n\treturn db as any;\n}\n\nexport function drizzle<\n\tTSchema extends Record<string, unknown> = Record<string, never>,\n\tTRelations extends AnyRelations = EmptyRelations,\n\tTClient extends NeonClient = Pool,\n>(\n\t...params: [\n\t\tstring,\n\t] | [\n\t\tstring,\n\t\tDrizzleConfig<TSchema, TRelations>,\n\t] | [\n\t\t(\n\t\t\t& DrizzleConfig<TSchema, TRelations>\n\t\t\t& ({\n\t\t\t\tconnection: string | PoolConfig;\n\t\t\t} | {\n\t\t\t\tclient: TClient;\n\t\t\t})\n\t\t\t& {\n\t\t\t\tws?: any;\n\t\t\t}\n\t\t),\n\t]\n): NeonDatabase<TSchema, TRelations> & {\n\t$client: NeonClient extends TClient ? Pool : TClient;\n} {\n\tif (typeof params[0] === 'string') {\n\t\tconst instance = new Pool({\n\t\t\tconnectionString: params[0],\n\t\t});\n\n\t\treturn construct(instance, params[1]) as any;\n\t}\n\n\tconst { connection, client, ws, ...drizzleConfig } = params[0] as {\n\t\tconnection?: PoolConfig | string;\n\t\tws?: any;\n\t\tclient?: TClient;\n\t} & DrizzleConfig<TSchema, TRelations>;\n\n\tif (ws) {\n\t\tneonConfig.webSocketConstructor = ws;\n\t}\n\n\tif (client) return construct(client, drizzleConfig);\n\n\tconst instance = typeof connection === 'string'\n\t\t? new Pool({\n\t\t\tconnectionString: connection,\n\t\t})\n\t\t: new Pool(connection);\n\n\treturn construct(instance, drizzleConfig) as any;\n}\n\nexport namespace drizzle {\n\texport function mock<\n\t\tTSchema extends Record<string, unknown> = Record<string, never>,\n\t\tTRelations extends AnyRelations = EmptyRelations,\n\t>(\n\t\tconfig?: DrizzleConfig<TSchema, TRelations>,\n\t): NeonDatabase<TSchema> & {\n\t\t$client: '$client is not available on drizzle.mock()';\n\t} {\n\t\treturn construct({} as any, config) as any;\n\t}\n}\n"],"mappings":";;;;;;;;;;;;AAkBA,IAAa,aAAb,MAAwB;CACvB,QAAiBA,0BAAsB;CAEvC,YACC,AAAQ,QACR,AAAQ,SACR,AAAQ,UAA6B,EAAE,EACtC;EAHO;EACA;EACA;;CAIT,cACC,WACA,QACgF;AAChF,SAAO,IAAIC,4CAAY,KAAK,QAAQ,KAAK,SAAS,WAAW,QAAQ;GACpE,QAAQ,KAAK,QAAQ;GACrB,OAAO,KAAK,QAAQ;GACpB,CAAC;;;AAIJ,IAAa,eAAb,cAGUC,sCAAyD;CAClE,QAA0BF,0BAAsB;;AAGjD,SAAS,UAKR,QACA,SAA6C,EAAE,EAG9C;CACD,MAAM,UAAU,IAAIG,+BAAU,EAAE,QAAQ,OAAO,QAAQ,CAAC;CACxD,IAAI;AACJ,KAAI,OAAO,WAAW,KACrB,UAAS,IAAIC,2BAAe;UAClB,OAAO,WAAW,MAC5B,UAAS,OAAO;CAGjB,IAAI;AACJ,KAAI,OAAO,QAAQ;EAClB,MAAM,eAAeC,gBAAG,8BACvB,OAAO,QACPA,gBAAG,4BACH;AACD,WAAS;GACR,YAAY,OAAO;GACnB,QAAQ,aAAa;GACrB,eAAe,aAAa;GAC5B;;CAGF,MAAM,YAAY,OAAO,aAAa,EAAE;CAGxC,MAAM,KAAK,IAAI,aAAa,SAFb,IAAI,WAAW,QAAQ,SAAS;EAAE;EAAQ,OAAO,OAAO;EAAO,CAAC,CACxD,cAAc,WAAW,OAAO,EACT,WAAW,OAAyC;AAGlG,CAAO,GAAI,UAAU;AACrB,CAAO,GAAI,SAAS,OAAO;AAC3B,KAAW,GAAI,OACd,CAAO,GAAI,OAAO,gBAAgB,OAAO,OAAO;AAGjD,QAAO;;AAGR,SAAgB,QAKf,GAAG,QAoBF;AACD,KAAI,OAAO,OAAO,OAAO,SAKxB,QAAO,UAJU,IAAIC,8BAAK,EACzB,kBAAkB,OAAO,IACzB,CAAC,EAEyB,OAAO,GAAG;CAGtC,MAAM,EAAE,YAAY,QAAQ,IAAI,GAAG,kBAAkB,OAAO;AAM5D,KAAI,GACH,qCAAW,uBAAuB;AAGnC,KAAI,OAAQ,QAAO,UAAU,QAAQ,cAAc;AAQnD,QAAO,UANU,OAAO,eAAe,WACpC,IAAIA,8BAAK,EACV,kBAAkB,YAClB,CAAC,GACA,IAAIA,8BAAK,WAAW,EAEI,cAAc;;;CAIlC,SAAS,KAIf,QAGC;AACD,SAAO,UAAU,EAAE,EAAS,OAAO"}
+{"version":3,"file":"driver.cjs","names":["PgAsyncDatabase","entityKind","PgDialect","DefaultLogger","NeonSession","Pool"],"sources":["../../src/neon-serverless/driver.ts"],"sourcesContent":["import { neonConfig, Pool, type PoolConfig } from '@neondatabase/serverless';\nimport type { Cache } from '~/cache/core/cache.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { Logger } from '~/logger.ts';\nimport { DefaultLogger } from '~/logger.ts';\nimport { PgAsyncDatabase } from '~/pg-core/async/db.ts';\nimport { refineGenericPgCodecs } from '~/pg-core/codecs.ts';\nimport { PgDialect } from '~/pg-core/dialect.ts';\nimport type { DrizzlePgConfig } from '~/pg-core/utils.ts';\nimport type { AnyRelations, EmptyRelations } from '~/relations.ts';\nimport type { NeonClient, NeonQueryResultHKT } from './session.ts';\nimport { NeonSession } from './session.ts';\n\nexport interface NeonDriverOptions {\n\tlogger?: Logger;\n\tcache?: Cache;\n\tuseJitMapper?: boolean;\n}\n\nexport class NeonDatabase<TRelations extends AnyRelations = EmptyRelations>\n\textends PgAsyncDatabase<NeonQueryResultHKT, TRelations>\n{\n\tstatic override readonly [entityKind]: string = 'NeonServerlessDatabase';\n}\n\nexport const neonServerlessCodecs = refineGenericPgCodecs();\n\nfunction construct<\n\tTRelations extends AnyRelations = EmptyRelations,\n\tTClient extends NeonClient = NeonClient,\n>(\n\tclient: TClient,\n\tconfig: DrizzlePgConfig<TRelations> = {},\n): NeonDatabase<TRelations> & {\n\t$client: NeonClient extends TClient ? Pool : TClient;\n} {\n\tconst dialect = new PgDialect({\n\t\tcasing: config.casing,\n\t\tuseJitMappers: config.useJitMappers,\n\t\tcodecs: config.codecs ?? neonServerlessCodecs,\n\t});\n\tlet logger;\n\tif (config.logger === true) {\n\t\tlogger = new DefaultLogger();\n\t} else if (config.logger !== false) {\n\t\tlogger = config.logger;\n\t}\n\n\tconst relations = config.relations ?? {} as TRelations;\n\tconst session = new NeonSession(client, dialect, relations, {\n\t\tlogger,\n\t\tuseJitMapper: config.useJitMappers ?? false,\n\t\tcache: config.cache,\n\t});\n\tconst db = new NeonDatabase(dialect, session, relations) as NeonDatabase<TRelations>;\n\t(<any> db).$client = client;\n\t(<any> db).$cache = config.cache;\n\tif ((<any> db).$cache) {\n\t\t(<any> db).$cache['invalidate'] = config.cache?.onMutate;\n\t}\n\n\treturn db as any;\n}\n\nexport function drizzle<\n\tTRelations extends AnyRelations = EmptyRelations,\n\tTClient extends NeonClient = Pool,\n>(\n\t...params: [\n\t\tstring,\n\t] | [\n\t\tstring,\n\t\tDrizzlePgConfig<TRelations>,\n\t] | [\n\t\t(\n\t\t\t& DrizzlePgConfig<TRelations>\n\t\t\t& ({\n\t\t\t\tconnection: string | PoolConfig;\n\t\t\t} | {\n\t\t\t\tclient: TClient;\n\t\t\t})\n\t\t\t& {\n\t\t\t\tws?: any;\n\t\t\t}\n\t\t),\n\t]\n): NeonDatabase<TRelations> & {\n\t$client: NeonClient extends TClient ? Pool : TClient;\n} {\n\tif (typeof params[0] === 'string') {\n\t\tconst instance = new Pool({\n\t\t\tconnectionString: params[0],\n\t\t});\n\n\t\treturn construct(instance, params[1]) as any;\n\t}\n\n\tconst { connection, client, ws, ...DrizzlePgConfig } = params[0] as\n\t\t& {\n\t\t\tconnection?: PoolConfig | string;\n\t\t\tws?: any;\n\t\t\tclient?: TClient;\n\t\t}\n\t\t& DrizzlePgConfig<TRelations>;\n\n\tif (ws) {\n\t\tneonConfig.webSocketConstructor = ws;\n\t}\n\n\tif (client) return construct(client, DrizzlePgConfig);\n\n\tconst instance = typeof connection === 'string'\n\t\t? new Pool({\n\t\t\tconnectionString: connection,\n\t\t})\n\t\t: new Pool(connection);\n\n\treturn construct(instance, DrizzlePgConfig) as any;\n}\n\nexport namespace drizzle {\n\texport function mock<TRelations extends AnyRelations = EmptyRelations>(\n\t\tconfig?: DrizzlePgConfig<TRelations>,\n\t): NeonDatabase<TRelations> & {\n\t\t$client: '$client is not available on drizzle.mock()';\n\t} {\n\t\treturn construct({} as any, config) as any;\n\t}\n}\n"],"mappings":";;;;;;;;;;;AAmBA,IAAa,eAAb,cACSA,sCACT;CACC,QAA0BC,0BAAsB;;AAGjD,MAAa,uEAA8C;AAE3D,SAAS,UAIR,QACA,SAAsC,EAAE,EAGvC;CACD,MAAM,UAAU,IAAIC,+BAAU;EAC7B,QAAQ,OAAO;EACf,eAAe,OAAO;EACtB,QAAQ,OAAO,UAAU;EACzB,CAAC;CACF,IAAI;AACJ,KAAI,OAAO,WAAW,KACrB,UAAS,IAAIC,2BAAe;UAClB,OAAO,WAAW,MAC5B,UAAS,OAAO;CAGjB,MAAM,YAAY,OAAO,aAAa,EAAE;CAMxC,MAAM,KAAK,IAAI,aAAa,SALZ,IAAIC,4CAAY,QAAQ,SAAS,WAAW;EAC3D;EACA,cAAc,OAAO,iBAAiB;EACtC,OAAO,OAAO;EACd,CAAC,EAC4C,UAAU;AACxD,CAAO,GAAI,UAAU;AACrB,CAAO,GAAI,SAAS,OAAO;AAC3B,KAAW,GAAI,OACd,CAAO,GAAI,OAAO,gBAAgB,OAAO,OAAO;AAGjD,QAAO;;AAGR,SAAgB,QAIf,GAAG,QAoBF;AACD,KAAI,OAAO,OAAO,OAAO,SAKxB,QAAO,UAJU,IAAIC,8BAAK,EACzB,kBAAkB,OAAO,IACzB,CAAC,EAEyB,OAAO,GAAG;CAGtC,MAAM,EAAE,YAAY,QAAQ,IAAI,GAAG,oBAAoB,OAAO;AAQ9D,KAAI,GACH,qCAAW,uBAAuB;AAGnC,KAAI,OAAQ,QAAO,UAAU,QAAQ,gBAAgB;AAQrD,QAAO,UANU,OAAO,eAAe,WACpC,IAAIA,8BAAK,EACV,kBAAkB,YAClB,CAAC,GACA,IAAIA,8BAAK,WAAW,EAEI,gBAAgB;;;CAIpC,SAAS,KACf,QAGC;AACD,SAAO,UAAU,EAAE,EAAS,OAAO"}

package/neon-serverless/driver.d.cts

@@ -1,44 +1,39 @@
-import { NeonClient, NeonQueryResultHKT, NeonSession } from "./session.cjs";
+import { PartialWithUndefined } from "../utils.cjs";
+import { Codec } from "../codecs.cjs";
+import { NeonClient, NeonQueryResultHKT } from "./session.cjs";
 import { entityKind } from "../entity.cjs";
-import { DrizzleConfig } from "../utils.cjs";
-import * as V1 from "../_relations.cjs";
 import { Cache } from "../cache/core/cache.cjs";
 import { AnyRelations, EmptyRelations } from "../relations.cjs";
-import { PgDialect } from "../pg-core/dialect.cjs";
 import { Logger } from "../logger.cjs";
+import * as __pg_core_codecs_ts0 from "../pg-core/codecs.cjs";
 import { PgAsyncDatabase } from "../pg-core/async/db.cjs";
+import { DrizzlePgConfig } from "../pg-core/utils.cjs";
 import { Pool, PoolConfig } from "@neondatabase/serverless";
 
 //#region src/neon-serverless/driver.d.ts
 interface NeonDriverOptions {
   logger?: Logger;
   cache?: Cache;
+  useJitMapper?: boolean;
 }
-declare class NeonDriver {
-  private client;
-  private dialect;
-  private options;
+declare class NeonDatabase<TRelations extends AnyRelations = EmptyRelations> extends PgAsyncDatabase<NeonQueryResultHKT, TRelations> {
   static readonly [entityKind]: string;
-  constructor(client: NeonClient, dialect: PgDialect, options?: NeonDriverOptions);
-  createSession(relations: AnyRelations, schema: V1.RelationalSchemaConfig<V1.TablesRelationalConfig> | undefined): NeonSession<Record<string, unknown>, AnyRelations, V1.TablesRelationalConfig>;
 }
-declare class NeonDatabase<TSchema extends Record<string, unknown> = Record<string, never>, TRelations extends AnyRelations = EmptyRelations> extends PgAsyncDatabase<NeonQueryResultHKT, TSchema, TRelations> {
-  static readonly [entityKind]: string;
-}
-declare function drizzle<TSchema extends Record<string, unknown> = Record<string, never>, TRelations extends AnyRelations = EmptyRelations, TClient extends NeonClient = Pool>(...params: [string] | [string, DrizzleConfig<TSchema, TRelations>] | [(DrizzleConfig<TSchema, TRelations> & ({
+declare const neonServerlessCodecs: PartialWithUndefined<Record<__pg_core_codecs_ts0.PostgresType, Codec>>;
+declare function drizzle<TRelations extends AnyRelations = EmptyRelations, TClient extends NeonClient = Pool>(...params: [string] | [string, DrizzlePgConfig<TRelations>] | [(DrizzlePgConfig<TRelations> & ({
   connection: string | PoolConfig;
 } | {
   client: TClient;
 }) & {
   ws?: any;
-})]): NeonDatabase<TSchema, TRelations> & {
+})]): NeonDatabase<TRelations> & {
   $client: NeonClient extends TClient ? Pool : TClient;
 };
 declare namespace drizzle {
-  function mock<TSchema extends Record<string, unknown> = Record<string, never>, TRelations extends AnyRelations = EmptyRelations>(config?: DrizzleConfig<TSchema, TRelations>): NeonDatabase<TSchema> & {
+  function mock<TRelations extends AnyRelations = EmptyRelations>(config?: DrizzlePgConfig<TRelations>): NeonDatabase<TRelations> & {
     $client: '$client is not available on drizzle.mock()';
   };
 }
 //#endregion
-export { NeonDatabase, NeonDriver, NeonDriverOptions, drizzle };
+export { NeonDatabase, NeonDriverOptions, drizzle, neonServerlessCodecs };
 //# sourceMappingURL=driver.d.cts.map

package/neon-serverless/driver.d.ts

@@ -1,44 +1,39 @@
-import { NeonClient, NeonQueryResultHKT, NeonSession } from "./session.js";
+import { PartialWithUndefined } from "../utils.js";
+import { Codec } from "../codecs.js";
+import { NeonClient, NeonQueryResultHKT } from "./session.js";
 import { entityKind } from "../entity.js";
-import { DrizzleConfig } from "../utils.js";
-import * as V1 from "../_relations.js";
 import { Logger } from "../logger.js";
+import { AnyRelations, EmptyRelations } from "../relations.js";
 import { PgAsyncDatabase } from "../pg-core/async/db.js";
-import { PgDialect } from "../pg-core/dialect.js";
+import * as __pg_core_codecs_ts0 from "../pg-core/codecs.js";
 import { Cache } from "../cache/core/cache.js";
 import { Pool, PoolConfig } from "@neondatabase/serverless";
-import { AnyRelations, EmptyRelations } from "../relations.js";
+import { DrizzlePgConfig } from "../pg-core/utils.js";
 
 //#region src/neon-serverless/driver.d.ts
 interface NeonDriverOptions {
   logger?: Logger;
   cache?: Cache;
+  useJitMapper?: boolean;
 }
-declare class NeonDriver {
-  private client;
-  private dialect;
-  private options;
-  static readonly [entityKind]: string;
-  constructor(client: NeonClient, dialect: PgDialect, options?: NeonDriverOptions);
-  createSession(relations: AnyRelations, schema: V1.RelationalSchemaConfig<V1.TablesRelationalConfig> | undefined): NeonSession<Record<string, unknown>, AnyRelations, V1.TablesRelationalConfig>;
-}
-declare class NeonDatabase<TSchema extends Record<string, unknown> = Record<string, never>, TRelations extends AnyRelations = EmptyRelations> extends PgAsyncDatabase<NeonQueryResultHKT, TSchema, TRelations> {
+declare class NeonDatabase<TRelations extends AnyRelations = EmptyRelations> extends PgAsyncDatabase<NeonQueryResultHKT, TRelations> {
   static readonly [entityKind]: string;
 }
-declare function drizzle<TSchema extends Record<string, unknown> = Record<string, never>, TRelations extends AnyRelations = EmptyRelations, TClient extends NeonClient = Pool>(...params: [string] | [string, DrizzleConfig<TSchema, TRelations>] | [(DrizzleConfig<TSchema, TRelations> & ({
+declare const neonServerlessCodecs: PartialWithUndefined<Record<__pg_core_codecs_ts0.PostgresType, Codec>>;
+declare function drizzle<TRelations extends AnyRelations = EmptyRelations, TClient extends NeonClient = Pool>(...params: [string] | [string, DrizzlePgConfig<TRelations>] | [(DrizzlePgConfig<TRelations> & ({
   connection: string | PoolConfig;
 } | {
   client: TClient;
 }) & {
   ws?: any;
-})]): NeonDatabase<TSchema, TRelations> & {
+})]): NeonDatabase<TRelations> & {
   $client: NeonClient extends TClient ? Pool : TClient;
 };
 declare namespace drizzle {
-  function mock<TSchema extends Record<string, unknown> = Record<string, never>, TRelations extends AnyRelations = EmptyRelations>(config?: DrizzleConfig<TSchema, TRelations>): NeonDatabase<TSchema> & {
+  function mock<TRelations extends AnyRelations = EmptyRelations>(config?: DrizzlePgConfig<TRelations>): NeonDatabase<TRelations> & {
     $client: '$client is not available on drizzle.mock()';
   };
 }
 //#endregion
-export { NeonDatabase, NeonDriver, NeonDriverOptions, drizzle };
+export { NeonDatabase, NeonDriverOptions, drizzle, neonServerlessCodecs };
 //# sourceMappingURL=driver.d.ts.map

package/neon-serverless/driver.js

@@ -1,48 +1,31 @@
 import { NeonSession } from "./session.js";
 import { entityKind } from "../entity.js";
-import * as V1 from "../_relations.js";
 import { DefaultLogger } from "../logger.js";
 import { PgAsyncDatabase } from "../pg-core/async/db.js";
+import { refineGenericPgCodecs } from "../pg-core/codecs.js";
 import { PgDialect } from "../pg-core/dialect.js";
 import { Pool, neonConfig } from "@neondatabase/serverless";
 
 //#region src/neon-serverless/driver.ts
-var NeonDriver = class {
-	static [entityKind] = "NeonDriver";
-	constructor(client, dialect, options = {}) {
-		this.client = client;
-		this.dialect = dialect;
-		this.options = options;
-	}
-	createSession(relations, schema) {
-		return new NeonSession(this.client, this.dialect, relations, schema, {
-			logger: this.options.logger,
-			cache: this.options.cache
-		});
-	}
-};
 var NeonDatabase = class extends PgAsyncDatabase {
 	static [entityKind] = "NeonServerlessDatabase";
 };
+const neonServerlessCodecs = refineGenericPgCodecs();
 function construct(client, config = {}) {
-	const dialect = new PgDialect({ casing: config.casing });
+	const dialect = new PgDialect({
+		casing: config.casing,
+		useJitMappers: config.useJitMappers,
+		codecs: config.codecs ?? neonServerlessCodecs
+	});
 	let logger;
 	if (config.logger === true) logger = new DefaultLogger();
 	else if (config.logger !== false) logger = config.logger;
-	let schema;
-	if (config.schema) {
-		const tablesConfig = V1.extractTablesRelationalConfig(config.schema, V1.createTableRelationsHelpers);
-		schema = {
-			fullSchema: config.schema,
-			schema: tablesConfig.tables,
-			tableNamesMap: tablesConfig.tableNamesMap
-		};
-	}
 	const relations = config.relations ?? {};
-	const db = new NeonDatabase(dialect, new NeonDriver(client, dialect, {
+	const db = new NeonDatabase(dialect, new NeonSession(client, dialect, relations, {
 		logger,
+		useJitMapper: config.useJitMappers ?? false,
 		cache: config.cache
-	}).createSession(relations, schema), relations, schema);
+	}), relations);
 	db.$client = client;
 	db.$cache = config.cache;
 	if (db.$cache) db.$cache["invalidate"] = config.cache?.onMutate;
@@ -50,10 +33,10 @@ function construct(client, config = {}) {
 }
 function drizzle(...params) {
 	if (typeof params[0] === "string") return construct(new Pool({ connectionString: params[0] }), params[1]);
-	const { connection, client, ws, ...drizzleConfig } = params[0];
+	const { connection, client, ws, ...DrizzlePgConfig } = params[0];
 	if (ws) neonConfig.webSocketConstructor = ws;
-	if (client) return construct(client, drizzleConfig);
-	return construct(typeof connection === "string" ? new Pool({ connectionString: connection }) : new Pool(connection), drizzleConfig);
+	if (client) return construct(client, DrizzlePgConfig);
+	return construct(typeof connection === "string" ? new Pool({ connectionString: connection }) : new Pool(connection), DrizzlePgConfig);
 }
 (function(_drizzle) {
 	function mock(config) {
@@ -63,5 +46,5 @@ function drizzle(...params) {
 })(drizzle || (drizzle = {}));
 
 //#endregion
-export { NeonDatabase, NeonDriver, drizzle };
+export { NeonDatabase, drizzle, neonServerlessCodecs };
 //# sourceMappingURL=driver.js.map

package/neon-serverless/driver.js.map

@@ -1 +1 @@
-{"version":3,"file":"driver.js","names":[],"sources":["../../src/neon-serverless/driver.ts"],"sourcesContent":["import { neonConfig, Pool, type PoolConfig } from '@neondatabase/serverless';\nimport * as V1 from '~/_relations.ts';\nimport type { Cache } from '~/cache/core/cache.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { Logger } from '~/logger.ts';\nimport { DefaultLogger } from '~/logger.ts';\nimport { PgAsyncDatabase } from '~/pg-core/async/db.ts';\nimport { PgDialect } from '~/pg-core/dialect.ts';\nimport type { AnyRelations, EmptyRelations } from '~/relations.ts';\nimport type { DrizzleConfig } from '~/utils.ts';\nimport type { NeonClient, NeonQueryResultHKT } from './session.ts';\nimport { NeonSession } from './session.ts';\n\nexport interface NeonDriverOptions {\n\tlogger?: Logger;\n\tcache?: Cache;\n}\n\nexport class NeonDriver {\n\tstatic readonly [entityKind]: string = 'NeonDriver';\n\n\tconstructor(\n\t\tprivate client: NeonClient,\n\t\tprivate dialect: PgDialect,\n\t\tprivate options: NeonDriverOptions = {},\n\t) {\n\t}\n\n\tcreateSession(\n\t\trelations: AnyRelations,\n\t\tschema: V1.RelationalSchemaConfig<V1.TablesRelationalConfig> | undefined,\n\t): NeonSession<Record<string, unknown>, AnyRelations, V1.TablesRelationalConfig> {\n\t\treturn new NeonSession(this.client, this.dialect, relations, schema, {\n\t\t\tlogger: this.options.logger,\n\t\t\tcache: this.options.cache,\n\t\t});\n\t}\n}\n\nexport class NeonDatabase<\n\tTSchema extends Record<string, unknown> = Record<string, never>,\n\tTRelations extends AnyRelations = EmptyRelations,\n> extends PgAsyncDatabase<NeonQueryResultHKT, TSchema, TRelations> {\n\tstatic override readonly [entityKind]: string = 'NeonServerlessDatabase';\n}\n\nfunction construct<\n\tTSchema extends Record<string, unknown> = Record<string, never>,\n\tTRelations extends AnyRelations = EmptyRelations,\n\tTClient extends NeonClient = NeonClient,\n>(\n\tclient: TClient,\n\tconfig: DrizzleConfig<TSchema, TRelations> = {},\n): NeonDatabase<TSchema, TRelations> & {\n\t$client: NeonClient extends TClient ? Pool : TClient;\n} {\n\tconst dialect = new PgDialect({ casing: config.casing });\n\tlet logger;\n\tif (config.logger === true) {\n\t\tlogger = new DefaultLogger();\n\t} else if (config.logger !== false) {\n\t\tlogger = config.logger;\n\t}\n\n\tlet schema: V1.RelationalSchemaConfig<V1.TablesRelationalConfig> | undefined;\n\tif (config.schema) {\n\t\tconst tablesConfig = V1.extractTablesRelationalConfig(\n\t\t\tconfig.schema,\n\t\t\tV1.createTableRelationsHelpers,\n\t\t);\n\t\tschema = {\n\t\t\tfullSchema: config.schema,\n\t\t\tschema: tablesConfig.tables,\n\t\t\ttableNamesMap: tablesConfig.tableNamesMap,\n\t\t};\n\t}\n\n\tconst relations = config.relations ?? {} as TRelations;\n\tconst driver = new NeonDriver(client, dialect, { logger, cache: config.cache });\n\tconst session = driver.createSession(relations, schema);\n\tconst db = new NeonDatabase(dialect, session, relations, schema as V1.RelationalSchemaConfig<any>) as NeonDatabase<\n\t\tTSchema\n\t>;\n\t(<any> db).$client = client;\n\t(<any> db).$cache = config.cache;\n\tif ((<any> db).$cache) {\n\t\t(<any> db).$cache['invalidate'] = config.cache?.onMutate;\n\t}\n\n\treturn db as any;\n}\n\nexport function drizzle<\n\tTSchema extends Record<string, unknown> = Record<string, never>,\n\tTRelations extends AnyRelations = EmptyRelations,\n\tTClient extends NeonClient = Pool,\n>(\n\t...params: [\n\t\tstring,\n\t] | [\n\t\tstring,\n\t\tDrizzleConfig<TSchema, TRelations>,\n\t] | [\n\t\t(\n\t\t\t& DrizzleConfig<TSchema, TRelations>\n\t\t\t& ({\n\t\t\t\tconnection: string | PoolConfig;\n\t\t\t} | {\n\t\t\t\tclient: TClient;\n\t\t\t})\n\t\t\t& {\n\t\t\t\tws?: any;\n\t\t\t}\n\t\t),\n\t]\n): NeonDatabase<TSchema, TRelations> & {\n\t$client: NeonClient extends TClient ? Pool : TClient;\n} {\n\tif (typeof params[0] === 'string') {\n\t\tconst instance = new Pool({\n\t\t\tconnectionString: params[0],\n\t\t});\n\n\t\treturn construct(instance, params[1]) as any;\n\t}\n\n\tconst { connection, client, ws, ...drizzleConfig } = params[0] as {\n\t\tconnection?: PoolConfig | string;\n\t\tws?: any;\n\t\tclient?: TClient;\n\t} & DrizzleConfig<TSchema, TRelations>;\n\n\tif (ws) {\n\t\tneonConfig.webSocketConstructor = ws;\n\t}\n\n\tif (client) return construct(client, drizzleConfig);\n\n\tconst instance = typeof connection === 'string'\n\t\t? new Pool({\n\t\t\tconnectionString: connection,\n\t\t})\n\t\t: new Pool(connection);\n\n\treturn construct(instance, drizzleConfig) as any;\n}\n\nexport namespace drizzle {\n\texport function mock<\n\t\tTSchema extends Record<string, unknown> = Record<string, never>,\n\t\tTRelations extends AnyRelations = EmptyRelations,\n\t>(\n\t\tconfig?: DrizzleConfig<TSchema, TRelations>,\n\t): NeonDatabase<TSchema> & {\n\t\t$client: '$client is not available on drizzle.mock()';\n\t} {\n\t\treturn construct({} as any, config) as any;\n\t}\n}\n"],"mappings":";;;;;;;;;AAkBA,IAAa,aAAb,MAAwB;CACvB,QAAiB,cAAsB;CAEvC,YACC,AAAQ,QACR,AAAQ,SACR,AAAQ,UAA6B,EAAE,EACtC;EAHO;EACA;EACA;;CAIT,cACC,WACA,QACgF;AAChF,SAAO,IAAI,YAAY,KAAK,QAAQ,KAAK,SAAS,WAAW,QAAQ;GACpE,QAAQ,KAAK,QAAQ;GACrB,OAAO,KAAK,QAAQ;GACpB,CAAC;;;AAIJ,IAAa,eAAb,cAGU,gBAAyD;CAClE,QAA0B,cAAsB;;AAGjD,SAAS,UAKR,QACA,SAA6C,EAAE,EAG9C;CACD,MAAM,UAAU,IAAI,UAAU,EAAE,QAAQ,OAAO,QAAQ,CAAC;CACxD,IAAI;AACJ,KAAI,OAAO,WAAW,KACrB,UAAS,IAAI,eAAe;UAClB,OAAO,WAAW,MAC5B,UAAS,OAAO;CAGjB,IAAI;AACJ,KAAI,OAAO,QAAQ;EAClB,MAAM,eAAe,GAAG,8BACvB,OAAO,QACP,GAAG,4BACH;AACD,WAAS;GACR,YAAY,OAAO;GACnB,QAAQ,aAAa;GACrB,eAAe,aAAa;GAC5B;;CAGF,MAAM,YAAY,OAAO,aAAa,EAAE;CAGxC,MAAM,KAAK,IAAI,aAAa,SAFb,IAAI,WAAW,QAAQ,SAAS;EAAE;EAAQ,OAAO,OAAO;EAAO,CAAC,CACxD,cAAc,WAAW,OAAO,EACT,WAAW,OAAyC;AAGlG,CAAO,GAAI,UAAU;AACrB,CAAO,GAAI,SAAS,OAAO;AAC3B,KAAW,GAAI,OACd,CAAO,GAAI,OAAO,gBAAgB,OAAO,OAAO;AAGjD,QAAO;;AAGR,SAAgB,QAKf,GAAG,QAoBF;AACD,KAAI,OAAO,OAAO,OAAO,SAKxB,QAAO,UAJU,IAAI,KAAK,EACzB,kBAAkB,OAAO,IACzB,CAAC,EAEyB,OAAO,GAAG;CAGtC,MAAM,EAAE,YAAY,QAAQ,IAAI,GAAG,kBAAkB,OAAO;AAM5D,KAAI,GACH,YAAW,uBAAuB;AAGnC,KAAI,OAAQ,QAAO,UAAU,QAAQ,cAAc;AAQnD,QAAO,UANU,OAAO,eAAe,WACpC,IAAI,KAAK,EACV,kBAAkB,YAClB,CAAC,GACA,IAAI,KAAK,WAAW,EAEI,cAAc;;;CAIlC,SAAS,KAIf,QAGC;AACD,SAAO,UAAU,EAAE,EAAS,OAAO"}
+{"version":3,"file":"driver.js","names":[],"sources":["../../src/neon-serverless/driver.ts"],"sourcesContent":["import { neonConfig, Pool, type PoolConfig } from '@neondatabase/serverless';\nimport type { Cache } from '~/cache/core/cache.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { Logger } from '~/logger.ts';\nimport { DefaultLogger } from '~/logger.ts';\nimport { PgAsyncDatabase } from '~/pg-core/async/db.ts';\nimport { refineGenericPgCodecs } from '~/pg-core/codecs.ts';\nimport { PgDialect } from '~/pg-core/dialect.ts';\nimport type { DrizzlePgConfig } from '~/pg-core/utils.ts';\nimport type { AnyRelations, EmptyRelations } from '~/relations.ts';\nimport type { NeonClient, NeonQueryResultHKT } from './session.ts';\nimport { NeonSession } from './session.ts';\n\nexport interface NeonDriverOptions {\n\tlogger?: Logger;\n\tcache?: Cache;\n\tuseJitMapper?: boolean;\n}\n\nexport class NeonDatabase<TRelations extends AnyRelations = EmptyRelations>\n\textends PgAsyncDatabase<NeonQueryResultHKT, TRelations>\n{\n\tstatic override readonly [entityKind]: string = 'NeonServerlessDatabase';\n}\n\nexport const neonServerlessCodecs = refineGenericPgCodecs();\n\nfunction construct<\n\tTRelations extends AnyRelations = EmptyRelations,\n\tTClient extends NeonClient = NeonClient,\n>(\n\tclient: TClient,\n\tconfig: DrizzlePgConfig<TRelations> = {},\n): NeonDatabase<TRelations> & {\n\t$client: NeonClient extends TClient ? Pool : TClient;\n} {\n\tconst dialect = new PgDialect({\n\t\tcasing: config.casing,\n\t\tuseJitMappers: config.useJitMappers,\n\t\tcodecs: config.codecs ?? neonServerlessCodecs,\n\t});\n\tlet logger;\n\tif (config.logger === true) {\n\t\tlogger = new DefaultLogger();\n\t} else if (config.logger !== false) {\n\t\tlogger = config.logger;\n\t}\n\n\tconst relations = config.relations ?? {} as TRelations;\n\tconst session = new NeonSession(client, dialect, relations, {\n\t\tlogger,\n\t\tuseJitMapper: config.useJitMappers ?? false,\n\t\tcache: config.cache,\n\t});\n\tconst db = new NeonDatabase(dialect, session, relations) as NeonDatabase<TRelations>;\n\t(<any> db).$client = client;\n\t(<any> db).$cache = config.cache;\n\tif ((<any> db).$cache) {\n\t\t(<any> db).$cache['invalidate'] = config.cache?.onMutate;\n\t}\n\n\treturn db as any;\n}\n\nexport function drizzle<\n\tTRelations extends AnyRelations = EmptyRelations,\n\tTClient extends NeonClient = Pool,\n>(\n\t...params: [\n\t\tstring,\n\t] | [\n\t\tstring,\n\t\tDrizzlePgConfig<TRelations>,\n\t] | [\n\t\t(\n\t\t\t& DrizzlePgConfig<TRelations>\n\t\t\t& ({\n\t\t\t\tconnection: string | PoolConfig;\n\t\t\t} | {\n\t\t\t\tclient: TClient;\n\t\t\t})\n\t\t\t& {\n\t\t\t\tws?: any;\n\t\t\t}\n\t\t),\n\t]\n): NeonDatabase<TRelations> & {\n\t$client: NeonClient extends TClient ? Pool : TClient;\n} {\n\tif (typeof params[0] === 'string') {\n\t\tconst instance = new Pool({\n\t\t\tconnectionString: params[0],\n\t\t});\n\n\t\treturn construct(instance, params[1]) as any;\n\t}\n\n\tconst { connection, client, ws, ...DrizzlePgConfig } = params[0] as\n\t\t& {\n\t\t\tconnection?: PoolConfig | string;\n\t\t\tws?: any;\n\t\t\tclient?: TClient;\n\t\t}\n\t\t& DrizzlePgConfig<TRelations>;\n\n\tif (ws) {\n\t\tneonConfig.webSocketConstructor = ws;\n\t}\n\n\tif (client) return construct(client, DrizzlePgConfig);\n\n\tconst instance = typeof connection === 'string'\n\t\t? new Pool({\n\t\t\tconnectionString: connection,\n\t\t})\n\t\t: new Pool(connection);\n\n\treturn construct(instance, DrizzlePgConfig) as any;\n}\n\nexport namespace drizzle {\n\texport function mock<TRelations extends AnyRelations = EmptyRelations>(\n\t\tconfig?: DrizzlePgConfig<TRelations>,\n\t): NeonDatabase<TRelations> & {\n\t\t$client: '$client is not available on drizzle.mock()';\n\t} {\n\t\treturn construct({} as any, config) as any;\n\t}\n}\n"],"mappings":";;;;;;;;;AAmBA,IAAa,eAAb,cACS,gBACT;CACC,QAA0B,cAAsB;;AAGjD,MAAa,uBAAuB,uBAAuB;AAE3D,SAAS,UAIR,QACA,SAAsC,EAAE,EAGvC;CACD,MAAM,UAAU,IAAI,UAAU;EAC7B,QAAQ,OAAO;EACf,eAAe,OAAO;EACtB,QAAQ,OAAO,UAAU;EACzB,CAAC;CACF,IAAI;AACJ,KAAI,OAAO,WAAW,KACrB,UAAS,IAAI,eAAe;UAClB,OAAO,WAAW,MAC5B,UAAS,OAAO;CAGjB,MAAM,YAAY,OAAO,aAAa,EAAE;CAMxC,MAAM,KAAK,IAAI,aAAa,SALZ,IAAI,YAAY,QAAQ,SAAS,WAAW;EAC3D;EACA,cAAc,OAAO,iBAAiB;EACtC,OAAO,OAAO;EACd,CAAC,EAC4C,UAAU;AACxD,CAAO,GAAI,UAAU;AACrB,CAAO,GAAI,SAAS,OAAO;AAC3B,KAAW,GAAI,OACd,CAAO,GAAI,OAAO,gBAAgB,OAAO,OAAO;AAGjD,QAAO;;AAGR,SAAgB,QAIf,GAAG,QAoBF;AACD,KAAI,OAAO,OAAO,OAAO,SAKxB,QAAO,UAJU,IAAI,KAAK,EACzB,kBAAkB,OAAO,IACzB,CAAC,EAEyB,OAAO,GAAG;CAGtC,MAAM,EAAE,YAAY,QAAQ,IAAI,GAAG,oBAAoB,OAAO;AAQ9D,KAAI,GACH,YAAW,uBAAuB;AAGnC,KAAI,OAAQ,QAAO,UAAU,QAAQ,gBAAgB;AAQrD,QAAO,UANU,OAAO,eAAe,WACpC,IAAI,KAAK,EACV,kBAAkB,YAClB,CAAC,GACA,IAAI,KAAK,WAAW,EAEI,gBAAgB;;;CAIpC,SAAS,KACf,QAGC;AACD,SAAO,UAAU,EAAE,EAAS,OAAO"}

package/neon-serverless/index.cjs

@@ -3,8 +3,6 @@ const require_neon_serverless_session = require('./session.cjs');
 const require_neon_serverless_driver = require('./driver.cjs');
 
 exports.NeonDatabase = require_neon_serverless_driver.NeonDatabase;
-exports.NeonDriver = require_neon_serverless_driver.NeonDriver;
-exports.NeonPreparedQuery = require_neon_serverless_session.NeonPreparedQuery;
 exports.NeonSession = require_neon_serverless_session.NeonSession;
 exports.NeonTransaction = require_neon_serverless_session.NeonTransaction;
 Object.defineProperty(exports, 'drizzle', {
@@ -12,4 +10,5 @@ Object.defineProperty(exports, 'drizzle', {
   get: function () {
     return require_neon_serverless_driver.drizzle;
   }
-});
+});
+exports.neonServerlessCodecs = require_neon_serverless_driver.neonServerlessCodecs;

package/neon-serverless/index.d.cts

@@ -1,3 +1,3 @@
-import { NeonClient, NeonPreparedQuery, NeonQueryResultHKT, NeonSession, NeonSessionOptions, NeonTransaction } from "./session.cjs";
-import { NeonDatabase, NeonDriver, NeonDriverOptions, drizzle } from "./driver.cjs";
-export { NeonClient, NeonDatabase, NeonDriver, NeonDriverOptions, NeonPreparedQuery, NeonQueryResultHKT, NeonSession, NeonSessionOptions, NeonTransaction, drizzle };
+import { NeonClient, NeonQueryResultHKT, NeonSession, NeonSessionOptions, NeonTransaction } from "./session.cjs";
+import { NeonDatabase, NeonDriverOptions, drizzle, neonServerlessCodecs } from "./driver.cjs";
+export { NeonClient, NeonDatabase, NeonDriverOptions, NeonQueryResultHKT, NeonSession, NeonSessionOptions, NeonTransaction, drizzle, neonServerlessCodecs };

package/neon-serverless/index.d.ts

@@ -1,3 +1,3 @@
-import { NeonClient, NeonPreparedQuery, NeonQueryResultHKT, NeonSession, NeonSessionOptions, NeonTransaction } from "./session.js";
-import { NeonDatabase, NeonDriver, NeonDriverOptions, drizzle } from "./driver.js";
-export { NeonClient, NeonDatabase, NeonDriver, NeonDriverOptions, NeonPreparedQuery, NeonQueryResultHKT, NeonSession, NeonSessionOptions, NeonTransaction, drizzle };
+import { NeonClient, NeonQueryResultHKT, NeonSession, NeonSessionOptions, NeonTransaction } from "./session.js";
+import { NeonDatabase, NeonDriverOptions, drizzle, neonServerlessCodecs } from "./driver.js";
+export { NeonClient, NeonDatabase, NeonDriverOptions, NeonQueryResultHKT, NeonSession, NeonSessionOptions, NeonTransaction, drizzle, neonServerlessCodecs };

package/neon-serverless/index.js

@@ -1,4 +1,4 @@
-import { NeonPreparedQuery, NeonSession, NeonTransaction } from "./session.js";
-import { NeonDatabase, NeonDriver, drizzle } from "./driver.js";
+import { NeonSession, NeonTransaction } from "./session.js";
+import { NeonDatabase, drizzle, neonServerlessCodecs } from "./driver.js";
 
-export { NeonDatabase, NeonDriver, NeonPreparedQuery, NeonSession, NeonTransaction, drizzle };
+export { NeonDatabase, NeonSession, NeonTransaction, drizzle, neonServerlessCodecs };