pqb 0.67.3 → 0.67.4

package/dist/index.mjs

@@ -748,6 +748,15 @@ var Column = class {
 		return setColumnData(this, "explicitSelect", !value);
 	}
 	/**
+	* Set SQL to use when selecting this column.
+	*
+	* The column remains a regular writable database column. Create, update,
+	* filters, ordering, grouping, and migrations still use the physical column.
+	*/
+	selectSql(fn) {
+		return setColumnData(this, "selectSqlFn", fn);
+	}
+	/**
 	* Forbid the column to be used in [create](/guide/create-update-delete.html#create-insert) and [update](/guide/create-update-delete.html#update) methods.
 	*
 	* `readOnly` column is still can be set from a [hook](http://localhost:5173/guide/hooks.html#set-values-before-create-or-update).
@@ -3969,6 +3978,7 @@ const applyComputedColumns = (q, fn) => {
 			q.shape[key] = col;
 			const { data } = col;
 			data.computed = item;
+			data.selectSql = item;
 			data.explicitSelect = true;
 			data.readOnly = true;
 			const parse = col._parse;
@@ -6504,6 +6514,15 @@ const columnToSql = (ctx, data, shape, column, quotedAs, select) => {
 	if (index !== -1) return columnWithDotToSql(ctx, data, shape, column, index, quotedAs, select);
 	return simpleColumnToSQL(ctx, column, shape[column], quotedAs);
 };
+const selectedColumnToSql = (ctx, data, shape, column, quotedAs) => {
+	const index = column.indexOf(".");
+	return index !== -1 ? selectedColumnWithDotToSql(ctx, data, shape, column, index, quotedAs) : selectedSimpleColumnToSql(ctx, column, shape[column], quotedAs);
+};
+const selectedSimpleColumnToSql = (ctx, key, column, quotedAs) => {
+	if (!column) return `"${key}"`;
+	const { data } = column;
+	return data.selectSql ? `(${data.selectSql.toSQL(ctx, quotedAs)})` : `${quotedAs ? `${quotedAs}.` : ""}"${data.name || key}"`;
+};
 /**
 * in a case when ordering or grouping by a column which was selected as expression:
 * ```ts
@@ -6529,7 +6548,7 @@ const columnWithDotToSql = (ctx, data, shape, column, index, quotedAs, select) =
 	const key = column.slice(index + 1);
 	if (key === "*") {
 		const shape = data.joinedShapes?.[table];
-		return shape ? select ? makeRowToJson(table, shape, true) : `"${table}".*` : column;
+		return shape ? select ? makeRowToJson(ctx, table, shape, true) : `"${table}".*` : column;
 	}
 	const tableName = _getQueryAliasOrName(data, table);
 	const quoted = `"${table}"`;
@@ -6541,6 +6560,22 @@ const columnWithDotToSql = (ctx, data, shape, column, index, quotedAs, select) =
 	}
 	return `"${tableName}"."${key}"`;
 };
+const selectedColumnWithDotToSql = (ctx, data, shape, column, index, quotedAs) => {
+	const table = column.slice(0, index);
+	const key = column.slice(index + 1);
+	if (key === "*") {
+		const shape = data.joinedShapes?.[table];
+		return shape ? makeRowToJson(ctx, table, shape, true) : column;
+	}
+	const tableName = _getQueryAliasOrName(data, table);
+	const quoted = `"${table}"`;
+	const col = quoted === quotedAs ? shape[key] : data.joinedShapes?.[tableName]?.[key];
+	if (col) {
+		if (col.data.selectSql) return `(${col.data.selectSql.toSQL(ctx, quoted)})`;
+		if (col.data.name) return `"${tableName}"."${col.data.name}"`;
+	}
+	return `"${tableName}"."${key}"`;
+};
 const columnToSqlWithAs = (ctx, data, column, as, quotedAs, select, jsonList) => {
 	const index = column.indexOf(".");
 	return index !== -1 ? tableColumnToSqlWithAs(ctx, data, column, column.slice(0, index), column.slice(index + 1), as, quotedAs, select, jsonList) : ownColumnToSqlWithAs(ctx, data, column, as, quotedAs, select, jsonList);
@@ -6550,7 +6585,7 @@ const tableColumnToSqlWithAs = (ctx, data, column, table, key, as, quotedAs, sel
 		if (jsonList) jsonList[as] = void 0;
 		const shape = data.joinedShapes?.[table];
 		if (shape) {
-			if (select) return makeRowToJson(table, shape, true) + ` "${as}"`;
+			if (select) return makeRowToJson(ctx, table, shape, true) + ` "${as}"`;
 			return `"${table}"."${table}" "${as}"`;
 		}
 		return column;
@@ -6558,10 +6593,10 @@ const tableColumnToSqlWithAs = (ctx, data, column, table, key, as, quotedAs, sel
 	const tableName = _getQueryAliasOrName(data, table);
 	const quoted = `"${table}"`;
 	const col = quoted === quotedAs ? data.shape[key] : data.joinedShapes?.[tableName][key];
-	if (jsonList) jsonList[as] = col;
+	if (jsonList) jsonList[as] = col && getSelectedColumnData(col);
 	if (col) {
+		if (col.data.selectSql) return `(${col.data.selectSql.toSQL(ctx, quoted)}) "${as}"`;
 		if (col.data.name && col.data.name !== key) return `"${tableName}"."${col.data.name}" "${as}"`;
-		if (col.data.computed) return `(${col.data.computed.toSQL(ctx, quoted)}) "${as}"`;
 	}
 	return `"${tableName}"."${key}"${key === as ? "" : ` "${as}"`}`;
 };
@@ -6571,10 +6606,10 @@ const ownColumnToSqlWithAs = (ctx, data, column, as, quotedAs, select, jsonList)
 		return `"${column}"."${column}" "${as}"`;
 	}
 	const col = data.shape[column];
-	if (jsonList) jsonList[as] = col;
+	if (jsonList) jsonList[as] = col && getSelectedColumnData(col);
 	if (col) {
+		if (col.data.selectSql) return `(${col.data.selectSql.toSQL(ctx, quotedAs)}) "${as}"`;
 		if (col.data.name && col.data.name !== column) return `${quotedAs ? `${quotedAs}.` : ""}"${col.data.name}"${col.data.name === as ? "" : ` "${as}"`}`;
-		if (col.data.computed) return `(${col.data.computed.toSQL(ctx, quotedAs)}) "${as}"`;
 	}
 	return `${quotedAs ? `${quotedAs}.` : ""}"${column}"${column === as ? "" : ` "${as}"`}`;
 };
@@ -6730,7 +6765,7 @@ var SelectItemExpression = class extends Expression {
 	}
 	makeSQL(ctx, quotedAs) {
 		const q = this.q;
-		return typeof this.item === "string" ? this.item === "*" ? selectAllSql(q, quotedAs).join(", ") : columnToSql(ctx, q, q.shape, this.item, quotedAs, true) : this.item.toSQL(ctx, quotedAs);
+		return typeof this.item === "string" ? this.item === "*" ? selectAllSql(q, quotedAs, void 0, ctx).join(", ") : selectedColumnToSql(ctx, q, q.shape, this.item, quotedAs) : this.item.toSQL(ctx, quotedAs);
 	}
 };
 const _getSelectableColumn = (q, arg) => {
@@ -7087,12 +7122,12 @@ const selectToSqlList = (ctx, table, query, quotedAs, hookSelect = query.hookSel
 				quotedTable = `"${tableName}"`;
 				columnName = select.slice(index + 1);
 				col = table.q.joinedShapes?.[tableName]?.[columnName];
-				sql = col?.data.computed ? col.data.computed.toSQL(ctx, `"${tableName}"`) : `"${tableName}"."${col?.data.name || columnName}"`;
+				sql = selectedColumnToSql(ctx, table.q, table.q.shape, select, void 0);
 			} else {
 				quotedTable = quotedAs;
 				columnName = select;
 				col = query.shape[select];
-				sql = simpleColumnToSQL(ctx, select, col, quotedAs);
+				sql = selectedColumnToSql(ctx, table.q, query.shape, select, quotedAs);
 			}
 		} else {
 			columnName = column;
@@ -7132,17 +7167,24 @@ const selectToSql = (ctx, table, query, quotedAs, hookSelect = query.hookSelect,
 	return selectToSqlList(ctx, table, query, quotedAs, hookSelect, isSubSql, aliases, jsonList, delayedRelationSelect).join(", ");
 };
 const internalSelectAllSql = (ctx, query, quotedAs, jsonList) => {
-	if (jsonList) Object.assign(jsonList, query.selectAllShape);
+	if (jsonList) for (const key in query.selectAllShape) {
+		const column = query.selectAllShape[key];
+		jsonList[key] = getSelectedColumnData(column);
+	}
 	let columnsCount;
 	if (query.shape !== anyShape) {
 		columnsCount = 0;
 		for (const key in query.shape) if (!query.shape[key].data.explicitSelect) columnsCount++;
 		ctx.selectedCount += columnsCount;
 	}
-	return selectAllSql(query, quotedAs, columnsCount);
+	return selectAllSql(query, quotedAs, columnsCount, ctx);
+};
+const selectAllSql = (q, quotedAs, columnsCount, ctx) => {
+	return q.join?.length || q.updateFrom || q.updateMany ? q.selectAllColumns?.map((item) => selectAllColumnToSql(item, ctx, quotedAs, true)) || (isEmptySelect(q.shape, columnsCount) ? [] : [`${quotedAs}.*`]) : q.selectAllColumns ? q.selectAllColumns.map((item) => selectAllColumnToSql(item, ctx, quotedAs)) : isEmptySelect(q.shape, columnsCount) ? [] : ["*"];
 };
-const selectAllSql = (q, quotedAs, columnsCount) => {
-	return q.join?.length || q.updateFrom || q.updateMany ? q.selectAllColumns?.map((item) => `${quotedAs}.${item}`) || (isEmptySelect(q.shape, columnsCount) ? [] : [`${quotedAs}.*`]) : q.selectAllColumns ? [...q.selectAllColumns] : isEmptySelect(q.shape, columnsCount) ? [] : ["*"];
+const selectAllColumnToSql = (item, ctx, quotedAs, prefix) => {
+	if (typeof item !== "string") return item(ctx, quotedAs);
+	return prefix ? `${quotedAs}.${item}` : item;
 };
 const isEmptySelect = (shape, columnsCount) => columnsCount === void 0 ? shape === anyShape ? false : isObjectEmpty(shape) : !columnsCount;
 const pushSubQuerySql = (ctx, mainQuery, query, as, list, quotedAs, aliases) => {
@@ -7176,7 +7218,7 @@ const pushSubQuerySql = (ctx, mainQuery, query, as, list, quotedAs, aliases) =>
 			case "oneOrThrow": {
 				const table = query.q.joinedForSelect;
 				const shape = mainQuery.joinedShapes?.[as];
-				sql = makeRowToJson(table, shape, false);
+				sql = makeRowToJson(ctx, table, shape, false);
 				break;
 			}
 			case "all":
@@ -9644,7 +9686,7 @@ const toSql = (table, type, topCtx, isSubSql, cteName, calledByThen, dontAddTabl
 			if (ctx.topCtx.cteHooks.hasSelect) {
 				if (prependedSelectParenthesis) result.text += ")";
 				const { tableHooks, ensureCount } = ctx.topCtx.cteHooks;
-				const keyValues = [...tableHooks ? Object.entries(tableHooks).map(([cteName, data]) => `'${cteName}', (SELECT json_agg(${makeRowToJson(cteName, data.shape, false, true)}) FROM "${cteName}")`) : emptyArray, ...ensureCount ? Object.entries(ensureCount).map(([cteName, item]) => `'#${cteName}', CASE WHEN ${"count" in item ? `(SELECT count(*) FROM "${cteName}") < ${item.count}` : `(SELECT "${cteName}"."${item.jsonNotNull}" FROM "${cteName}") IS NULL`} THEN (SELECT 'not-found')::int END`) : emptyArray];
+				const keyValues = [...tableHooks ? Object.entries(tableHooks).map(([cteName, data]) => `'${cteName}', (SELECT json_agg(${makeRowToJson(ctx, cteName, data.shape, false, true)}) FROM "${cteName}")`) : emptyArray, ...ensureCount ? Object.entries(ensureCount).map(([cteName, item]) => `'#${cteName}', CASE WHEN ${"count" in item ? `(SELECT count(*) FROM "${cteName}") < ${item.count}` : `(SELECT "${cteName}"."${item.jsonNotNull}" FROM "${cteName}") IS NULL`} THEN (SELECT 'not-found')::int END`) : emptyArray];
 				result.text += ` UNION ALL SELECT ${"NULL, ".repeat(ctx.selectedCount || 0)}json_build_object(${keyValues.join(", ")})`;
 			}
 		}
@@ -9772,17 +9814,23 @@ const quoteFromWithSchema = (schema, table) => {
 	const s = typeof schema === "function" ? schema() : schema;
 	return s ? `"${s}"."${table}"` : `"${table}"`;
 };
-const makeRowToJson = (table, shape, aliasName, includingExplicitSelect) => {
+const makeRowToJson = (ctx, table, shape, aliasName, includingExplicitSelect) => {
 	let isSimple = true;
 	const list = [];
 	for (const key in shape) {
 		const column = shape[key];
 		if (!includingExplicitSelect && column.data.explicitSelect) continue;
-		if (aliasName && column.data.name || column.data.jsonCast) isSimple = false;
-		list.push(`'${key}', "${table}"."${aliasName && column.data.name || key}"${column.data.jsonCast ? `::${column.data.jsonCast}` : ""}`);
+		const selectSql = !column.data.computed ? column.data.selectSql : void 0;
+		const outputColumn = getSelectedColumnData(column);
+		if (aliasName && column.data.name || outputColumn.data.jsonCast || selectSql) isSimple = false;
+		const value = selectSql ? selectSql.toSQL(ctx, `"${table}"`) : `"${table}"."${aliasName && column.data.name || key}"`;
+		list.push(`'${key}', ${value}${outputColumn.data.jsonCast ? `::${outputColumn.data.jsonCast}` : ""}`);
 	}
 	return isSimple ? `row_to_json("${table}".*)` : `CASE WHEN to_jsonb("${table}") IS NULL THEN NULL ELSE json_build_object(` + list.join(", ") + ") END";
 };
+const getSelectedColumnData = (column) => {
+	return column.data.selectSql?.result.value || column;
+};
 const getSqlText = (sql) => {
 	if ("text" in sql) return sql.text;
 	throw new Error(`Batch SQL is not supported in this query`);
@@ -12421,6 +12469,10 @@ var MergeQueryMethods = class {
 		return query;
 	}
 };
+const applyColumnSelectSql = (column) => {
+	const { selectSqlFn } = column.data;
+	if (selectSqlFn) column.data.selectSql = selectSqlFn(new ColumnRefExpression(column, column.data.key));
+};
 const DEFAULT_PRIVILEGE = {
 	OBJECT_TYPES: [
 		"TABLES",
@@ -13791,6 +13843,10 @@ var Db = class extends QueryMethods {
 			}
 			if (column.data.explicitSelect) prepareSelectAll = true;
 			else selectAllCount++;
+			if (column.data.selectSqlFn) {
+				applyColumnSelectSql(column);
+				prepareSelectAll = true;
+			}
 			const { modifyQuery: mq } = column.data;
 			if (mq) modifyQuery = pushOrNewArray(modifyQuery, (q) => mq(q, column));
 			if (typeof column.data.default === "function") {
@@ -13848,7 +13904,12 @@ var Db = class extends QueryMethods {
 			for (const key in shape) {
 				const column = shape[key];
 				if (!column.data.explicitSelect) {
-					list.push(column.data.name ? `"${column.data.name}" "${key}"` : `"${key}"`);
+					const { data } = column;
+					const { selectSql } = data;
+					let item;
+					if (selectSql) item = (ctx, quotedAs) => `(${selectSql.toSQL(ctx, quotedAs)}) "${key}"`;
+					else item = data.name ? `"${data.name}" "${key}"` : `"${key}"`;
+					list.push(item);
 					selectAllShape[key] = column;
 				}
 			}