@erfanium/drizzle-orm 0.1.0 → 1.0.0

package/d1/session.cjs

@@ -1,220 +1,134 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
+Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+const require_runtime = require('../_virtual/_rolldown/runtime.cjs');
+let __entity_ts = require("../entity.cjs");
+let __sql_sql_ts = require("../sql/sql.cjs");
+let __logger_ts = require("../logger.cjs");
+let __errors_ts = require("../errors.cjs");
+let __cache_core_index_ts = require("../cache/core/index.cjs");
+let __sqlite_core_async_session_ts = require("../sqlite-core/async/session.cjs");
+
+//#region src/d1/session.ts
+var SQLiteD1Session = class extends __sqlite_core_async_session_ts.SQLiteAsyncSession {
+	static [__entity_ts.entityKind] = "SQLiteD1Session";
+	logger;
+	cache;
+	constructor(client, dialect, relations, options = {}) {
+		super(dialect, "async");
+		this.client = client;
+		this.relations = relations;
+		this.options = options;
+		this.logger = options.logger ?? new __logger_ts.NoopLogger();
+		this.cache = options.cache ?? new __cache_core_index_ts.NoopCache();
+	}
+	prepareQuery(query, mode, _prepare, executeMethod, mapper, queryMetadata, cacheConfig) {
+		let stmt;
+		try {
+			stmt = this.client.prepare(query.sql);
+		} catch (e) {
+			throw new __errors_ts.DrizzleQueryError(query.sql, query.params, e);
+		}
+		return new D1PreparedQuery(stmt, "async", executeMethod, {
+			all: (params) => {
+				if (mode === "arrays") return stmt.bind(...params).raw();
+				return stmt.bind(...params).all().then(({ results }) => results);
+			},
+			get: (params) => {
+				if (mode === "arrays") return stmt.bind(...params).raw().then((rows) => rows[0]);
+				return stmt.bind(...params).first();
+			},
+			run: (params) => {
+				return stmt.bind(...params).run();
+			},
+			values: (params) => {
+				return stmt.bind(...params).raw();
+			}
+		}, query, mapper, mode, this.logger, this.cache, queryMetadata, cacheConfig);
+	}
+	async batch(queries) {
+		const preparedQueries = [];
+		const builtQueries = [];
+		for (const query of queries) {
+			const preparedQuery = query._prepare();
+			const builtQuery = preparedQuery.getQuery();
+			preparedQueries.push(preparedQuery);
+			if (builtQuery.params.length > 0) builtQueries.push(preparedQuery.stmt.bind(...builtQuery.params));
+			else {
+				const builtQuery = preparedQuery.getQuery();
+				builtQueries.push(this.client.prepare(builtQuery.sql).bind(...builtQuery.params));
+			}
+		}
+		return (await this.client.batch(builtQueries)).map((result, i) => {
+			const { executeMethod, mapper, mode } = preparedQueries[i];
+			if (executeMethod === "run") return result;
+			let values = result.results;
+			if (executeMethod === "values") return d1ToRawMapping(values);
+			if (executeMethod === "get") {
+				if (!values[0]) return;
+				if (!mapper) return mode === "arrays" ? d1ToRawMapping([values[0]])[0] : values[0];
+				return mapper(mode === "arrays" ? d1ToRawMapping([values[0]]) : [values[0]])[0];
+			}
+			values = mode === "arrays" ? d1ToRawMapping(values) : values;
+			if (!mapper) return values;
+			return mapper(values);
+		});
+	}
+	async transaction(transaction, config) {
+		const tx = new D1Transaction("async", this.dialect, this, this.relations, void 0, true);
+		await this.run(__sql_sql_ts.sql.raw(`begin${config?.behavior ? " " + config.behavior : ""}`));
+		try {
+			const result = await transaction(tx);
+			await this.run(__sql_sql_ts.sql`commit`);
+			return result;
+		} catch (err) {
+			await this.run(__sql_sql_ts.sql`rollback`);
+			throw err;
+		}
+	}
 };
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
+var D1Transaction = class D1Transaction extends __sqlite_core_async_session_ts.SQLiteAsyncTransaction {
+	static [__entity_ts.entityKind] = "D1Transaction";
+	async transaction(transaction) {
+		const savepointName = `sp${this.nestedIndex}`;
+		const tx = new D1Transaction("async", this.dialect, this.session, this._.relations, this.nestedIndex + 1, this.forbidJsonb);
+		await this.session.run(__sql_sql_ts.sql.raw(`savepoint ${savepointName}`));
+		try {
+			const result = await transaction(tx);
+			await this.session.run(__sql_sql_ts.sql.raw(`release savepoint ${savepointName}`));
+			return result;
+		} catch (err) {
+			await this.session.run(__sql_sql_ts.sql.raw(`rollback to savepoint ${savepointName}`));
+			throw err;
+		}
+	}
 };
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var session_exports = {};
-__export(session_exports, {
-  D1PreparedQuery: () => D1PreparedQuery,
-  D1Transaction: () => D1Transaction,
-  SQLiteD1Session: () => SQLiteD1Session
-});
-module.exports = __toCommonJS(session_exports);
-var import_core = require("../cache/core/index.cjs");
-var import_entity = require("../entity.cjs");
-var import_logger = require("../logger.cjs");
-var import_sql = require("../sql/sql.cjs");
-var import_sqlite_core = require("../sqlite-core/index.cjs");
-var import_session = require("../sqlite-core/session.cjs");
-var import_utils = require("../utils.cjs");
-class SQLiteD1Session extends import_session.SQLiteSession {
-  constructor(client, dialect, schema, options = {}) {
-    super(dialect);
-    this.client = client;
-    this.schema = schema;
-    this.options = options;
-    this.logger = options.logger ?? new import_logger.NoopLogger();
-    this.cache = options.cache ?? new import_core.NoopCache();
-  }
-  static [import_entity.entityKind] = "SQLiteD1Session";
-  logger;
-  cache;
-  prepareQuery(query, fields, executeMethod, isResponseInArrayMode, customResultMapper, queryMetadata, cacheConfig) {
-    const stmt = this.client.prepare(query.sql);
-    return new D1PreparedQuery(
-      stmt,
-      query,
-      this.logger,
-      this.cache,
-      queryMetadata,
-      cacheConfig,
-      fields,
-      executeMethod,
-      isResponseInArrayMode,
-      customResultMapper
-    );
-  }
-  async batch(queries) {
-    const preparedQueries = [];
-    const builtQueries = [];
-    for (const query of queries) {
-      const preparedQuery = query._prepare();
-      const builtQuery = preparedQuery.getQuery();
-      preparedQueries.push(preparedQuery);
-      if (builtQuery.params.length > 0) {
-        builtQueries.push(preparedQuery.stmt.bind(...builtQuery.params));
-      } else {
-        const builtQuery2 = preparedQuery.getQuery();
-        builtQueries.push(
-          this.client.prepare(builtQuery2.sql).bind(...builtQuery2.params)
-        );
-      }
-    }
-    const batchResults = await this.client.batch(builtQueries);
-    return batchResults.map((result, i) => preparedQueries[i].mapResult(result, true));
-  }
-  extractRawAllValueFromBatchResult(result) {
-    return result.results;
-  }
-  extractRawGetValueFromBatchResult(result) {
-    return result.results[0];
-  }
-  extractRawValuesValueFromBatchResult(result) {
-    return d1ToRawMapping(result.results);
-  }
-  async transaction(transaction, config) {
-    const tx = new D1Transaction("async", this.dialect, this, this.schema);
-    await this.run(import_sql.sql.raw(`begin${config?.behavior ? " " + config.behavior : ""}`));
-    try {
-      const result = await transaction(tx);
-      await this.run(import_sql.sql`commit`);
-      return result;
-    } catch (err) {
-      await this.run(import_sql.sql`rollback`);
-      throw err;
-    }
-  }
-}
-class D1Transaction extends import_sqlite_core.SQLiteTransaction {
-  static [import_entity.entityKind] = "D1Transaction";
-  async transaction(transaction) {
-    const savepointName = `sp${this.nestedIndex}`;
-    const tx = new D1Transaction("async", this.dialect, this.session, this.schema, this.nestedIndex + 1);
-    await this.session.run(import_sql.sql.raw(`savepoint ${savepointName}`));
-    try {
-      const result = await transaction(tx);
-      await this.session.run(import_sql.sql.raw(`release savepoint ${savepointName}`));
-      return result;
-    } catch (err) {
-      await this.session.run(import_sql.sql.raw(`rollback to savepoint ${savepointName}`));
-      throw err;
-    }
-  }
-}
+/**
+* This function was taken from the D1 implementation: https://github.com/cloudflare/workerd/blob/4aae9f4c7ae30a59a88ca868c4aff88bda85c956/src/cloudflare/internal/d1-api.ts#L287
+* It may cause issues with duplicated column names in join queries, which should be fixed on the D1 side.
+* @param results
+* @returns
+*/
 function d1ToRawMapping(results) {
-  const rows = [];
-  for (const row of results) {
-    const entry = Object.keys(row).map((k) => row[k]);
-    rows.push(entry);
-  }
-  return rows;
+	const rows = [];
+	for (const row of results) {
+		const entry = Object.keys(row).map((k) => row[k]);
+		rows.push(entry);
+	}
+	return rows;
 }
