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

package/durable-sqlite/session.js

@@ -1,7 +1,8 @@
 import { entityKind } from "../entity.js";
-import { mapResultRow } from "../utils.js";
+import { makeJitQueryMapper, mapResultRow } from "../utils.js";
 import { fillPlaceholders } from "../sql/sql.js";
 import { NoopLogger } from "../logger.js";
+import { makeJitRqbMapper } from "../relations.js";
 import { SQLiteTransaction } from "../sqlite-core/index.js";
 import { SQLitePreparedQuery as SQLitePreparedQuery$1, SQLiteSession as SQLiteSession$1 } from "../sqlite-core/session.js";
 
@@ -14,13 +15,14 @@ var SQLiteDOSession = class extends SQLiteSession$1 {
 		this.client = client;
 		this.relations = relations;
 		this.schema = schema;
+		this.options = options;
 		this.logger = options.logger ?? new NoopLogger();
 	}
-	prepareQuery(query, fields, executeMethod, isResponseInArrayMode, customResultMapper) {
-		return new SQLiteDOPreparedQuery(this.client, query, this.logger, fields, executeMethod, isResponseInArrayMode, customResultMapper);
+	prepareQuery(query, fields, executeMethod, customResultMapper) {
+		return new SQLiteDOPreparedQuery(this.client, query, this.logger, fields, executeMethod, this.options.useJitMapper, customResultMapper);
 	}
-	prepareRelationalQuery(query, fields, executeMethod, customResultMapper) {
-		return new SQLiteDOPreparedQuery(this.client, query, this.logger, fields, executeMethod, false, customResultMapper, true);
+	prepareRelationalQuery(query, fields, executeMethod, customResultMapper, config) {
+		return new SQLiteDOPreparedQuery(this.client, query, this.logger, fields, executeMethod, this.options.useJitMapper, customResultMapper, true, config);
 	}
 	transaction(transaction, _config) {
 		const tx = new SQLiteDOTransaction("sync", this.dialect, this, this.relations, this.schema, void 0, false, true);
@@ -36,14 +38,16 @@ var SQLiteDOTransaction = class SQLiteDOTransaction extends SQLiteTransaction {
 };
 var SQLiteDOPreparedQuery = class extends SQLitePreparedQuery$1 {
 	static [entityKind] = "SQLiteDOPreparedQuery";
-	constructor(client, query, logger, fields, executeMethod, _isResponseInArrayMode, customResultMapper, isRqbV2Query) {
+	jitMapper;
+	constructor(client, query, logger, fields, executeMethod, useJitMapper, customResultMapper, isRqbV2Query, rqbConfig) {
 		super("sync", executeMethod, query, void 0, void 0, void 0);
 		this.client = client;
 		this.logger = logger;
 		this.fields = fields;
-		this._isResponseInArrayMode = _isResponseInArrayMode;
+		this.useJitMapper = useJitMapper;
 		this.customResultMapper = customResultMapper;
 		this.isRqbV2Query = isRqbV2Query;
+		this.rqbConfig = rqbConfig;
 	}
 	run(placeholderValues) {
 		const params = fillPlaceholders(this.query.params, placeholderValues ?? {});
@@ -61,13 +65,14 @@ var SQLiteDOPreparedQuery = class extends SQLitePreparedQuery$1 {
 		}
 		const rows = this.values(placeholderValues);
 		if (customResultMapper) return customResultMapper(rows);
-		return rows.map((row) => mapResultRow(fields, row, joinsNotNullableMap));
+		return this.useJitMapper ? (this.jitMapper = this.jitMapper ?? makeJitQueryMapper(fields, joinsNotNullableMap))(rows) : rows.map((row) => mapResultRow(fields, row, joinsNotNullableMap));
 	}
 	allRqbV2(placeholderValues) {
 		const { query, logger, client, customResultMapper } = this;
 		const params = fillPlaceholders(query.params, placeholderValues ?? {});
 		logger.logQuery(query.sql, params);
-		return customResultMapper(params.length > 0 ? client.sql.exec(query.sql, ...params).toArray() : client.sql.exec(query.sql).toArray());
+		const rows = params.length > 0 ? client.sql.exec(query.sql, ...params).toArray() : client.sql.exec(query.sql).toArray();
+		return this.useJitMapper ? (this.jitMapper = this.jitMapper ?? makeJitRqbMapper(this.rqbConfig))(rows) : customResultMapper(rows);
 	}
 	get(placeholderValues) {
 		if (this.isRqbV2Query) return this.getRqbV2(placeholderValues);
@@ -79,7 +84,7 @@ var SQLiteDOPreparedQuery = class extends SQLitePreparedQuery$1 {
 		const row = rows[0];
 		if (!row) return;
 		if (customResultMapper) return customResultMapper(rows);
-		return mapResultRow(fields, row, joinsNotNullableMap);
+		return this.useJitMapper ? (this.jitMapper = this.jitMapper ?? makeJitQueryMapper(fields, joinsNotNullableMap))([row])[0] : mapResultRow(fields, row, joinsNotNullableMap);
 	}
 	getRqbV2(placeholderValues) {
 		const params = fillPlaceholders(this.query.params, placeholderValues ?? {});
@@ -87,17 +92,13 @@ var SQLiteDOPreparedQuery = class extends SQLitePreparedQuery$1 {
 		const { client, customResultMapper, query } = this;
 		const row = (params.length > 0 ? client.sql.exec(query.sql, ...params) : client.sql.exec(query.sql)).next().value;
 		if (!row) return;
-		return customResultMapper([row]);
+		return this.useJitMapper ? (this.jitMapper = this.jitMapper ?? makeJitRqbMapper(this.rqbConfig))([row]) : customResultMapper([row]);
 	}
 	values(placeholderValues) {
 		const params = fillPlaceholders(this.query.params, placeholderValues ?? {});
 		this.logger.logQuery(this.query.sql, params);
 		return (params.length > 0 ? this.client.sql.exec(this.query.sql, ...params) : this.client.sql.exec(this.query.sql)).raw().toArray();
 	}
-	/** @internal */
-	isResponseInArrayMode() {
-		return this._isResponseInArrayMode;
-	}
 };
 
 //#endregion

package/durable-sqlite/session.js.map

@@ -1 +1 @@
-{"version":3,"file":"session.js","names":["SQLiteSession","PreparedQueryBase"],"sources":["../../src/durable-sqlite/session.ts"],"sourcesContent":["import type * as V1 from '~/_relations.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { Logger } from '~/logger.ts';\nimport { NoopLogger } from '~/logger.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport { fillPlaceholders, type Query } from '~/sql/sql.ts';\nimport { type SQLiteSyncDialect, SQLiteTransaction } from '~/sqlite-core/index.ts';\nimport type { SelectedFieldsOrdered } from '~/sqlite-core/query-builders/select.types.ts';\nimport {\n\ttype PreparedQueryConfig as PreparedQueryConfigBase,\n\ttype SQLiteExecuteMethod,\n\tSQLitePreparedQuery as PreparedQueryBase,\n\tSQLiteSession,\n\ttype SQLiteTransactionConfig,\n} from '~/sqlite-core/session.ts';\nimport { type DrizzleTypeError, mapResultRow } from '~/utils.ts';\n\nexport interface SQLiteDOSessionOptions {\n\tlogger?: Logger;\n}\n\ntype PreparedQueryConfig = Omit<PreparedQueryConfigBase, 'statement' | 'run'>;\n\nexport class SQLiteDOSession<\n\tTFullSchema extends Record<string, unknown>,\n\tTRelations extends AnyRelations,\n\tTSchema extends V1.TablesRelationalConfig,\n> extends SQLiteSession<\n\t'sync',\n\tSqlStorageCursor<Record<string, SqlStorageValue>>,\n\tTFullSchema,\n\tTRelations,\n\tTSchema\n> {\n\tstatic override readonly [entityKind]: string = 'SQLiteDOSession';\n\n\tprivate logger: Logger;\n\n\tconstructor(\n\t\tprivate client: DurableObjectStorage,\n\t\tdialect: SQLiteSyncDialect,\n\t\tprivate relations: TRelations,\n\t\tprivate schema: V1.RelationalSchemaConfig<TSchema> | undefined,\n\t\toptions: SQLiteDOSessionOptions = {},\n\t) {\n\t\tsuper(dialect);\n\t\tthis.logger = options.logger ?? new NoopLogger();\n\t}\n\n\tprepareQuery<T extends Omit<PreparedQueryConfig, 'run'>>(\n\t\tquery: Query,\n\t\tfields: SelectedFieldsOrdered | undefined,\n\t\texecuteMethod: SQLiteExecuteMethod,\n\t\tisResponseInArrayMode: boolean,\n\t\tcustomResultMapper?: (rows: unknown[][]) => unknown,\n\t): SQLiteDOPreparedQuery<T> {\n\t\treturn new SQLiteDOPreparedQuery(\n\t\t\tthis.client,\n\t\t\tquery,\n\t\t\tthis.logger,\n\t\t\tfields,\n\t\t\texecuteMethod,\n\t\t\tisResponseInArrayMode,\n\t\t\tcustomResultMapper,\n\t\t);\n\t}\n\n\tprepareRelationalQuery<T extends Omit<PreparedQueryConfig, 'run'>>(\n\t\tquery: Query,\n\t\tfields: SelectedFieldsOrdered | undefined,\n\t\texecuteMethod: SQLiteExecuteMethod,\n\t\tcustomResultMapper: (rows: Record<string, unknown>[]) => unknown,\n\t): SQLiteDOPreparedQuery<T, true> {\n\t\treturn new SQLiteDOPreparedQuery(\n\t\t\tthis.client,\n\t\t\tquery,\n\t\t\tthis.logger,\n\t\t\tfields,\n\t\t\texecuteMethod,\n\t\t\tfalse,\n\t\t\tcustomResultMapper,\n\t\t\ttrue,\n\t\t);\n\t}\n\n\toverride transaction<T>(\n\t\ttransaction: (\n\t\t\ttx: SQLiteTransaction<\n\t\t\t\t'sync',\n\t\t\t\tSqlStorageCursor<Record<string, SqlStorageValue>>,\n\t\t\t\tTFullSchema,\n\t\t\t\tTRelations,\n\t\t\t\tTSchema\n\t\t\t>,\n\t\t) => T,\n\t\t_config?: SQLiteTransactionConfig,\n\t): T {\n\t\tconst tx = new SQLiteDOTransaction('sync', this.dialect, this, this.relations, this.schema, undefined, false, true);\n\t\treturn this.client.transactionSync(() => transaction(tx));\n\t}\n}\n\nexport class SQLiteDOTransaction<\n\tTFullSchema extends Record<string, unknown>,\n\tTRelations extends AnyRelations,\n\tTSchema extends V1.TablesRelationalConfig,\n> extends SQLiteTransaction<\n\t'sync',\n\tSqlStorageCursor<Record<string, SqlStorageValue>>,\n\tTFullSchema,\n\tTRelations,\n\tTSchema\n> {\n\tstatic override readonly [entityKind]: string = 'SQLiteDOTransaction';\n\n\toverride transaction<T>(\n\t\ttransaction: (\n\t\t\ttx: SQLiteDOTransaction<TFullSchema, TRelations, TSchema>,\n\t\t) => T extends Promise<any> ? DrizzleTypeError<\"Sync drivers can't use async functions in transactions!\">\n\t\t\t: T,\n\t): T {\n\t\tconst tx = new SQLiteDOTransaction(\n\t\t\t'sync',\n\t\t\tthis.dialect,\n\t\t\tthis.session,\n\t\t\tthis.relations,\n\t\t\tthis.schema,\n\t\t\tthis.nestedIndex + 1,\n\t\t\tfalse,\n\t\t\ttrue,\n\t\t);\n\t\treturn this.session.transaction(() => transaction(tx)) as T;\n\t}\n}\n\nexport class SQLiteDOPreparedQuery<\n\tT extends PreparedQueryConfig = PreparedQueryConfig,\n\tTIsRqbV2 extends boolean = false,\n> extends PreparedQueryBase<{\n\ttype: 'sync';\n\trun: void;\n\tall: T['all'];\n\tget: T['get'];\n\tvalues: T['values'];\n\texecute: T['execute'];\n}> {\n\tstatic override readonly [entityKind]: string = 'SQLiteDOPreparedQuery';\n\n\tconstructor(\n\t\tprivate client: DurableObjectStorage,\n\t\tquery: Query,\n\t\tprivate logger: Logger,\n\t\tprivate fields: SelectedFieldsOrdered | undefined,\n\t\texecuteMethod: SQLiteExecuteMethod,\n\t\tprivate _isResponseInArrayMode: boolean,\n\t\tprivate customResultMapper?: (\n\t\t\trows: TIsRqbV2 extends true ? Record<string, unknown>[] : unknown[][],\n\t\t) => unknown,\n\t\tprivate isRqbV2Query?: TIsRqbV2,\n\t) {\n\t\t// 3-6 params are for cache. As long as we don't support sync cache - it will be skipped here\n\t\tsuper('sync', executeMethod, query, undefined, undefined, undefined);\n\t}\n\n\trun(placeholderValues?: Record<string, unknown>): SqlStorageCursor<Record<string, SqlStorageValue>> {\n\t\tconst params = fillPlaceholders(this.query.params, placeholderValues ?? {});\n\t\tthis.logger.logQuery(this.query.sql, params);\n\n\t\tif (params.length > 0) {\n\t\t\treturn this.client.sql.exec(this.query.sql, ...params);\n\t\t}\n\t\treturn this.client.sql.exec(this.query.sql);\n\t}\n\n\tall(placeholderValues?: Record<string, unknown>): T['all'] {\n\t\tif (this.isRqbV2Query) return this.allRqbV2(placeholderValues);\n\n\t\tconst { fields, joinsNotNullableMap, query, logger, client, customResultMapper } = this;\n\t\tif (!fields && !customResultMapper) {\n\t\t\tconst params = fillPlaceholders(query.params, placeholderValues ?? {});\n\t\t\tlogger.logQuery(query.sql, params);\n\n\t\t\treturn params.length > 0 ? client.sql.exec(query.sql, ...params).toArray() : client.sql.exec(query.sql).toArray();\n\t\t}\n\n\t\tconst rows = this.values(placeholderValues) as unknown[][];\n\n\t\tif (customResultMapper) {\n\t\t\treturn (customResultMapper as (rows: unknown[][]) => unknown)(rows) as T['all'];\n\t\t}\n\n\t\treturn rows.map((row) => mapResultRow(fields!, row, joinsNotNullableMap));\n\t}\n\n\tprivate allRqbV2(placeholderValues?: Record<string, unknown>): T['all'] {\n\t\tconst { query, logger, client, customResultMapper } = this;\n\n\t\tconst params = fillPlaceholders(query.params, placeholderValues ?? {});\n\t\tlogger.logQuery(query.sql, params);\n\n\t\tconst rows = params.length > 0\n\t\t\t? client.sql.exec(query.sql, ...params).toArray()\n\t\t\t: client.sql.exec(query.sql).toArray();\n\n\t\treturn (customResultMapper as (rows: Record<string, unknown>[]) => unknown)(rows);\n\t}\n\n\tget(placeholderValues?: Record<string, unknown>): T['get'] {\n\t\tif (this.isRqbV2Query) return this.getRqbV2(placeholderValues);\n\n\t\tconst params = fillPlaceholders(this.query.params, placeholderValues ?? {});\n\t\tthis.logger.logQuery(this.query.sql, params);\n\n\t\tconst { fields, client, joinsNotNullableMap, customResultMapper, query } = this;\n\t\tif (!fields && !customResultMapper) {\n\t\t\treturn (params.length > 0 ? client.sql.exec(query.sql, ...params) : client.sql.exec(query.sql)).next().value;\n\t\t}\n\n\t\tconst rows = this.values(placeholderValues) as unknown[][];\n\t\tconst row = rows[0];\n\n\t\tif (!row) {\n\t\t\treturn undefined;\n\t\t}\n\n\t\tif (customResultMapper) {\n\t\t\treturn (customResultMapper as (rows: unknown[][]) => unknown)(rows) as T['get'];\n\t\t}\n\n\t\treturn mapResultRow(fields!, row, joinsNotNullableMap);\n\t}\n\n\tprivate getRqbV2(placeholderValues?: Record<string, unknown>): T['get'] {\n\t\tconst params = fillPlaceholders(this.query.params, placeholderValues ?? {});\n\t\tthis.logger.logQuery(this.query.sql, params);\n\n\t\tconst { client, customResultMapper, query } = this;\n\n\t\tconst row = (params.length > 0 ? client.sql.exec(query.sql, ...params) : client.sql.exec(query.sql)).next().value;\n\n\t\tif (!row) {\n\t\t\treturn undefined;\n\t\t}\n\n\t\treturn (customResultMapper as (rows: Record<string, unknown>[]) => unknown)([row]) as T['get'];\n\t}\n\n\tvalues(placeholderValues?: Record<string, unknown>): T['values'] {\n\t\tconst params = fillPlaceholders(this.query.params, placeholderValues ?? {});\n\t\tthis.logger.logQuery(this.query.sql, params);\n\n\t\tconst res = params.length > 0\n\t\t\t? this.client.sql.exec(this.query.sql, ...params)\n\t\t\t: this.client.sql.exec(this.query.sql);\n\n\t\t// @ts-ignore .raw().toArray() exists\n\t\treturn res.raw().toArray();\n\t}\n\n\t/** @internal */\n\tisResponseInArrayMode(): boolean {\n\t\treturn this._isResponseInArrayMode;\n\t}\n}\n"],"mappings":"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"}
+{"version":3,"file":"session.js","names":["SQLiteSession","PreparedQueryBase"],"sources":["../../src/durable-sqlite/session.ts"],"sourcesContent":["import type * as V1 from '~/_relations.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { Logger } from '~/logger.ts';\nimport { NoopLogger } from '~/logger.ts';\nimport {\n\ttype AnyRelations,\n\tmakeJitRqbMapper,\n\ttype RelationalQueryMapperConfig,\n\ttype RelationalRowsMapper,\n} from '~/relations.ts';\nimport { fillPlaceholders, type Query } from '~/sql/sql.ts';\nimport { type SQLiteSyncDialect, SQLiteTransaction } from '~/sqlite-core/index.ts';\nimport type { SelectedFieldsOrdered } from '~/sqlite-core/query-builders/select.types.ts';\nimport {\n\ttype PreparedQueryConfig as PreparedQueryConfigBase,\n\ttype SQLiteExecuteMethod,\n\tSQLitePreparedQuery as PreparedQueryBase,\n\tSQLiteSession,\n\ttype SQLiteTransactionConfig,\n} from '~/sqlite-core/session.ts';\nimport { type DrizzleTypeError, makeJitQueryMapper, mapResultRow, type RowsMapper } from '~/utils.ts';\n\nexport interface SQLiteDOSessionOptions {\n\tlogger?: Logger;\n\tuseJitMapper?: boolean;\n}\n\ntype PreparedQueryConfig = Omit<PreparedQueryConfigBase, 'statement' | 'run'>;\n\nexport class SQLiteDOSession<\n\tTFullSchema extends Record<string, unknown>,\n\tTRelations extends AnyRelations,\n\tTSchema extends V1.TablesRelationalConfig,\n> extends SQLiteSession<\n\t'sync',\n\tSqlStorageCursor<Record<string, SqlStorageValue>>,\n\tTFullSchema,\n\tTRelations,\n\tTSchema\n> {\n\tstatic override readonly [entityKind]: string = 'SQLiteDOSession';\n\n\tprivate logger: Logger;\n\n\tconstructor(\n\t\tprivate client: DurableObjectStorage,\n\t\tdialect: SQLiteSyncDialect,\n\t\tprivate relations: TRelations,\n\t\tprivate schema: V1.RelationalSchemaConfig<TSchema> | undefined,\n\t\tprivate options: SQLiteDOSessionOptions = {},\n\t) {\n\t\tsuper(dialect);\n\t\tthis.logger = options.logger ?? new NoopLogger();\n\t}\n\n\tprepareQuery<T extends Omit<PreparedQueryConfig, 'run'>>(\n\t\tquery: Query,\n\t\tfields: SelectedFieldsOrdered | undefined,\n\t\texecuteMethod: SQLiteExecuteMethod,\n\t\tcustomResultMapper?: (rows: unknown[][]) => unknown,\n\t): SQLiteDOPreparedQuery<T> {\n\t\treturn new SQLiteDOPreparedQuery(\n\t\t\tthis.client,\n\t\t\tquery,\n\t\t\tthis.logger,\n\t\t\tfields,\n\t\t\texecuteMethod,\n\t\t\tthis.options.useJitMapper,\n\t\t\tcustomResultMapper,\n\t\t);\n\t}\n\n\tprepareRelationalQuery<T extends Omit<PreparedQueryConfig, 'run'>>(\n\t\tquery: Query,\n\t\tfields: SelectedFieldsOrdered | undefined,\n\t\texecuteMethod: SQLiteExecuteMethod,\n\t\tcustomResultMapper: (rows: Record<string, unknown>[]) => unknown,\n\t\tconfig: RelationalQueryMapperConfig,\n\t): SQLiteDOPreparedQuery<T, true> {\n\t\treturn new SQLiteDOPreparedQuery(\n\t\t\tthis.client,\n\t\t\tquery,\n\t\t\tthis.logger,\n\t\t\tfields,\n\t\t\texecuteMethod,\n\t\t\tthis.options.useJitMapper,\n\t\t\tcustomResultMapper,\n\t\t\ttrue,\n\t\t\tconfig,\n\t\t);\n\t}\n\n\toverride transaction<T>(\n\t\ttransaction: (\n\t\t\ttx: SQLiteTransaction<\n\t\t\t\t'sync',\n\t\t\t\tSqlStorageCursor<Record<string, SqlStorageValue>>,\n\t\t\t\tTFullSchema,\n\t\t\t\tTRelations,\n\t\t\t\tTSchema\n\t\t\t>,\n\t\t) => T,\n\t\t_config?: SQLiteTransactionConfig,\n\t): T {\n\t\tconst tx = new SQLiteDOTransaction('sync', this.dialect, this, this.relations, this.schema, undefined, false, true);\n\t\treturn this.client.transactionSync(() => transaction(tx));\n\t}\n}\n\nexport class SQLiteDOTransaction<\n\tTFullSchema extends Record<string, unknown>,\n\tTRelations extends AnyRelations,\n\tTSchema extends V1.TablesRelationalConfig,\n> extends SQLiteTransaction<\n\t'sync',\n\tSqlStorageCursor<Record<string, SqlStorageValue>>,\n\tTFullSchema,\n\tTRelations,\n\tTSchema\n> {\n\tstatic override readonly [entityKind]: string = 'SQLiteDOTransaction';\n\n\toverride transaction<T>(\n\t\ttransaction: (\n\t\t\ttx: SQLiteDOTransaction<TFullSchema, TRelations, TSchema>,\n\t\t) => T extends Promise<any> ? DrizzleTypeError<\"Sync drivers can't use async functions in transactions!\">\n\t\t\t: T,\n\t): T {\n\t\tconst tx = new SQLiteDOTransaction(\n\t\t\t'sync',\n\t\t\tthis.dialect,\n\t\t\tthis.session,\n\t\t\tthis.relations,\n\t\t\tthis.schema,\n\t\t\tthis.nestedIndex + 1,\n\t\t\tfalse,\n\t\t\ttrue,\n\t\t);\n\t\treturn this.session.transaction(() => transaction(tx)) as T;\n\t}\n}\n\nexport class SQLiteDOPreparedQuery<\n\tT extends PreparedQueryConfig = PreparedQueryConfig,\n\tTIsRqbV2 extends boolean = false,\n> extends PreparedQueryBase<{\n\ttype: 'sync';\n\trun: void;\n\tall: T['all'];\n\tget: T['get'];\n\tvalues: T['values'];\n\texecute: T['execute'];\n}> {\n\tstatic override readonly [entityKind]: string = 'SQLiteDOPreparedQuery';\n\tprivate jitMapper?: RowsMapper<any> | RelationalRowsMapper<any>;\n\n\tconstructor(\n\t\tprivate client: DurableObjectStorage,\n\t\tquery: Query,\n\t\tprivate logger: Logger,\n\t\tprivate fields: SelectedFieldsOrdered | undefined,\n\t\texecuteMethod: SQLiteExecuteMethod,\n\t\tprivate useJitMapper: boolean | undefined,\n\t\tprivate customResultMapper?: (\n\t\t\trows: TIsRqbV2 extends true ? Record<string, unknown>[] : unknown[][],\n\t\t) => unknown,\n\t\tprivate isRqbV2Query?: TIsRqbV2,\n\t\tprivate rqbConfig?: RelationalQueryMapperConfig,\n\t) {\n\t\t// 3-6 params are for cache. As long as we don't support sync cache - it will be skipped here\n\t\tsuper('sync', executeMethod, query, undefined, undefined, undefined);\n\t}\n\n\trun(placeholderValues?: Record<string, unknown>): SqlStorageCursor<Record<string, SqlStorageValue>> {\n\t\tconst params = fillPlaceholders(this.query.params, placeholderValues ?? {});\n\t\tthis.logger.logQuery(this.query.sql, params);\n\n\t\tif (params.length > 0) {\n\t\t\treturn this.client.sql.exec(this.query.sql, ...params);\n\t\t}\n\t\treturn this.client.sql.exec(this.query.sql);\n\t}\n\n\tall(placeholderValues?: Record<string, unknown>): T['all'] {\n\t\tif (this.isRqbV2Query) return this.allRqbV2(placeholderValues);\n\n\t\tconst { fields, joinsNotNullableMap, query, logger, client, customResultMapper } = this;\n\t\tif (!fields && !customResultMapper) {\n\t\t\tconst params = fillPlaceholders(query.params, placeholderValues ?? {});\n\t\t\tlogger.logQuery(query.sql, params);\n\n\t\t\treturn params.length > 0 ? client.sql.exec(query.sql, ...params).toArray() : client.sql.exec(query.sql).toArray();\n\t\t}\n\n\t\tconst rows = this.values(placeholderValues) as unknown[][];\n\n\t\tif (customResultMapper) {\n\t\t\treturn (customResultMapper as (rows: unknown[][]) => unknown)(rows) as T['all'];\n\t\t}\n\n\t\treturn this.useJitMapper\n\t\t\t? (this.jitMapper = this.jitMapper as RowsMapper<T['all']>\n\t\t\t\t?? makeJitQueryMapper<T['all']>(fields!, joinsNotNullableMap))(rows)\n\t\t\t: rows.map((row) => mapResultRow(fields!, row, joinsNotNullableMap));\n\t}\n\n\tprivate allRqbV2(placeholderValues?: Record<string, unknown>): T['all'] {\n\t\tconst { query, logger, client, customResultMapper } = this;\n\n\t\tconst params = fillPlaceholders(query.params, placeholderValues ?? {});\n\t\tlogger.logQuery(query.sql, params);\n\n\t\tconst rows = params.length > 0\n\t\t\t? client.sql.exec(query.sql, ...params).toArray()\n\t\t\t: client.sql.exec(query.sql).toArray();\n\n\t\treturn this.useJitMapper\n\t\t\t? (this.jitMapper = this.jitMapper as RelationalRowsMapper<T['all']>\n\t\t\t\t?? makeJitRqbMapper<T['all']>(this.rqbConfig!))(rows)\n\t\t\t: (customResultMapper as (rows: Record<string, unknown>[]) => unknown)(rows);\n\t}\n\n\tget(placeholderValues?: Record<string, unknown>): T['get'] {\n\t\tif (this.isRqbV2Query) return this.getRqbV2(placeholderValues);\n\n\t\tconst params = fillPlaceholders(this.query.params, placeholderValues ?? {});\n\t\tthis.logger.logQuery(this.query.sql, params);\n\n\t\tconst { fields, client, joinsNotNullableMap, customResultMapper, query } = this;\n\t\tif (!fields && !customResultMapper) {\n\t\t\treturn (params.length > 0 ? client.sql.exec(query.sql, ...params) : client.sql.exec(query.sql)).next().value;\n\t\t}\n\n\t\tconst rows = this.values(placeholderValues) as unknown[][];\n\t\tconst row = rows[0];\n\n\t\tif (!row) {\n\t\t\treturn undefined;\n\t\t}\n\n\t\tif (customResultMapper) {\n\t\t\treturn (customResultMapper as (rows: unknown[][]) => unknown)(rows) as T['get'];\n\t\t}\n\n\t\treturn this.useJitMapper\n\t\t\t? (this.jitMapper = this.jitMapper as RowsMapper<T['get'][]>\n\t\t\t\t?? makeJitQueryMapper<T['get'][]>(fields!, joinsNotNullableMap))(\n\t\t\t\t\t[row],\n\t\t\t\t)[0]\n\t\t\t: mapResultRow(fields!, row, joinsNotNullableMap);\n\t}\n\n\tprivate getRqbV2(placeholderValues?: Record<string, unknown>): T['get'] {\n\t\tconst params = fillPlaceholders(this.query.params, placeholderValues ?? {});\n\t\tthis.logger.logQuery(this.query.sql, params);\n\n\t\tconst { client, customResultMapper, query } = this;\n\n\t\tconst row = (params.length > 0 ? client.sql.exec(query.sql, ...params) : client.sql.exec(query.sql)).next().value;\n\n\t\tif (!row) {\n\t\t\treturn undefined;\n\t\t}\n\n\t\treturn this.useJitMapper\n\t\t\t? (this.jitMapper = this.jitMapper as RelationalRowsMapper<T['get'][]>\n\t\t\t\t?? makeJitRqbMapper<T['get'][]>(this.rqbConfig!))([row])\n\t\t\t: (customResultMapper as (rows: Record<string, unknown>[]) => unknown)([row]) as T['get'];\n\t}\n\n\tvalues(placeholderValues?: Record<string, unknown>): T['values'] {\n\t\tconst params = fillPlaceholders(this.query.params, placeholderValues ?? {});\n\t\tthis.logger.logQuery(this.query.sql, params);\n\n\t\tconst res = params.length > 0\n\t\t\t? this.client.sql.exec(this.query.sql, ...params)\n\t\t\t: this.client.sql.exec(this.query.sql);\n\n\t\t// @ts-ignore .raw().toArray() exists\n\t\treturn res.raw().toArray();\n\t}\n}\n"],"mappings":";;;;;;;;;AA6BA,IAAa,kBAAb,cAIUA,gBAMR;CACD,QAA0B,cAAsB;CAEhD,AAAQ;CAER,YACC,AAAQ,QACR,SACA,AAAQ,WACR,AAAQ,QACR,AAAQ,UAAkC,EAAE,EAC3C;AACD,QAAM,QAAQ;EANN;EAEA;EACA;EACA;AAGR,OAAK,SAAS,QAAQ,UAAU,IAAI,YAAY;;CAGjD,aACC,OACA,QACA,eACA,oBAC2B;AAC3B,SAAO,IAAI,sBACV,KAAK,QACL,OACA,KAAK,QACL,QACA,eACA,KAAK,QAAQ,cACb,mBACA;;CAGF,uBACC,OACA,QACA,eACA,oBACA,QACiC;AACjC,SAAO,IAAI,sBACV,KAAK,QACL,OACA,KAAK,QACL,QACA,eACA,KAAK,QAAQ,cACb,oBACA,MACA,OACA;;CAGF,AAAS,YACR,aASA,SACI;EACJ,MAAM,KAAK,IAAI,oBAAoB,QAAQ,KAAK,SAAS,MAAM,KAAK,WAAW,KAAK,QAAQ,QAAW,OAAO,KAAK;AACnH,SAAO,KAAK,OAAO,sBAAsB,YAAY,GAAG,CAAC;;;AAI3D,IAAa,sBAAb,MAAa,4BAIH,kBAMR;CACD,QAA0B,cAAsB;CAEhD,AAAS,YACR,aAII;EACJ,MAAM,KAAK,IAAI,oBACd,QACA,KAAK,SACL,KAAK,SACL,KAAK,WACL,KAAK,QACL,KAAK,cAAc,GACnB,OACA,KACA;AACD,SAAO,KAAK,QAAQ,kBAAkB,YAAY,GAAG,CAAC;;;AAIxD,IAAa,wBAAb,cAGUC,sBAOP;CACF,QAA0B,cAAsB;CAChD,AAAQ;CAER,YACC,AAAQ,QACR,OACA,AAAQ,QACR,AAAQ,QACR,eACA,AAAQ,cACR,AAAQ,oBAGR,AAAQ,cACR,AAAQ,WACP;AAED,QAAM,QAAQ,eAAe,OAAO,QAAW,QAAW,OAAU;EAb5D;EAEA;EACA;EAEA;EACA;EAGA;EACA;;CAMT,IAAI,mBAAgG;EACnG,MAAM,SAAS,iBAAiB,KAAK,MAAM,QAAQ,qBAAqB,EAAE,CAAC;AAC3E,OAAK,OAAO,SAAS,KAAK,MAAM,KAAK,OAAO;AAE5C,MAAI,OAAO,SAAS,EACnB,QAAO,KAAK,OAAO,IAAI,KAAK,KAAK,MAAM,KAAK,GAAG,OAAO;AAEvD,SAAO,KAAK,OAAO,IAAI,KAAK,KAAK,MAAM,IAAI;;CAG5C,IAAI,mBAAuD;AAC1D,MAAI,KAAK,aAAc,QAAO,KAAK,SAAS,kBAAkB;EAE9D,MAAM,EAAE,QAAQ,qBAAqB,OAAO,QAAQ,QAAQ,uBAAuB;AACnF,MAAI,CAAC,UAAU,CAAC,oBAAoB;GACnC,MAAM,SAAS,iBAAiB,MAAM,QAAQ,qBAAqB,EAAE,CAAC;AACtE,UAAO,SAAS,MAAM,KAAK,OAAO;AAElC,UAAO,OAAO,SAAS,IAAI,OAAO,IAAI,KAAK,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,GAAG,OAAO,IAAI,KAAK,MAAM,IAAI,CAAC,SAAS;;EAGlH,MAAM,OAAO,KAAK,OAAO,kBAAkB;AAE3C,MAAI,mBACH,QAAQ,mBAAsD,KAAK;AAGpE,SAAO,KAAK,gBACR,KAAK,YAAY,KAAK,aACrB,mBAA6B,QAAS,oBAAoB,EAAE,KAAK,GACnE,KAAK,KAAK,QAAQ,aAAa,QAAS,KAAK,oBAAoB,CAAC;;CAGtE,AAAQ,SAAS,mBAAuD;EACvE,MAAM,EAAE,OAAO,QAAQ,QAAQ,uBAAuB;EAEtD,MAAM,SAAS,iBAAiB,MAAM,QAAQ,qBAAqB,EAAE,CAAC;AACtE,SAAO,SAAS,MAAM,KAAK,OAAO;EAElC,MAAM,OAAO,OAAO,SAAS,IAC1B,OAAO,IAAI,KAAK,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,GAC/C,OAAO,IAAI,KAAK,MAAM,IAAI,CAAC,SAAS;AAEvC,SAAO,KAAK,gBACR,KAAK,YAAY,KAAK,aACrB,iBAA2B,KAAK,UAAW,EAAE,KAAK,GACnD,mBAAoE,KAAK;;CAG9E,IAAI,mBAAuD;AAC1D,MAAI,KAAK,aAAc,QAAO,KAAK,SAAS,kBAAkB;EAE9D,MAAM,SAAS,iBAAiB,KAAK,MAAM,QAAQ,qBAAqB,EAAE,CAAC;AAC3E,OAAK,OAAO,SAAS,KAAK,MAAM,KAAK,OAAO;EAE5C,MAAM,EAAE,QAAQ,QAAQ,qBAAqB,oBAAoB,UAAU;AAC3E,MAAI,CAAC,UAAU,CAAC,mBACf,SAAQ,OAAO,SAAS,IAAI,OAAO,IAAI,KAAK,MAAM,KAAK,GAAG,OAAO,GAAG,OAAO,IAAI,KAAK,MAAM,IAAI,EAAE,MAAM,CAAC;EAGxG,MAAM,OAAO,KAAK,OAAO,kBAAkB;EAC3C,MAAM,MAAM,KAAK;AAEjB,MAAI,CAAC,IACJ;AAGD,MAAI,mBACH,QAAQ,mBAAsD,KAAK;AAGpE,SAAO,KAAK,gBACR,KAAK,YAAY,KAAK,aACrB,mBAA+B,QAAS,oBAAoB,EAC9D,CAAC,IAAI,CACL,CAAC,KACD,aAAa,QAAS,KAAK,oBAAoB;;CAGnD,AAAQ,SAAS,mBAAuD;EACvE,MAAM,SAAS,iBAAiB,KAAK,MAAM,QAAQ,qBAAqB,EAAE,CAAC;AAC3E,OAAK,OAAO,SAAS,KAAK,MAAM,KAAK,OAAO;EAE5C,MAAM,EAAE,QAAQ,oBAAoB,UAAU;EAE9C,MAAM,OAAO,OAAO,SAAS,IAAI,OAAO,IAAI,KAAK,MAAM,KAAK,GAAG,OAAO,GAAG,OAAO,IAAI,KAAK,MAAM,IAAI,EAAE,MAAM,CAAC;AAE5G,MAAI,CAAC,IACJ;AAGD,SAAO,KAAK,gBACR,KAAK,YAAY,KAAK,aACrB,iBAA6B,KAAK,UAAW,EAAE,CAAC,IAAI,CAAC,GACtD,mBAAoE,CAAC,IAAI,CAAC;;CAG/E,OAAO,mBAA0D;EAChE,MAAM,SAAS,iBAAiB,KAAK,MAAM,QAAQ,qBAAqB,EAAE,CAAC;AAC3E,OAAK,OAAO,SAAS,KAAK,MAAM,KAAK,OAAO;AAO5C,UALY,OAAO,SAAS,IACzB,KAAK,OAAO,IAAI,KAAK,KAAK,MAAM,KAAK,GAAG,OAAO,GAC/C,KAAK,OAAO,IAAI,KAAK,KAAK,MAAM,IAAI,EAG5B,KAAK,CAAC,SAAS"}

package/effect-core/index.cjs

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-const require_effect_core_logger = require('./logger.cjs');
 const require_effect_core_errors = require('./errors.cjs');
 const require_effect_core_query_effect = require('./query-effect.cjs');
+const require_effect_core_logger = require('./logger.cjs');
 
 exports.EffectDrizzleError = require_effect_core_errors.EffectDrizzleError;
 exports.EffectDrizzleQueryError = require_effect_core_errors.EffectDrizzleQueryError;

package/effect-core/index.js

@@ -1,5 +1,5 @@
-import { EffectLogger } from "./logger.js";
 import { EffectDrizzleError, EffectDrizzleQueryError, EffectTransactionRollbackError, MigratorInitError } from "./errors.js";
 import { applyEffectWrapper } from "./query-effect.js";
+import { EffectLogger } from "./logger.js";
 
 export { EffectDrizzleError, EffectDrizzleQueryError, EffectLogger, EffectTransactionRollbackError, MigratorInitError, applyEffectWrapper };

package/effect-postgres/driver.cjs

@@ -2,14 +2,14 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_runtime = require('../_virtual/_rolldown/runtime.cjs');
 const require_effect_postgres_session = require('./session.cjs');
 let __entity_ts = require("../entity.cjs");
-let ___relations_ts = require("../_relations.cjs");
-___relations_ts = require_runtime.__toESM(___relations_ts);
+let __pg_core_array_ts = require("../pg-core/array.cjs");
+let __pg_core_codecs_ts = require("../pg-core/codecs.cjs");
 let __pg_core_dialect_ts = require("../pg-core/dialect.cjs");
-let _effect_sql_pg_PgClient = require("@effect/sql-pg/PgClient");
 let effect_Effect = require("effect/Effect");
 effect_Effect = require_runtime.__toESM(effect_Effect);
 let effect_Layer = require("effect/Layer");
 effect_Layer = require_runtime.__toESM(effect_Layer);
+let _effect_sql_pg_PgClient = require("@effect/sql-pg/PgClient");
 let __cache_core_cache_effect_ts = require("../cache/core/cache-effect.cjs");
 let __effect_core_index_ts = require("../effect-core/index.cjs");
 let __pg_core_effect_db_ts = require("../pg-core/effect/db.cjs");
@@ -19,6 +19,92 @@ var EffectPgDatabase = class extends __pg_core_effect_db_ts.PgEffectDatabase {
 	static [__entity_ts.entityKind] = "EffectPgDatabase";
 };
 const DefaultServices = effect_Layer.merge(__cache_core_cache_effect_ts.EffectCache.Default, __effect_core_index_ts.EffectLogger.Default);
+const effectPgCodecs = (0, __pg_core_codecs_ts.refineGenericPgCodecs)({
+	date: {
+		cast: __pg_core_codecs_ts.castToText,
+		normalizeParamArray: __pg_core_array_ts.makePgArray
+	},
+	interval: {
+		cast: __pg_core_codecs_ts.castToText,
+		normalizeParamArray: __pg_core_array_ts.makePgArray
+	},
+	timestamp: {
+		cast: __pg_core_codecs_ts.castToText,
+		normalizeParamArray: __pg_core_array_ts.makePgArray
+	},
+	timestamptz: {
+		cast: __pg_core_codecs_ts.castToText,
+		normalizeParamArray: __pg_core_array_ts.makePgArray
+	},
+	json: { normalizeParam: (v) => JSON.stringify(v) },
+	jsonb: { normalizeParam: (v) => JSON.stringify(v) },
+	bit: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	bool: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	box: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	box2d: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	box3d: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	char: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	cidr: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	circle: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	datemultirange: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	daterange: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	float8: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	geography: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	halfvec: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	inet: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	int4multirange: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	int4range: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	int8multirange: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	int8range: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	lseg: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	macaddr: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	money: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	nummultirange: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	numrange: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	oid: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	path: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	polygon: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	raster: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	regclass: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	regconfig: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	regdictionary: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	regnamespace: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	regoper: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	regoperator: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	regproc: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	regprocedure: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	regrole: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	regtype: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	serial: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	smallint: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	smallserial: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	sparsevec: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	text: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	time: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	timetz: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	tsmultirange: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	tsquery: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	tsrange: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	tstzmultirange: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	tstzrange: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	tsvector: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	varbit: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	varchar: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	vector: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	xml: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	bytea: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	enum: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	geometry: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	line: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	macaddr8: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	numeric: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	point: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	bigint: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	bigserial: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	float4: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	int: { normalizeParamArray: __pg_core_array_ts.makePgArray },
+	uuid: { normalizeParamArray: __pg_core_array_ts.makePgArray }
+});
 /**
 * Creates an EffectPgDatabase instance.
 *
@@ -49,18 +135,17 @@ const make = effect_Effect.fn("PgDrizzle.make")(function* (config = {}) {
 	const client = yield* _effect_sql_pg_PgClient.PgClient;
 	const cache = yield* __cache_core_cache_effect_ts.EffectCache;
 	const logger = yield* __effect_core_index_ts.EffectLogger;
-	const dialect = new __pg_core_dialect_ts.PgDialect({ casing: config.casing });
-	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 dialect = new __pg_core_dialect_ts.PgDialect({
+		casing: config.casing,
+		useJitMappers: config.useJitMappers,
+		codecs: config.codecs ?? effectPgCodecs
+	});
 	const relations = config.relations ?? {};
-	const db = new EffectPgDatabase(dialect, new require_effect_postgres_session.EffectPgSession(client, dialect, relations, schema, logger, cache), relations, schema);
+	const db = new EffectPgDatabase(dialect, new require_effect_postgres_session.EffectPgSession(client, dialect, relations, {
+		logger,
+		cache,
+		useJitMapper: config.useJitMappers
+	}), relations);
 	db.$client = client;
 	db.$cache = cache;
 	if (db.$cache) db.$cache["invalidate"] = cache.onMutate;
@@ -74,6 +159,7 @@ const makeWithDefaults = (config = {}) => make(config).pipe(effect_Effect.provid
 //#endregion
 exports.DefaultServices = DefaultServices;
 exports.EffectPgDatabase = EffectPgDatabase;
+exports.effectPgCodecs = effectPgCodecs;
 exports.make = make;
 exports.makeWithDefaults = makeWithDefaults;
 //# sourceMappingURL=driver.cjs.map

package/effect-postgres/driver.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"driver.cjs","names":["PgEffectDatabase","entityKind","Layer","EffectCache","EffectLogger","Effect","PgClient","PgDialect","V1","EffectPgSession"],"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,cAGUA,wCAA0F;CACnG,QAA0BC,0BAAsB;;AAQjD,MAAa,kBAAkBC,aAAM,MACpCC,yCAAY,SACZC,oCAAa,QACb;;;;;;;;;;;;;;;;;;;;;;;;;;;AA4BD,MAAa,OAAOC,cAAO,GAAG,iBAAiB,CAC9C,WAGE,SAAmD,EAAE,EAAE;CACxD,MAAM,SAAS,OAAOC;CACtB,MAAM,QAAQ,OAAOH;CACrB,MAAM,SAAS,OAAOC;CAEtB,MAAM,UAAU,IAAIG,+BAAU,EAAE,QAAQ,OAAO,QAAQ,CAAC;CAExD,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;CAExC,MAAM,KAAK,IAAI,iBACd,SAFe,IAAIC,gDAAgB,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,KAAKJ,cAAO,QAAQ,gBAAgB,CAAC"}
+{"version":3,"file":"driver.cjs","names":["PgEffectDatabase","entityKind","Layer","EffectCache","EffectLogger","castToText","makePgArray","Effect","PgClient","PgDialect","EffectPgSession"],"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/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,20 +1,24 @@
+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 { PgClient } from "@effect/sql-pg/PgClient";
+import { AnyRelations, EmptyRelations } from "../relations.js";
+import * as __pg_core_codecs_ts0 from "../pg-core/codecs.js";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
+import { PgClient } from "@effect/sql-pg/PgClient";
 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,10 +1,11 @@
 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";
 import * as Layer from "effect/Layer";
+import { PgClient } from "@effect/sql-pg/PgClient";
 import { EffectCache } from "../cache/core/cache-effect.js";
 import { EffectLogger } from "../effect-core/index.js";
 import { PgEffectDatabase } from "../pg-core/effect/db.js";
@@ -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