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

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 { 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 { AnyRelations, EmptyRelations } from "../relations.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 };

package/neon-serverless/migrator.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"migrator.cjs","names":[],"sources":["../../src/neon-serverless/migrator.ts"],"sourcesContent":["import type { MigrationConfig } from '~/migrator.ts';\nimport { readMigrationFiles } from '~/migrator.ts';\nimport { migrate as coreMigrate } from '~/pg-core/async/session.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport type { NeonDatabase } from './driver.ts';\n\nexport async function migrate<TSchema extends Record<string, unknown>, TRelations extends AnyRelations>(\n\tdb: NeonDatabase<TSchema, TRelations>,\n\tconfig: MigrationConfig,\n) {\n\tconst migrations = readMigrationFiles(config);\n\treturn await coreMigrate(migrations, db, config);\n}\n"],"mappings":";;;;;;AAMA,eAAsB,QACrB,IACA,QACC;AAED,QAAO,oFAD+B,OAAO,EACR,IAAI,OAAO"}
+{"version":3,"file":"migrator.cjs","names":[],"sources":["../../src/neon-serverless/migrator.ts"],"sourcesContent":["import type { MigrationConfig } from '~/migrator.ts';\nimport { readMigrationFiles } from '~/migrator.ts';\nimport { migrate as coreMigrate } from '~/pg-core/async/session.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport type { NeonDatabase } from './driver.ts';\n\nexport async function migrate<TRelations extends AnyRelations>(\n\tdb: NeonDatabase<TRelations>,\n\tconfig: MigrationConfig,\n) {\n\tconst migrations = readMigrationFiles(config);\n\treturn await coreMigrate(migrations, db, config);\n}\n"],"mappings":";;;;;;AAMA,eAAsB,QACrB,IACA,QACC;AAED,QAAO,oFAD+B,OAAO,EACR,IAAI,OAAO"}

package/neon-serverless/migrator.d.cts

@@ -4,7 +4,7 @@ import { MigrationConfig } from "../migrator.cjs";
 import { AnyRelations } from "../relations.cjs";
 
 //#region src/neon-serverless/migrator.d.ts
-declare function migrate<TSchema extends Record<string, unknown>, TRelations extends AnyRelations>(db: NeonDatabase<TSchema, TRelations>, config: MigrationConfig): Promise<void | __migrator_ts0.MigratorInitFailResponse>;
+declare function migrate<TRelations extends AnyRelations>(db: NeonDatabase<TRelations>, config: MigrationConfig): Promise<void | __migrator_ts0.MigratorInitFailResponse>;
 //#endregion
 export { migrate };
 //# sourceMappingURL=migrator.d.cts.map

package/neon-serverless/migrator.d.ts

@@ -4,7 +4,7 @@ import { MigrationConfig } from "../migrator.js";
 import { AnyRelations } from "../relations.js";
 
 //#region src/neon-serverless/migrator.d.ts
-declare function migrate<TSchema extends Record<string, unknown>, TRelations extends AnyRelations>(db: NeonDatabase<TSchema, TRelations>, config: MigrationConfig): Promise<void | __migrator_ts0.MigratorInitFailResponse>;
+declare function migrate<TRelations extends AnyRelations>(db: NeonDatabase<TRelations>, config: MigrationConfig): Promise<void | __migrator_ts0.MigratorInitFailResponse>;
 //#endregion
 export { migrate };
 //# sourceMappingURL=migrator.d.ts.map

package/neon-serverless/migrator.js.map

@@ -1 +1 @@
-{"version":3,"file":"migrator.js","names":["coreMigrate"],"sources":["../../src/neon-serverless/migrator.ts"],"sourcesContent":["import type { MigrationConfig } from '~/migrator.ts';\nimport { readMigrationFiles } from '~/migrator.ts';\nimport { migrate as coreMigrate } from '~/pg-core/async/session.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport type { NeonDatabase } from './driver.ts';\n\nexport async function migrate<TSchema extends Record<string, unknown>, TRelations extends AnyRelations>(\n\tdb: NeonDatabase<TSchema, TRelations>,\n\tconfig: MigrationConfig,\n) {\n\tconst migrations = readMigrationFiles(config);\n\treturn await coreMigrate(migrations, db, config);\n}\n"],"mappings":";;;;AAMA,eAAsB,QACrB,IACA,QACC;AAED,QAAO,MAAMA,UADM,mBAAmB,OAAO,EACR,IAAI,OAAO"}
+{"version":3,"file":"migrator.js","names":["coreMigrate"],"sources":["../../src/neon-serverless/migrator.ts"],"sourcesContent":["import type { MigrationConfig } from '~/migrator.ts';\nimport { readMigrationFiles } from '~/migrator.ts';\nimport { migrate as coreMigrate } from '~/pg-core/async/session.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport type { NeonDatabase } from './driver.ts';\n\nexport async function migrate<TRelations extends AnyRelations>(\n\tdb: NeonDatabase<TRelations>,\n\tconfig: MigrationConfig,\n) {\n\tconst migrations = readMigrationFiles(config);\n\treturn await coreMigrate(migrations, db, config);\n}\n"],"mappings":";;;;AAMA,eAAsB,QACrB,IACA,QACC;AAED,QAAO,MAAMA,UADM,mBAAmB,OAAO,EACR,IAAI,OAAO"}

