pqb 0.67.0 → 0.67.1

package/dist/index.mjs

@@ -6740,17 +6740,27 @@ const _get = (query, returnType, arg) => {
 	if (q.returning) q.returning = void 0;
 	q.returnType = returnType;
 	let type;
-	if (typeof arg === "string") {
-		const joinedAs = q.valuesJoinedAs?.[arg];
-		type = joinedAs ? q.joinedShapes?.[joinedAs]?.value : _getSelectableColumn(query, arg);
+	let value = arg;
+	if (typeof value === "function") {
+		const item = processSelectAsArg(query, getQueryAs(query), "value", value);
+		if (item !== false) value = item;
+	}
+	if (typeof value === "string") {
+		const joinedAs = q.valuesJoinedAs?.[value];
+		type = joinedAs ? q.joinedShapes?.[joinedAs]?.value : _getSelectableColumn(query, value);
 		q.getColumn = type;
-		const selected = setParserForSelectedString(query, joinedAs ? joinedAs + "." + arg : arg, getQueryAs(query), getValueKey);
+		const selected = setParserForSelectedString(query, joinedAs ? joinedAs + "." + value : value, getQueryAs(query), getValueKey);
 		q.select = selected ? [q.expr = new SelectItemExpression(query, selected, type)] : void 0;
-	} else {
-		type = arg.result.value;
+	} else if (isExpression(value)) {
+		type = value.result.value;
 		q.getColumn = type;
-		addParserForRawExpression(query, getValueKey, arg);
-		q.select = [q.expr = arg];
+		addParserForRawExpression(query, getValueKey, value);
+		q.select = [q.expr = value];
+	} else {
+		const selected = value;
+		q.getColumn = selected.q.getColumn;
+		if (q.getColumn) addColumnParserToQuery(q, getValueKey, q.getColumn);
+		q.select = selected ? [{ selectAs: { value: selected } }] : void 0;
 	}
 	return setQueryOperators(query, type?.operators || Operators.any);
 };
@@ -10865,44 +10875,49 @@ const collectNestedSelectBatches = (batches, rows, path, last) => {
 };
 const emptyArrSQL = new RawSql("'[]'");
 const processSelectArg = (q, as, arg, columnAs) => {
-	const query = q;
 	if (typeof arg === "string") return setParserForSelectedString(q, arg, as, columnAs);
 	const selectAs = {};
 	for (const key in arg) {
-		let value = arg[key];
-		let joinQuery;
-		if (typeof value === "function") {
-			value = resolveSubQueryCallback(q, value);
-			if (isQueryNone(value)) {
-				if (value.q.innerJoinLateral) return false;
-			}
-			if (!isExpression(value)) {
-				if (isRelationQuery(value) && value.q.subQuery !== 1) {
-					joinQuery = true;
-					setSelectRelation(query.q);
-					value = value.joinQuery(value, q);
-					let subQuery;
-					const { returnType, innerJoinLateral } = value.q;
-					if (!returnType || returnType === "all") {
-						subQuery = value.json(false);
-						if (!innerJoinLateral) value.q.coalesceValue = emptyArrSQL;
-					} else if (returnType === "pluck") {
-						subQuery = value.q.select ? value.wrap(cloneQueryBaseUnscoped(value)).jsonAgg(value.q.select[0]) : value.json(false);
-						value.q.coalesceValue = emptyArrSQL;
-					} else if (returnType === "value" || returnType === "valueOrThrow") if (value.q.select) {
-						if (typeof value.q.select[0] === "string") value.q.select[0] = { selectAs: { r: value.q.select[0] } };
-						subQuery = value;
-					} else subQuery = value.json(false);
-					else subQuery = value;
-					const as = _joinLateral(q, innerJoinLateral ? "JOIN" : "LEFT JOIN", subQuery, key, innerJoinLateral && returnType !== "one" && returnType !== "oneOrThrow");
-					if (as) value.q.joinedForSelect = _copyQueryAliasToQuery(value, q, as);
-				}
-				value = prepareSubQueryForSql(q, value);
+		const item = processSelectAsArg(q, as, key, arg[key]);
+		if (item === false) return false;
+		selectAs[key] = item;
+	}
+	return { selectAs };
+};
+const processSelectAsArg = (q, as, key, arg) => {
+	const query = q;
+	let value = arg;
+	let joinQuery;
+	if (typeof value === "function") {
+		value = resolveSubQueryCallback(q, value);
+		if (isQueryNone(value)) {
+			if (value.q.innerJoinLateral) return false;
+		}
+		if (!isExpression(value)) {
+			if (isRelationQuery(value) && value.q.subQuery !== 1) {
+				joinQuery = true;
+				setSelectRelation(query.q);
+				value = value.joinQuery(value, q);
+				let subQuery;
+				const { returnType, innerJoinLateral } = value.q;
+				if (!returnType || returnType === "all") {
+					subQuery = value.json(false);
+					if (!innerJoinLateral) value.q.coalesceValue = emptyArrSQL;
+				} else if (returnType === "pluck") {
+					subQuery = value.q.select ? value.wrap(cloneQueryBaseUnscoped(value)).jsonAgg(value.q.select[0]) : value.json(false);
+					value.q.coalesceValue = emptyArrSQL;
+				} else if (returnType === "value" || returnType === "valueOrThrow") if (value.q.select) {
+					if (typeof value.q.select[0] === "string") value.q.select[0] = { selectAs: { r: value.q.select[0] } };
+					subQuery = value;
+				} else subQuery = value.json(false);
+				else subQuery = value;
+				const as = _joinLateral(q, innerJoinLateral || query.q.returnType === "valueOrThrow" ? "JOIN" : "LEFT JOIN", subQuery, key, innerJoinLateral && returnType !== "one" && returnType !== "oneOrThrow");
+				if (as) value.q.joinedForSelect = _copyQueryAliasToQuery(value, q, as);
 			}
+			value = prepareSubQueryForSql(q, value);
 		}
-		selectAs[key] = addParserForSelectItem(q, as, key, value, key, joinQuery);
 	}
-	return { selectAs };
+	return addParserForSelectItem(query, as, key, value, key, joinQuery);
 };
 const setParserForSelectedString = (query, arg, as, columnAs, columnAlias) => {
 	const { q } = query;
@@ -12808,6 +12823,28 @@ var Having = class {
 		return pushQueryValueImmutable(_clone(this), "having", args);
 	}
 };
+var QueryPluck = class {
+	/**
+	* `.pluck` returns a single array of a single selected column values:
+	*
+	* ```ts
+	* const ids = await db.table.select('id').pluck();
+	* // ids are an array of all users' id like [1, 2, 3]
+	* ```
+	* @param select - column name or a raw SQL
+	*/
+	pluck(select) {
+		const q = _clone(this);
+		q.q.returnType = "pluck";
+		let selected;
+		if (typeof select === "function") {
+			const item = processSelectAsArg(q, q.q.as || q.table, "pluck", select);
+			if (item !== false) selected = isExpression(item) ? item : { selectAs: { pluck: item } };
+		} else selected = addParserForSelectItem(q, q.q.as || q.table, "pluck", select);
+		q.q.select = selected ? [selected] : void 0;
+		return q;
+	}
+};
 var QueryMap = class {
 	/**
 	* Use `map` to transform individual records of a query result.
@@ -13162,22 +13199,6 @@ var QueryMethods = class {
 		return _queryRows(_clone(this));
 	}
 	/**
-	* `.pluck` returns a single array of a single selected column values:
-	*
-	* ```ts
-	* const ids = await db.table.select('id').pluck();
-	* // ids are an array of all users' id like [1, 2, 3]
-	* ```
-	* @param select - column name or a raw SQL
-	*/
-	pluck(select) {
-		const q = _clone(this);
-		q.q.returnType = "pluck";
-		const selected = addParserForSelectItem(q, q.q.as || q.table, "pluck", select);
-		q.q.select = selected ? [selected] : void 0;
-		return q;
-	}
-	/**
 	* `.exec` won't parse the response at all, and returns undefined:
 	*
 	* ```ts
@@ -13632,6 +13653,7 @@ applyMixins(QueryMethods, [
 	QueryOrCreate,
 	QueryHooks,
 	QueryGet,
+	QueryPluck,
 	MergeQueryMethods,
 	QuerySql,
 	QueryTransform,