pqb 0.72.0 → 0.72.1

package/dist/index.mjs

@@ -2291,6 +2291,17 @@ const make = (_op) => {
 		(q.chain ??= []).push(_op, val || value);
 		if (getValueParser(q.parsers)) setValueParser(q, void 0);
 		q.getColumn = BooleanColumn.instance;
+		if (this instanceof Expression && this.result) {
+			let column;
+			if (this.result.value?.data.name) {
+				column = Object.create(BooleanColumn.instance);
+				column.data = {
+					...column.data,
+					name: this.result.value.data.name
+				};
+			} else column = BooleanColumn.instance;
+			this.result.value = column;
+		}
 		return setQueryOperators(this, boolean);
 	}, { _op });
 };
@@ -2797,7 +2808,8 @@ var SimpleRawSQL = class extends RawSql {
 };
 const raw$1 = (sql) => new SimpleRawSQL(sql);
 const makeTimestamps = (timestamp) => {
-	const nowRaw = raw$1(getDefaultNowFn());
+	const now = getDefaultNowFn();
+	const nowRaw = raw$1(now);
 	const updatedAt = timestamp().default(nowRaw);
 	let updater;
 	updatedAt.data.modifyQuery = (q, column) => {
@@ -2830,7 +2842,7 @@ const timestampHelpers = {
 };
 const defaultSrid = 4326;
 const encode = ({ srid = defaultSrid, lon, lat }) => {
-	const arr = new Uint8Array(25);
+	const arr = /* @__PURE__ */ new Uint8Array(25);
 	const view = new DataView(arr.buffer);
 	view.setInt8(0, 1);
 	view.setInt8(1, 1);
@@ -2859,7 +2871,7 @@ var PostgisGeographyPointColumn = class extends Column {
 	}
 };
 const parse = (input) => {
-	const bytes = new Uint8Array(20);
+	const bytes = /* @__PURE__ */ new Uint8Array(20);
 	for (let i = 0; i < 40; i += 2) bytes[i / 2] = parseInt(input.slice(10 + i, 12 + i), 16);
 	const view = new DataView(bytes.buffer);
 	const srid = view.getUint32(0, true);
@@ -3804,7 +3816,8 @@ var QueryTransaction = class QueryTransaction {
 		return QueryTransaction.prototype.transaction.call(this, cb);
 	}
 	isInTransaction() {
-		return isInUserTransaction(this.internal.asyncStorage.getStore());
+		const trx = this.internal.asyncStorage.getStore();
+		return isInUserTransaction(trx);
 	}
 	/**
 	* Schedules a hook to run after the outermost transaction commits:
@@ -5664,7 +5677,8 @@ const resolveCallbacksInArgs = (q, args) => {
 			qb.q.and = qb.q.or = qb.q.scopes = void 0;
 			qb.q.subQuery = 1;
 			_setSubQueryAliases(qb);
-			args[i] = prepareSubQueryForSql(q, resolveSubQueryCallback(qb, arg));
+			const resolved = resolveSubQueryCallback(qb, arg);
+			args[i] = prepareSubQueryForSql(q, resolved);
 		} else if (arg.constructor === Object) {
 			const copy = args[i] = { ...arg };
 			for (const key in arg) {
@@ -6436,7 +6450,8 @@ var Where = class {
 	* @param args - no arguments needed when the first argument is a relation name, or conditions to join the table with.
 	*/
 	whereNotExists(arg, ...args) {
-		return _queryWhereNotExists(_clone(this), arg, args);
+		const q = _clone(this);
+		return _queryWhereNotExists(q, arg, args);
 	}
 	/**
 	* Acts as `whereExists`, but prepends the condition with `OR` and negates it with `NOT`:
@@ -6583,7 +6598,11 @@ const tableColumnToSql = (ctx, queryData, shape, table, key, quotedAs, select, a
 const columnToSqlNotSelect = (ctx, data, shape, column, quotedAs, useSelectList) => columnToSql(ctx, data, shape, column, quotedAs, void 0, void 0, void 0, useSelectList, true);
 const columnToSql = (ctx, data, shape, column, quotedAs, select, as, jsonList, useSelectList, skipValueToArray) => {
 	let index = column.indexOf(".");
-	if (index !== -1) return tableColumnToSql(ctx, data, shape, column.slice(0, index), column.slice(index + 1), quotedAs, select, as, jsonList, skipValueToArray);
+	if (index !== -1) {
+		const table = column.slice(0, index);
+		const key = column.slice(index + 1);
+		return tableColumnToSql(ctx, data, shape, table, key, quotedAs, select, as, jsonList, skipValueToArray);
+	}
 	return simpleColumnToSQL(ctx, data, shape, column, shape[column], quotedAs, select, as, jsonList, useSelectList, void 0, skipValueToArray);
 };
 const rawOrColumnToSql = (ctx, data, shape, expr, quotedAs, select, skipValueToArray) => {
@@ -6826,11 +6845,20 @@ const _addToHookSelectWithTable = (query, selects, table) => {
 };
 const moveQueryToCte = (ctx, query, type, dontAddTableHook) => {
 	const { returnType } = query.q;
+	const throwOnNotFound = returnType === "valueOrThrow";
 	let valueAs;
 	if (returnType === "value" || returnType === "valueOrThrow" || returnType === "pluck") {
 		const first = query.q.select[0];
-		if (first instanceof SelectItemExpression && typeof first.item === "string") valueAs = first.item;
-		else {
+		if (first instanceof SelectItemExpression && typeof first.item === "string") {
+			const columnName = first.result.value?.data.name;
+			if (columnName && columnName !== first.item) {
+				query = _clone(query);
+				query.q.returnType = "one";
+				query.q.select = [{ selectAs: { [first.item]: first } }];
+				if (throwOnNotFound && query.q.type !== "upsert") query.q.cteThrowOnNotFound = true;
+			}
+			valueAs = first.item;
+		} else {
 			query = _clone(query);
 			query.q.returnType = "one";
 			query.q.select = [{ selectAs: { value: query.q.select[0] } }];
@@ -6887,7 +6915,7 @@ const addTableHook = (ctx, q, data, select, hookPurpose, dontAddTableHook) => {
 	const afterUpdateCommit = data.afterUpdateCommit;
 	const afterSaveCommit = data.afterSaveCommit;
 	const afterDeleteCommit = data.afterDeleteCommit;
-	const throwOnNotFound = hookPurpose !== "Create" && (data.returnType === "oneOrThrow" || data.returnType === "valueOrThrow");
+	const throwOnNotFound = hookPurpose !== "Create" && (data.cteThrowOnNotFound || data.returnType === "oneOrThrow" || data.returnType === "valueOrThrow");
 	const hasAfterHook = afterCreate || afterUpdate || afterSave || afterDelete || afterCreateCommit || afterUpdateCommit || afterSaveCommit || afterDeleteCommit;
 	if (!select && !hasAfterHook && !throwOnNotFound) return;
 	const tableHook = {
@@ -6912,7 +6940,8 @@ const addTableHook = (ctx, q, data, select, hookPurpose, dontAddTableHook) => {
 				tableHook,
 				throwOnNotFound
 			};
-			const cteHooks = setCteHooks(ctx, throwOnNotFound || !!tableHook.select);
+			const hasSelect = throwOnNotFound || !!tableHook.select;
+			const cteHooks = setCteHooks(ctx, hasSelect);
 			(cteHooks.tableHooks ??= {})[ctx.cteName] ??= item;
 		}
 	} else ctx.topCtx.tableHook = tableHook;
@@ -7305,7 +7334,8 @@ const processWhere = (ands, ctx, table, query, data, quotedAs) => {
 		const value = data[key];
 		if (value === void 0) continue;
 		if (key === "AND") {
-			const sql = processAnds(toArray(value), ctx, table, query, quotedAs);
+			const arr = toArray(value);
+			const sql = processAnds(arr, ctx, table, query, quotedAs);
 			if (sql) ands.push(sql);
 		} else if (key === "OR") {
 			const sqls = value.map(toArray).reduce((acc, and) => {
@@ -8948,7 +8978,9 @@ const _queryCreate = (q, data) => {
 };
 const _queryInsert = (query, data) => {
 	throwIfReadOnly(query);
-	return insert(query, handleOneData(query, data, createCtx()));
+	const ctx = createCtx();
+	const obj = handleOneData(query, data, ctx);
+	return insert(query, obj);
 };
 const _queryCreateMany = (q, data) => {
 	throwIfReadOnly(q);
@@ -8957,7 +8989,8 @@ const _queryCreateMany = (q, data) => {
 };
 const _queryInsertMany = (q, data) => {
 	throwIfReadOnly(q);
-	let result = insert(q, handleManyData(q, data, createCtx()), true);
+	const ctx = createCtx();
+	let result = insert(q, handleManyData(q, data, ctx), true);
 	if (!data.length) result = result.none();
 	return result;
 };
@@ -9561,7 +9594,8 @@ const toSql = (table, type, topCtx, isSubSql, cteName, calledByThen, dontAddTabl
 				upsertOrCreate.q.or = upsertOrCreate.q.scopes = void 0;
 				upsertOrCreate.q.and = [new RawSql(`NOT EXISTS (SELECT 1 FROM "${as}")`)];
 				if (query.upsertInsert) {
-					_queryInsert(upsertOrCreate, query.upsertInsert());
+					const insertData = query.upsertInsert();
+					_queryInsert(upsertOrCreate, insertData);
 					upsertOrCreate.q.type = "upsert";
 				}
 				upsertOrCreate.q.with = query.upsertCreateWith;
@@ -9674,7 +9708,8 @@ const cteToSqlGiveAs = (ctx, item, type, dontAddTableHook) => {
 	let as;
 	if (typeof item.n === "string") as = item.n;
 	else if (ctx === ctx.topCtx) {
-		as = setFreeAlias((ctx.topCtx.topCTE ??= newTopCte(ctx)).names, "q", true);
+		const topCTE = ctx.topCtx.topCTE ??= newTopCte(ctx);
+		as = setFreeAlias(topCTE.names, "q", true);
 		item.n(as);
 	} else throw new Error("not implemented yet");
 	if (item.q) inner = getSqlText(toSql(item.q, type, ctx.topCtx, true, as, void 0, dontAddTableHook));
@@ -10798,12 +10833,15 @@ var OnMethods = class {
 const setSelectRelation = (q) => {
 	q.selectRelation = true;
 };
-const addParsersForSelectJoined = (q, arg, as = arg) => {
+const addParsersForSelectJoinedWildcard = (q, arg, as = arg) => {
 	const parsers = q.q.joinedParsers?.[arg];
 	if (parsers) setParserToQuery(q.q, as, (row) => parseRecord(parsers, row));
 	const batchParsers = q.q.joinedBatchParsers?.[arg];
 	if (batchParsers) pushQueryArrayImmutable(q, "batchParsers", batchParsers.map((x) => ({
-		path: [{ key: as }, ...x.path],
+		path: [{
+			key: as,
+			returnType: "one"
+		}, ...x.path],
 		fn: x.fn
 	})));
 };
@@ -10985,7 +11023,8 @@ const processSelectAsArg = (q, selectAs, as, key, arg, columnAlias, outerReturnT
 					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");
+				const joinLateral = innerJoinLateral || query.q.returnType === "valueOrThrow";
+				const as = _joinLateral(q, joinLateral ? "JOIN" : "LEFT JOIN", subQuery, key, innerJoinLateral && returnType !== "one" && returnType !== "oneOrThrow");
 				if (as) value.q.joinedForSelect = _copyQueryAliasToQuery(value, q, as);
 			}
 			if (value.q.getColumn?.data.skipValueToArray) value.q.notFoundDefault ??= null;
@@ -11017,7 +11056,7 @@ const setParserForSelectedString = (query, arg, as, columnAs, columnAlias) => {
 	const table = getFullColumnTable(query, arg, index, as);
 	const column = arg.slice(index + 1);
 	if (column === "*") {
-		addParsersForSelectJoined(query, table, columnAs);
+		addParsersForSelectJoinedWildcard(query, table, columnAs);
 		return table === as ? column : arg;
 	}
 	if (table === as) return selectColumn(query, q, column, columnAs, columnAlias);
@@ -12443,7 +12482,7 @@ const _prependWithOnUpsertCreate = (q, name, query) => {
 	q.q.upsertCreateWith = q.q.with;
 	q.q.with = prev;
 };
-const mergableObjects = new Set([
+const mergableObjects = /* @__PURE__ */ new Set([
 	"selectShape",
 	"withShapes",
 	"defaultParsers",
@@ -12455,7 +12494,7 @@ const mergableObjects = new Set([
 	"joinedBatchParsers",
 	"selectedComputeds"
 ]);
-const dontMergeArrays = new Set(["selectAllColumns"]);
+const dontMergeArrays = /* @__PURE__ */ new Set(["selectAllColumns"]);
 var MergeQueryMethods = class {
 	merge(q) {
 		const query = _clone(this);
@@ -12469,20 +12508,18 @@ var MergeQueryMethods = class {
 				case "number":
 					a[key] = value;
 					break;
-				case "object":
-					if (Array.isArray(value)) {
-						if (!dontMergeArrays.has(key)) a[key] = a[key] ? [...a[key], ...value] : value;
-					} else if (mergableObjects.has(key)) a[key] = a[key] ? {
-						...a[key],
-						...value
-					} : value;
-					else if (key === "union") a[key] = a[key] ? {
-						b: a[key].b,
-						u: [...a[key].u, ...value.u]
-					} : value;
-					else if (value instanceof Set) a[key] = a[key] ? new Set([...a[key], ...value]) : value;
-					else a[key] = value;
-					break;
+				case "object": if (Array.isArray(value)) {
+					if (!dontMergeArrays.has(key)) a[key] = a[key] ? [...a[key], ...value] : value;
+				} else if (mergableObjects.has(key)) a[key] = a[key] ? {
+					...a[key],
+					...value
+				} : value;
+				else if (key === "union") a[key] = a[key] ? {
+					b: a[key].b,
+					u: [...a[key].u, ...value.u]
+				} : value;
+				else if (value instanceof Set) a[key] = a[key] ? /* @__PURE__ */ new Set([...a[key], ...value]) : value;
+				else a[key] = value;
 			}
 		}
 		if (b.returnType) a.returnType = b.returnType;
@@ -13460,7 +13497,8 @@ var QueryMethods = class {
 	* @param args - SQL expression
 	*/
 	findBySql(...args) {
-		return _queryTake(_queryWhereSql(_clone(this), args));
+		const q = _clone(this);
+		return _queryTake(_queryWhereSql(q, args));
 	}
 	/**
 	* Finds a single record by the primary key (id), returns `undefined` when not found.
@@ -14000,7 +14038,8 @@ var Db = class extends QueryMethods {
 			if (options.noPrimaryKey === "error") throw new Error(message);
 			else logger.warn(message);
 		}
-		this.columns = Object.keys(shape);
+		const columns = Object.keys(shape);
+		this.columns = columns;
 		if (options.computed) applyComputedColumns(this, options.computed);
 		if (prepareSelectAll) {
 			const selectAllShape = this.q.selectAllShape = {};
@@ -14456,6 +14495,12 @@ var Rollback = class extends Error {};
 const trxForTest = Symbol("trxForTest");
 const argToDb = (arg) => "$qb" in arg ? arg.$qb : arg;
 const testTransaction = {
+	/**
+	* Start a test transaction.
+	* The returned promise is resolved immediately when transaction starts, not waiting for it to end.
+	*
+	* @param arg - ORM instance or a queryable instance (such as db.someTable).
+	*/
 	start(arg) {
 		const db = argToDb(arg);
 		const { asyncStorage } = db.internal;
@@ -14491,6 +14536,11 @@ const testTransaction = {
 			});
 		});
 	},
+	/**
+	* Rollback a test transaction.
+	*
+	* @param arg - the same ORM or query argument passed into the `testTransaction.start`.
+	*/
 	rollback(arg) {
 		const db = argToDb(arg);
 		const data = db.internal[trxForTest];
@@ -14500,6 +14550,12 @@ const testTransaction = {
 		last.reject?.(new Rollback());
 		return last.promise;
 	},
+	/**
+	* Will roll back the current `testTransaction` (won't have any effect if it was rolled back already),
+	* and if there's no nested test transactions left, it will close the db connection.
+	*
+	* @param arg - the same ORM or query argument passed into the `testTransaction.start`.
+	*/
 	async close(arg) {
 		const db = argToDb(arg);
 		await this.rollback(db);