-class D1PreparedQuery extends import_session.SQLitePreparedQuery {
-  constructor(stmt, query, logger, cache, queryMetadata, cacheConfig, fields, executeMethod, _isResponseInArrayMode, customResultMapper) {
-    super("async", executeMethod, query, cache, queryMetadata, cacheConfig);
-    this.logger = logger;
-    this._isResponseInArrayMode = _isResponseInArrayMode;
-    this.customResultMapper = customResultMapper;
-    this.fields = fields;
-    this.stmt = stmt;
-  }
-  static [import_entity.entityKind] = "D1PreparedQuery";
-  /** @internal */
-  customResultMapper;
-  /** @internal */
-  fields;
-  /** @internal */
-  stmt;
-  async run(placeholderValues) {
-    const params = (0, import_sql.fillPlaceholders)(this.query.params, placeholderValues ?? {});
-    this.logger.logQuery(this.query.sql, params);
-    return await this.queryWithCache(this.query.sql, params, async () => {
-      return this.stmt.bind(...params).run();
-    });
-  }
-  async all(placeholderValues) {
-    const { fields, query, logger, stmt, customResultMapper } = this;
-    if (!fields && !customResultMapper) {
-      const params = (0, import_sql.fillPlaceholders)(query.params, placeholderValues ?? {});
-      logger.logQuery(query.sql, params);
-      return await this.queryWithCache(query.sql, params, async () => {
-        return stmt.bind(...params).all().then(({ results }) => this.mapAllResult(results));
-      });
-    }
-    const rows = await this.values(placeholderValues);
-    return this.mapAllResult(rows);
-  }
-  mapAllResult(rows, isFromBatch) {
-    if (isFromBatch) {
-      rows = d1ToRawMapping(rows.results);
-    }
-    if (!this.fields && !this.customResultMapper) {
-      return rows;
-    }
-    if (this.customResultMapper) {
-      return this.customResultMapper(rows);
-    }
-    return rows.map((row) => (0, import_utils.mapResultRow)(this.fields, row, this.joinsNotNullableMap));
-  }
-  async get(placeholderValues) {
-    const { fields, joinsNotNullableMap, query, logger, stmt, customResultMapper } = this;
-    if (!fields && !customResultMapper) {
-      const params = (0, import_sql.fillPlaceholders)(query.params, placeholderValues ?? {});
-      logger.logQuery(query.sql, params);
-      return await this.queryWithCache(query.sql, params, async () => {
-        return stmt.bind(...params).all().then(({ results }) => results[0]);
-      });
-    }
-    const rows = await this.values(placeholderValues);
-    if (!rows[0]) {
-      return void 0;
-    }
-    if (customResultMapper) {
-      return customResultMapper(rows);
-    }
-    return (0, import_utils.mapResultRow)(fields, rows[0], joinsNotNullableMap);
-  }
-  mapGetResult(result, isFromBatch) {
-    if (isFromBatch) {
-      result = d1ToRawMapping(result.results)[0];
-    }
-    if (!this.fields && !this.customResultMapper) {
-      return result;
-    }
-    if (this.customResultMapper) {
-      return this.customResultMapper([result]);
-    }
-    return (0, import_utils.mapResultRow)(this.fields, result, this.joinsNotNullableMap);
-  }
-  async values(placeholderValues) {
-    const params = (0, import_sql.fillPlaceholders)(this.query.params, placeholderValues ?? {});
-    this.logger.logQuery(this.query.sql, params);
-    return await this.queryWithCache(this.query.sql, params, async () => {
-      return this.stmt.bind(...params).raw();
-    });
-  }
-  /** @internal */
-  isResponseInArrayMode() {
-    return this._isResponseInArrayMode;
-  }
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  D1PreparedQuery,
-  D1Transaction,
-  SQLiteD1Session
-});
+var D1PreparedQuery = class extends __sqlite_core_async_session_ts.SQLiteAsyncPreparedQuery {
+	static [__entity_ts.entityKind] = "D1PreparedQuery";
+	/** @internal */
+	fields;
+	/** @internal */
+	stmt;
+	constructor(stmt, resultKind, executeMethod = "all", executors, query, mapper, mode, logger, cache, queryMetadata, cacheConfig) {
+		super(resultKind, executeMethod, executors, query, mapper, mode, logger, cache, queryMetadata, cacheConfig);
+		this.stmt = stmt;
+	}
+};
+
+//#endregion
+exports.D1PreparedQuery = D1PreparedQuery;
+exports.D1Transaction = D1Transaction;
+exports.SQLiteD1Session = SQLiteD1Session;
 //# sourceMappingURL=session.cjs.map

