pqb 0.72.0 → 0.72.1

package/dist/internal.js

@@ -67,13 +67,6 @@ const singleQuote$1 = (s) => {
 	return `'${s.replaceAll("\\", "\\\\").replaceAll("'", "\\'")}'`;
 };
 /**
-* For code generation: stringify array of strings using a single quote.
-* @param arr
-*/
-const singleQuoteArray = (arr) => {
-	return `[${arr.map(singleQuote$1).join(", ")}]`;
-};
-/**
 * For code generation: some strings must be quoted when used as an object key.
 * This function quotes the strings when needed.
 * @param key - object key to quote
@@ -1081,131 +1074,6 @@ const columnErrorMessagesToCode = (errors) => {
 	addCode$1(code, "})");
 	return code;
 };
-const indexOrExcludeToCode = (innerToCode) => (item, t, prefix) => {
-	const code = innerToCode(item, t);
-	if (prefix) code[0] = prefix + code[0];
-	const last = code[code.length - 1];
-	if (typeof last === "string" && !last.endsWith(",")) addCode$1(code, ",");
-	return code;
-};
-const indexInnerToCode$1 = (index, t) => {
-	const code = [`${t}.${index.options.tsVector ? "searchIndex" : index.options.unique ? "unique" : "index"}(`];
-	const columnOptions = [
-		"collate",
-		"opclass",
-		"order",
-		"weight"
-	];
-	const indexOptionsKeys = [
-		index.options.tsVector ? "unique" : void 0,
-		"name",
-		"using",
-		"nullsNotDistinct",
-		"deferrable",
-		"include",
-		"with",
-		"tablespace",
-		"where",
-		"language",
-		"languageColumn",
-		"dropMode"
-	];
-	const hasOptions = indexOptionsKeys.some((key) => key && index.options[key]);
-	const columnsMultiline = index.columns.some((column) => {
-		for (const key in column) if (key !== "column" && column[key] !== void 0) return true;
-		return false;
-	});
-	if (columnsMultiline) {
-		const objects = [];
-		for (const column of index.columns) {
-			const expr = "expression" in column ? column.expression : column.column;
-			let hasOptions = false;
-			for (const key in column) if (key !== "column") hasOptions = true;
-			if (!hasOptions) objects.push(`${singleQuote$1(expr)},`);
-			else {
-				const props = [`${"expression" in column ? "expression" : "column"}: ${singleQuote$1(expr)},`];
-				for (const key of columnOptions) {
-					const value = column[key];
-					if (value !== void 0) props.push(`${key}: ${singleQuote$1(value)},`);
-				}
-				objects.push("{", props, "},");
-			}
-		}
-		code.push([
-			"[",
-			objects,
-			hasOptions ? "]," : "]"
-		]);
-	} else addCode$1(code, `[${index.columns.map((it) => singleQuote$1(it.column)).join(", ")}]`);
-	if (hasOptions) {
-		if (columnsMultiline) code.push(["{"]);
-		else addCode$1(code, ", {");
-		const options = [];
-		for (const key of indexOptionsKeys) {
-			if (!key) continue;
-			const value = index.options[key];
-			if (value === null || value === void 0) continue;
-			options.push(`${key}: ${Array.isArray(value) ? singleQuoteArray(value) : typeof value === "string" ? singleQuote$1(value) : value},`);
-		}
-		if (columnsMultiline) code.push([options, "},"]);
-		else {
-			code.push(options);
-			addCode$1(code, "}");
-		}
-	}
-	if (columnsMultiline) code.push("),");
-	else addCode$1(code, ")");
-	return code;
-};
-indexOrExcludeToCode(indexInnerToCode$1);
-const excludeInnerToCode$1 = (item, t) => {
-	const code = [`${t}.exclude(`];
-	const columnOptions = [
-		"collate",
-		"opclass",
-		"order",
-		"with"
-	];
-	const optionsKeys = [
-		"name",
-		"using",
-		"include",
-		"with",
-		"tablespace",
-		"where",
-		"dropMode"
-	];
-	const hasOptions = optionsKeys.some((key) => key && item.options[key]);
-	const objects = [];
-	for (const column of item.columns) {
-		const expr = "expression" in column ? column.expression : column.column;
-		const props = [`${"expression" in column ? "expression" : "column"}: ${singleQuote$1(expr)},`];
-		for (const key of columnOptions) {
-			const value = column[key];
-			if (value !== void 0) props.push(`${key}: ${singleQuote$1(value)},`);
-		}
-		objects.push("{", props, "},");
-	}
-	code.push([
-		"[",
-		objects,
-		hasOptions ? "]," : "]"
-	]);
-	if (hasOptions) {
-		code.push(["{"]);
-		const options = [];
-		for (const key of optionsKeys) {
-			if (!key) continue;
-			const value = item.options[key];
-			if (value === null || value === void 0) continue;
-			options.push(`${key}: ${Array.isArray(value) ? singleQuoteArray(value) : typeof value === "string" ? singleQuote$1(value) : value},`);
-		}
-		code.push([options, "},"]);
-	}
-	code.push("),");
-	return code;
-};
-indexOrExcludeToCode(excludeInnerToCode$1);
 const columnForeignKeysToCode = (foreignKeys, migration) => {
 	const code = [];
 	for (const foreignKey of foreignKeys) {
@@ -1909,6 +1777,17 @@ const make = (_op) => {
 		(q.chain ??= []).push(_op, val || value);
 		if (getValueParser(q.parsers)) setValueParser(q, void 0);
 		q.getColumn = BooleanColumn$1.instance;
+		if (this instanceof Expression$1 && this.result) {
+			let column;
+			if (this.result.value?.data.name) {
+				column = Object.create(BooleanColumn$1.instance);
+				column.data = {
+					...column.data,
+					name: this.result.value.data.name
+				};
+			} else column = BooleanColumn$1.instance;
+			this.result.value = column;
+		}
 		return setQueryOperators(this, boolean);
 	}, { _op });
 };
@@ -2415,7 +2294,8 @@ var SimpleRawSQL = class extends RawSql$1 {
 };
 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) => {
@@ -2448,7 +2328,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);
@@ -2477,7 +2357,7 @@ var PostgisGeographyPointColumn$1 = class extends Column$1 {
 	}
 };
 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);
@@ -3773,7 +3653,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$1(q, resolveSubQueryCallback(qb, arg));
+			const resolved = resolveSubQueryCallback(qb, arg);
+			args[i] = prepareSubQueryForSql$1(q, resolved);
 		} else if (arg.constructor === Object) {
 			const copy = args[i] = { ...arg };
 			for (const key in arg) {
@@ -3980,12 +3861,15 @@ const _addToHookSelectWithTable = (query, selects, table) => {
 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
 	})));
 };
@@ -4155,7 +4039,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;
@@ -4187,7 +4072,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);
@@ -4359,11 +4244,20 @@ function queryJson(self, coalesce) {
 }
 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$1(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$1(query);
 			query.q.returnType = "one";
 			query.q.select = [{ selectAs: { value: query.q.select[0] } }];
@@ -4420,7 +4314,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 = {
@@ -4445,7 +4339,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;
@@ -4838,7 +4733,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$1(value), ctx, table, query, quotedAs);
+			const arr = toArray$1(value);
+			const sql = processAnds(arr, ctx, table, query, quotedAs);
 			if (sql) ands.push(sql);
 		} else if (key === "OR") {
 			const sqls = value.map(toArray$1).reduce((acc, and) => {
@@ -5690,7 +5586,8 @@ const toSql = (table, type, topCtx, isSubSql, cteName, calledByThen, dontAddTabl
 				upsertOrCreate.q.or = upsertOrCreate.q.scopes = void 0;
 				upsertOrCreate.q.and = [new RawSql$1(`NOT EXISTS (SELECT 1 FROM "${as}")`)];
 				if (query.upsertInsert) {
-					_queryInsert$1(upsertOrCreate, query.upsertInsert());
+					const insertData = query.upsertInsert();
+					_queryInsert$1(upsertOrCreate, insertData);
 					upsertOrCreate.q.type = "upsert";
 				}
 				upsertOrCreate.q.with = query.upsertCreateWith;
@@ -5803,7 +5700,8 @@ const cteToSqlGiveAs = (ctx, item, type, dontAddTableHook) => {
 	let as;
 	if (typeof item.n === "string") as = item.n;
 	else if (ctx === ctx.topCtx) {
-		as = setFreeAlias$1((ctx.topCtx.topCTE ??= newTopCte(ctx)).names, "q", true);
+		const topCTE = ctx.topCtx.topCTE ??= newTopCte(ctx);
+		as = setFreeAlias$1(topCTE.names, "q", true);
 		item.n(as);
 	} else throw new Error("not implemented yet");
 	if (item.q) inner = getSqlText$1(toSql(item.q, type, ctx.topCtx, true, as, void 0, dontAddTableHook));
@@ -5997,7 +5895,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) => {
@@ -6173,7 +6075,9 @@ const insert = (self, { columns, insertFrom, values }, many, queryMany) => {
 };
 const _queryInsert$1 = (query, data) => {
 	throwIfReadOnly(query);
-	return insert(query, handleOneData(query, data, createCtx()));
+	const ctx = createCtx();
+	const obj = handleOneData(query, data, ctx);
+	return insert(query, obj);
 };
 /**
 * Is used by all create from queries methods.