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

package/pg-proxy/session.d.cts

@@ -2,33 +2,56 @@ import { RemoteCallback } from "./driver.cjs";
 import { entityKind } from "../entity.cjs";
 import { QueryWithTypings } from "../sql/sql.cjs";
 import { Assume } from "../utils.cjs";
+import * as V1 from "../_relations.cjs";
 import { Cache } from "../cache/core/cache.cjs";
 import { WithCacheConfig } from "../cache/core/types.cjs";
 import { AnyRelations } from "../relations.cjs";
 import { PgDialect } from "../pg-core/dialect.cjs";
 import { PgQueryResultHKT, PgTransactionConfig, PreparedQueryConfig } from "../pg-core/session.cjs";
-import { Logger } from "../logger.cjs";
+import { SelectedFieldsOrdered } from "../pg-core/query-builders/select.types.cjs";
 import { PgAsyncPreparedQuery, PgAsyncSession, PgAsyncTransaction } from "../pg-core/async/session.cjs";
+import { Logger } from "../logger.cjs";
 
 //#region src/pg-proxy/session.d.ts
 interface PgRemoteSessionOptions {
   logger?: Logger;
   cache?: Cache;
-  useJitMapper?: boolean;
 }
-declare class PgRemoteSession<TRelations extends AnyRelations> extends PgAsyncSession<PgRemoteQueryResultHKT, TRelations> {
+declare class PgRemoteSession<TFullSchema extends Record<string, unknown>, TRelations extends AnyRelations, TSchema extends V1.TablesRelationalConfig> extends PgAsyncSession<PgRemoteQueryResultHKT, TFullSchema, TRelations, TSchema> {
   private client;
   private relations;
-  private options;
+  private schema;
   static readonly [entityKind]: string;
   private logger;
   private cache;
-  constructor(client: RemoteCallback, dialect: PgDialect, relations: TRelations, options?: PgRemoteSessionOptions);
-  prepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: QueryWithTypings, mode: 'arrays' | 'objects' | 'raw', _name: string | boolean, mapper: ((rows: any[]) => any) | undefined, queryMetadata?: {
+  constructor(client: RemoteCallback, dialect: PgDialect, relations: TRelations, schema: V1.RelationalSchemaConfig<TSchema> | undefined, options?: PgRemoteSessionOptions);
+  prepareQuery<T extends PreparedQueryConfig>(query: QueryWithTypings, fields: SelectedFieldsOrdered | undefined, name: string | undefined, isResponseInArrayMode: boolean, customResultMapper?: (rows: unknown[][]) => T['execute'], queryMetadata?: {
+    type: 'select' | 'update' | 'delete' | 'insert';
+    tables: string[];
+  }, cacheConfig?: WithCacheConfig): PreparedQuery<T>;
+  prepareRelationalQuery<T extends PreparedQueryConfig>(query: QueryWithTypings, fields: SelectedFieldsOrdered | undefined, name: string | undefined, customResultMapper?: (rows: Record<string, unknown>[]) => T['execute']): PreparedQuery<T, true>;
+  transaction<T>(_transaction: (tx: PgProxyTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>, _config?: PgTransactionConfig): Promise<T>;
+}
+declare class PgProxyTransaction<TFullSchema extends Record<string, unknown>, TRelations extends AnyRelations, TSchema extends V1.TablesRelationalConfig> extends PgAsyncTransaction<PgRemoteQueryResultHKT, TFullSchema, TRelations, TSchema> {
+  static readonly [entityKind]: string;
+  transaction<T>(_transaction: (tx: PgProxyTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>): Promise<T>;
+}
+declare class PreparedQuery<T extends PreparedQueryConfig, TIsRqbV2 extends boolean = false> extends PgAsyncPreparedQuery<T> {
+  private client;
+  private logger;
+  private fields;
+  private _isResponseInArrayMode;
+  private customResultMapper?;
+  private isRqbV2Query?;
+  static readonly [entityKind]: string;
+  protected query: QueryWithTypings;
+  constructor(client: RemoteCallback, query: QueryWithTypings, logger: Logger, cache: Cache, queryMetadata: {
     type: 'select' | 'update' | 'delete' | 'insert';
     tables: string[];
-  }, cacheConfig?: WithCacheConfig): PgAsyncPreparedQuery<T>;
-  transaction<T>(_transaction: (tx: PgAsyncTransaction<PgRemoteQueryResultHKT, TRelations>) => Promise<T>, _config?: PgTransactionConfig): Promise<T>;
+  } | undefined, cacheConfig: WithCacheConfig | undefined, fields: SelectedFieldsOrdered | undefined, _isResponseInArrayMode: boolean, customResultMapper?: ((rows: TIsRqbV2 extends true ? Record<string, unknown>[] : unknown[][]) => T["execute"]) | undefined, isRqbV2Query?: TIsRqbV2 | undefined);
+  execute(placeholderValues?: Record<string, unknown> | undefined): Promise<T['execute']>;
+  private executeRqbV2;
+  all(): Promise<void>;
 }
 interface PgRemoteQueryResultHKT extends PgQueryResultHKT {
   type: Assume<this['row'], {
@@ -36,5 +59,5 @@ interface PgRemoteQueryResultHKT extends PgQueryResultHKT {
   }>[];
 }
 //#endregion
-export { PgRemoteQueryResultHKT, PgRemoteSession, PgRemoteSessionOptions };
+export { PgProxyTransaction, PgRemoteQueryResultHKT, PgRemoteSession, PgRemoteSessionOptions, PreparedQuery };
 //# sourceMappingURL=session.d.cts.map

package/pg-proxy/session.d.ts

@@ -2,33 +2,56 @@ import { RemoteCallback } from "./driver.js";
 import { entityKind } from "../entity.js";
 import { Assume } from "../utils.js";
 import { QueryWithTypings } from "../sql/sql.js";
+import * as V1 from "../_relations.js";
 import { Logger } from "../logger.js";
-import { PgAsyncPreparedQuery, PgAsyncSession, PgAsyncTransaction } from "../pg-core/async/session.js";
-import { AnyRelations } from "../relations.js";
 import { PgDialect } from "../pg-core/dialect.js";
+import { PgAsyncPreparedQuery, PgAsyncSession, PgAsyncTransaction } from "../pg-core/async/session.js";
 import { Cache } from "../cache/core/cache.js";
+import { AnyRelations } from "../relations.js";
 import { WithCacheConfig } from "../cache/core/types.js";
 import { PgQueryResultHKT, PgTransactionConfig, PreparedQueryConfig } from "../pg-core/session.js";
+import { SelectedFieldsOrdered } from "../pg-core/query-builders/select.types.js";
 
 //#region src/pg-proxy/session.d.ts
 interface PgRemoteSessionOptions {
   logger?: Logger;
   cache?: Cache;
-  useJitMapper?: boolean;
 }
-declare class PgRemoteSession<TRelations extends AnyRelations> extends PgAsyncSession<PgRemoteQueryResultHKT, TRelations> {
+declare class PgRemoteSession<TFullSchema extends Record<string, unknown>, TRelations extends AnyRelations, TSchema extends V1.TablesRelationalConfig> extends PgAsyncSession<PgRemoteQueryResultHKT, TFullSchema, TRelations, TSchema> {
   private client;
   private relations;
-  private options;
+  private schema;
   static readonly [entityKind]: string;
   private logger;
   private cache;
-  constructor(client: RemoteCallback, dialect: PgDialect, relations: TRelations, options?: PgRemoteSessionOptions);
-  prepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(query: QueryWithTypings, mode: 'arrays' | 'objects' | 'raw', _name: string | boolean, mapper: ((rows: any[]) => any) | undefined, queryMetadata?: {
+  constructor(client: RemoteCallback, dialect: PgDialect, relations: TRelations, schema: V1.RelationalSchemaConfig<TSchema> | undefined, options?: PgRemoteSessionOptions);
+  prepareQuery<T extends PreparedQueryConfig>(query: QueryWithTypings, fields: SelectedFieldsOrdered | undefined, name: string | undefined, isResponseInArrayMode: boolean, customResultMapper?: (rows: unknown[][]) => T['execute'], queryMetadata?: {
+    type: 'select' | 'update' | 'delete' | 'insert';
+    tables: string[];
+  }, cacheConfig?: WithCacheConfig): PreparedQuery<T>;
+  prepareRelationalQuery<T extends PreparedQueryConfig>(query: QueryWithTypings, fields: SelectedFieldsOrdered | undefined, name: string | undefined, customResultMapper?: (rows: Record<string, unknown>[]) => T['execute']): PreparedQuery<T, true>;
+  transaction<T>(_transaction: (tx: PgProxyTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>, _config?: PgTransactionConfig): Promise<T>;
+}
+declare class PgProxyTransaction<TFullSchema extends Record<string, unknown>, TRelations extends AnyRelations, TSchema extends V1.TablesRelationalConfig> extends PgAsyncTransaction<PgRemoteQueryResultHKT, TFullSchema, TRelations, TSchema> {
+  static readonly [entityKind]: string;
+  transaction<T>(_transaction: (tx: PgProxyTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>): Promise<T>;
+}
+declare class PreparedQuery<T extends PreparedQueryConfig, TIsRqbV2 extends boolean = false> extends PgAsyncPreparedQuery<T> {
+  private client;
+  private logger;
+  private fields;
+  private _isResponseInArrayMode;
+  private customResultMapper?;
+  private isRqbV2Query?;
+  static readonly [entityKind]: string;
+  protected query: QueryWithTypings;
+  constructor(client: RemoteCallback, query: QueryWithTypings, logger: Logger, cache: Cache, queryMetadata: {
     type: 'select' | 'update' | 'delete' | 'insert';
     tables: string[];
-  }, cacheConfig?: WithCacheConfig): PgAsyncPreparedQuery<T>;
-  transaction<T>(_transaction: (tx: PgAsyncTransaction<PgRemoteQueryResultHKT, TRelations>) => Promise<T>, _config?: PgTransactionConfig): Promise<T>;
+  } | undefined, cacheConfig: WithCacheConfig | undefined, fields: SelectedFieldsOrdered | undefined, _isResponseInArrayMode: boolean, customResultMapper?: ((rows: TIsRqbV2 extends true ? Record<string, unknown>[] : unknown[][]) => T["execute"]) | undefined, isRqbV2Query?: TIsRqbV2 | undefined);
+  execute(placeholderValues?: Record<string, unknown> | undefined): Promise<T['execute']>;
+  private executeRqbV2;
+  all(): Promise<void>;
 }
 interface PgRemoteQueryResultHKT extends PgQueryResultHKT {
   type: Assume<this['row'], {
@@ -36,5 +59,5 @@ interface PgRemoteQueryResultHKT extends PgQueryResultHKT {
   }>[];
 }
 //#endregion
-export { PgRemoteQueryResultHKT, PgRemoteSession, PgRemoteSessionOptions };
+export { PgProxyTransaction, PgRemoteQueryResultHKT, PgRemoteSession, PgRemoteSessionOptions, PreparedQuery };
 //# sourceMappingURL=session.d.ts.map

package/pg-proxy/session.js

@@ -1,6 +1,9 @@
 import { entityKind } from "../entity.js";
+import { tracer } from "../tracing.js";
+import { mapResultRow } from "../utils.js";
+import { fillPlaceholders } from "../sql/sql.js";
 import { NoopLogger } from "../logger.js";
-import { PgAsyncPreparedQuery, PgAsyncSession } from "../pg-core/async/session.js";
+import { PgAsyncPreparedQuery, PgAsyncSession, PgAsyncTransaction } from "../pg-core/async/session.js";
 import { NoopCache } from "../cache/core/cache.js";
 
 //#region src/pg-proxy/session.ts
@@ -8,26 +11,97 @@ var PgRemoteSession = class extends PgAsyncSession {
 	static [entityKind] = "PgRemoteSession";
 	logger;
 	cache;
-	constructor(client, dialect, relations, options = {}) {
+	constructor(client, dialect, relations, schema, options = {}) {
 		super(dialect);
 		this.client = client;
 		this.relations = relations;
-		this.options = options;
+		this.schema = schema;
 		this.logger = options.logger ?? new NoopLogger();
 		this.cache = options.cache ?? new NoopCache();
 	}
-	prepareQuery(query, mode, _name, mapper, queryMetadata, cacheConfig) {
-		const executor = async (params) => {
-			if (mode === "arrays") return this.client(query.sql, params, "all", query.typings).then((r) => r.rows);
-			return this.client(query.sql, params, "execute", query.typings).then((r) => r.rows);
-		};
-		return new PgAsyncPreparedQuery(executor, query, mapper, mode, this.logger, this.cache, queryMetadata, cacheConfig);
+	prepareQuery(query, fields, name, isResponseInArrayMode, customResultMapper, queryMetadata, cacheConfig) {
+		return new PreparedQuery(this.client, query, this.logger, this.cache, queryMetadata, cacheConfig, fields, isResponseInArrayMode, customResultMapper);
+	}
+	prepareRelationalQuery(query, fields, name, customResultMapper) {
+		return new PreparedQuery(this.client, query, this.logger, this.cache, void 0, void 0, fields, false, customResultMapper, true);
 	}
 	async transaction(_transaction, _config) {
 		throw new Error("Transactions are not supported by the Postgres Proxy driver");
 	}
 };
+var PgProxyTransaction = class extends PgAsyncTransaction {
+	static [entityKind] = "PgProxyTransaction";
+	async transaction(_transaction) {
+		throw new Error("Transactions are not supported by the Postgres Proxy driver");
+	}
+};
+var PreparedQuery = class extends PgAsyncPreparedQuery {
+	static [entityKind] = "PgProxyPreparedQuery";
+	constructor(client, query, logger, cache, queryMetadata, cacheConfig, fields, _isResponseInArrayMode, customResultMapper, isRqbV2Query) {
+		super(query, cache, queryMetadata, cacheConfig);
+		this.client = client;
+		this.logger = logger;
+		this.fields = fields;
+		this._isResponseInArrayMode = _isResponseInArrayMode;
+		this.customResultMapper = customResultMapper;
+		this.isRqbV2Query = isRqbV2Query;
+	}
+	async execute(placeholderValues = {}) {
+		if (this.isRqbV2Query) return this.executeRqbV2(placeholderValues);
+		return tracer.startActiveSpan("drizzle.execute", async (span) => {
+			const params = fillPlaceholders(this.query.params, placeholderValues);
+			const { fields, client, query, joinsNotNullableMap, customResultMapper, logger } = this;
+			span?.setAttributes({
+				"drizzle.query.text": query.sql,
+				"drizzle.query.params": JSON.stringify(params)
+			});
+			logger.logQuery(query.sql, params);
+			if (!fields && !customResultMapper) return tracer.startActiveSpan("drizzle.driver.execute", async () => {
+				const { rows } = await this.queryWithCache(query.sql, params, async () => {
+					return await client(query.sql, params, "execute", query.typings);
+				});
+				return rows;
+			});
+			const rows = await tracer.startActiveSpan("drizzle.driver.execute", async () => {
+				span?.setAttributes({
+					"drizzle.query.text": query.sql,
+					"drizzle.query.params": JSON.stringify(params)
+				});
+				const { rows } = await this.queryWithCache(query.sql, params, async () => {
+					return await client(query.sql, params, "all", query.typings);
+				});
+				return rows;
+			});
+			return tracer.startActiveSpan("drizzle.mapResponse", () => {
+				return customResultMapper ? customResultMapper(rows) : rows.map((row) => mapResultRow(fields, row, joinsNotNullableMap));
+			});
+		});
+	}
+	async executeRqbV2(placeholderValues = {}) {
+		return tracer.startActiveSpan("drizzle.execute", async (span) => {
+			const params = fillPlaceholders(this.query.params, placeholderValues);
+			const { client, query, customResultMapper, logger } = this;
+			span?.setAttributes({
+				"drizzle.query.text": query.sql,
+				"drizzle.query.params": JSON.stringify(params)
+			});
+			logger.logQuery(query.sql, params);
+			const rows = await tracer.startActiveSpan("drizzle.driver.execute", async () => {
+				const { rows } = await client(query.sql, params, "execute", query.typings);
+				return rows;
+			});
+			return tracer.startActiveSpan("drizzle.mapResponse", () => {
+				return customResultMapper(rows);
+			});
+		});
+	}
+	async all() {}
+	/** @internal */
+	isResponseInArrayMode() {
+		return this._isResponseInArrayMode;
+	}
+};
 
 //#endregion
-export { PgRemoteSession };
+export { PgProxyTransaction, PgRemoteSession, PreparedQuery };
 //# sourceMappingURL=session.js.map

package/pg-proxy/session.js.map

@@ -1 +1 @@
-{"version":3,"file":"session.js","names":[],"sources":["../../src/pg-proxy/session.ts"],"sourcesContent":["import { type Cache, NoopCache } from '~/cache/core/cache.ts';\nimport type { WithCacheConfig } from '~/cache/core/types.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { Logger } from '~/logger.ts';\nimport { NoopLogger } from '~/logger.ts';\nimport { PgAsyncPreparedQuery, PgAsyncSession, type PgAsyncTransaction } from '~/pg-core/async/session.ts';\nimport type { PgDialect } from '~/pg-core/dialect.ts';\nimport type { PgQueryResultHKT, PgTransactionConfig, PreparedQueryConfig } from '~/pg-core/session.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport type { QueryWithTypings } from '~/sql/sql.ts';\nimport type { Assume } from '~/utils.ts';\nimport type { RemoteCallback } from './driver.ts';\n\nexport interface PgRemoteSessionOptions {\n\tlogger?: Logger;\n\tcache?: Cache;\n\tuseJitMapper?: boolean;\n}\n\nexport class PgRemoteSession<\n\tTRelations extends AnyRelations,\n> extends PgAsyncSession<PgRemoteQueryResultHKT, TRelations> {\n\tstatic override readonly [entityKind]: string = 'PgRemoteSession';\n\n\tprivate logger: Logger;\n\tprivate cache: Cache;\n\n\tconstructor(\n\t\tprivate client: RemoteCallback,\n\t\tdialect: PgDialect,\n\t\tprivate relations: TRelations,\n\t\tprivate options: PgRemoteSessionOptions = {},\n\t) {\n\t\tsuper(dialect);\n\t\tthis.logger = options.logger ?? new NoopLogger();\n\t\tthis.cache = options.cache ?? new NoopCache();\n\t}\n\n\tprepareQuery<T extends PreparedQueryConfig = PreparedQueryConfig>(\n\t\tquery: QueryWithTypings,\n\t\tmode: 'arrays' | 'objects' | 'raw',\n\t\t_name: string | boolean,\n\t\tmapper: ((rows: any[]) => any) | undefined,\n\t\tqueryMetadata?: {\n\t\t\ttype: 'select' | 'update' | 'delete' | 'insert';\n\t\t\ttables: string[];\n\t\t},\n\t\tcacheConfig?: WithCacheConfig,\n\t) {\n\t\tconst executor = async (params?: unknown[]) => {\n\t\t\tif (mode === 'arrays') return this.client(query.sql, params as any[], 'all', query.typings).then((r) => r.rows);\n\n\t\t\treturn this.client(query.sql, params as any[], 'execute', query.typings).then((r) => r.rows);\n\t\t};\n\n\t\treturn new PgAsyncPreparedQuery<T>(\n\t\t\texecutor,\n\t\t\tquery,\n\t\t\tmapper,\n\t\t\tmode,\n\t\t\tthis.logger,\n\t\t\tthis.cache,\n\t\t\tqueryMetadata,\n\t\t\tcacheConfig,\n\t\t);\n\t}\n\n\toverride async transaction<T>(\n\t\t_transaction: (tx: PgAsyncTransaction<PgRemoteQueryResultHKT, TRelations>) => Promise<T>,\n\t\t_config?: PgTransactionConfig,\n\t): Promise<T> {\n\t\tthrow new Error('Transactions are not supported by the Postgres Proxy driver');\n\t}\n}\n\nexport interface PgRemoteQueryResultHKT extends PgQueryResultHKT {\n\ttype: Assume<this['row'], {\n\t\t[column: string]: any;\n\t}>[];\n}\n"],"mappings":";;;;;;AAmBA,IAAa,kBAAb,cAEU,eAAmD;CAC5D,QAA0B,cAAsB;CAEhD,AAAQ;CACR,AAAQ;CAER,YACC,AAAQ,QACR,SACA,AAAQ,WACR,AAAQ,UAAkC,EAAE,EAC3C;AACD,QAAM,QAAQ;EALN;EAEA;EACA;AAGR,OAAK,SAAS,QAAQ,UAAU,IAAI,YAAY;AAChD,OAAK,QAAQ,QAAQ,SAAS,IAAI,WAAW;;CAG9C,aACC,OACA,MACA,OACA,QACA,eAIA,aACC;EACD,MAAM,WAAW,OAAO,WAAuB;AAC9C,OAAI,SAAS,SAAU,QAAO,KAAK,OAAO,MAAM,KAAK,QAAiB,OAAO,MAAM,QAAQ,CAAC,MAAM,MAAM,EAAE,KAAK;AAE/G,UAAO,KAAK,OAAO,MAAM,KAAK,QAAiB,WAAW,MAAM,QAAQ,CAAC,MAAM,MAAM,EAAE,KAAK;;AAG7F,SAAO,IAAI,qBACV,UACA,OACA,QACA,MACA,KAAK,QACL,KAAK,OACL,eACA,YACA;;CAGF,MAAe,YACd,cACA,SACa;AACb,QAAM,IAAI,MAAM,8DAA8D"}
+{"version":3,"file":"session.js","names":[],"sources":["../../src/pg-proxy/session.ts"],"sourcesContent":["import type * as V1 from '~/_relations.ts';\nimport { type Cache, NoopCache } from '~/cache/core/cache.ts';\nimport type { WithCacheConfig } from '~/cache/core/types.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { Logger } from '~/logger.ts';\nimport { NoopLogger } from '~/logger.ts';\nimport { PgAsyncPreparedQuery, PgAsyncSession, PgAsyncTransaction } from '~/pg-core/async/session.ts';\nimport type { PgDialect } from '~/pg-core/dialect.ts';\nimport type { SelectedFieldsOrdered } from '~/pg-core/query-builders/select.types.ts';\nimport type { PgQueryResultHKT, PgTransactionConfig, PreparedQueryConfig } from '~/pg-core/session.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport { fillPlaceholders, type QueryWithTypings } from '~/sql/sql.ts';\nimport { tracer } from '~/tracing.ts';\nimport { type Assume, mapResultRow } from '~/utils.ts';\nimport type { RemoteCallback } from './driver.ts';\n\nexport interface PgRemoteSessionOptions {\n\tlogger?: Logger;\n\tcache?: Cache;\n}\n\nexport class PgRemoteSession<\n\tTFullSchema extends Record<string, unknown>,\n\tTRelations extends AnyRelations,\n\tTSchema extends V1.TablesRelationalConfig,\n> extends PgAsyncSession<PgRemoteQueryResultHKT, TFullSchema, TRelations, TSchema> {\n\tstatic override readonly [entityKind]: string = 'PgRemoteSession';\n\n\tprivate logger: Logger;\n\tprivate cache: Cache;\n\n\tconstructor(\n\t\tprivate client: RemoteCallback,\n\t\tdialect: PgDialect,\n\t\tprivate relations: TRelations,\n\t\tprivate schema: V1.RelationalSchemaConfig<TSchema> | undefined,\n\t\toptions: PgRemoteSessionOptions = {},\n\t) {\n\t\tsuper(dialect);\n\t\tthis.logger = options.logger ?? new NoopLogger();\n\t\tthis.cache = options.cache ?? new NoopCache();\n\t}\n\n\tprepareQuery<T extends PreparedQueryConfig>(\n\t\tquery: QueryWithTypings,\n\t\tfields: SelectedFieldsOrdered | undefined,\n\t\tname: string | undefined,\n\t\tisResponseInArrayMode: boolean,\n\t\tcustomResultMapper?: (rows: unknown[][]) => T['execute'],\n\t\tqueryMetadata?: {\n\t\t\ttype: 'select' | 'update' | 'delete' | 'insert';\n\t\t\ttables: string[];\n\t\t},\n\t\tcacheConfig?: WithCacheConfig,\n\t): PreparedQuery<T> {\n\t\treturn new PreparedQuery(\n\t\t\tthis.client,\n\t\t\tquery,\n\t\t\tthis.logger,\n\t\t\tthis.cache,\n\t\t\tqueryMetadata,\n\t\t\tcacheConfig,\n\t\t\tfields,\n\t\t\tisResponseInArrayMode,\n\t\t\tcustomResultMapper,\n\t\t);\n\t}\n\n\tprepareRelationalQuery<T extends PreparedQueryConfig>(\n\t\tquery: QueryWithTypings,\n\t\tfields: SelectedFieldsOrdered | undefined,\n\t\tname: string | undefined,\n\t\tcustomResultMapper?: (rows: Record<string, unknown>[]) => T['execute'],\n\t): PreparedQuery<T, true> {\n\t\treturn new PreparedQuery(\n\t\t\tthis.client,\n\t\t\tquery,\n\t\t\tthis.logger,\n\t\t\tthis.cache,\n\t\t\tundefined,\n\t\t\tundefined,\n\t\t\tfields,\n\t\t\tfalse,\n\t\t\tcustomResultMapper,\n\t\t\ttrue,\n\t\t);\n\t}\n\n\toverride async transaction<T>(\n\t\t_transaction: (tx: PgProxyTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>,\n\t\t_config?: PgTransactionConfig,\n\t): Promise<T> {\n\t\tthrow new Error('Transactions are not supported by the Postgres Proxy driver');\n\t}\n}\n\nexport class PgProxyTransaction<\n\tTFullSchema extends Record<string, unknown>,\n\tTRelations extends AnyRelations,\n\tTSchema extends V1.TablesRelationalConfig,\n> extends PgAsyncTransaction<PgRemoteQueryResultHKT, TFullSchema, TRelations, TSchema> {\n\tstatic override readonly [entityKind]: string = 'PgProxyTransaction';\n\n\toverride async transaction<T>(\n\t\t_transaction: (tx: PgProxyTransaction<TFullSchema, TRelations, TSchema>) => Promise<T>,\n\t): Promise<T> {\n\t\tthrow new Error('Transactions are not supported by the Postgres Proxy driver');\n\t}\n}\n\nexport class PreparedQuery<T extends PreparedQueryConfig, TIsRqbV2 extends boolean = false>\n\textends PgAsyncPreparedQuery<T>\n{\n\tstatic override readonly [entityKind]: string = 'PgProxyPreparedQuery';\n\n\tdeclare protected query: QueryWithTypings;\n\n\tconstructor(\n\t\tprivate client: RemoteCallback,\n\t\tquery: QueryWithTypings,\n\t\tprivate logger: Logger,\n\t\tcache: Cache,\n\t\tqueryMetadata: {\n\t\t\ttype: 'select' | 'update' | 'delete' | 'insert';\n\t\t\ttables: string[];\n\t\t} | undefined,\n\t\tcacheConfig: WithCacheConfig | undefined,\n\t\tprivate fields: SelectedFieldsOrdered | undefined,\n\t\tprivate _isResponseInArrayMode: boolean,\n\t\tprivate customResultMapper?: (\n\t\t\trows: TIsRqbV2 extends true ? Record<string, unknown>[] : unknown[][],\n\t\t) => T['execute'],\n\t\tprivate isRqbV2Query?: TIsRqbV2,\n\t) {\n\t\tsuper(query, cache, queryMetadata, cacheConfig);\n\t}\n\n\tasync execute(placeholderValues: Record<string, unknown> | undefined = {}): Promise<T['execute']> {\n\t\tif (this.isRqbV2Query) return this.executeRqbV2(placeholderValues);\n\n\t\treturn tracer.startActiveSpan('drizzle.execute', async (span) => {\n\t\t\tconst params = fillPlaceholders(this.query.params, placeholderValues);\n\t\t\tconst { fields, client, query, joinsNotNullableMap, customResultMapper, logger } = this;\n\n\t\t\tspan?.setAttributes({\n\t\t\t\t'drizzle.query.text': query.sql,\n\t\t\t\t'drizzle.query.params': JSON.stringify(params),\n\t\t\t});\n\n\t\t\tlogger.logQuery(query.sql, params);\n\n\t\t\tif (!fields && !customResultMapper) {\n\t\t\t\treturn tracer.startActiveSpan('drizzle.driver.execute', async () => {\n\t\t\t\t\tconst { rows } = await this.queryWithCache(query.sql, params, async () => {\n\t\t\t\t\t\treturn await client(query.sql, params as any[], 'execute', query.typings);\n\t\t\t\t\t});\n\n\t\t\t\t\treturn rows;\n\t\t\t\t});\n\t\t\t}\n\n\t\t\tconst rows = await tracer.startActiveSpan('drizzle.driver.execute', async () => {\n\t\t\t\tspan?.setAttributes({\n\t\t\t\t\t'drizzle.query.text': query.sql,\n\t\t\t\t\t'drizzle.query.params': JSON.stringify(params),\n\t\t\t\t});\n\n\t\t\t\tconst { rows } = await this.queryWithCache(query.sql, params, async () => {\n\t\t\t\t\treturn await client(query.sql, params as any[], 'all', query.typings);\n\t\t\t\t});\n\n\t\t\t\treturn rows;\n\t\t\t});\n\n\t\t\treturn tracer.startActiveSpan('drizzle.mapResponse', () => {\n\t\t\t\treturn customResultMapper\n\t\t\t\t\t? customResultMapper(rows)\n\t\t\t\t\t: rows.map((row) => mapResultRow<T['execute']>(fields!, row, joinsNotNullableMap));\n\t\t\t});\n\t\t});\n\t}\n\n\tprivate async executeRqbV2(placeholderValues: Record<string, unknown> | undefined = {}): Promise<T['execute']> {\n\t\treturn tracer.startActiveSpan('drizzle.execute', async (span) => {\n\t\t\tconst params = fillPlaceholders(this.query.params, placeholderValues);\n\t\t\tconst { client, query, customResultMapper, logger } = this;\n\n\t\t\tspan?.setAttributes({\n\t\t\t\t'drizzle.query.text': query.sql,\n\t\t\t\t'drizzle.query.params': JSON.stringify(params),\n\t\t\t});\n\n\t\t\tlogger.logQuery(query.sql, params);\n\n\t\t\tconst rows = await tracer.startActiveSpan('drizzle.driver.execute', async () => {\n\t\t\t\tconst { rows } = await client(query.sql, params as any[], 'execute', query.typings);\n\n\t\t\t\treturn rows;\n\t\t\t});\n\n\t\t\treturn tracer.startActiveSpan('drizzle.mapResponse', () => {\n\t\t\t\treturn (customResultMapper as (rows: Record<string, unknown>[]) => T['execute'])(rows);\n\t\t\t});\n\t\t});\n\t}\n\n\tasync all() {\n\t}\n\n\t/** @internal */\n\tisResponseInArrayMode(): boolean {\n\t\treturn this._isResponseInArrayMode;\n\t}\n}\n\nexport interface PgRemoteQueryResultHKT extends PgQueryResultHKT {\n\ttype: Assume<this['row'], {\n\t\t[column: string]: any;\n\t}>[];\n}\n"],"mappings":"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"}

package/pglite/driver.cjs

@@ -2,88 +2,50 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 const require_runtime = require('../_virtual/_rolldown/runtime.cjs');
 const require_pglite_session = require('./session.cjs');
 let __entity_ts = require("../entity.cjs");
-let __utils_ts = require("../utils.cjs");
+let ___relations_ts = require("../_relations.cjs");
+___relations_ts = require_runtime.__toESM(___relations_ts);
 let __logger_ts = require("../logger.cjs");
-let __pg_core_array_ts = require("../pg-core/array.cjs");
 let __pg_core_async_db_ts = require("../pg-core/async/db.cjs");
-let __pg_core_codecs_ts = require("../pg-core/codecs.cjs");
 let __pg_core_dialect_ts = require("../pg-core/dialect.cjs");
 let _electric_sql_pglite = require("@electric-sql/pglite");
 
 //#region src/pglite/driver.ts
+var PgliteDriver = class {
+	static [__entity_ts.entityKind] = "PgliteDriver";
+	constructor(client, dialect, options = {}) {
+		this.client = client;
+		this.dialect = dialect;
+		this.options = options;
+	}
+	createSession(relations, schema) {
+		return new require_pglite_session.PgliteSession(this.client, this.dialect, relations, schema, {
+			logger: this.options.logger,
+			cache: this.options.cache
+		});
+	}
+};
 var PgliteDatabase = class extends __pg_core_async_db_ts.PgAsyncDatabase {
 	static [__entity_ts.entityKind] = "PgliteDatabase";
 };
-const pgliteCodecs = (0, __pg_core_codecs_ts.refineGenericPgCodecs)({
-	bigint: {
-		cast: __pg_core_codecs_ts.castToText,
-		castArray: __pg_core_codecs_ts.castToTextArr
-	},
-	bigserial: {
-		cast: __pg_core_codecs_ts.castToText,
-		castArray: __pg_core_codecs_ts.castToTextArr
-	},
-	bytea: {
-		normalizeInJson: typeof Buffer === "undefined" ? __utils_ts.base64ToUint8Array : __pg_core_codecs_ts.genericPgCodecs.bytea?.normalizeInJson,
-		normalizeArrayInJson: typeof Buffer === "undefined" ? (0, __pg_core_codecs_ts.arrayCompatNormalize)(__utils_ts.base64ToUint8Array) : __pg_core_codecs_ts.genericPgCodecs.bytea?.normalizeArrayInJson,
-		normalize: typeof Buffer === "undefined" ? __pg_core_codecs_ts.genericPgCodecs.bytea?.normalize : (v) => Buffer.from(v),
-		normalizeArray: typeof Buffer === "undefined" ? __pg_core_codecs_ts.genericPgCodecs.bytea?.normalizeArray : (0, __pg_core_codecs_ts.arrayCompatNormalize)((v) => Buffer.from(v))
-	},
-	json: { normalizeParam: (v) => typeof v === "object" ? v : JSON.stringify(v) },
-	jsonb: { normalizeParam: (v) => typeof v === "object" ? v : JSON.stringify(v) },
-	geometry: {
-		castParam: (name) => `${name}::geometry`,
-		castArrayParam: (name, dimensions) => `${name}::geometry${"[]".repeat(dimensions)}`,
-		normalizeParamArray: __pg_core_array_ts.makePgArray
-	},
-	bit: { normalizeArray: void 0 },
-	halfvec: {
-		castParam: (name) => `${name}::halfvec`,
-		castArrayParam: (name, dimensions) => `${name}::halfvec${"[]".repeat(dimensions)}`,
-		normalizeParamArray: __pg_core_array_ts.makePgArray
-	},
-	vector: {
-		castParam: (name) => `${name}::vector`,
-		castArrayParam: (name, dimensions) => `${name}::vector${"[]".repeat(dimensions)}`,
-		normalizeParamArray: __pg_core_array_ts.makePgArray
-	},
-	sparsevec: {
-		castParam: (name) => `${name}::sparsevec`,
-		castArrayParam: (name, dimensions) => `${name}::sparsevec${"[]".repeat(dimensions)}`,
-		normalizeParamArray: __pg_core_array_ts.makePgArray
-	},
-	point: {
-		cast: void 0,
-		castArray: void 0,
-		castInJson: void 0,
-		castArrayInJson: void 0
-	},
-	line: {
-		cast: void 0,
-		castArray: void 0,
-		castInJson: void 0,
-		castArrayInJson: void 0
-	},
-	macaddr8: {
-		castArrayInJson: void 0,
-		castArray: void 0
-	}
-});
 function construct(client, config = {}) {
-	const dialect = new __pg_core_dialect_ts.PgDialect({
-		casing: config.casing,
-		useJitMappers: config.useJitMappers,
-		codecs: config.codecs ?? pgliteCodecs
-	});
+	const dialect = new __pg_core_dialect_ts.PgDialect({ casing: config.casing });
 	let logger;
 	if (config.logger === true) logger = new __logger_ts.DefaultLogger();
 	else if (config.logger !== false) logger = config.logger;
+	let schema;
+	if (config.schema) {
+		const tablesConfig = ___relations_ts.extractTablesRelationalConfig(config.schema, ___relations_ts.createTableRelationsHelpers);
+		schema = {
+			fullSchema: config.schema,
+			schema: tablesConfig.tables,
+			tableNamesMap: tablesConfig.tableNamesMap
+		};
+	}
 	const relations = config.relations ?? {};
-	const db = new PgliteDatabase(dialect, new require_pglite_session.PgliteSession(client, dialect, relations, {
+	const db = new PgliteDatabase(dialect, new PgliteDriver(client, dialect, {
 		logger,
-		useJitMapper: config.useJitMappers ?? false,
 		cache: config.cache
-	}), relations);
+	}).createSession(relations, schema), relations, schema);
 	db.$client = client;
 	db.$cache = config.cache;
 	if (db.$cache) db.$cache["invalidate"] = config.cache?.onMutate;
@@ -91,13 +53,13 @@ function construct(client, config = {}) {
 }
 function drizzle(...params) {
 	if (params[0] === void 0 || typeof params[0] === "string") return construct(new _electric_sql_pglite.PGlite(params[0]), params[1]);
-	const { connection, client, ...DrizzlePgConfig } = params[0];
-	if (client) return construct(client, DrizzlePgConfig);
+	const { connection, client, ...drizzleConfig } = params[0];
+	if (client) return construct(client, drizzleConfig);
 	if (typeof connection === "object") {
 		const { dataDir, ...options } = connection;
-		return construct(new _electric_sql_pglite.PGlite(dataDir, options), DrizzlePgConfig);
+		return construct(new _electric_sql_pglite.PGlite(dataDir, options), drizzleConfig);
 	}
-	return construct(new _electric_sql_pglite.PGlite(connection), DrizzlePgConfig);
+	return construct(new _electric_sql_pglite.PGlite(connection), drizzleConfig);
 }
 (function(_drizzle) {
 	function mock(config) {
@@ -108,11 +70,11 @@ function drizzle(...params) {
 
 //#endregion
 exports.PgliteDatabase = PgliteDatabase;
+exports.PgliteDriver = PgliteDriver;
 Object.defineProperty(exports, 'drizzle', {
   enumerable: true,
   get: function () {
     return drizzle;
   }
 });
-exports.pgliteCodecs = pgliteCodecs;
 //# sourceMappingURL=driver.cjs.map

package/pglite/driver.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"driver.cjs","names":["PgAsyncDatabase","entityKind","castToText","castToTextArr","base64ToUint8Array","genericPgCodecs","makePgArray","PgDialect","DefaultLogger","PgliteSession","PGlite"],"sources":["../../src/pglite/driver.ts"],"sourcesContent":["import { PGlite, type PGliteOptions } from '@electric-sql/pglite';\nimport type { Cache } from '~/cache/core/cache.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { Logger } from '~/logger.ts';\nimport { DefaultLogger } from '~/logger.ts';\nimport { makePgArray } from '~/pg-core/array.ts';\nimport { PgAsyncDatabase } from '~/pg-core/async/db.ts';\nimport {\n\tarrayCompatNormalize,\n\tcastToText,\n\tcastToTextArr,\n\tgenericPgCodecs,\n\trefineGenericPgCodecs,\n} from '~/pg-core/codecs.ts';\nimport { PgDialect } from '~/pg-core/dialect.ts';\nimport type { DrizzlePgConfig } from '~/pg-core/utils.ts';\nimport type { AnyRelations, EmptyRelations } from '~/relations.ts';\nimport { base64ToUint8Array } from '~/utils.ts';\nimport type { PgliteClient, PgliteQueryResultHKT } from './session.ts';\nimport { PgliteSession } from './session.ts';\n\nexport interface PgDriverOptions {\n\tlogger?: Logger;\n\tcache?: Cache;\n\tuseJitMapper?: boolean;\n}\n\nexport class PgliteDatabase<\n\tTRelations extends AnyRelations = EmptyRelations,\n> extends PgAsyncDatabase<PgliteQueryResultHKT, TRelations> {\n\tstatic override readonly [entityKind]: string = 'PgliteDatabase';\n}\n\nexport const pgliteCodecs = refineGenericPgCodecs({\n\tbigint: {\n\t\tcast: castToText,\n\t\tcastArray: castToTextArr,\n\t},\n\tbigserial: {\n\t\tcast: castToText,\n\t\tcastArray: castToTextArr,\n\t},\n\tbytea: {\n\t\tnormalizeInJson: typeof Buffer === 'undefined' ? base64ToUint8Array : genericPgCodecs.bytea?.normalizeInJson,\n\t\tnormalizeArrayInJson: typeof Buffer === 'undefined'\n\t\t\t? arrayCompatNormalize(base64ToUint8Array)\n\t\t\t: genericPgCodecs.bytea?.normalizeArrayInJson,\n\t\tnormalize: typeof Buffer === 'undefined'\n\t\t\t? genericPgCodecs.bytea?.normalize\n\t\t\t: (v: Uint8Array) => Buffer.from(v),\n\t\tnormalizeArray: typeof Buffer === 'undefined'\n\t\t\t? genericPgCodecs.bytea?.normalizeArray\n\t\t\t: arrayCompatNormalize((v: Uint8Array) => Buffer.from(v)),\n\t},\n\tjson: {\n\t\tnormalizeParam: (v) => typeof v === 'object' ? v : JSON.stringify(v),\n\t},\n\tjsonb: {\n\t\tnormalizeParam: (v) => typeof v === 'object' ? v : JSON.stringify(v),\n\t},\n\tgeometry: {\n\t\tcastParam: (name) => `${name}::geometry`,\n\t\tcastArrayParam: (name, dimensions) => `${name}::geometry${'[]'.repeat(dimensions)}`,\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tbit: {\n\t\tnormalizeArray: undefined,\n\t},\n\thalfvec: {\n\t\tcastParam: (name) => `${name}::halfvec`,\n\t\tcastArrayParam: (name, dimensions) => `${name}::halfvec${'[]'.repeat(dimensions)}`,\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tvector: {\n\t\tcastParam: (name) => `${name}::vector`,\n\t\tcastArrayParam: (name, dimensions) => `${name}::vector${'[]'.repeat(dimensions)}`,\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tsparsevec: {\n\t\tcastParam: (name) => `${name}::sparsevec`,\n\t\tcastArrayParam: (name, dimensions) => `${name}::sparsevec${'[]'.repeat(dimensions)}`,\n\t\tnormalizeParamArray: makePgArray,\n\t},\n\tpoint: {\n\t\tcast: undefined,\n\t\tcastArray: undefined,\n\t\tcastInJson: undefined,\n\t\tcastArrayInJson: undefined,\n\t},\n\tline: {\n\t\tcast: undefined,\n\t\tcastArray: undefined,\n\t\tcastInJson: undefined,\n\t\tcastArrayInJson: undefined,\n\t},\n\tmacaddr8: {\n\t\tcastArrayInJson: undefined,\n\t\tcastArray: undefined,\n\t},\n});\n\nfunction construct<TRelations extends AnyRelations = EmptyRelations>(\n\tclient: PgliteClient,\n\tconfig: DrizzlePgConfig<TRelations> = {},\n): PgliteDatabase<TRelations> & {\n\t$client: PgliteClient;\n} {\n\tconst dialect = new PgDialect({\n\t\tcasing: config.casing,\n\t\tuseJitMappers: config.useJitMappers,\n\t\tcodecs: config.codecs ?? pgliteCodecs,\n\t});\n\tlet logger;\n\tif (config.logger === true) {\n\t\tlogger = new DefaultLogger();\n\t} else if (config.logger !== false) {\n\t\tlogger = config.logger;\n\t}\n\n\tconst relations = config.relations ?? {} as TRelations;\n\tconst session = new PgliteSession(client, dialect, relations, {\n\t\tlogger,\n\t\tuseJitMapper: config.useJitMappers ?? false,\n\t\tcache: config.cache,\n\t});\n\tconst db = new PgliteDatabase(\n\t\tdialect,\n\t\tsession,\n\t\trelations,\n\t) as PgliteDatabase<TRelations>;\n\t(<any> db).$client = client;\n\t(<any> db).$cache = config.cache;\n\tif ((<any> db).$cache) {\n\t\t(<any> db).$cache['invalidate'] = config.cache?.onMutate;\n\t}\n\t// (<any> db).$cache = { invalidate: (<any> config).cache?.onMutate };\n\t// if (config.cache) {\n\t// \tfor (\n\t// \t\tconst key of Object.getOwnPropertyNames(Object.getPrototypeOf(config.cache)).filter((key) =>\n\t// \t\t\tkey !== 'constructor'\n\t// \t\t)\n\t// \t) {\n\t// \t\t(<any> db).$cache[key as keyof typeof config.cache] = (<any> config).cache[key];\n\t// \t}\n\t// }\n\n\treturn db as any;\n}\n\nexport function drizzle<\n\tTRelations extends AnyRelations = EmptyRelations,\n\tTClient extends PGlite = PGlite,\n>(\n\t...params:\n\t\t| []\n\t\t| [\n\t\t\tstring,\n\t\t]\n\t\t| [\n\t\t\tstring,\n\t\t\tDrizzlePgConfig<TRelations>,\n\t\t]\n\t\t| [\n\t\t\t(\n\t\t\t\t& DrizzlePgConfig<TRelations>\n\t\t\t\t& ({\n\t\t\t\t\tconnection?: (PGliteOptions & { dataDir?: string }) | string;\n\t\t\t\t} | {\n\t\t\t\t\tclient: TClient;\n\t\t\t\t})\n\t\t\t),\n\t\t]\n): PgliteDatabase<TRelations> & {\n\t$client: TClient;\n} {\n\tif (params[0] === undefined || typeof params[0] === 'string') {\n\t\tconst instance = new PGlite(params[0]);\n\t\treturn construct(instance, params[1]) as any;\n\t}\n\n\tconst { connection, client, ...DrizzlePgConfig } = params[0] as\n\t\t& {\n\t\t\tconnection?: PGliteOptions & { dataDir: string };\n\t\t\tclient?: TClient;\n\t\t}\n\t\t& DrizzlePgConfig<TRelations>;\n\n\tif (client) return construct(client, DrizzlePgConfig) as any;\n\n\tif (typeof connection === 'object') {\n\t\tconst { dataDir, ...options } = connection;\n\n\t\tconst instance = new PGlite(dataDir, options);\n\n\t\treturn construct(instance, DrizzlePgConfig) as any;\n\t}\n\n\tconst instance = new PGlite(connection);\n\n\treturn construct(instance, DrizzlePgConfig) as any;\n}\n\nexport namespace drizzle {\n\texport function mock<\n\t\tTRelations extends AnyRelations = EmptyRelations,\n\t>(\n\t\tconfig?: DrizzlePgConfig<TRelations>,\n\t): PgliteDatabase<TRelations> & {\n\t\t$client: '$client is not available on drizzle.mock()';\n\t} {\n\t\treturn construct({} as any, config) as any;\n\t}\n}\n"],"mappings":"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"}
+{"version":3,"file":"driver.cjs","names":["entityKind","PgliteSession","PgAsyncDatabase","PgDialect","DefaultLogger","V1","PGlite"],"sources":["../../src/pglite/driver.ts"],"sourcesContent":["import { PGlite, type PGliteOptions } from '@electric-sql/pglite';\nimport * as V1 from '~/_relations.ts';\nimport type { Cache } from '~/cache/core/cache.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { Logger } from '~/logger.ts';\nimport { DefaultLogger } from '~/logger.ts';\nimport { PgAsyncDatabase } from '~/pg-core/async/db.ts';\nimport { PgDialect } from '~/pg-core/dialect.ts';\nimport type { AnyRelations, EmptyRelations } from '~/relations.ts';\nimport type { DrizzleConfig } from '~/utils.ts';\nimport type { PgliteClient, PgliteQueryResultHKT } from './session.ts';\nimport { PgliteSession } from './session.ts';\n\nexport interface PgDriverOptions {\n\tlogger?: Logger;\n\tcache?: Cache;\n}\n\nexport class PgliteDriver {\n\tstatic readonly [entityKind]: string = 'PgliteDriver';\n\n\tconstructor(\n\t\tprivate client: PgliteClient,\n\t\tprivate dialect: PgDialect,\n\t\tprivate options: PgDriverOptions = {},\n\t) {\n\t}\n\n\tcreateSession(\n\t\trelations: AnyRelations,\n\t\tschema: V1.RelationalSchemaConfig<V1.TablesRelationalConfig> | undefined,\n\t): PgliteSession<Record<string, unknown>, AnyRelations, V1.TablesRelationalConfig> {\n\t\treturn new PgliteSession(this.client, this.dialect, relations, schema, {\n\t\t\tlogger: this.options.logger,\n\t\t\tcache: this.options.cache,\n\t\t});\n\t}\n}\n\nexport class PgliteDatabase<\n\tTSchema extends Record<string, unknown> = Record<string, never>,\n\tTRelations extends AnyRelations = EmptyRelations,\n> extends PgAsyncDatabase<PgliteQueryResultHKT, TSchema, TRelations> {\n\tstatic override readonly [entityKind]: string = 'PgliteDatabase';\n}\n\nfunction construct<\n\tTSchema extends Record<string, unknown> = Record<string, never>,\n\tTRelations extends AnyRelations = EmptyRelations,\n>(\n\tclient: PgliteClient,\n\tconfig: DrizzleConfig<TSchema, TRelations> = {},\n): PgliteDatabase<TSchema, TRelations> & {\n\t$client: PgliteClient;\n} {\n\tconst dialect = new PgDialect({ casing: config.casing });\n\tlet logger;\n\tif (config.logger === true) {\n\t\tlogger = new DefaultLogger();\n\t} else if (config.logger !== false) {\n\t\tlogger = config.logger;\n\t}\n\n\tlet schema: V1.RelationalSchemaConfig<V1.TablesRelationalConfig> | undefined;\n\tif (config.schema) {\n\t\tconst tablesConfig = V1.extractTablesRelationalConfig(\n\t\t\tconfig.schema,\n\t\t\tV1.createTableRelationsHelpers,\n\t\t);\n\t\tschema = {\n\t\t\tfullSchema: config.schema,\n\t\t\tschema: tablesConfig.tables,\n\t\t\ttableNamesMap: tablesConfig.tableNamesMap,\n\t\t};\n\t}\n\n\tconst relations = config.relations ?? {} as TRelations;\n\tconst driver = new PgliteDriver(client, dialect, { logger, cache: config.cache });\n\tconst session = driver.createSession(relations, schema);\n\tconst db = new PgliteDatabase(\n\t\tdialect,\n\t\tsession,\n\t\trelations,\n\t\tschema as V1.RelationalSchemaConfig<any>,\n\t) as PgliteDatabase<TSchema>;\n\t(<any> db).$client = client;\n\t(<any> db).$cache = config.cache;\n\tif ((<any> db).$cache) {\n\t\t(<any> db).$cache['invalidate'] = config.cache?.onMutate;\n\t}\n\t// (<any> db).$cache = { invalidate: (<any> config).cache?.onMutate };\n\t// if (config.cache) {\n\t// \tfor (\n\t// \t\tconst key of Object.getOwnPropertyNames(Object.getPrototypeOf(config.cache)).filter((key) =>\n\t// \t\t\tkey !== 'constructor'\n\t// \t\t)\n\t// \t) {\n\t// \t\t(<any> db).$cache[key as keyof typeof config.cache] = (<any> config).cache[key];\n\t// \t}\n\t// }\n\n\treturn db as any;\n}\n\nexport function drizzle<\n\tTSchema extends Record<string, unknown> = Record<string, never>,\n\tTRelations extends AnyRelations = EmptyRelations,\n\tTClient extends PGlite = PGlite,\n>(\n\t...params:\n\t\t| []\n\t\t| [\n\t\t\tstring,\n\t\t]\n\t\t| [\n\t\t\tstring,\n\t\t\tDrizzleConfig<TSchema, TRelations>,\n\t\t]\n\t\t| [\n\t\t\t(\n\t\t\t\t& DrizzleConfig<TSchema, TRelations>\n\t\t\t\t& ({\n\t\t\t\t\tconnection?: (PGliteOptions & { dataDir?: string }) | string;\n\t\t\t\t} | {\n\t\t\t\t\tclient: TClient;\n\t\t\t\t})\n\t\t\t),\n\t\t]\n): PgliteDatabase<TSchema, TRelations> & {\n\t$client: TClient;\n} {\n\tif (params[0] === undefined || typeof params[0] === 'string') {\n\t\tconst instance = new PGlite(params[0]);\n\t\treturn construct(instance, params[1]) as any;\n\t}\n\n\tconst { connection, client, ...drizzleConfig } = params[0] as {\n\t\tconnection?: PGliteOptions & { dataDir: string };\n\t\tclient?: TClient;\n\t} & DrizzleConfig<TSchema, TRelations>;\n\n\tif (client) return construct(client, drizzleConfig) as any;\n\n\tif (typeof connection === 'object') {\n\t\tconst { dataDir, ...options } = connection;\n\n\t\tconst instance = new PGlite(dataDir, options);\n\n\t\treturn construct(instance, drizzleConfig) as any;\n\t}\n\n\tconst instance = new PGlite(connection);\n\n\treturn construct(instance, drizzleConfig) as any;\n}\n\nexport namespace drizzle {\n\texport function mock<\n\t\tTSchema extends Record<string, unknown> = Record<string, never>,\n\t\tTRelations extends AnyRelations = EmptyRelations,\n\t>(\n\t\tconfig?: DrizzleConfig<TSchema, TRelations>,\n\t): PgliteDatabase<TSchema, TRelations> & {\n\t\t$client: '$client is not available on drizzle.mock()';\n\t} {\n\t\treturn construct({} as any, config) as any;\n\t}\n}\n"],"mappings":";;;;;;;;;;;;AAkBA,IAAa,eAAb,MAA0B;CACzB,QAAiBA,0BAAsB;CAEvC,YACC,AAAQ,QACR,AAAQ,SACR,AAAQ,UAA2B,EAAE,EACpC;EAHO;EACA;EACA;;CAIT,cACC,WACA,QACkF;AAClF,SAAO,IAAIC,qCAAc,KAAK,QAAQ,KAAK,SAAS,WAAW,QAAQ;GACtE,QAAQ,KAAK,QAAQ;GACrB,OAAO,KAAK,QAAQ;GACpB,CAAC;;;AAIJ,IAAa,iBAAb,cAGUC,sCAA2D;CACpE,QAA0BF,0BAAsB;;AAGjD,SAAS,UAIR,QACA,SAA6C,EAAE,EAG9C;CACD,MAAM,UAAU,IAAIG,+BAAU,EAAE,QAAQ,OAAO,QAAQ,CAAC;CACxD,IAAI;AACJ,KAAI,OAAO,WAAW,KACrB,UAAS,IAAIC,2BAAe;UAClB,OAAO,WAAW,MAC5B,UAAS,OAAO;CAGjB,IAAI;AACJ,KAAI,OAAO,QAAQ;EAClB,MAAM,eAAeC,gBAAG,8BACvB,OAAO,QACPA,gBAAG,4BACH;AACD,WAAS;GACR,YAAY,OAAO;GACnB,QAAQ,aAAa;GACrB,eAAe,aAAa;GAC5B;;CAGF,MAAM,YAAY,OAAO,aAAa,EAAE;CAGxC,MAAM,KAAK,IAAI,eACd,SAHc,IAAI,aAAa,QAAQ,SAAS;EAAE;EAAQ,OAAO,OAAO;EAAO,CAAC,CAC1D,cAAc,WAAW,OAAO,EAItD,WACA,OACA;AACD,CAAO,GAAI,UAAU;AACrB,CAAO,GAAI,SAAS,OAAO;AAC3B,KAAW,GAAI,OACd,CAAO,GAAI,OAAO,gBAAgB,OAAO,OAAO;AAajD,QAAO;;AAGR,SAAgB,QAKf,GAAG,QAqBF;AACD,KAAI,OAAO,OAAO,UAAa,OAAO,OAAO,OAAO,SAEnD,QAAO,UADU,IAAIC,4BAAO,OAAO,GAAG,EACX,OAAO,GAAG;CAGtC,MAAM,EAAE,YAAY,QAAQ,GAAG,kBAAkB,OAAO;AAKxD,KAAI,OAAQ,QAAO,UAAU,QAAQ,cAAc;AAEnD,KAAI,OAAO,eAAe,UAAU;EACnC,MAAM,EAAE,SAAS,GAAG,YAAY;AAIhC,SAAO,UAFU,IAAIA,4BAAO,SAAS,QAAQ,EAElB,cAAc;;AAK1C,QAAO,UAFU,IAAIA,4BAAO,WAAW,EAEZ,cAAc;;;CAIlC,SAAS,KAIf,QAGC;AACD,SAAO,UAAU,EAAE,EAAS,OAAO"}

package/pglite/driver.d.cts

@@ -1,39 +1,44 @@
-import { Codec } from "../codecs.cjs";
-import { PgliteQueryResultHKT } from "./session.cjs";
+import { PgliteClient, PgliteQueryResultHKT, PgliteSession } from "./session.cjs";
 import { entityKind } from "../entity.cjs";
-import * as __utils_ts0 from "../utils.cjs";
+import { DrizzleConfig } from "../utils.cjs";
+import * as V1 from "../_relations.cjs";
 import { Cache } from "../cache/core/cache.cjs";
 import { AnyRelations, EmptyRelations } from "../relations.cjs";
+import { PgDialect } from "../pg-core/dialect.cjs";
 import { Logger } from "../logger.cjs";
-import * as __pg_core_codecs_ts0 from "../pg-core/codecs.cjs";
 import { PgAsyncDatabase } from "../pg-core/async/db.cjs";
-import { DrizzlePgConfig } from "../pg-core/utils.cjs";
 import { PGlite, PGliteOptions } from "@electric-sql/pglite";
 
 //#region src/pglite/driver.d.ts
 interface PgDriverOptions {
   logger?: Logger;
   cache?: Cache;
-  useJitMapper?: boolean;
 }
-declare class PgliteDatabase<TRelations extends AnyRelations = EmptyRelations> extends PgAsyncDatabase<PgliteQueryResultHKT, TRelations> {
+declare class PgliteDriver {
+  private client;
+  private dialect;
+  private options;
   static readonly [entityKind]: string;
+  constructor(client: PgliteClient, dialect: PgDialect, options?: PgDriverOptions);
+  createSession(relations: AnyRelations, schema: V1.RelationalSchemaConfig<V1.TablesRelationalConfig> | undefined): PgliteSession<Record<string, unknown>, AnyRelations, V1.TablesRelationalConfig>;
 }
-declare const pgliteCodecs: __utils_ts0.PartialWithUndefined<Record<__pg_core_codecs_ts0.PostgresType, Codec>>;
-declare function drizzle<TRelations extends AnyRelations = EmptyRelations, TClient extends PGlite = PGlite>(...params: [] | [string] | [string, DrizzlePgConfig<TRelations>] | [(DrizzlePgConfig<TRelations> & ({
+declare class PgliteDatabase<TSchema extends Record<string, unknown> = Record<string, never>, TRelations extends AnyRelations = EmptyRelations> extends PgAsyncDatabase<PgliteQueryResultHKT, TSchema, TRelations> {
+  static readonly [entityKind]: string;
+}
+declare function drizzle<TSchema extends Record<string, unknown> = Record<string, never>, TRelations extends AnyRelations = EmptyRelations, TClient extends PGlite = PGlite>(...params: [] | [string] | [string, DrizzleConfig<TSchema, TRelations>] | [(DrizzleConfig<TSchema, TRelations> & ({
   connection?: (PGliteOptions & {
     dataDir?: string;
   }) | string;
 } | {
   client: TClient;
-}))]): PgliteDatabase<TRelations> & {
+}))]): PgliteDatabase<TSchema, TRelations> & {
   $client: TClient;
 };
 declare namespace drizzle {
-  function mock<TRelations extends AnyRelations = EmptyRelations>(config?: DrizzlePgConfig<TRelations>): PgliteDatabase<TRelations> & {
+  function mock<TSchema extends Record<string, unknown> = Record<string, never>, TRelations extends AnyRelations = EmptyRelations>(config?: DrizzleConfig<TSchema, TRelations>): PgliteDatabase<TSchema, TRelations> & {
     $client: '$client is not available on drizzle.mock()';
   };
 }
 //#endregion
-export { PgDriverOptions, PgliteDatabase, drizzle, pgliteCodecs };
+export { PgDriverOptions, PgliteDatabase, PgliteDriver, drizzle };
 //# sourceMappingURL=driver.d.cts.map

package/pglite/driver.d.ts

@@ -1,39 +1,44 @@
-import { Codec } from "../codecs.js";
-import { PgliteQueryResultHKT } from "./session.js";
+import { PgliteClient, PgliteQueryResultHKT, PgliteSession } from "./session.js";
 import { entityKind } from "../entity.js";
-import * as __utils_ts0 from "../utils.js";
+import { DrizzleConfig } from "../utils.js";
+import * as V1 from "../_relations.js";
 import { Logger } from "../logger.js";
-import { AnyRelations, EmptyRelations } from "../relations.js";
 import { PgAsyncDatabase } from "../pg-core/async/db.js";
-import * as __pg_core_codecs_ts0 from "../pg-core/codecs.js";
-import { Cache } from "../cache/core/cache.js";
+import { PgDialect } from "../pg-core/dialect.js";
 import { PGlite, PGliteOptions } from "@electric-sql/pglite";
-import { DrizzlePgConfig } from "../pg-core/utils.js";
+import { Cache } from "../cache/core/cache.js";
+import { AnyRelations, EmptyRelations } from "../relations.js";
 
 //#region src/pglite/driver.d.ts
 interface PgDriverOptions {
   logger?: Logger;
   cache?: Cache;
-  useJitMapper?: boolean;
 }
-declare class PgliteDatabase<TRelations extends AnyRelations = EmptyRelations> extends PgAsyncDatabase<PgliteQueryResultHKT, TRelations> {
+declare class PgliteDriver {
+  private client;
+  private dialect;
+  private options;
+  static readonly [entityKind]: string;
+  constructor(client: PgliteClient, dialect: PgDialect, options?: PgDriverOptions);
+  createSession(relations: AnyRelations, schema: V1.RelationalSchemaConfig<V1.TablesRelationalConfig> | undefined): PgliteSession<Record<string, unknown>, AnyRelations, V1.TablesRelationalConfig>;
+}
+declare class PgliteDatabase<TSchema extends Record<string, unknown> = Record<string, never>, TRelations extends AnyRelations = EmptyRelations> extends PgAsyncDatabase<PgliteQueryResultHKT, TSchema, TRelations> {
   static readonly [entityKind]: string;
 }
-declare const pgliteCodecs: __utils_ts0.PartialWithUndefined<Record<__pg_core_codecs_ts0.PostgresType, Codec>>;
-declare function drizzle<TRelations extends AnyRelations = EmptyRelations, TClient extends PGlite = PGlite>(...params: [] | [string] | [string, DrizzlePgConfig<TRelations>] | [(DrizzlePgConfig<TRelations> & ({
+declare function drizzle<TSchema extends Record<string, unknown> = Record<string, never>, TRelations extends AnyRelations = EmptyRelations, TClient extends PGlite = PGlite>(...params: [] | [string] | [string, DrizzleConfig<TSchema, TRelations>] | [(DrizzleConfig<TSchema, TRelations> & ({
   connection?: (PGliteOptions & {
     dataDir?: string;
   }) | string;
 } | {
   client: TClient;
-}))]): PgliteDatabase<TRelations> & {
+}))]): PgliteDatabase<TSchema, TRelations> & {
   $client: TClient;
 };
 declare namespace drizzle {
-  function mock<TRelations extends AnyRelations = EmptyRelations>(config?: DrizzlePgConfig<TRelations>): PgliteDatabase<TRelations> & {
+  function mock<TSchema extends Record<string, unknown> = Record<string, never>, TRelations extends AnyRelations = EmptyRelations>(config?: DrizzleConfig<TSchema, TRelations>): PgliteDatabase<TSchema, TRelations> & {
     $client: '$client is not available on drizzle.mock()';
   };
 }
 //#endregion
-export { PgDriverOptions, PgliteDatabase, drizzle, pgliteCodecs };
+export { PgDriverOptions, PgliteDatabase, PgliteDriver, drizzle };
 //# sourceMappingURL=driver.d.ts.map