package/neon-serverless/session.cjs

@@ -1,131 +1,56 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_runtime = require('../_virtual/_rolldown/runtime.cjs');
 let __entity_ts = require("../entity.cjs");
-let __utils_ts = require("../utils.cjs");
 let __sql_sql_ts = require("../sql/sql.cjs");
 let __logger_ts = require("../logger.cjs");
 let __pg_core_async_session_ts = require("../pg-core/async/session.cjs");
 let __cache_core_cache_ts = require("../cache/core/cache.cjs");
 let _neondatabase_serverless = require("@neondatabase/serverless");
+let __query_name_generator_ts = require("../query-name-generator.cjs");
 
 //#region src/neon-serverless/session.ts
-const parsers = { getTypeParser: (typeId, format) => {
-	if (typeId === _neondatabase_serverless.types.builtins.TIMESTAMPTZ) return (val) => val;
-	if (typeId === _neondatabase_serverless.types.builtins.TIMESTAMP) return (val) => val;
-	if (typeId === _neondatabase_serverless.types.builtins.DATE) return (val) => val;
-	if (typeId === _neondatabase_serverless.types.builtins.INTERVAL) return (val) => val;
-	if (typeId === 1231) return (val) => val;
-	if (typeId === 1115) return (val) => val;
-	if (typeId === 1185) return (val) => val;
-	if (typeId === 1187) return (val) => val;
-	if (typeId === 1182) return (val) => val;
-	return _neondatabase_serverless.types.getTypeParser(typeId, format);
-} };
-var NeonPreparedQuery = class extends __pg_core_async_session_ts.PgAsyncPreparedQuery {
-	static [__entity_ts.entityKind] = "NeonPreparedQuery";
-	constructor(client, query, logger, cache, queryMetadata, cacheConfig, fields, name, _isResponseInArrayMode, customResultMapper, isRqbV2Query) {
-		super(query, cache, queryMetadata, cacheConfig);
-		this.client = client;
-		this.logger = logger;
-		this.fields = fields;
-		this.name = name;
-		this._isResponseInArrayMode = _isResponseInArrayMode;
-		this.customResultMapper = customResultMapper;
-		this.isRqbV2Query = isRqbV2Query;
-	}
-	async execute(placeholderValues = {}) {
-		if (this.isRqbV2Query) return this.executeRqbV2(placeholderValues);
-		const params = (0, __sql_sql_ts.fillPlaceholders)(this.query.params, placeholderValues);
-		this.logger.logQuery(this.query.sql, params);
-		const { fields, client, query, joinsNotNullableMap, customResultMapper } = this;
-		if (!fields && !customResultMapper) return await this.queryWithCache(query.sql, params, async () => {
-			return await client.query({
-				text: this.query.sql,
-				name: this.name,
-				types: parsers
-			}, params);
-		});
-		const result = await this.queryWithCache(query.sql, params, async () => {
-			return await client.query({
-				text: this.query.sql,
-				name: this.name,
-				types: parsers,
-				rowMode: "array"
-			}, params);
-		});
-		return customResultMapper ? customResultMapper(result.rows) : result.rows.map((row) => (0, __utils_ts.mapResultRow)(fields, row, joinsNotNullableMap));
-	}
-	async executeRqbV2(placeholderValues = {}) {
-		const params = (0, __sql_sql_ts.fillPlaceholders)(this.query.params, placeholderValues);
-		this.logger.logQuery(this.query.sql, params);
-		const { client, customResultMapper } = this;
-		return customResultMapper((await client.query({
-			text: this.query.sql,
-			name: this.name,
-			types: parsers
-		}, params)).rows);
-	}
-	all(placeholderValues = {}) {
-		const params = (0, __sql_sql_ts.fillPlaceholders)(this.query.params, placeholderValues);
-		this.logger.logQuery(this.query.sql, params);
-		return this.queryWithCache(this.query.sql, params, async () => {
-			return await this.client.query({
-				text: this.query.sql,
-				name: this.name,
-				types: parsers
-			}, params);
-		}).then((result) => result.rows);
-	}
-	values(placeholderValues = {}) {
-		const params = (0, __sql_sql_ts.fillPlaceholders)(this.query.params, placeholderValues);
-		this.logger.logQuery(this.query.sql, params);
-		return this.queryWithCache(this.query.sql, params, async () => {
-			return await this.client.query({
-				text: this.query.sql,
-				name: this.name,
-				types: parsers,
-				rowMode: "array"
-			}, params);
-		}).then((result) => result.rows);
-	}
-	/** @internal */
-	isResponseInArrayMode() {
-		return this._isResponseInArrayMode;
+const noop = (val) => val;
+const typeConfig = { getTypeParser: ((typeId, format) => {
+	switch (typeId) {
+		case _neondatabase_serverless.types.builtins.TIMESTAMPTZ:
+		case _neondatabase_serverless.types.builtins.TIMESTAMP:
+		case _neondatabase_serverless.types.builtins.DATE:
+		case _neondatabase_serverless.types.builtins.INTERVAL:
+		case 1231:
+		case 1115:
+		case 1185:
+		case 1187:
+		case 1182: return noop;
+		default: return _neondatabase_serverless.types.getTypeParser(typeId, format);
 	}
-};
+}) };
 var NeonSession = class NeonSession extends __pg_core_async_session_ts.PgAsyncSession {
 	static [__entity_ts.entityKind] = "NeonSession";
 	logger;
 	cache;
-	constructor(client, dialect, relations, schema, options = {}) {
+	constructor(client, dialect, relations, options = {}) {
 		super(dialect);
 		this.client = client;
 		this.relations = relations;
-		this.schema = schema;
 		this.options = options;
 		this.logger = options.logger ?? new __logger_ts.NoopLogger();
 		this.cache = options.cache ?? new __cache_core_cache_ts.NoopCache();
 	}
-	prepareQuery(query, fields, name, isResponseInArrayMode, customResultMapper, queryMetadata, cacheConfig) {
-		return new NeonPreparedQuery(this.client, query, this.logger, this.cache, queryMetadata, cacheConfig, fields, name, isResponseInArrayMode, customResultMapper);
-	}
-	prepareRelationalQuery(query, fields, name, customResultMapper) {
-		return new NeonPreparedQuery(this.client, query, this.logger, this.cache, void 0, void 0, fields, name, false, customResultMapper, true);
-	}
-	async query(query, params) {
-		this.logger.logQuery(query, params);
-		return await this.client.query({
-			rowMode: "array",
-			text: query,
-			values: params
-		});
-	}
-	async queryObjects(query, params) {
-		return this.client.query(query, params);
+	prepareQuery(query, mode, name, mapper, queryMetadata, cacheConfig) {
+		const queryName = typeof name === "string" ? name : name === true ? (0, __query_name_generator_ts.preparedStatementName)(query.sql, query.params) : void 0;
+		const executor = async (params) => {
+			return this.client.query({
+				name: queryName,
+				rowMode: mode === "arrays" ? "array" : void 0,
+				text: query.sql,
+				types: typeConfig
+			}, params).then((r) => mode === "raw" ? r : r.rows);
+		};
+		return new __pg_core_async_session_ts.PgAsyncPreparedQuery(executor, query, mapper, mode, this.logger, this.cache, queryMetadata, cacheConfig);
 	}
 	async transaction(transaction, config = {}) {
-		const session = this.client instanceof _neondatabase_serverless.Pool ? new NeonSession(await this.client.connect(), this.dialect, this.relations, this.schema, this.options) : this;
-		const tx = new NeonTransaction(this.dialect, session, this.relations, this.schema);
+		const session = this.client instanceof _neondatabase_serverless.Pool ? new NeonSession(await this.client.connect(), this.dialect, this.relations, this.options) : this;
+		const tx = new NeonTransaction(this.dialect, session, this.relations, void 0, false);
 		await tx.execute(__sql_sql_ts.sql`begin ${tx.getTransactionConfigSQL(config)}`);
 		try {
 			const result = await transaction(tx);
@@ -141,9 +66,9 @@ var NeonSession = class NeonSession extends __pg_core_async_session_ts.PgAsyncSe
 };
 var NeonTransaction = class NeonTransaction extends __pg_core_async_session_ts.PgAsyncTransaction {
 	static [__entity_ts.entityKind] = "NeonTransaction";
-	async transaction(transaction) {
+	transaction = async (transaction) => {
 		const savepointName = `sp${this.nestedIndex + 1}`;
-		const tx = new NeonTransaction(this.dialect, this.session, this.relations, this.schema, this.nestedIndex + 1);
+		const tx = new NeonTransaction(this.dialect, this.session, this._.relations, this.nestedIndex + 1, false);
 		await tx.execute(__sql_sql_ts.sql.raw(`savepoint ${savepointName}`));
 		try {
 			const result = await transaction(tx);
@@ -153,11 +78,10 @@ var NeonTransaction = class NeonTransaction extends __pg_core_async_session_ts.P
 			await tx.execute(__sql_sql_ts.sql.raw(`rollback to savepoint ${savepointName}`));
 			throw e;
 		}
-	}
+	};
 };
 
 //#endregion
-exports.NeonPreparedQuery = NeonPreparedQuery;
 exports.NeonSession = NeonSession;
 exports.NeonTransaction = NeonTransaction;
 //# sourceMappingURL=session.cjs.map