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

package/effect-postgres/driver.d.cts

@@ -1,7 +1,10 @@
+import { PartialWithUndefined } from "../utils.cjs";
+import { Codec } from "../codecs.cjs";
 import { EffectPgQueryEffectHKT, EffectPgQueryResultHKT } from "./session.cjs";
 import { entityKind } from "../entity.cjs";
-import { DrizzleConfig } from "../utils.cjs";
 import { AnyRelations, EmptyRelations } from "../relations.cjs";
+import * as __pg_core_codecs_ts0 from "../pg-core/codecs.cjs";
+import { DrizzlePgConfig } from "../pg-core/utils.cjs";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import { PgClient } from "@effect/sql-pg/PgClient";
@@ -10,11 +13,12 @@ import { EffectLogger } from "../effect-core/index.cjs";
 import { PgEffectDatabase } from "../pg-core/effect/db.cjs";
 
 //#region src/effect-postgres/driver.d.ts
-declare class EffectPgDatabase<TFullSchema extends Record<string, unknown> = Record<string, never>, TRelations extends AnyRelations = EmptyRelations> extends PgEffectDatabase<EffectPgQueryEffectHKT, EffectPgQueryResultHKT, TFullSchema, TRelations> {
+declare class EffectPgDatabase<TRelations extends AnyRelations = EmptyRelations> extends PgEffectDatabase<EffectPgQueryEffectHKT, EffectPgQueryResultHKT, TRelations> {
   static readonly [entityKind]: string;
 }
-type EffectDrizzleConfig<TSchema extends Record<string, unknown> = Record<string, never>, TRelations extends AnyRelations = EmptyRelations> = Omit<DrizzleConfig<TSchema, TRelations>, 'cache' | 'logger'>;
-declare const DefaultServices: Layer.Layer<EffectCache | EffectLogger, never, never>;
+type EffectDrizzlePgConfig<TRelations extends AnyRelations = EmptyRelations> = Omit<DrizzlePgConfig<TRelations>, 'cache' | 'logger'>;
+declare const DefaultServices: Layer.Layer<EffectLogger | EffectCache, never, never>;
+declare const effectPgCodecs: PartialWithUndefined<Record<__pg_core_codecs_ts0.PostgresType, Codec>>;
 /**
  * Creates an EffectPgDatabase instance.
  *
@@ -41,15 +45,15 @@ declare const DefaultServices: Layer.Layer<EffectCache | EffectLogger, never, ne
  * );
  * ```
  */
-declare const make: <TSchema extends Record<string, unknown> = Record<string, never>, TRelations extends AnyRelations = EmptyRelations>(config?: EffectDrizzleConfig<TSchema, TRelations> | undefined) => Effect.Effect<EffectPgDatabase<TSchema, TRelations> & {
+declare const make: <TRelations extends AnyRelations = EmptyRelations>(config?: EffectDrizzlePgConfig<TRelations> | undefined) => Effect.Effect<EffectPgDatabase<TRelations> & {
   $client: PgClient;
-}, never, EffectCache | EffectLogger | PgClient>;
+}, never, EffectLogger | EffectCache | PgClient>;
 /**
  * Convenience function that creates an EffectPgDatabase with `DefaultServices` already provided.
  */
-declare const makeWithDefaults: <TSchema extends Record<string, unknown> = Record<string, never>, TRelations extends AnyRelations = EmptyRelations>(config?: EffectDrizzleConfig<TSchema, TRelations>) => Effect.Effect<EffectPgDatabase<TSchema, TRelations> & {
+declare const makeWithDefaults: <TRelations extends AnyRelations = EmptyRelations>(config?: EffectDrizzlePgConfig<TRelations>) => Effect.Effect<EffectPgDatabase<TRelations> & {
   $client: PgClient;
 }, never, PgClient>;
 //#endregion
-export { DefaultServices, EffectDrizzleConfig, EffectPgDatabase, make, makeWithDefaults };
+export { DefaultServices, EffectDrizzlePgConfig, EffectPgDatabase, effectPgCodecs, make, makeWithDefaults };
 //# sourceMappingURL=driver.d.cts.map

package/effect-postgres/driver.d.ts

@@ -1,6 +1,8 @@
+import { PartialWithUndefined } from "../utils.js";
+import { Codec } from "../codecs.js";
 import { EffectPgQueryEffectHKT, EffectPgQueryResultHKT } from "./session.js";
 import { entityKind } from "../entity.js";
-import { DrizzleConfig } from "../utils.js";
+import * as __pg_core_codecs_ts0 from "../pg-core/codecs.js";
 import { PgClient } from "@effect/sql-pg/PgClient";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
@@ -8,13 +10,15 @@ import { EffectCache } from "../cache/core/cache-effect.js";
 import { EffectLogger } from "../effect-core/index.js";
 import { PgEffectDatabase } from "../pg-core/effect/db.js";
 import { AnyRelations, EmptyRelations } from "../relations.js";
+import { DrizzlePgConfig } from "../pg-core/utils.js";
 
 //#region src/effect-postgres/driver.d.ts
-declare class EffectPgDatabase<TFullSchema extends Record<string, unknown> = Record<string, never>, TRelations extends AnyRelations = EmptyRelations> extends PgEffectDatabase<EffectPgQueryEffectHKT, EffectPgQueryResultHKT, TFullSchema, TRelations> {
+declare class EffectPgDatabase<TRelations extends AnyRelations = EmptyRelations> extends PgEffectDatabase<EffectPgQueryEffectHKT, EffectPgQueryResultHKT, TRelations> {
   static readonly [entityKind]: string;
 }
-type EffectDrizzleConfig<TSchema extends Record<string, unknown> = Record<string, never>, TRelations extends AnyRelations = EmptyRelations> = Omit<DrizzleConfig<TSchema, TRelations>, 'cache' | 'logger'>;
-declare const DefaultServices: Layer.Layer<EffectCache | EffectLogger, never, never>;
+type EffectDrizzlePgConfig<TRelations extends AnyRelations = EmptyRelations> = Omit<DrizzlePgConfig<TRelations>, 'cache' | 'logger'>;
+declare const DefaultServices: Layer.Layer<EffectLogger | EffectCache, never, never>;
+declare const effectPgCodecs: PartialWithUndefined<Record<__pg_core_codecs_ts0.PostgresType, Codec>>;
 /**
  * Creates an EffectPgDatabase instance.
  *
@@ -41,15 +45,15 @@ declare const DefaultServices: Layer.Layer<EffectCache | EffectLogger, never, ne
  * );
  * ```
  */
-declare const make: <TSchema extends Record<string, unknown> = Record<string, never>, TRelations extends AnyRelations = EmptyRelations>(config?: EffectDrizzleConfig<TSchema, TRelations> | undefined) => Effect.Effect<EffectPgDatabase<TSchema, TRelations> & {
+declare const make: <TRelations extends AnyRelations = EmptyRelations>(config?: EffectDrizzlePgConfig<TRelations> | undefined) => Effect.Effect<EffectPgDatabase<TRelations> & {
   $client: PgClient;
-}, never, EffectCache | EffectLogger | PgClient>;
+}, never, EffectLogger | EffectCache | PgClient>;
 /**
  * Convenience function that creates an EffectPgDatabase with `DefaultServices` already provided.
  */
-declare const makeWithDefaults: <TSchema extends Record<string, unknown> = Record<string, never>, TRelations extends AnyRelations = EmptyRelations>(config?: EffectDrizzleConfig<TSchema, TRelations>) => Effect.Effect<EffectPgDatabase<TSchema, TRelations> & {
+declare const makeWithDefaults: <TRelations extends AnyRelations = EmptyRelations>(config?: EffectDrizzlePgConfig<TRelations>) => Effect.Effect<EffectPgDatabase<TRelations> & {
   $client: PgClient;
 }, never, PgClient>;
 //#endregion
-export { DefaultServices, EffectDrizzleConfig, EffectPgDatabase, make, makeWithDefaults };
+export { DefaultServices, EffectDrizzlePgConfig, EffectPgDatabase, effectPgCodecs, make, makeWithDefaults };
 //# sourceMappingURL=driver.d.ts.map

package/effect-postgres/driver.js

@@ -1,6 +1,7 @@
 import { EffectPgSession } from "./session.js";
 import { entityKind } from "../entity.js";
-import * as V1 from "../_relations.js";
+import { makePgArray } from "../pg-core/array.js";
+import { castToText, refineGenericPgCodecs } from "../pg-core/codecs.js";
 import { PgDialect } from "../pg-core/dialect.js";
 import { PgClient } from "@effect/sql-pg/PgClient";
 import * as Effect from "effect/Effect";
@@ -14,6 +15,92 @@ var EffectPgDatabase = class extends PgEffectDatabase {
 	static [entityKind] = "EffectPgDatabase";
 };
 const DefaultServices = Layer.merge(EffectCache.Default, EffectLogger.Default);
+const effectPgCodecs = refineGenericPgCodecs({
+	date: {
+		cast: castToText,
+		normalizeParamArray: makePgArray
+	},
+	interval: {
+		cast: castToText,
+		normalizeParamArray: makePgArray
+	},
+	timestamp: {
+		cast: castToText,
+		normalizeParamArray: makePgArray
+	},
+	timestamptz: {
+		cast: castToText,
+		normalizeParamArray: makePgArray
+	},
+	json: { normalizeParam: (v) => JSON.stringify(v) },
+	jsonb: { normalizeParam: (v) => JSON.stringify(v) },
+	bit: { normalizeParamArray: makePgArray },
+	bool: { normalizeParamArray: makePgArray },
+	box: { normalizeParamArray: makePgArray },
+	box2d: { normalizeParamArray: makePgArray },
+	box3d: { normalizeParamArray: makePgArray },
+	char: { normalizeParamArray: makePgArray },
+	cidr: { normalizeParamArray: makePgArray },
+	circle: { normalizeParamArray: makePgArray },
+	datemultirange: { normalizeParamArray: makePgArray },
+	daterange: { normalizeParamArray: makePgArray },
+	float8: { normalizeParamArray: makePgArray },
+	geography: { normalizeParamArray: makePgArray },
+	halfvec: { normalizeParamArray: makePgArray },
+	inet: { normalizeParamArray: makePgArray },
+	int4multirange: { normalizeParamArray: makePgArray },
+	int4range: { normalizeParamArray: makePgArray },
+	int8multirange: { normalizeParamArray: makePgArray },
+	int8range: { normalizeParamArray: makePgArray },
+	lseg: { normalizeParamArray: makePgArray },
+	macaddr: { normalizeParamArray: makePgArray },
+	money: { normalizeParamArray: makePgArray },
+	nummultirange: { normalizeParamArray: makePgArray },
+	numrange: { normalizeParamArray: makePgArray },
+	oid: { normalizeParamArray: makePgArray },
+	path: { normalizeParamArray: makePgArray },
+	polygon: { normalizeParamArray: makePgArray },
+	raster: { normalizeParamArray: makePgArray },
+	regclass: { normalizeParamArray: makePgArray },
+	regconfig: { normalizeParamArray: makePgArray },
+	regdictionary: { normalizeParamArray: makePgArray },
+	regnamespace: { normalizeParamArray: makePgArray },
+	regoper: { normalizeParamArray: makePgArray },
+	regoperator: { normalizeParamArray: makePgArray },
+	regproc: { normalizeParamArray: makePgArray },
+	regprocedure: { normalizeParamArray: makePgArray },
+	regrole: { normalizeParamArray: makePgArray },
+	regtype: { normalizeParamArray: makePgArray },
+	serial: { normalizeParamArray: makePgArray },
+	smallint: { normalizeParamArray: makePgArray },
+	smallserial: { normalizeParamArray: makePgArray },
+	sparsevec: { normalizeParamArray: makePgArray },
+	text: { normalizeParamArray: makePgArray },
+	time: { normalizeParamArray: makePgArray },
+	timetz: { normalizeParamArray: makePgArray },
+	tsmultirange: { normalizeParamArray: makePgArray },
+	tsquery: { normalizeParamArray: makePgArray },
+	tsrange: { normalizeParamArray: makePgArray },
+	tstzmultirange: { normalizeParamArray: makePgArray },
+	tstzrange: { normalizeParamArray: makePgArray },
+	tsvector: { normalizeParamArray: makePgArray },
+	varbit: { normalizeParamArray: makePgArray },
+	varchar: { normalizeParamArray: makePgArray },
+	vector: { normalizeParamArray: makePgArray },
+	xml: { normalizeParamArray: makePgArray },
+	bytea: { normalizeParamArray: makePgArray },
+	enum: { normalizeParamArray: makePgArray },
+	geometry: { normalizeParamArray: makePgArray },
+	line: { normalizeParamArray: makePgArray },
+	macaddr8: { normalizeParamArray: makePgArray },
+	numeric: { normalizeParamArray: makePgArray },
+	point: { normalizeParamArray: makePgArray },
+	bigint: { normalizeParamArray: makePgArray },
+	bigserial: { normalizeParamArray: makePgArray },
+	float4: { normalizeParamArray: makePgArray },
+	int: { normalizeParamArray: makePgArray },
+	uuid: { normalizeParamArray: makePgArray }
+});
 /**
 * Creates an EffectPgDatabase instance.
 *
@@ -44,18 +131,17 @@ const make = Effect.fn("PgDrizzle.make")(function* (config = {}) {
 	const client = yield* PgClient;
 	const cache = yield* EffectCache;
 	const logger = yield* EffectLogger;
-	const dialect = new PgDialect({ casing: config.casing });
-	let schema;
-	if (config.schema) {
-		const tablesConfig = V1.extractTablesRelationalConfig(config.schema, V1.createTableRelationsHelpers);
-		schema = {
-			fullSchema: config.schema,
-			schema: tablesConfig.tables,
-			tableNamesMap: tablesConfig.tableNamesMap
-		};
-	}
+	const dialect = new PgDialect({
+		casing: config.casing,
+		useJitMappers: config.useJitMappers,
+		codecs: config.codecs ?? effectPgCodecs
+	});
 	const relations = config.relations ?? {};
-	const db = new EffectPgDatabase(dialect, new EffectPgSession(client, dialect, relations, schema, logger, cache), relations, schema);
+	const db = new EffectPgDatabase(dialect, new EffectPgSession(client, dialect, relations, {
+		logger,
+		cache,
+		useJitMapper: config.useJitMappers
+	}), relations);
 	db.$client = client;
 	db.$cache = cache;
 	if (db.$cache) db.$cache["invalidate"] = cache.onMutate;
@@ -67,5 +153,5 @@ const make = Effect.fn("PgDrizzle.make")(function* (config = {}) {
 const makeWithDefaults = (config = {}) => make(config).pipe(Effect.provide(DefaultServices));
 
 //#endregion
-export { DefaultServices, EffectPgDatabase, make, makeWithDefaults };
+export { DefaultServices, EffectPgDatabase, effectPgCodecs, make, makeWithDefaults };
 //# sourceMappingURL=driver.js.map

package/effect-postgres/driver.js.map

@@ -1 +1 @@
-{"version":3,"file":"driver.js","names":[],"sources":["../../src/effect-postgres/driver.ts"],"sourcesContent":["import { PgClient } from '@effect/sql-pg/PgClient';\nimport * as Effect from 'effect/Effect';\nimport * as Layer from 'effect/Layer';\nimport * as V1 from '~/_relations.ts';\nimport { EffectCache } from '~/cache/core/cache-effect.ts';\nimport { EffectLogger } from '~/effect-core/index.ts';\nimport { entityKind } from '~/entity.ts';\nimport { PgDialect } from '~/pg-core/dialect.ts';\nimport { PgEffectDatabase } from '~/pg-core/effect/db.ts';\nimport type { _RelationalQueryBuilder } from '~/pg-core/query-builders/_query.ts';\nimport type { AnyRelations, EmptyRelations } from '~/relations.ts';\nimport type { DrizzleConfig } from '~/utils.ts';\nimport { type EffectPgQueryEffectHKT, type EffectPgQueryResultHKT, EffectPgSession } from './session.ts';\n\nexport class EffectPgDatabase<\n\tTFullSchema extends Record<string, unknown> = Record<string, never>,\n\tTRelations extends AnyRelations = EmptyRelations,\n> extends PgEffectDatabase<EffectPgQueryEffectHKT, EffectPgQueryResultHKT, TFullSchema, TRelations> {\n\tstatic override readonly [entityKind]: string = 'EffectPgDatabase';\n}\n\nexport type EffectDrizzleConfig<\n\tTSchema extends Record<string, unknown> = Record<string, never>,\n\tTRelations extends AnyRelations = EmptyRelations,\n> = Omit<DrizzleConfig<TSchema, TRelations>, 'cache' | 'logger'>;\n\nexport const DefaultServices = Layer.merge(\n\tEffectCache.Default,\n\tEffectLogger.Default,\n);\n\n/**\n * Creates an EffectPgDatabase instance.\n *\n * Requires `PgClient`, `EffectLogger`, and `EffectCache` services to be provided.\n * Use `DefaultServices` to provide default (no-op) logger and cache implementations.\n *\n * @example\n * ```ts\n * // With default services (no logging, no caching)\n * const db = yield* PgDrizzle.make({ relations }).pipe(\n *   Effect.provide(PgDrizzle.DefaultServices),\n * );\n *\n * // With Effect-based logging\n * const db = yield* PgDrizzle.make({ relations }).pipe(\n *   Effect.provide(EffectLogger.layer),\n *   Effect.provide(PgDrizzle.DefaultServices),\n * );\n *\n * // With custom Drizzle logger\n * const db = yield* PgDrizzle.make({ relations }).pipe(\n *   Effect.provide(EffectLogger.layerFromDrizzle(myLogger)),\n *   Effect.provide(PgDrizzle.DefaultServices),\n * );\n * ```\n */\nexport const make = Effect.fn('PgDrizzle.make')(\n\tfunction*<\n\t\tTSchema extends Record<string, unknown> = Record<string, never>,\n\t\tTRelations extends AnyRelations = EmptyRelations,\n\t>(config: EffectDrizzleConfig<TSchema, TRelations> = {}) {\n\t\tconst client = yield* PgClient;\n\t\tconst cache = yield* EffectCache;\n\t\tconst logger = yield* EffectLogger;\n\n\t\tconst dialect = new PgDialect({ casing: config.casing });\n\n\t\tlet schema: V1.RelationalSchemaConfig<V1.TablesRelationalConfig> | undefined;\n\t\tif (config.schema) {\n\t\t\tconst tablesConfig = V1.extractTablesRelationalConfig(\n\t\t\t\tconfig.schema,\n\t\t\t\tV1.createTableRelationsHelpers,\n\t\t\t);\n\t\t\tschema = {\n\t\t\t\tfullSchema: config.schema,\n\t\t\t\tschema: tablesConfig.tables,\n\t\t\t\ttableNamesMap: tablesConfig.tableNamesMap,\n\t\t\t};\n\t\t}\n\n\t\tconst relations = config.relations ?? {} as TRelations;\n\t\tconst session = new EffectPgSession(client, dialect, relations, schema, logger, cache);\n\t\tconst db = new EffectPgDatabase(\n\t\t\tdialect,\n\t\t\tsession,\n\t\t\trelations,\n\t\t\tschema as V1.RelationalSchemaConfig<any>,\n\t\t) as EffectPgDatabase<TSchema>;\n\t\t(<any> db).$client = client;\n\t\t(<any> db).$cache = cache;\n\t\tif ((<any> db).$cache) {\n\t\t\t(<any> db).$cache['invalidate'] = cache.onMutate;\n\t\t}\n\n\t\treturn db as EffectPgDatabase<TSchema, TRelations> & {\n\t\t\t$client: PgClient;\n\t\t};\n\t},\n);\n\n/**\n * Convenience function that creates an EffectPgDatabase with `DefaultServices` already provided.\n */\nexport const makeWithDefaults = <\n\tTSchema extends Record<string, unknown> = Record<string, never>,\n\tTRelations extends AnyRelations = EmptyRelations,\n>(config: EffectDrizzleConfig<TSchema, TRelations> = {}) => make(config).pipe(Effect.provide(DefaultServices));\n"],"mappings":";;;;;;;;;;;;AAcA,IAAa,mBAAb,cAGU,iBAA0F;CACnG,QAA0B,cAAsB;;AAQjD,MAAa,kBAAkB,MAAM,MACpC,YAAY,SACZ,aAAa,QACb;;;;;;;;;;;;;;;;;;;;;;;;;;;AA4BD,MAAa,OAAO,OAAO,GAAG,iBAAiB,CAC9C,WAGE,SAAmD,EAAE,EAAE;CACxD,MAAM,SAAS,OAAO;CACtB,MAAM,QAAQ,OAAO;CACrB,MAAM,SAAS,OAAO;CAEtB,MAAM,UAAU,IAAI,UAAU,EAAE,QAAQ,OAAO,QAAQ,CAAC;CAExD,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;CAExC,MAAM,KAAK,IAAI,iBACd,SAFe,IAAI,gBAAgB,QAAQ,SAAS,WAAW,QAAQ,QAAQ,MAAM,EAIrF,WACA,OACA;AACD,CAAO,GAAI,UAAU;AACrB,CAAO,GAAI,SAAS;AACpB,KAAW,GAAI,OACd,CAAO,GAAI,OAAO,gBAAgB,MAAM;AAGzC,QAAO;EAIR;;;;AAKD,MAAa,oBAGX,SAAmD,EAAE,KAAK,KAAK,OAAO,CAAC,KAAK,OAAO,QAAQ,gBAAgB,CAAC"}
+{"version":3,"file":"driver.js","names":[],"sources":["../../src/effect-postgres/driver.ts"],"sourcesContent":["import { PgClient } from '@effect/sql-pg/PgClient';\nimport * as Effect from 'effect/Effect';\nimport * as Layer from 'effect/Layer';\nimport { EffectCache } from '~/cache/core/cache-effect.ts';\nimport { EffectLogger } from '~/effect-core/index.ts';\nimport { entityKind } from '~/entity.ts';\nimport { makePgArray } from '~/pg-core/array.ts';\nimport { castToText, refineGenericPgCodecs } from '~/pg-core/codecs.ts';\nimport { PgDialect } from '~/pg-core/dialect.ts';\nimport { PgEffectDatabase } from '~/pg-core/effect/db.ts';\nimport type { DrizzlePgConfig } from '~/pg-core/utils.ts';\nimport type { AnyRelations, EmptyRelations } from '~/relations.ts';\nimport { type EffectPgQueryEffectHKT, type EffectPgQueryResultHKT, EffectPgSession } from './session.ts';\n\nexport class EffectPgDatabase<TRelations extends AnyRelations = EmptyRelations>\n\textends PgEffectDatabase<EffectPgQueryEffectHKT, EffectPgQueryResultHKT, TRelations>\n{\n\tstatic override readonly [entityKind]: string = 'EffectPgDatabase';\n}\n\nexport type EffectDrizzlePgConfig<\n\tTRelations extends AnyRelations = EmptyRelations,\n> = Omit<DrizzlePgConfig<TRelations>, 'cache' | 'logger'>;\n\nexport const DefaultServices = Layer.merge(\n\tEffectCache.Default,\n\tEffectLogger.Default,\n);\n\nexport const effectPgCodecs = refineGenericPgCodecs({\n\tdate: {\n\t\tcast: castToText,\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tinterval: {\n\t\tcast: castToText,\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\ttimestamp: {\n\t\tcast: castToText,\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\ttimestamptz: {\n\t\tcast: castToText,\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tjson: {\n\t\tnormalizeParam: (v) => JSON.stringify(v),\n\t},\n\tjsonb: {\n\t\tnormalizeParam: (v) => JSON.stringify(v),\n\t},\n\n\tbit: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tbool: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tbox: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tbox2d: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tbox3d: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tchar: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tcidr: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tcircle: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tdatemultirange: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tdaterange: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tfloat8: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tgeography: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\thalfvec: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tinet: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tint4multirange: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tint4range: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tint8multirange: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tint8range: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tlseg: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tmacaddr: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tmoney: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tnummultirange: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tnumrange: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\toid: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tpath: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tpolygon: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\traster: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tregclass: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tregconfig: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tregdictionary: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tregnamespace: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tregoper: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tregoperator: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tregproc: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tregprocedure: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tregrole: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tregtype: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tserial: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tsmallint: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tsmallserial: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tsparsevec: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\ttext: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\ttime: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\ttimetz: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\ttsmultirange: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\ttsquery: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\ttsrange: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\ttstzmultirange: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\ttstzrange: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\ttsvector: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tvarbit: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tvarchar: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tvector: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\txml: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tbytea: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tenum: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tgeometry: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tline: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tmacaddr8: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tnumeric: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tpoint: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tbigint: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tbigserial: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tfloat4: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tint: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tuuid: {\n\t\tnormalizeParamArray: makePgArray,\n\t},\n});\n\n/**\n * Creates an EffectPgDatabase instance.\n *\n * Requires `PgClient`, `EffectLogger`, and `EffectCache` services to be provided.\n * Use `DefaultServices` to provide default (no-op) logger and cache implementations.\n *\n * @example\n * ```ts\n * // With default services (no logging, no caching)\n * const db = yield* PgDrizzle.make({ relations }).pipe(\n *   Effect.provide(PgDrizzle.DefaultServices),\n * );\n *\n * // With Effect-based logging\n * const db = yield* PgDrizzle.make({ relations }).pipe(\n *   Effect.provide(EffectLogger.layer),\n *   Effect.provide(PgDrizzle.DefaultServices),\n * );\n *\n * // With custom Drizzle logger\n * const db = yield* PgDrizzle.make({ relations }).pipe(\n *   Effect.provide(EffectLogger.layerFromDrizzle(myLogger)),\n *   Effect.provide(PgDrizzle.DefaultServices),\n * );\n * ```\n */\nexport const make = Effect.fn('PgDrizzle.make')(\n\tfunction*<\n\t\tTRelations extends AnyRelations = EmptyRelations,\n\t>(config: EffectDrizzlePgConfig<TRelations> = {}) {\n\t\tconst client = yield* PgClient;\n\t\tconst cache = yield* EffectCache;\n\t\tconst logger = yield* EffectLogger;\n\n\t\tconst dialect = new PgDialect({\n\t\t\tcasing: config.casing,\n\t\t\tuseJitMappers: config.useJitMappers,\n\t\t\tcodecs: config.codecs ?? effectPgCodecs,\n\t\t});\n\n\t\tconst relations = config.relations ?? {} as TRelations;\n\t\tconst session = new EffectPgSession(client, dialect, relations, {\n\t\t\tlogger,\n\t\t\tcache,\n\t\t\tuseJitMapper: config.useJitMappers,\n\t\t});\n\t\tconst db = new EffectPgDatabase(dialect, session, relations) as EffectPgDatabase<TRelations>;\n\t\t(<any> db).$client = client;\n\t\t(<any> db).$cache = cache;\n\t\tif ((<any> db).$cache) {\n\t\t\t(<any> db).$cache['invalidate'] = cache.onMutate;\n\t\t}\n\n\t\treturn db as EffectPgDatabase<TRelations> & {\n\t\t\t$client: PgClient;\n\t\t};\n\t},\n);\n\n/**\n * Convenience function that creates an EffectPgDatabase with `DefaultServices` already provided.\n */\nexport const makeWithDefaults = <\n\tTRelations extends AnyRelations = EmptyRelations,\n>(config: EffectDrizzlePgConfig<TRelations> = {}) => make(config).pipe(Effect.provide(DefaultServices));\n"],"mappings":"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"}

package/effect-postgres/index.cjs

@@ -12,8 +12,8 @@ Object.defineProperty(exports, 'EffectLogger', {
   }
 });
 exports.EffectPgDatabase = require_effect_postgres_driver.EffectPgDatabase;
-exports.EffectPgPreparedQuery = require_effect_postgres_session.EffectPgPreparedQuery;
 exports.EffectPgSession = require_effect_postgres_session.EffectPgSession;
 exports.EffectPgTransaction = require_effect_postgres_session.EffectPgTransaction;
+exports.effectPgCodecs = require_effect_postgres_driver.effectPgCodecs;
 exports.make = require_effect_postgres_driver.make;
 exports.makeWithDefaults = require_effect_postgres_driver.makeWithDefaults;

package/effect-postgres/index.d.cts

@@ -1,4 +1,4 @@
-import { EffectPgPreparedQuery, EffectPgQueryEffectHKT, EffectPgQueryResultHKT, EffectPgSession, EffectPgTransaction } from "./session.cjs";
-import { DefaultServices, EffectDrizzleConfig, EffectPgDatabase, make, makeWithDefaults } from "./driver.cjs";
+import { EffectPgQueryEffectHKT, EffectPgQueryResultHKT, EffectPgSession, EffectPgSessionOptions, EffectPgTransaction } from "./session.cjs";
+import { DefaultServices, EffectDrizzlePgConfig, EffectPgDatabase, effectPgCodecs, make, makeWithDefaults } from "./driver.cjs";
 import { EffectLogger } from "../effect-core/index.cjs";
-export { DefaultServices, EffectDrizzleConfig, EffectLogger, EffectPgDatabase, EffectPgPreparedQuery, EffectPgQueryEffectHKT, EffectPgQueryResultHKT, EffectPgSession, EffectPgTransaction, make, makeWithDefaults };
+export { DefaultServices, EffectDrizzlePgConfig, EffectLogger, EffectPgDatabase, EffectPgQueryEffectHKT, EffectPgQueryResultHKT, EffectPgSession, EffectPgSessionOptions, EffectPgTransaction, effectPgCodecs, make, makeWithDefaults };

package/effect-postgres/index.d.ts

@@ -1,4 +1,4 @@
-import { EffectPgPreparedQuery, EffectPgQueryEffectHKT, EffectPgQueryResultHKT, EffectPgSession, EffectPgTransaction } from "./session.js";
-import { DefaultServices, EffectDrizzleConfig, EffectPgDatabase, make, makeWithDefaults } from "./driver.js";
+import { EffectPgQueryEffectHKT, EffectPgQueryResultHKT, EffectPgSession, EffectPgSessionOptions, EffectPgTransaction } from "./session.js";
+import { DefaultServices, EffectDrizzlePgConfig, EffectPgDatabase, effectPgCodecs, make, makeWithDefaults } from "./driver.js";
 import { EffectLogger } from "../effect-core/index.js";
-export { DefaultServices, EffectDrizzleConfig, EffectLogger, EffectPgDatabase, EffectPgPreparedQuery, EffectPgQueryEffectHKT, EffectPgQueryResultHKT, EffectPgSession, EffectPgTransaction, make, makeWithDefaults };
+export { DefaultServices, EffectDrizzlePgConfig, EffectLogger, EffectPgDatabase, EffectPgQueryEffectHKT, EffectPgQueryResultHKT, EffectPgSession, EffectPgSessionOptions, EffectPgTransaction, effectPgCodecs, make, makeWithDefaults };

package/effect-postgres/index.js

@@ -1,5 +1,5 @@
-import { EffectPgPreparedQuery, EffectPgSession, EffectPgTransaction } from "./session.js";
-import { DefaultServices, EffectPgDatabase, make, makeWithDefaults } from "./driver.js";
+import { EffectPgSession, EffectPgTransaction } from "./session.js";
+import { DefaultServices, EffectPgDatabase, effectPgCodecs, make, makeWithDefaults } from "./driver.js";
 import { EffectLogger } from "../effect-core/index.js";
 
-export { DefaultServices, EffectLogger, EffectPgDatabase, EffectPgPreparedQuery, EffectPgSession, EffectPgTransaction, make, makeWithDefaults };
+export { DefaultServices, EffectLogger, EffectPgDatabase, EffectPgSession, EffectPgTransaction, effectPgCodecs, make, makeWithDefaults };

package/effect-postgres/migrator.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"migrator.cjs","names":[],"sources":["../../src/effect-postgres/migrator.ts"],"sourcesContent":["import type { MigrationConfig } from '~/migrator.ts';\nimport { readMigrationFiles } from '~/migrator.ts';\nimport { migrate as coreMigrate } from '~/pg-core/effect/session.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport type { EffectPgDatabase } from './driver.ts';\n\nexport function migrate<TSchema extends Record<string, unknown>, TRelations extends AnyRelations>(\n\tdb: EffectPgDatabase<TSchema, TRelations>,\n\tconfig: MigrationConfig,\n) {\n\tconst migrations = readMigrationFiles(config);\n\treturn coreMigrate(migrations, db.session, config);\n}\n"],"mappings":";;;;;;AAMA,SAAgB,QACf,IACA,QACC;AAED,uFADsC,OAAO,EACd,GAAG,SAAS,OAAO"}
+{"version":3,"file":"migrator.cjs","names":[],"sources":["../../src/effect-postgres/migrator.ts"],"sourcesContent":["import type { MigrationConfig } from '~/migrator.ts';\nimport { readMigrationFiles } from '~/migrator.ts';\nimport { migrate as coreMigrate } from '~/pg-core/effect/session.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport type { EffectPgDatabase } from './driver.ts';\n\nexport function migrate<TRelations extends AnyRelations>(\n\tdb: EffectPgDatabase<TRelations>,\n\tconfig: MigrationConfig,\n) {\n\tconst migrations = readMigrationFiles(config);\n\treturn coreMigrate(migrations, db.session, config);\n}\n"],"mappings":";;;;;;AAMA,SAAgB,QACf,IACA,QACC;AAED,uFADsC,OAAO,EACd,GAAG,SAAS,OAAO"}

package/effect-postgres/migrator.d.cts

@@ -6,7 +6,7 @@ import * as effect_Effect0 from "effect/Effect";
 import * as _effect_sql_SqlError0 from "@effect/sql/SqlError";
 
 //#region src/effect-postgres/migrator.d.ts
-declare function migrate<TSchema extends Record<string, unknown>, TRelations extends AnyRelations>(db: EffectPgDatabase<TSchema, TRelations>, config: MigrationConfig): effect_Effect0.Effect<undefined, MigratorInitError | EffectDrizzleQueryError | _effect_sql_SqlError0.SqlError, never>;
+declare function migrate<TRelations extends AnyRelations>(db: EffectPgDatabase<TRelations>, config: MigrationConfig): effect_Effect0.Effect<undefined, MigratorInitError | EffectDrizzleQueryError | _effect_sql_SqlError0.SqlError, never>;
 //#endregion
 export { migrate };
 //# sourceMappingURL=migrator.d.cts.map

package/effect-postgres/migrator.d.ts

@@ -6,7 +6,7 @@ import { AnyRelations } from "../relations.js";
 import * as _effect_sql_SqlError0 from "@effect/sql/SqlError";
 
 //#region src/effect-postgres/migrator.d.ts
-declare function migrate<TSchema extends Record<string, unknown>, TRelations extends AnyRelations>(db: EffectPgDatabase<TSchema, TRelations>, config: MigrationConfig): effect_Effect0.Effect<undefined, MigratorInitError | EffectDrizzleQueryError | _effect_sql_SqlError0.SqlError, never>;
+declare function migrate<TRelations extends AnyRelations>(db: EffectPgDatabase<TRelations>, config: MigrationConfig): effect_Effect0.Effect<undefined, MigratorInitError | EffectDrizzleQueryError | _effect_sql_SqlError0.SqlError, never>;
 //#endregion
 export { migrate };
 //# sourceMappingURL=migrator.d.ts.map

package/effect-postgres/migrator.js.map

@@ -1 +1 @@
-{"version":3,"file":"migrator.js","names":["coreMigrate"],"sources":["../../src/effect-postgres/migrator.ts"],"sourcesContent":["import type { MigrationConfig } from '~/migrator.ts';\nimport { readMigrationFiles } from '~/migrator.ts';\nimport { migrate as coreMigrate } from '~/pg-core/effect/session.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport type { EffectPgDatabase } from './driver.ts';\n\nexport function migrate<TSchema extends Record<string, unknown>, TRelations extends AnyRelations>(\n\tdb: EffectPgDatabase<TSchema, TRelations>,\n\tconfig: MigrationConfig,\n) {\n\tconst migrations = readMigrationFiles(config);\n\treturn coreMigrate(migrations, db.session, config);\n}\n"],"mappings":";;;;AAMA,SAAgB,QACf,IACA,QACC;AAED,QAAOA,UADY,mBAAmB,OAAO,EACd,GAAG,SAAS,OAAO"}
+{"version":3,"file":"migrator.js","names":["coreMigrate"],"sources":["../../src/effect-postgres/migrator.ts"],"sourcesContent":["import type { MigrationConfig } from '~/migrator.ts';\nimport { readMigrationFiles } from '~/migrator.ts';\nimport { migrate as coreMigrate } from '~/pg-core/effect/session.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport type { EffectPgDatabase } from './driver.ts';\n\nexport function migrate<TRelations extends AnyRelations>(\n\tdb: EffectPgDatabase<TRelations>,\n\tconfig: MigrationConfig,\n) {\n\tconst migrations = readMigrationFiles(config);\n\treturn coreMigrate(migrations, db.session, config);\n}\n"],"mappings":";;;;AAMA,SAAgB,QACf,IACA,QACC;AAED,QAAOA,UADY,mBAAmB,OAAO,EACd,GAAG,SAAS,OAAO"}

package/effect-postgres/session.cjs

@@ -1,99 +1,40 @@
 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 effect_Effect = require("effect/Effect");
 effect_Effect = require_runtime.__toESM(effect_Effect);
-let __effect_core_errors_ts = require("../effect-core/errors.cjs");
-let __effect_core_logger_ts = require("../effect-core/logger.cjs");
 let __pg_core_effect_session_ts = require("../pg-core/effect/session.cjs");
 
 //#region src/effect-postgres/session.ts
-var EffectPgPreparedQuery = class extends __pg_core_effect_session_ts.PgEffectPreparedQuery {
-	static [__entity_ts.entityKind] = "EffectPgPreparedQuery";
-	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._isResponseInArrayMode = _isResponseInArrayMode;
-		this.customResultMapper = customResultMapper;
-		this.isRqbV2Query = isRqbV2Query;
-	}
-	execute(placeholderValues) {
-		return effect_Effect.gen(this, function* () {
-			if (this.isRqbV2Query) return yield* this.executeRqbV2(placeholderValues);
-			const { query, customResultMapper, fields, joinsNotNullableMap, client } = this;
-			const params = (0, __sql_sql_ts.fillPlaceholders)(query.params, placeholderValues ?? {});
-			yield* __effect_core_logger_ts.EffectLogger.logQuery(query.sql, params);
-			if (!fields && !customResultMapper) return yield* this.queryWithCache(query.sql, params, this.client.unsafe(query.sql, params).withoutTransform);
-			return yield* this.queryWithCache(query.sql, params, client.unsafe(query.sql, params).values).pipe(effect_Effect.map((rows) => {
-				if (customResultMapper) return customResultMapper(rows);
-				return rows.map((row) => (0, __utils_ts.mapResultRow)(fields, row, joinsNotNullableMap));
-			}));
-		}).pipe(effect_Effect.provideService(__effect_core_logger_ts.EffectLogger, this.logger));
-	}
-	executeRqbV2(placeholderValues) {
-		return effect_Effect.gen(this, function* () {
-			const { query, customResultMapper, client } = this;
-			const params = (0, __sql_sql_ts.fillPlaceholders)(query.params, placeholderValues ?? {});
-			yield* __effect_core_logger_ts.EffectLogger.logQuery(query.sql, params);
-			return yield* client.unsafe(query.sql, params).withoutTransform.pipe(effect_Effect.flatMap((v) => effect_Effect.try(() => customResultMapper(v))), effect_Effect.catchAll((e) => new __effect_core_errors_ts.EffectDrizzleQueryError({
-				query: query.sql,
-				params,
-				cause: e
-			})));
-		}).pipe(effect_Effect.provideService(__effect_core_logger_ts.EffectLogger, this.logger));
-	}
-	all(placeholderValues) {
-		return effect_Effect.gen(this, function* () {
-			const { query, client } = this;
-			const params = (0, __sql_sql_ts.fillPlaceholders)(query.params, placeholderValues ?? {});
-			yield* __effect_core_logger_ts.EffectLogger.logQuery(query.sql, params);
-			return yield* this.queryWithCache(query.sql, params, client.unsafe(query.sql, params).withoutTransform);
-		}).pipe(effect_Effect.provideService(__effect_core_logger_ts.EffectLogger, this.logger));
-	}
-	/** @internal */
-	isResponseInArrayMode() {
-		return this._isResponseInArrayMode;
-	}
-};
 var EffectPgSession = class extends __pg_core_effect_session_ts.PgEffectSession {
 	static [__entity_ts.entityKind] = "EffectPgSession";
-	constructor(client, dialect, relations, schema, logger, cache) {
+	constructor(client, dialect, relations, options) {
 		super(dialect);
 		this.client = client;
 		this.relations = relations;
-		this.schema = schema;
-		this.logger = logger;
-		this.cache = cache;
-	}
-	prepareQuery(query, fields, name, isResponseInArrayMode, customResultMapper, queryMetadata, cacheConfig) {
-		return new EffectPgPreparedQuery(this.client, query, this.logger, this.cache, queryMetadata, cacheConfig, fields, name, isResponseInArrayMode, customResultMapper, false);
-	}
-	prepareRelationalQuery(query, fields, name, customResultMapper) {
-		return new EffectPgPreparedQuery(this.client, query, this.logger, this.cache, void 0, void 0, fields, name, false, customResultMapper, true);
-	}
-	execute(query) {
-		return this.prepareQuery(this.dialect.sqlToQuery(query), void 0, void 0, false).execute();
+		this.options = options;
 	}
-	all(query) {
-		return this.prepareQuery(this.dialect.sqlToQuery(query), void 0, void 0, false).all();
+	prepareQuery(query, mode, _name, mapper, queryMetadata, cacheConfig) {
+		const executor = (params) => {
+			const q = this.client.unsafe(query.sql, params);
+			if (mode === "arrays") return q.values;
+			return q.withoutTransform;
+		};
+		return new __pg_core_effect_session_ts.PgEffectPreparedQuery(executor, query, mapper, mode, this.options.logger, this.options.cache, queryMetadata, cacheConfig);
 	}
 	transaction(transaction) {
-		const { dialect, relations, schema } = this;
+		const { dialect, relations } = this;
 		return this.client.withTransaction(effect_Effect.gen(this, function* () {
-			return yield* transaction(new EffectPgTransaction(dialect, this, relations, schema));
+			return yield* transaction(new EffectPgTransaction(dialect, this, relations));
 		}));
 	}
 };
 var EffectPgTransaction = class extends __pg_core_effect_session_ts.PgEffectTransaction {
 	static [__entity_ts.entityKind] = "EffectPgTransaction";
+	transaction = (tx) => this.session.transaction(tx);
 };
 
 //#endregion
-exports.EffectPgPreparedQuery = EffectPgPreparedQuery;
 exports.EffectPgSession = EffectPgSession;
 exports.EffectPgTransaction = EffectPgTransaction;
 //# sourceMappingURL=session.cjs.map

package/effect-postgres/session.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"session.cjs","names":["PgEffectPreparedQuery","entityKind","Effect","EffectLogger","EffectDrizzleQueryError","PgEffectSession","PgEffectTransaction"],"sources":["../../src/effect-postgres/session.ts"],"sourcesContent":["import type { PgClient } from '@effect/sql-pg/PgClient';\nimport type { SqlError } from '@effect/sql/SqlError';\nimport * as Effect from 'effect/Effect';\nimport type * as V1 from '~/_relations.ts';\nimport type { EffectCache } from '~/cache/core/cache-effect.ts';\nimport type { WithCacheConfig } from '~/cache/core/types.ts';\nimport { EffectDrizzleQueryError } from '~/effect-core/errors.ts';\nimport { EffectLogger } from '~/effect-core/logger.ts';\nimport type { QueryEffectHKTBase } from '~/effect-core/query-effect.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { PgDialect } from '~/pg-core/dialect.ts';\nimport { PgEffectPreparedQuery, PgEffectSession, PgEffectTransaction } from '~/pg-core/effect/session.ts';\nimport type { SelectedFieldsOrdered } from '~/pg-core/query-builders/select.types.ts';\nimport type { PgQueryResultHKT, PreparedQueryConfig } from '~/pg-core/session.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport type { Query, SQL } from '~/sql/sql.ts';\nimport { fillPlaceholders } from '~/sql/sql.ts';\nimport { type Assume, mapResultRow } from '~/utils.ts';\n\nexport interface EffectPgQueryEffectHKT extends QueryEffectHKTBase {\n\treadonly error: EffectDrizzleQueryError;\n\treadonly context: never;\n}\n\nexport interface EffectPgQueryResultHKT extends PgQueryResultHKT {\n\ttype: readonly Assume<this['row'], object>[];\n}\n\nexport class EffectPgPreparedQuery<T extends PreparedQueryConfig, TIsRqbV2 extends boolean = false>\n\textends PgEffectPreparedQuery<T, EffectPgQueryEffectHKT>\n{\n\tstatic override readonly [entityKind]: string = 'EffectPgPreparedQuery';\n\n\tconstructor(\n\t\tprivate client: PgClient,\n\t\tquery: Query,\n\t\tprivate logger: EffectLogger,\n\t\tcache: EffectCache,\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\tname: string | 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}\n\n\toverride execute(placeholderValues?: Record<string, unknown>) {\n\t\treturn Effect.gen(this, function*() {\n\t\t\tif (this.isRqbV2Query) return yield* this.executeRqbV2(placeholderValues);\n\n\t\t\tconst { query, customResultMapper, fields, joinsNotNullableMap, client } = this;\n\t\t\tconst params = fillPlaceholders(query.params, placeholderValues ?? {});\n\t\t\tyield* EffectLogger.logQuery(query.sql, params);\n\n\t\t\tif (!fields && !customResultMapper) {\n\t\t\t\treturn yield* this.queryWithCache<T['execute'], SqlError, never>(\n\t\t\t\t\tquery.sql,\n\t\t\t\t\tparams,\n\t\t\t\t\tthis.client.unsafe(query.sql, params as any).withoutTransform,\n\t\t\t\t);\n\t\t\t}\n\n\t\t\treturn yield* this.queryWithCache(\n\t\t\t\tquery.sql,\n\t\t\t\tparams,\n\t\t\t\tclient.unsafe(query.sql, params as any).values,\n\t\t\t).pipe(Effect.map(\n\t\t\t\t(rows) => {\n\t\t\t\t\tif (customResultMapper) {\n\t\t\t\t\t\treturn (customResultMapper as (rows: unknown[][]) => T['execute'])(rows as unknown[][]);\n\t\t\t\t\t}\n\n\t\t\t\t\treturn rows.map((row) => mapResultRow(fields!, row, joinsNotNullableMap)) as T['execute'];\n\t\t\t\t},\n\t\t\t));\n\t\t}).pipe(Effect.provideService(EffectLogger, this.logger));\n\t}\n\n\tprivate executeRqbV2(\n\t\tplaceholderValues?: Record<string, unknown>,\n\t) {\n\t\treturn Effect.gen(this, function*() {\n\t\t\tconst { query, customResultMapper, client } = this;\n\t\t\tconst params = fillPlaceholders(query.params, placeholderValues ?? {});\n\n\t\t\tyield* EffectLogger.logQuery(query.sql, params);\n\t\t\treturn yield* client.unsafe(query.sql, params as any).withoutTransform.pipe(\n\t\t\t\tEffect.flatMap((v) =>\n\t\t\t\t\tEffect.try(() =>\n\t\t\t\t\t\t(customResultMapper as (\n\t\t\t\t\t\t\trows: Record<string, unknown>[],\n\t\t\t\t\t\t\tmapColumnValue?: (value: unknown) => unknown,\n\t\t\t\t\t\t) => T['execute'])(v as Record<string, unknown>[])\n\t\t\t\t\t)\n\t\t\t\t),\n\t\t\t\tEffect.catchAll((e) => new EffectDrizzleQueryError({ query: query.sql, params, cause: e })),\n\t\t\t);\n\t\t}).pipe(Effect.provideService(EffectLogger, this.logger));\n\t}\n\n\toverride all(placeholderValues?: Record<string, unknown>) {\n\t\treturn Effect.gen(this, function*() {\n\t\t\tconst { query, client } = this;\n\t\t\tconst params = fillPlaceholders(query.params, placeholderValues ?? {});\n\n\t\t\tyield* EffectLogger.logQuery(query.sql, params);\n\n\t\t\treturn yield* this.queryWithCache<T['all'], SqlError, never>(\n\t\t\t\tquery.sql,\n\t\t\t\tparams,\n\t\t\t\tclient.unsafe(query.sql, params as any).withoutTransform,\n\t\t\t);\n\t\t}).pipe(Effect.provideService(EffectLogger, this.logger));\n\t}\n\n\t/** @internal */\n\tisResponseInArrayMode(): boolean {\n\t\treturn this._isResponseInArrayMode;\n\t}\n}\n\nexport class EffectPgSession<\n\tTQueryResult extends PgQueryResultHKT,\n\tTFullSchema extends Record<string, unknown>,\n\tTRelations extends AnyRelations,\n\tTSchema extends V1.TablesRelationalConfig,\n> extends PgEffectSession<EffectPgQueryEffectHKT, TQueryResult, TFullSchema, TRelations, TSchema> {\n\tstatic override readonly [entityKind]: string = 'EffectPgSession';\n\n\tconstructor(\n\t\tprivate client: PgClient,\n\t\tdialect: PgDialect,\n\t\tprotected relations: TRelations,\n\t\tprotected schema: V1.RelationalSchemaConfig<TSchema> | undefined,\n\t\tprivate logger: EffectLogger,\n\t\tprivate cache: EffectCache,\n\t) {\n\t\tsuper(dialect);\n\t}\n\n\toverride prepareQuery<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[][], mapColumnValue?: (value: unknown) => 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): EffectPgPreparedQuery<T, false> {\n\t\treturn new EffectPgPreparedQuery(\n\t\t\tthis.client,\n\t\t\tquery,\n\t\t\tthis.logger,\n\t\t\tthis.cache,\n\t\t\tqueryMetadata,\n\t\t\tcacheConfig,\n\t\t\tfields,\n\t\t\tname,\n\t\t\tisResponseInArrayMode,\n\t\t\tcustomResultMapper,\n\t\t\tfalse,\n\t\t);\n\t}\n\n\toverride prepareRelationalQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(\n\t\tquery: Query,\n\t\tfields: SelectedFieldsOrdered | undefined,\n\t\tname: string | undefined,\n\t\tcustomResultMapper: (\n\t\t\trows: Record<string, unknown>[],\n\t\t\tmapColumnValue?: (value: unknown) => unknown,\n\t\t) => T['execute'],\n\t): EffectPgPreparedQuery<T, true> {\n\t\treturn new EffectPgPreparedQuery<T, true>(\n\t\t\tthis.client,\n\t\t\tquery,\n\t\t\tthis.logger,\n\t\t\tthis.cache,\n\t\t\tundefined,\n\t\t\tundefined,\n\t\t\tfields,\n\t\t\tname,\n\t\t\tfalse,\n\t\t\tcustomResultMapper,\n\t\t\ttrue,\n\t\t);\n\t}\n\n\toverride execute<T>(query: SQL) {\n\t\treturn this.prepareQuery<PreparedQueryConfig & { execute: T }>(\n\t\t\tthis.dialect.sqlToQuery(query),\n\t\t\tundefined,\n\t\t\tundefined,\n\t\t\tfalse,\n\t\t).execute();\n\t}\n\n\toverride all<T>(query: SQL) {\n\t\treturn this.prepareQuery<PreparedQueryConfig & { all: T }>(\n\t\t\tthis.dialect.sqlToQuery(query),\n\t\t\tundefined,\n\t\t\tundefined,\n\t\t\tfalse,\n\t\t).all();\n\t}\n\n\toverride transaction<A, E, R>(\n\t\ttransaction: (\n\t\t\ttx: EffectPgTransaction<\n\t\t\t\tTQueryResult,\n\t\t\t\tTFullSchema,\n\t\t\t\tTRelations,\n\t\t\t\tTSchema\n\t\t\t>,\n\t\t) => Effect.Effect<A, E, R>,\n\t): Effect.Effect<A, E | SqlError, R> {\n\t\tconst { dialect, relations, schema } = this;\n\n\t\treturn this.client.withTransaction(Effect.gen(this, function*() {\n\t\t\tconst tx = new EffectPgTransaction<TQueryResult, TFullSchema, TRelations, TSchema>(\n\t\t\t\tdialect,\n\t\t\t\tthis,\n\t\t\t\trelations,\n\t\t\t\tschema,\n\t\t\t);\n\n\t\t\treturn yield* transaction(tx);\n\t\t}));\n\t}\n}\n\nexport class EffectPgTransaction<\n\tTQueryResult extends PgQueryResultHKT,\n\tTFullSchema extends Record<string, unknown>,\n\tTRelations extends AnyRelations,\n\tTSchema extends V1.TablesRelationalConfig,\n> extends PgEffectTransaction<EffectPgQueryEffectHKT, TQueryResult, TFullSchema, TRelations, TSchema> {\n\tstatic override readonly [entityKind]: string = 'EffectPgTransaction';\n}\n"],"mappings":"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"}
+{"version":3,"file":"session.cjs","names":["PgEffectSession","entityKind","PgEffectPreparedQuery","Effect","PgEffectTransaction"],"sources":["../../src/effect-postgres/session.ts"],"sourcesContent":["import type { PgClient } from '@effect/sql-pg/PgClient';\nimport type { SqlError } from '@effect/sql/SqlError';\nimport * as Effect from 'effect/Effect';\nimport type { EffectCache } from '~/cache/core/cache-effect.ts';\nimport type { WithCacheConfig } from '~/cache/core/types.ts';\nimport type { EffectDrizzleQueryError } from '~/effect-core/errors.ts';\nimport type { EffectLogger } from '~/effect-core/logger.ts';\nimport type { QueryEffectHKTBase } from '~/effect-core/query-effect.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { PgDialect } from '~/pg-core/dialect.ts';\nimport { PgEffectPreparedQuery, PgEffectSession, PgEffectTransaction } from '~/pg-core/effect/session.ts';\nimport type { PgQueryResultHKT, PreparedQueryConfig } from '~/pg-core/session.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport type { Query } from '~/sql/sql.ts';\nimport type { Assume } from '~/utils.ts';\n\nexport interface EffectPgQueryEffectHKT extends QueryEffectHKTBase {\n\treadonly error: EffectDrizzleQueryError;\n\treadonly context: never;\n}\n\nexport interface EffectPgQueryResultHKT extends PgQueryResultHKT {\n\ttype: readonly Assume<this['row'], object>[];\n}\n\nexport interface EffectPgSessionOptions {\n\tlogger: EffectLogger;\n\tcache: EffectCache;\n\tuseJitMapper?: boolean;\n}\n\nexport class EffectPgSession<\n\tTQueryResult extends PgQueryResultHKT,\n\tTRelations extends AnyRelations,\n> extends PgEffectSession<EffectPgQueryEffectHKT, TQueryResult, TRelations> {\n\tstatic override readonly [entityKind]: string = 'EffectPgSession';\n\n\tconstructor(\n\t\tprivate client: PgClient,\n\t\tdialect: PgDialect,\n\t\tprotected relations: TRelations,\n\t\tprivate options: EffectPgSessionOptions,\n\t) {\n\t\tsuper(dialect);\n\t}\n\n\toverride prepareQuery<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,\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): PgEffectPreparedQuery<T, EffectPgQueryEffectHKT> {\n\t\tconst executor = (params?: unknown[]) => {\n\t\t\tconst q = this.client.unsafe(query.sql, params);\n\n\t\t\tif (mode === 'arrays') return q.values;\n\t\t\treturn q.withoutTransform;\n\t\t};\n\n\t\treturn new PgEffectPreparedQuery<T, EffectPgQueryEffectHKT>(\n\t\t\texecutor,\n\t\t\tquery,\n\t\t\tmapper,\n\t\t\tmode,\n\t\t\tthis.options.logger,\n\t\t\tthis.options.cache,\n\t\t\tqueryMetadata,\n\t\t\tcacheConfig,\n\t\t);\n\t}\n\n\toverride transaction<A, E, R>(\n\t\ttransaction: (\n\t\t\ttx: EffectPgTransaction<TQueryResult, TRelations>,\n\t\t) => Effect.Effect<A, E, R>,\n\t): Effect.Effect<A, E | SqlError, R> {\n\t\tconst { dialect, relations } = this;\n\n\t\treturn this.client.withTransaction(Effect.gen(this, function*() {\n\t\t\tconst tx = new EffectPgTransaction<TQueryResult, TRelations>(\n\t\t\t\tdialect,\n\t\t\t\tthis,\n\t\t\t\trelations,\n\t\t\t);\n\n\t\t\treturn yield* transaction(tx);\n\t\t}));\n\t}\n}\n\nexport class EffectPgTransaction<\n\tTQueryResult extends PgQueryResultHKT,\n\tTRelations extends AnyRelations,\n> extends PgEffectTransaction<EffectPgQueryEffectHKT, TQueryResult, TRelations> {\n\tstatic override readonly [entityKind]: string = 'EffectPgTransaction';\n\n\toverride transaction: <A, E, R>(\n\t\ttransaction: (\n\t\t\ttx: PgEffectTransaction<EffectPgQueryEffectHKT, TQueryResult, TRelations>,\n\t\t) => Effect.Effect<A, E, R>,\n\t) => Effect.Effect<A, SqlError | E, R> = (tx) => this.session.transaction(tx);\n}\n"],"mappings":";;;;;;;;AA+BA,IAAa,kBAAb,cAGUA,4CAAkE;CAC3E,QAA0BC,0BAAsB;CAEhD,YACC,AAAQ,QACR,SACA,AAAU,WACV,AAAQ,SACP;AACD,QAAM,QAAQ;EALN;EAEE;EACF;;CAKT,AAAS,aACR,OACA,MACA,OACA,QACA,eAIA,aACmD;EACnD,MAAM,YAAY,WAAuB;GACxC,MAAM,IAAI,KAAK,OAAO,OAAO,MAAM,KAAK,OAAO;AAE/C,OAAI,SAAS,SAAU,QAAO,EAAE;AAChC,UAAO,EAAE;;AAGV,SAAO,IAAIC,kDACV,UACA,OACA,QACA,MACA,KAAK,QAAQ,QACb,KAAK,QAAQ,OACb,eACA,YACA;;CAGF,AAAS,YACR,aAGoC;EACpC,MAAM,EAAE,SAAS,cAAc;AAE/B,SAAO,KAAK,OAAO,gBAAgBC,cAAO,IAAI,MAAM,aAAY;AAO/D,UAAO,OAAO,YANH,IAAI,oBACd,SACA,MACA,UACA,CAE4B;IAC5B,CAAC;;;AAIL,IAAa,sBAAb,cAGUC,gDAAsE;CAC/E,QAA0BH,0BAAsB;CAEhD,AAAS,eAIiC,OAAO,KAAK,QAAQ,YAAY,GAAG"}

package/effect-postgres/session.d.cts

@@ -1,12 +1,10 @@
 import { entityKind } from "../entity.cjs";
-import { Query, SQL } from "../sql/sql.cjs";
+import { Query } from "../sql/sql.cjs";
 import { Assume } from "../utils.cjs";
-import * as V1 from "../_relations.cjs";
 import { WithCacheConfig } from "../cache/core/types.cjs";
 import { AnyRelations } from "../relations.cjs";
 import { PgDialect } from "../pg-core/dialect.cjs";
 import { PgQueryResultHKT, PreparedQueryConfig } from "../pg-core/session.cjs";
-import { SelectedFieldsOrdered } from "../pg-core/query-builders/select.types.cjs";
 import * as Effect from "effect/Effect";
 import { PgClient } from "@effect/sql-pg/PgClient";
 import { EffectCache } from "../cache/core/cache-effect.cjs";
@@ -24,42 +22,27 @@ interface EffectPgQueryEffectHKT extends QueryEffectHKTBase {
 interface EffectPgQueryResultHKT extends PgQueryResultHKT {
   type: readonly Assume<this['row'], object>[];
 }
-declare class EffectPgPreparedQuery<T extends PreparedQueryConfig, TIsRqbV2 extends boolean = false> extends PgEffectPreparedQuery<T, EffectPgQueryEffectHKT> {
-  private client;
-  private logger;
-  private fields;
-  private _isResponseInArrayMode;
-  private customResultMapper?;
-  private isRqbV2Query?;
-  static readonly [entityKind]: string;
-  constructor(client: PgClient, query: Query, logger: EffectLogger, cache: EffectCache, queryMetadata: {
-    type: 'select' | 'update' | 'delete' | 'insert';
-    tables: string[];
-  } | undefined, cacheConfig: WithCacheConfig | undefined, fields: SelectedFieldsOrdered | undefined, name: string | undefined, _isResponseInArrayMode: boolean, customResultMapper?: ((rows: TIsRqbV2 extends true ? Record<string, unknown>[] : unknown[][]) => T["execute"]) | undefined, isRqbV2Query?: TIsRqbV2 | undefined);
-  execute(placeholderValues?: Record<string, unknown>): Effect.Effect<T["execute"], EffectDrizzleQueryError, never>;
-  private executeRqbV2;
-  all(placeholderValues?: Record<string, unknown>): Effect.Effect<T["all"], EffectDrizzleQueryError, never>;
+interface EffectPgSessionOptions {
+  logger: EffectLogger;
+  cache: EffectCache;
+  useJitMapper?: boolean;
 }
-declare class EffectPgSession<TQueryResult extends PgQueryResultHKT, TFullSchema extends Record<string, unknown>, TRelations extends AnyRelations, TSchema extends V1.TablesRelationalConfig> extends PgEffectSession<EffectPgQueryEffectHKT, TQueryResult, TFullSchema, TRelations, TSchema> {
+declare class EffectPgSession<TQueryResult extends PgQueryResultHKT, TRelations extends AnyRelations> extends PgEffectSession<EffectPgQueryEffectHKT, TQueryResult, TRelations> {
   private client;
   protected relations: TRelations;
-  protected schema: V1.RelationalSchemaConfig<TSchema> | undefined;
-  private logger;
-  private cache;
+  private options;
   static readonly [entityKind]: string;
-  constructor(client: PgClient, dialect: PgDialect, relations: TRelations, schema: V1.RelationalSchemaConfig<TSchema> | undefined, logger: EffectLogger, cache: EffectCache);
-  prepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: Query, fields: SelectedFieldsOrdered | undefined, name: string | undefined, isResponseInArrayMode: boolean, customResultMapper?: (rows: unknown[][], mapColumnValue?: (value: unknown) => unknown) => T['execute'], queryMetadata?: {
+  constructor(client: PgClient, dialect: PgDialect, relations: TRelations, options: EffectPgSessionOptions);
+  prepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: Query, mode: 'arrays' | 'objects' | 'raw', _name: string | boolean, mapper?: (rows: any[]) => any, queryMetadata?: {
     type: 'select' | 'update' | 'delete' | 'insert';
     tables: string[];
-  }, cacheConfig?: WithCacheConfig): EffectPgPreparedQuery<T, false>;
-  prepareRelationalQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: Query, fields: SelectedFieldsOrdered | undefined, name: string | undefined, customResultMapper: (rows: Record<string, unknown>[], mapColumnValue?: (value: unknown) => unknown) => T['execute']): EffectPgPreparedQuery<T, true>;
-  execute<T>(query: SQL): Effect.Effect<T, EffectDrizzleQueryError, never>;
-  all<T>(query: SQL): Effect.Effect<T, EffectDrizzleQueryError, never>;
-  transaction<A, E, R>(transaction: (tx: EffectPgTransaction<TQueryResult, TFullSchema, TRelations, TSchema>) => Effect.Effect<A, E, R>): Effect.Effect<A, E | SqlError, R>;
+  }, cacheConfig?: WithCacheConfig): PgEffectPreparedQuery<T, EffectPgQueryEffectHKT>;
+  transaction<A, E, R>(transaction: (tx: EffectPgTransaction<TQueryResult, TRelations>) => Effect.Effect<A, E, R>): Effect.Effect<A, E | SqlError, R>;
 }
-declare class EffectPgTransaction<TQueryResult extends PgQueryResultHKT, TFullSchema extends Record<string, unknown>, TRelations extends AnyRelations, TSchema extends V1.TablesRelationalConfig> extends PgEffectTransaction<EffectPgQueryEffectHKT, TQueryResult, TFullSchema, TRelations, TSchema> {
+declare class EffectPgTransaction<TQueryResult extends PgQueryResultHKT, TRelations extends AnyRelations> extends PgEffectTransaction<EffectPgQueryEffectHKT, TQueryResult, TRelations> {
   static readonly [entityKind]: string;
+  transaction: <A, E, R>(transaction: (tx: PgEffectTransaction<EffectPgQueryEffectHKT, TQueryResult, TRelations>) => Effect.Effect<A, E, R>) => Effect.Effect<A, SqlError | E, R>;
 }
 //#endregion
-export { EffectPgPreparedQuery, EffectPgQueryEffectHKT, EffectPgQueryResultHKT, EffectPgSession, EffectPgTransaction };
+export { EffectPgQueryEffectHKT, EffectPgQueryResultHKT, EffectPgSession, EffectPgSessionOptions, EffectPgTransaction };
 //# sourceMappingURL=session.d.cts.map