package/d1/session.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/d1/session.ts"],"sourcesContent":["/// <reference types=\"@cloudflare/workers-types\" />\n\nimport type { BatchItem } from '~/batch.ts';\nimport { type Cache, NoopCache } from '~/cache/core/index.ts';\nimport type { WithCacheConfig } from '~/cache/core/types.ts';\nimport { entityKind } from '~/entity.ts';\nimport type { Logger } from '~/logger.ts';\nimport { NoopLogger } from '~/logger.ts';\nimport type { RelationalSchemaConfig, TablesRelationalConfig } from '~/relations.ts';\nimport type { PreparedQuery } from '~/session.ts';\nimport { fillPlaceholders, type Query, sql } from '~/sql/sql.ts';\nimport type { SQLiteAsyncDialect } from '~/sqlite-core/dialect.ts';\nimport { SQLiteTransaction } from '~/sqlite-core/index.ts';\nimport type { SelectedFieldsOrdered } from '~/sqlite-core/query-builders/select.types.ts';\nimport type {\n\tPreparedQueryConfig as PreparedQueryConfigBase,\n\tSQLiteExecuteMethod,\n\tSQLiteTransactionConfig,\n} from '~/sqlite-core/session.ts';\nimport { SQLitePreparedQuery, SQLiteSession } from '~/sqlite-core/session.ts';\nimport { mapResultRow } from '~/utils.ts';\n\nexport interface SQLiteD1SessionOptions {\n\tlogger?: Logger;\n\tcache?: Cache;\n}\n\ntype PreparedQueryConfig = Omit<PreparedQueryConfigBase, 'statement' | 'run'>;\n\nexport class SQLiteD1Session<\n\tTFullSchema extends Record<string, unknown>,\n\tTSchema extends TablesRelationalConfig,\n> extends SQLiteSession<'async', D1Result, TFullSchema, TSchema> {\n\tstatic override readonly [entityKind]: string = 'SQLiteD1Session';\n\n\tprivate logger: Logger;\n\tprivate cache: Cache;\n\n\tconstructor(\n\t\tprivate client: D1Database,\n\t\tdialect: SQLiteAsyncDialect,\n\t\tprivate schema: RelationalSchemaConfig<TSchema> | undefined,\n\t\tprivate options: SQLiteD1SessionOptions = {},\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(\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\tqueryMetadata?: {\n\t\t\ttype: 'select' | 'update' | 'delete' | 'insert';\n\t\t\ttables: string[];\n\t\t},\n\t\tcacheConfig?: WithCacheConfig,\n\t): D1PreparedQuery {\n\t\tconst stmt = this.client.prepare(query.sql);\n\t\treturn new D1PreparedQuery(\n\t\t\tstmt,\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\texecuteMethod,\n\t\t\tisResponseInArrayMode,\n\t\t\tcustomResultMapper,\n\t\t);\n\t}\n\n\tasync batch<T extends BatchItem<'sqlite'>[] | readonly BatchItem<'sqlite'>[]>(queries: T) {\n\t\tconst preparedQueries: PreparedQuery[] = [];\n\t\tconst builtQueries: D1PreparedStatement[] = [];\n\n\t\tfor (const query of queries) {\n\t\t\tconst preparedQuery = query._prepare();\n\t\t\tconst builtQuery = preparedQuery.getQuery();\n\t\t\tpreparedQueries.push(preparedQuery);\n\t\t\tif (builtQuery.params.length > 0) {\n\t\t\t\tbuiltQueries.push((preparedQuery as D1PreparedQuery).stmt.bind(...builtQuery.params));\n\t\t\t} else {\n\t\t\t\tconst builtQuery = preparedQuery.getQuery();\n\t\t\t\tbuiltQueries.push(\n\t\t\t\t\tthis.client.prepare(builtQuery.sql).bind(...builtQuery.params),\n\t\t\t\t);\n\t\t\t}\n\t\t}\n\n\t\tconst batchResults = await this.client.batch<any>(builtQueries);\n\t\treturn batchResults.map((result, i) => preparedQueries[i]!.mapResult(result, true));\n\t}\n\n\toverride extractRawAllValueFromBatchResult(result: unknown): unknown {\n\t\treturn (result as D1Result).results;\n\t}\n\n\toverride extractRawGetValueFromBatchResult(result: unknown): unknown {\n\t\treturn (result as D1Result).results[0];\n\t}\n\n\toverride extractRawValuesValueFromBatchResult(result: unknown): unknown {\n\t\treturn d1ToRawMapping((result as D1Result).results);\n\t}\n\n\toverride async transaction<T>(\n\t\ttransaction: (tx: D1Transaction<TFullSchema, TSchema>) => T | Promise<T>,\n\t\tconfig?: SQLiteTransactionConfig,\n\t): Promise<T> {\n\t\tconst tx = new D1Transaction('async', this.dialect, this, this.schema);\n\t\tawait this.run(sql.raw(`begin${config?.behavior ? ' ' + config.behavior : ''}`));\n\t\ttry {\n\t\t\tconst result = await transaction(tx);\n\t\t\tawait this.run(sql`commit`);\n\t\t\treturn result;\n\t\t} catch (err) {\n\t\t\tawait this.run(sql`rollback`);\n\t\t\tthrow err;\n\t\t}\n\t}\n}\n\nexport class D1Transaction<\n\tTFullSchema extends Record<string, unknown>,\n\tTSchema extends TablesRelationalConfig,\n> extends SQLiteTransaction<'async', D1Result, TFullSchema, TSchema> {\n\tstatic override readonly [entityKind]: string = 'D1Transaction';\n\n\toverride async transaction<T>(transaction: (tx: D1Transaction<TFullSchema, TSchema>) => Promise<T>): Promise<T> {\n\t\tconst savepointName = `sp${this.nestedIndex}`;\n\t\tconst tx = new D1Transaction('async', this.dialect, this.session, this.schema, this.nestedIndex + 1);\n\t\tawait this.session.run(sql.raw(`savepoint ${savepointName}`));\n\t\ttry {\n\t\t\tconst result = await transaction(tx);\n\t\t\tawait this.session.run(sql.raw(`release savepoint ${savepointName}`));\n\t\t\treturn result;\n\t\t} catch (err) {\n\t\t\tawait this.session.run(sql.raw(`rollback to savepoint ${savepointName}`));\n\t\t\tthrow err;\n\t\t}\n\t}\n}\n\n/**\n * This function was taken from the D1 implementation: https://github.com/cloudflare/workerd/blob/4aae9f4c7ae30a59a88ca868c4aff88bda85c956/src/cloudflare/internal/d1-api.ts#L287\n * It may cause issues with duplicated column names in join queries, which should be fixed on the D1 side.\n * @param results\n * @returns\n */\nfunction d1ToRawMapping(results: any) {\n\tconst rows: unknown[][] = [];\n\tfor (const row of results) {\n\t\tconst entry = Object.keys(row).map((k) => row[k]);\n\t\trows.push(entry);\n\t}\n\treturn rows;\n}\n\nexport class D1PreparedQuery<T extends PreparedQueryConfig = PreparedQueryConfig> extends SQLitePreparedQuery<\n\t{ type: 'async'; run: D1Response; all: T['all']; get: T['get']; values: T['values']; execute: T['execute'] }\n> {\n\tstatic override readonly [entityKind]: string = 'D1PreparedQuery';\n\n\t/** @internal */\n\tcustomResultMapper?: (rows: unknown[][], mapColumnValue?: (value: unknown) => unknown) => unknown;\n\n\t/** @internal */\n\tfields?: SelectedFieldsOrdered;\n\n\t/** @internal */\n\tstmt: D1PreparedStatement;\n\n\tconstructor(\n\t\tstmt: D1PreparedStatement,\n\t\tquery: Query,\n\t\tprivate logger: Logger,\n\t\tcache: Cache,\n\t\tqueryMetadata: {\n\t\t\ttype: 'select' | 'update' | 'delete' | 'insert';\n\t\t\ttables: string[];\n\t\t} | undefined,\n\t\tcacheConfig: WithCacheConfig | undefined,\n\t\tfields: SelectedFieldsOrdered | undefined,\n\t\texecuteMethod: SQLiteExecuteMethod,\n\t\tprivate _isResponseInArrayMode: boolean,\n\t\tcustomResultMapper?: (rows: unknown[][]) => unknown,\n\t) {\n\t\tsuper('async', executeMethod, query, cache, queryMetadata, cacheConfig);\n\t\tthis.customResultMapper = customResultMapper;\n\t\tthis.fields = fields;\n\t\tthis.stmt = stmt;\n\t}\n\n\tasync run(placeholderValues?: Record<string, unknown>): Promise<D1Response> {\n\t\tconst params = fillPlaceholders(this.query.params, placeholderValues ?? {});\n\t\tthis.logger.logQuery(this.query.sql, params);\n\t\treturn await this.queryWithCache(this.query.sql, params, async () => {\n\t\t\treturn this.stmt.bind(...params).run();\n\t\t});\n\t}\n\n\tasync all(placeholderValues?: Record<string, unknown>): Promise<T['all']> {\n\t\tconst { fields, query, logger, stmt, 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\t\t\treturn await this.queryWithCache(query.sql, params, async () => {\n\t\t\t\treturn stmt.bind(...params).all().then(({ results }) => this.mapAllResult(results!));\n\t\t\t});\n\t\t}\n\n\t\tconst rows = await this.values(placeholderValues);\n\n\t\treturn this.mapAllResult(rows);\n\t}\n\n\toverride mapAllResult(rows: unknown, isFromBatch?: boolean): unknown {\n\t\tif (isFromBatch) {\n\t\t\trows = d1ToRawMapping((rows as D1Result).results);\n\t\t}\n\n\t\tif (!this.fields && !this.customResultMapper) {\n\t\t\treturn rows;\n\t\t}\n\n\t\tif (this.customResultMapper) {\n\t\t\treturn this.customResultMapper(rows as unknown[][]);\n\t\t}\n\n\t\treturn (rows as unknown[][]).map((row) => mapResultRow(this.fields!, row, this.joinsNotNullableMap));\n\t}\n\n\tasync get(placeholderValues?: Record<string, unknown>): Promise<T['get']> {\n\t\tconst { fields, joinsNotNullableMap, query, logger, stmt, 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\t\t\treturn await this.queryWithCache(query.sql, params, async () => {\n\t\t\t\treturn stmt.bind(...params).all().then(({ results }) => results![0]);\n\t\t\t});\n\t\t}\n\n\t\tconst rows = await this.values(placeholderValues);\n\n\t\tif (!rows[0]) {\n\t\t\treturn undefined;\n\t\t}\n\n\t\tif (customResultMapper) {\n\t\t\treturn customResultMapper(rows) as T['all'];\n\t\t}\n\n\t\treturn mapResultRow(fields!, rows[0], joinsNotNullableMap);\n\t}\n\n\toverride mapGetResult(result: unknown, isFromBatch?: boolean): unknown {\n\t\tif (isFromBatch) {\n\t\t\tresult = d1ToRawMapping((result as D1Result).results)[0];\n\t\t}\n\n\t\tif (!this.fields && !this.customResultMapper) {\n\t\t\treturn result;\n\t\t}\n\n\t\tif (this.customResultMapper) {\n\t\t\treturn this.customResultMapper([result as unknown[]]) as T['all'];\n\t\t}\n\n\t\treturn mapResultRow(this.fields!, result as unknown[], this.joinsNotNullableMap);\n\t}\n\n\tasync values<T extends any[] = unknown[]>(placeholderValues?: Record<string, unknown>): Promise<T[]> {\n\t\tconst params = fillPlaceholders(this.query.params, placeholderValues ?? {});\n\t\tthis.logger.logQuery(this.query.sql, params);\n\t\treturn await this.queryWithCache(this.query.sql, params, async () => {\n\t\t\treturn this.stmt.bind(...params).raw();\n\t\t});\n\t}\n\n\t/** @internal */\n\tisResponseInArrayMode(): boolean {\n\t\treturn this._isResponseInArrayMode;\n\t}\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAGA,kBAAsC;AAEtC,oBAA2B;AAE3B,oBAA2B;AAG3B,iBAAkD;AAElD,yBAAkC;AAOlC,qBAAmD;AACnD,mBAA6B;AAStB,MAAM,wBAGH,6BAAuD;AAAA,EAMhE,YACS,QACR,SACQ,QACA,UAAkC,CAAC,GAC1C;AACD,UAAM,OAAO;AALL;AAEA;AACA;AAGR,SAAK,SAAS,QAAQ,UAAU,IAAI,yBAAW;AAC/C,SAAK,QAAQ,QAAQ,SAAS,IAAI,sBAAU;AAAA,EAC7C;AAAA,EAdA,QAA0B,wBAAU,IAAY;AAAA,EAExC;AAAA,EACA;AAAA,EAaR,aACC,OACA,QACA,eACA,uBACA,oBACA,eAIA,aACkB;AAClB,UAAM,OAAO,KAAK,OAAO,QAAQ,MAAM,GAAG;AAC1C,WAAO,IAAI;AAAA,MACV;AAAA,MACA;AAAA,MACA,KAAK;AAAA,MACL,KAAK;AAAA,MACL;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACD;AAAA,EACD;AAAA,EAEA,MAAM,MAAwE,SAAY;AACzF,UAAM,kBAAmC,CAAC;AAC1C,UAAM,eAAsC,CAAC;AAE7C,eAAW,SAAS,SAAS;AAC5B,YAAM,gBAAgB,MAAM,SAAS;AACrC,YAAM,aAAa,cAAc,SAAS;AAC1C,sBAAgB,KAAK,aAAa;AAClC,UAAI,WAAW,OAAO,SAAS,GAAG;AACjC,qBAAa,KAAM,cAAkC,KAAK,KAAK,GAAG,WAAW,MAAM,CAAC;AAAA,MACrF,OAAO;AACN,cAAMA,cAAa,cAAc,SAAS;AAC1C,qBAAa;AAAA,UACZ,KAAK,OAAO,QAAQA,YAAW,GAAG,EAAE,KAAK,GAAGA,YAAW,MAAM;AAAA,QAC9D;AAAA,MACD;AAAA,IACD;AAEA,UAAM,eAAe,MAAM,KAAK,OAAO,MAAW,YAAY;AAC9D,WAAO,aAAa,IAAI,CAAC,QAAQ,MAAM,gBAAgB,CAAC,EAAG,UAAU,QAAQ,IAAI,CAAC;AAAA,EACnF;AAAA,EAES,kCAAkC,QAA0B;AACpE,WAAQ,OAAoB;AAAA,EAC7B;AAAA,EAES,kCAAkC,QAA0B;AACpE,WAAQ,OAAoB,QAAQ,CAAC;AAAA,EACtC;AAAA,EAES,qCAAqC,QAA0B;AACvE,WAAO,eAAgB,OAAoB,OAAO;AAAA,EACnD;AAAA,EAEA,MAAe,YACd,aACA,QACa;AACb,UAAM,KAAK,IAAI,cAAc,SAAS,KAAK,SAAS,MAAM,KAAK,MAAM;AACrE,UAAM,KAAK,IAAI,eAAI,IAAI,QAAQ,QAAQ,WAAW,MAAM,OAAO,WAAW,EAAE,EAAE,CAAC;AAC/E,QAAI;AACH,YAAM,SAAS,MAAM,YAAY,EAAE;AACnC,YAAM,KAAK,IAAI,sBAAW;AAC1B,aAAO;AAAA,IACR,SAAS,KAAK;AACb,YAAM,KAAK,IAAI,wBAAa;AAC5B,YAAM;AAAA,IACP;AAAA,EACD;AACD;AAEO,MAAM,sBAGH,qCAA2D;AAAA,EACpE,QAA0B,wBAAU,IAAY;AAAA,EAEhD,MAAe,YAAe,aAAkF;AAC/G,UAAM,gBAAgB,KAAK,KAAK,WAAW;AAC3C,UAAM,KAAK,IAAI,cAAc,SAAS,KAAK,SAAS,KAAK,SAAS,KAAK,QAAQ,KAAK,cAAc,CAAC;AACnG,UAAM,KAAK,QAAQ,IAAI,eAAI,IAAI,aAAa,aAAa,EAAE,CAAC;AAC5D,QAAI;AACH,YAAM,SAAS,MAAM,YAAY,EAAE;AACnC,YAAM,KAAK,QAAQ,IAAI,eAAI,IAAI,qBAAqB,aAAa,EAAE,CAAC;AACpE,aAAO;AAAA,IACR,SAAS,KAAK;AACb,YAAM,KAAK,QAAQ,IAAI,eAAI,IAAI,yBAAyB,aAAa,EAAE,CAAC;AACxE,YAAM;AAAA,IACP;AAAA,EACD;AACD;AAQA,SAAS,eAAe,SAAc;AACrC,QAAM,OAAoB,CAAC;AAC3B,aAAW,OAAO,SAAS;AAC1B,UAAM,QAAQ,OAAO,KAAK,GAAG,EAAE,IAAI,CAAC,MAAM,IAAI,CAAC,CAAC;AAChD,SAAK,KAAK,KAAK;AAAA,EAChB;AACA,SAAO;AACR;AAEO,MAAM,wBAA6E,mCAExF;AAAA,EAYD,YACC,MACA,OACQ,QACR,OACA,eAIA,aACA,QACA,eACQ,wBACR,oBACC;AACD,UAAM,SAAS,eAAe,OAAO,OAAO,eAAe,WAAW;AAZ9D;AASA;AAIR,SAAK,qBAAqB;AAC1B,SAAK,SAAS;AACd,SAAK,OAAO;AAAA,EACb;AAAA,EA9BA,QAA0B,wBAAU,IAAY;AAAA;AAAA,EAGhD;AAAA;AAAA,EAGA;AAAA;AAAA,EAGA;AAAA,EAuBA,MAAM,IAAI,mBAAkE;AAC3E,UAAM,aAAS,6BAAiB,KAAK,MAAM,QAAQ,qBAAqB,CAAC,CAAC;AAC1E,SAAK,OAAO,SAAS,KAAK,MAAM,KAAK,MAAM;AAC3C,WAAO,MAAM,KAAK,eAAe,KAAK,MAAM,KAAK,QAAQ,YAAY;AACpE,aAAO,KAAK,KAAK,KAAK,GAAG,MAAM,EAAE,IAAI;AAAA,IACtC,CAAC;AAAA,EACF;AAAA,EAEA,MAAM,IAAI,mBAAgE;AACzE,UAAM,EAAE,QAAQ,OAAO,QAAQ,MAAM,mBAAmB,IAAI;AAC5D,QAAI,CAAC,UAAU,CAAC,oBAAoB;AACnC,YAAM,aAAS,6BAAiB,MAAM,QAAQ,qBAAqB,CAAC,CAAC;AACrE,aAAO,SAAS,MAAM,KAAK,MAAM;AACjC,aAAO,MAAM,KAAK,eAAe,MAAM,KAAK,QAAQ,YAAY;AAC/D,eAAO,KAAK,KAAK,GAAG,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,EAAE,QAAQ,MAAM,KAAK,aAAa,OAAQ,CAAC;AAAA,MACpF,CAAC;AAAA,IACF;AAEA,UAAM,OAAO,MAAM,KAAK,OAAO,iBAAiB;AAEhD,WAAO,KAAK,aAAa,IAAI;AAAA,EAC9B;AAAA,EAES,aAAa,MAAe,aAAgC;AACpE,QAAI,aAAa;AAChB,aAAO,eAAgB,KAAkB,OAAO;AAAA,IACjD;AAEA,QAAI,CAAC,KAAK,UAAU,CAAC,KAAK,oBAAoB;AAC7C,aAAO;AAAA,IACR;AAEA,QAAI,KAAK,oBAAoB;AAC5B,aAAO,KAAK,mBAAmB,IAAmB;AAAA,IACnD;AAEA,WAAQ,KAAqB,IAAI,CAAC,YAAQ,2BAAa,KAAK,QAAS,KAAK,KAAK,mBAAmB,CAAC;AAAA,EACpG;AAAA,EAEA,MAAM,IAAI,mBAAgE;AACzE,UAAM,EAAE,QAAQ,qBAAqB,OAAO,QAAQ,MAAM,mBAAmB,IAAI;AACjF,QAAI,CAAC,UAAU,CAAC,oBAAoB;AACnC,YAAM,aAAS,6BAAiB,MAAM,QAAQ,qBAAqB,CAAC,CAAC;AACrE,aAAO,SAAS,MAAM,KAAK,MAAM;AACjC,aAAO,MAAM,KAAK,eAAe,MAAM,KAAK,QAAQ,YAAY;AAC/D,eAAO,KAAK,KAAK,GAAG,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,EAAE,QAAQ,MAAM,QAAS,CAAC,CAAC;AAAA,MACpE,CAAC;AAAA,IACF;AAEA,UAAM,OAAO,MAAM,KAAK,OAAO,iBAAiB;AAEhD,QAAI,CAAC,KAAK,CAAC,GAAG;AACb,aAAO;AAAA,IACR;AAEA,QAAI,oBAAoB;AACvB,aAAO,mBAAmB,IAAI;AAAA,IAC/B;AAEA,eAAO,2BAAa,QAAS,KAAK,CAAC,GAAG,mBAAmB;AAAA,EAC1D;AAAA,EAES,aAAa,QAAiB,aAAgC;AACtE,QAAI,aAAa;AAChB,eAAS,eAAgB,OAAoB,OAAO,EAAE,CAAC;AAAA,IACxD;AAEA,QAAI,CAAC,KAAK,UAAU,CAAC,KAAK,oBAAoB;AAC7C,aAAO;AAAA,IACR;AAEA,QAAI,KAAK,oBAAoB;AAC5B,aAAO,KAAK,mBAAmB,CAAC,MAAmB,CAAC;AAAA,IACrD;AAEA,eAAO,2BAAa,KAAK,QAAS,QAAqB,KAAK,mBAAmB;AAAA,EAChF;AAAA,EAEA,MAAM,OAAoC,mBAA2D;AACpG,UAAM,aAAS,6BAAiB,KAAK,MAAM,QAAQ,qBAAqB,CAAC,CAAC;AAC1E,SAAK,OAAO,SAAS,KAAK,MAAM,KAAK,MAAM;AAC3C,WAAO,MAAM,KAAK,eAAe,KAAK,MAAM,KAAK,QAAQ,YAAY;AACpE,aAAO,KAAK,KAAK,KAAK,GAAG,MAAM,EAAE,IAAI;AAAA,IACtC,CAAC;AAAA,EACF;AAAA;AAAA,EAGA,wBAAiC;AAChC,WAAO,KAAK;AAAA,EACb;AACD;","names":["builtQuery"]}
+{"version":3,"file":"session.cjs","names":["SQLiteAsyncSession","entityKind","NoopLogger","NoopCache","DrizzleQueryError","sql","SQLiteAsyncTransaction","SQLiteAsyncPreparedQuery"],"sources":["../../src/d1/session.ts"],"sourcesContent":["/// <reference types=\"@cloudflare/workers-types\" />\n\nimport type { BatchItem } from '~/batch.ts';\nimport { type Cache, NoopCache } from '~/cache/core/index.ts';\nimport type { WithCacheConfig } from '~/cache/core/types.ts';\nimport { entityKind } from '~/entity.ts';\nimport { DrizzleQueryError } from '~/errors.ts';\nimport type { Logger } from '~/logger.ts';\nimport { NoopLogger } from '~/logger.ts';\nimport type { AnyRelations } from '~/relations.ts';\nimport { type Query, sql } from '~/sql/sql.ts';\nimport {\n\tSQLiteAsyncPreparedQuery,\n\ttype SQLiteAsyncPreparedQueryConfig as PreparedQueryConfigBase,\n\tSQLiteAsyncSession,\n\tSQLiteAsyncTransaction,\n\ttype SQLiteQueryExecutors,\n} from '~/sqlite-core/async/session.ts';\nimport type { SQLiteDialect } from '~/sqlite-core/dialect.ts';\nimport type { SelectedFieldsOrdered } from '~/sqlite-core/query-builders/select.types.ts';\nimport type { SQLiteExecuteMethod, SQLiteTransactionConfig } from '~/sqlite-core/session.ts';\n\nexport interface SQLiteD1SessionOptions {\n\tlogger?: Logger;\n\tcache?: Cache;\n}\n\nexport type D1RunResult = D1Result;\n\ntype PreparedQueryConfig = Omit<PreparedQueryConfigBase, 'statement' | 'run'>;\n\nexport class SQLiteD1Session<TRelations extends AnyRelations>\n\textends SQLiteAsyncSession<'async', D1RunResult, TRelations>\n{\n\tstatic override readonly [entityKind]: string = 'SQLiteD1Session';\n\n\tprivate logger: Logger;\n\tprivate cache: Cache;\n\n\tconstructor(\n\t\tprivate client: D1Database | D1DatabaseSession,\n\t\tdialect: SQLiteDialect,\n\t\tprivate relations: TRelations,\n\t\tprivate options: SQLiteD1SessionOptions = {},\n\t) {\n\t\tsuper(dialect, 'async');\n\t\tthis.logger = options.logger ?? new NoopLogger();\n\t\tthis.cache = options.cache ?? new NoopCache();\n\t}\n\n\tprepareQuery(\n\t\tquery: Query,\n\t\tmode: 'arrays' | 'objects' | 'raw',\n\t\t_prepare: boolean,\n\t\texecuteMethod?: SQLiteExecuteMethod,\n\t\tmapper?: (rows: any[]) => any,\n\t\tqueryMetadata?: {\n\t\t\ttype: 'select' | 'update' | 'delete' | 'insert';\n\t\t\ttables: string[];\n\t\t},\n\t\tcacheConfig?: WithCacheConfig,\n\t): D1PreparedQuery {\n\t\tlet stmt: D1PreparedStatement;\n\t\ttry {\n\t\t\tstmt = this.client.prepare(query.sql);\n\t\t} catch (e) {\n\t\t\tthrow new DrizzleQueryError(query.sql, query.params, e as Error);\n\t\t}\n\t\tconst executors: SQLiteQueryExecutors<'async'> = {\n\t\t\tall: (params) => {\n\t\t\t\tif (mode === 'arrays') return stmt.bind(...params).raw();\n\t\t\t\treturn stmt.bind(...params).all().then(({ results }) => results);\n\t\t\t},\n\t\t\tget: (params) => {\n\t\t\t\tif (mode === 'arrays') return stmt.bind(...params).raw().then((rows) => rows[0]);\n\t\t\t\treturn stmt.bind(...params).first();\n\t\t\t},\n\t\t\trun: (params) => {\n\t\t\t\treturn stmt.bind(...params).run();\n\t\t\t},\n\t\t\tvalues: (params) => {\n\t\t\t\treturn stmt.bind(...params).raw();\n\t\t\t},\n\t\t};\n\t\treturn new D1PreparedQuery(\n\t\t\tstmt,\n\t\t\t'async',\n\t\t\texecuteMethod,\n\t\t\texecutors,\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\tasync batch<T extends BatchItem<'sqlite'>[] | readonly BatchItem<'sqlite'>[]>(queries: T) {\n\t\tconst preparedQueries: SQLiteAsyncPreparedQuery<any>[] = [];\n\t\tconst builtQueries: D1PreparedStatement[] = [];\n\n\t\tfor (const query of queries) {\n\t\t\tconst preparedQuery = query._prepare() as D1PreparedQuery<any>;\n\t\t\tconst builtQuery = preparedQuery.getQuery();\n\t\t\tpreparedQueries.push(preparedQuery);\n\t\t\tif (builtQuery.params.length > 0) {\n\t\t\t\tbuiltQueries.push((preparedQuery as D1PreparedQuery<any>).stmt.bind(...builtQuery.params));\n\t\t\t} else {\n\t\t\t\tconst builtQuery = preparedQuery.getQuery();\n\t\t\t\tbuiltQueries.push(\n\t\t\t\t\tthis.client.prepare(builtQuery.sql).bind(...builtQuery.params),\n\t\t\t\t);\n\t\t\t}\n\t\t}\n\n\t\tconst batchResults = await this.client.batch<any>(builtQueries);\n\t\treturn batchResults.map((result, i) => {\n\t\t\tconst { executeMethod, mapper, mode } = preparedQueries[i]!;\n\n\t\t\tif (executeMethod === 'run') return result;\n\n\t\t\tlet values: any = result.results;\n\t\t\tif (executeMethod === 'values') return d1ToRawMapping(values);\n\t\t\tif (executeMethod === 'get') {\n\t\t\t\tif (!values[0]) return;\n\n\t\t\t\tif (!mapper) return mode === 'arrays' ? d1ToRawMapping([values[0]])[0] : values[0];\n\n\t\t\t\treturn mapper(mode === 'arrays' ? d1ToRawMapping([values[0]]) : [values[0]])[0];\n\t\t\t}\n\n\t\t\tvalues = mode === 'arrays' ? d1ToRawMapping(values) : values;\n\t\t\tif (!mapper) return values;\n\n\t\t\treturn mapper(values);\n\t\t});\n\t}\n\n\toverride async transaction<T>(\n\t\ttransaction: (tx: D1Transaction<TRelations>) => T | Promise<T>,\n\t\tconfig?: SQLiteTransactionConfig,\n\t): Promise<T> {\n\t\tconst tx = new D1Transaction('async', this.dialect, this, this.relations, undefined, true);\n\t\tawait this.run(sql.raw(`begin${config?.behavior ? ' ' + config.behavior : ''}`));\n\t\ttry {\n\t\t\tconst result = await transaction(tx);\n\t\t\tawait this.run(sql`commit`);\n\t\t\treturn result;\n\t\t} catch (err) {\n\t\t\tawait this.run(sql`rollback`);\n\t\t\tthrow err;\n\t\t}\n\t}\n}\n\nexport class D1Transaction<TRelations extends AnyRelations>\n\textends SQLiteAsyncTransaction<'async', D1RunResult, TRelations>\n{\n\tstatic override readonly [entityKind]: string = 'D1Transaction';\n\n\toverride async transaction<T>(\n\t\ttransaction: (tx: D1Transaction<TRelations>) => Promise<T>,\n\t): Promise<T> {\n\t\tconst savepointName = `sp${this.nestedIndex}`;\n\t\tconst tx = new D1Transaction(\n\t\t\t'async',\n\t\t\tthis.dialect,\n\t\t\tthis.session,\n\t\t\tthis._.relations,\n\t\t\tthis.nestedIndex + 1,\n\t\t\tthis.forbidJsonb,\n\t\t);\n\t\tawait this.session.run(sql.raw(`savepoint ${savepointName}`));\n\t\ttry {\n\t\t\tconst result = await transaction(tx);\n\t\t\tawait this.session.run(sql.raw(`release savepoint ${savepointName}`));\n\t\t\treturn result;\n\t\t} catch (err) {\n\t\t\tawait this.session.run(sql.raw(`rollback to savepoint ${savepointName}`));\n\t\t\tthrow err;\n\t\t}\n\t}\n}\n\n/**\n * This function was taken from the D1 implementation: https://github.com/cloudflare/workerd/blob/4aae9f4c7ae30a59a88ca868c4aff88bda85c956/src/cloudflare/internal/d1-api.ts#L287\n * It may cause issues with duplicated column names in join queries, which should be fixed on the D1 side.\n * @param results\n * @returns\n */\nfunction d1ToRawMapping(results: any) {\n\tconst rows: unknown[][] = [];\n\tfor (const row of results) {\n\t\tconst entry = Object.keys(row).map((k) => row[k]);\n\t\trows.push(entry);\n\t}\n\treturn rows;\n}\n\nexport class D1PreparedQuery<T extends PreparedQueryConfig = PreparedQueryConfig> extends SQLiteAsyncPreparedQuery<\n\t{ type: 'async'; run: D1Response; all: T['all']; get: T['get']; values: T['values']; execute: T['execute'] }\n> {\n\tstatic override readonly [entityKind]: string = 'D1PreparedQuery';\n\n\t/** @internal */\n\tfields?: SelectedFieldsOrdered;\n\n\t/** @internal */\n\treadonly stmt: D1PreparedStatement;\n\n\tconstructor(\n\t\tstmt: D1PreparedStatement,\n\t\tresultKind: 'sync' | 'async',\n\t\texecuteMethod: SQLiteExecuteMethod = 'all',\n\t\texecutors: SQLiteQueryExecutors<'async'>,\n\t\tquery: Query,\n\t\tmapper: ((rows: any[]) => any) | undefined,\n\t\tmode: 'arrays' | 'objects' | 'raw',\n\t\tlogger: Logger,\n\t\tcache: Cache | undefined,\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) {\n\t\tsuper(\n\t\t\tresultKind,\n\t\t\texecuteMethod,\n\t\t\texecutors,\n\t\t\tquery,\n\t\t\tmapper,\n\t\t\tmode,\n\t\t\tlogger,\n\t\t\tcache,\n\t\t\tqueryMetadata,\n\t\t\tcacheConfig,\n\t\t);\n\n\t\tthis.stmt = stmt;\n\t}\n}\n"],"mappings":"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"}

