orchid-orm 1.78.3 → 1.78.5

package/dist/index.mjs

@@ -1,5 +1,5 @@
-import { DynamicRawSQL, QueryHooks, RawSql, VirtualColumn, _appendQuery, _appendQueryOnUpsertCreate, _clone, _createDbSqlMethod, _hookSelectColumns, _initQueryBuilder, _onUpsertUpdate, _orCreate, _prependWith, _prependWithOnUpsertCreate, _queryCreate, _queryCreateMany, _queryCreateManyFrom, _queryDefaults, _queryDelete, _queryFindBy, _queryFindByOptional, _queryHookAfterCreate, _queryHookAfterUpdate, _queryInsert, _queryInsertForEachFrom, _queryInsertMany, _queryInsertManyFrom, _queryJoinOn, _querySelect, _queryTake, _queryTakeOptional, _queryUpdate, _queryUpdateOrThrow, _queryUpsert, _queryWhere, _queryWhereExists, _queryWhereIn, applyMixins, cloneQueryBaseUnscoped, defaultSchemaConfig, emptyArray, emptyObject, getCallerFilePath, getClonedQueryData, getColumnTypes, getForeignKeyTableInstance, getFreeAlias, getPrimaryKeys, getQueryAs, getShapeFromSelect, getStackTrace, internalSchemaConfig, isExpression, isQueryReturnsAll, makeColumnTypes, noop, objectHasValues, parseTableData, parseTableDataInput, prepareSubQueryForSql, pushQueryOnForOuter, setQueryObjectValueImmutable, tableDataMethods, toArray, toSnakeCase } from "pqb/internal";
-import { Db, NotFoundError, OrchidOrmInternalError } from "pqb";
+import { DynamicRawSQL, QueryHooks, RawSql, ValExpression, VirtualColumn, _appendQuery, _appendQueryOnUpsertCreate, _clone, _createDbSqlMethod, _hookSelectColumns, _initQueryBuilder, _onUpsertUpdate, _orCreate, _prependWith, _prependWithOnUpsertCreate, _queryCreate, _queryCreateMany, _queryCreateManyFrom, _queryDefaults, _queryDelete, _queryFindBy, _queryFindByOptional, _queryHookAfterCreate, _queryHookAfterUpdate, _queryInsert, _queryInsertForEachFrom, _queryInsertMany, _queryInsertManyFrom, _queryJoinOn, _querySelect, _queryTake, _queryTakeOptional, _queryUpdate, _queryUpdateOrThrow, _queryUpsert, _queryWhere, _queryWhereExists, _queryWhereIn, applyMixins, cloneQueryBaseUnscoped, defaultSchemaConfig, emptyArray, emptyObject, getCallerFilePath, getClonedQueryData, getColumnTypes, getForeignKeyTableInstance, getFreeAlias, getPrimaryKeys, getQueryAs, getShapeFromSelect, getStackTrace, internalSchemaConfig, isExpression, isQueryReturnsAll, makeColumnTypes, noop, objectHasValues, parseTableData, parseTableDataInput, prepareSubQueryForSql, pushQueryOnForOuter, setQueryObjectValueImmutable, tableDataMethods, toArray, toSnakeCase } from "pqb/internal";
+import { Db, Expression, NotFoundError, OrchidOrmInternalError } from "pqb";
 import { AsyncLocalStorage } from "node:async_hooks";
 export * from "pqb";
 function createBaseTable({ schemaConfig = defaultSchemaConfig, columnTypes: columnTypesArg, snakeCase, filePath: filePathArg, nowSQL, exportAs = "BaseTable", language, autoForeignKeys } = {}) {
@@ -2616,6 +2616,81 @@ function isInTransaction() {
 function afterCommit(hook) {
 	this.$qb.afterCommit(hook);
 }
+const ormSelect = (qb) => (async (selection) => {
+	const q = qb.select(selection);
+	const [{ selectAs }] = q.q.select;
+	const values = Object.entries(selectAs);
+	if (values.every(([, val]) => val instanceof ValExpression)) return Object.fromEntries(values.map(([key, expr]) => [key, expr.value]));
+	const valExpressions = {};
+	for (const [key, value] of values) if (value instanceof ValExpression) {
+		valExpressions[key] = value.value;
+		delete selectAs[key];
+	}
+	const result = await q.take();
+	return Object.assign(result, valExpressions);
+});
+var PreparedParamExpression = class extends Expression {
+	constructor(key) {
+		super();
+		this.key = key;
+		this.result = { value: emptyObject };
+		this.q = { expr: this };
+	}
+	makeSQL(ctx) {
+		ctx.values.push(this);
+		return `$${ctx.values.length}`;
+	}
+};
+const prepareSqlItem = (sql, params) => {
+	const values = sql.values?.map((value) => {
+		return value instanceof PreparedParamExpression ? params[value.key] : value;
+	});
+	return {
+		...sql,
+		values,
+		prepare: true
+	};
+};
+const prepareSql = (sql, params) => {
+	if ("text" in sql) return prepareSqlItem(sql, params);
+	return {
+		...sql,
+		batch: sql.batch.map((item) => prepareSqlItem(item, params))
+	};
+};
+const createPreparedParams = () => {
+	return new Proxy(Object.create(null), { get(expressions, key) {
+		if (typeof key !== "string") return;
+		let expression = expressions[key];
+		if (!expression) {
+			expression = new PreparedParamExpression(key);
+			expressions[key] = expression;
+		}
+		return expression;
+	} });
+};
+const ormPrepare = () => {
+	return ((callback) => {
+		const query = callback(createPreparedParams());
+		const emptyParams = {};
+		let prepared;
+		return (params) => {
+			let cached;
+			if (prepared) cached = prepared;
+			else {
+				const sql = query.toSQL(true);
+				cached = {
+					query: Object.create(query),
+					sql
+				};
+				prepared = cached;
+			}
+			const executionQuery = Object.create(cached.query);
+			Object.defineProperty(executionQuery, "toSQL", { value: () => prepareSql(cached.sql, params ?? emptyParams) });
+			return executionQuery.then();
+		};
+	});
+};
 /**
 * Identity helper for table row-level security configuration.
 */
@@ -2765,7 +2840,8 @@ const privateOrchidORMWithAdapter = ({ log, logger, autoPreparedStatements, noPr
 		$withRecursive: qb.withRecursive.bind(qb),
 		$withSql: qb.withSql.bind(qb),
 		$from: qb.from.bind(qb),
-		$select: ((selection) => qb.select(selection).take()),
+		$select: ormSelect(qb),
+		$prepare: ormPrepare(),
 		$close: adapter.close.bind(adapter),
 		$withOptions: qb.withOptions.bind(qb)
 	};