package/d1/session.d.cts

@@ -1,62 +1,54 @@
-import type { BatchItem } from "../batch.cjs";
-import { type Cache } from "../cache/core/index.cjs";
-import type { WithCacheConfig } from "../cache/core/types.cjs";
 import { entityKind } from "../entity.cjs";
-import type { Logger } from "../logger.cjs";
-import type { RelationalSchemaConfig, TablesRelationalConfig } from "../relations.cjs";
-import { type Query } from "../sql/sql.cjs";
-import type { SQLiteAsyncDialect } from "../sqlite-core/dialect.cjs";
-import { SQLiteTransaction } from "../sqlite-core/index.cjs";
-import type { SelectedFieldsOrdered } from "../sqlite-core/query-builders/select.types.cjs";
-import type { PreparedQueryConfig as PreparedQueryConfigBase, SQLiteExecuteMethod, SQLiteTransactionConfig } from "../sqlite-core/session.cjs";
-import { SQLitePreparedQuery, SQLiteSession } from "../sqlite-core/session.cjs";
-export interface SQLiteD1SessionOptions {
-    logger?: Logger;
-    cache?: Cache;
+import { Query } from "../sql/sql.cjs";
+import { AnyRelations } from "../relations.cjs";
+import { WithCacheConfig } from "../cache/core/types.cjs";
+import { Logger } from "../logger.cjs";
+import { SQLiteDialect } from "../sqlite-core/dialect.cjs";
+import { SQLiteExecuteMethod, SQLiteTransactionConfig } from "../sqlite-core/session.cjs";
+import { SQLiteAsyncPreparedQuery, SQLiteAsyncPreparedQueryConfig, SQLiteAsyncSession, SQLiteAsyncTransaction, SQLiteQueryExecutors } from "../sqlite-core/async/session.cjs";
+import { Cache } from "../cache/core/index.cjs";
+import { BatchItem } from "../batch.cjs";
+
+//#region src/d1/session.d.ts
+interface SQLiteD1SessionOptions {
+  logger?: Logger;
+  cache?: Cache;
 }
-type PreparedQueryConfig = Omit<PreparedQueryConfigBase, 'statement' | 'run'>;
-export declare class SQLiteD1Session<TFullSchema extends Record<string, unknown>, TSchema extends TablesRelationalConfig> extends SQLiteSession<'async', D1Result, TFullSchema, TSchema> {
-    private client;
-    private schema;
-    private options;
-    static readonly [entityKind]: string;
-    private logger;
-    private cache;
-    constructor(client: D1Database, dialect: SQLiteAsyncDialect, schema: RelationalSchemaConfig<TSchema> | undefined, options?: SQLiteD1SessionOptions);
-    prepareQuery(query: Query, fields: SelectedFieldsOrdered | undefined, executeMethod: SQLiteExecuteMethod, isResponseInArrayMode: boolean, customResultMapper?: (rows: unknown[][]) => unknown, queryMetadata?: {
-        type: 'select' | 'update' | 'delete' | 'insert';
-        tables: string[];
-    }, cacheConfig?: WithCacheConfig): D1PreparedQuery;
-    batch<T extends BatchItem<'sqlite'>[] | readonly BatchItem<'sqlite'>[]>(queries: T): Promise<unknown[]>;
-    extractRawAllValueFromBatchResult(result: unknown): unknown;
-    extractRawGetValueFromBatchResult(result: unknown): unknown;
-    extractRawValuesValueFromBatchResult(result: unknown): unknown;
-    transaction<T>(transaction: (tx: D1Transaction<TFullSchema, TSchema>) => T | Promise<T>, config?: SQLiteTransactionConfig): Promise<T>;
+type D1RunResult = D1Result;
+type PreparedQueryConfig$1 = Omit<SQLiteAsyncPreparedQueryConfig, 'statement' | 'run'>;
+declare class SQLiteD1Session<TRelations extends AnyRelations> extends SQLiteAsyncSession<'async', D1RunResult, TRelations> {
+  private client;
+  private relations;
+  private options;
+  static readonly [entityKind]: string;
+  private logger;
+  private cache;
+  constructor(client: D1Database | D1DatabaseSession, dialect: SQLiteDialect, relations: TRelations, options?: SQLiteD1SessionOptions);
+  prepareQuery(query: Query, mode: 'arrays' | 'objects' | 'raw', _prepare: boolean, executeMethod?: SQLiteExecuteMethod, mapper?: (rows: any[]) => any, queryMetadata?: {
+    type: 'select' | 'update' | 'delete' | 'insert';
+    tables: string[];
+  }, cacheConfig?: WithCacheConfig): D1PreparedQuery;
+  batch<T extends BatchItem<'sqlite'>[] | readonly BatchItem<'sqlite'>[]>(queries: T): Promise<any[]>;
+  transaction<T>(transaction: (tx: D1Transaction<TRelations>) => T | Promise<T>, config?: SQLiteTransactionConfig): Promise<T>;
 }
-export declare class D1Transaction<TFullSchema extends Record<string, unknown>, TSchema extends TablesRelationalConfig> extends SQLiteTransaction<'async', D1Result, TFullSchema, TSchema> {
-    static readonly [entityKind]: string;
-    transaction<T>(transaction: (tx: D1Transaction<TFullSchema, TSchema>) => Promise<T>): Promise<T>;
+declare class D1Transaction<TRelations extends AnyRelations> extends SQLiteAsyncTransaction<'async', D1RunResult, TRelations> {
+  static readonly [entityKind]: string;
+  transaction<T>(transaction: (tx: D1Transaction<TRelations>) => Promise<T>): Promise<T>;
 }
-export declare class D1PreparedQuery<T extends PreparedQueryConfig = PreparedQueryConfig> extends SQLitePreparedQuery<{
-    type: 'async';
-    run: D1Response;
-    all: T['all'];
-    get: T['get'];
-    values: T['values'];
-    execute: T['execute'];
+declare class D1PreparedQuery<T extends PreparedQueryConfig$1 = PreparedQueryConfig$1> extends SQLiteAsyncPreparedQuery<{
+  type: 'async';
+  run: D1Response;
+  all: T['all'];
+  get: T['get'];
+  values: T['values'];
+  execute: T['execute'];
 }> {
-    private logger;
-    private _isResponseInArrayMode;
-    static readonly [entityKind]: string;
-    constructor(stmt: D1PreparedStatement, query: Query, logger: Logger, cache: Cache, queryMetadata: {
-        type: 'select' | 'update' | 'delete' | 'insert';
-        tables: string[];
-    } | undefined, cacheConfig: WithCacheConfig | undefined, fields: SelectedFieldsOrdered | undefined, executeMethod: SQLiteExecuteMethod, _isResponseInArrayMode: boolean, customResultMapper?: (rows: unknown[][]) => unknown);
-    run(placeholderValues?: Record<string, unknown>): Promise<D1Response>;
-    all(placeholderValues?: Record<string, unknown>): Promise<T['all']>;
-    mapAllResult(rows: unknown, isFromBatch?: boolean): unknown;
-    get(placeholderValues?: Record<string, unknown>): Promise<T['get']>;
-    mapGetResult(result: unknown, isFromBatch?: boolean): unknown;
-    values<T extends any[] = unknown[]>(placeholderValues?: Record<string, unknown>): Promise<T[]>;
+  static readonly [entityKind]: string;
+  constructor(stmt: D1PreparedStatement, resultKind: 'sync' | 'async', executeMethod: SQLiteExecuteMethod | undefined, executors: SQLiteQueryExecutors<'async'>, query: Query, mapper: ((rows: any[]) => any) | undefined, mode: 'arrays' | 'objects' | 'raw', logger: Logger, cache: Cache | undefined, queryMetadata: {
+    type: 'select' | 'update' | 'delete' | 'insert';
+    tables: string[];
+  } | undefined, cacheConfig: WithCacheConfig | undefined);
 }
-export {};
+//#endregion
+export { D1PreparedQuery, D1RunResult, D1Transaction, SQLiteD1Session, SQLiteD1SessionOptions };
+//# sourceMappingURL=session.d.cts.map