pqb 0.73.4 → 0.73.5

package/dist/index.d.ts

@@ -339,7 +339,7 @@ interface AdapterConfigBase {
    *   databaseURL: process.env.DATABASE_URL,
    *   connectRetry: {
    *     attempts: 5,
-   *     stragegy(currentAttempt: number, maxAttempts: number) {
+   *     strategy(currentAttempt: number, maxAttempts: number) {
    *       // linear: wait 100ms after 1st attempt, then 200m after 2nd, and so on.
    *       return setTimeout(currentAttempt * 100);
    *     },

package/dist/index.js

@@ -1740,6 +1740,14 @@ const columnCode = (type, ctx, key, code) => {
 	if (data.modifyQuery && !ctx.migration) addCode(code, `.modifyQuery(${data.modifyQuery.toString()})`);
 	return code.length === 1 && typeof code[0] === "string" ? code[0] : code;
 };
+const queryTypeWithLimitOne = {
+	one: true,
+	oneOrThrow: true,
+	value: true,
+	valueOrThrow: true
+};
+const isQueryReturnsAll = (q) => !q.q.returnType || q.q.returnType === "all";
+const isQuery = (q) => !!q && typeof q === "object" && "__isQuery" in q && q.__isQuery === true;
 /**
 * generic utility to add a parser to the query object
 * @param query - the query object, it will be mutated
@@ -2362,7 +2370,7 @@ const quoteValue = (arg, ctx, quotedAs, IN) => {
 	if (arg && typeof arg === "object") {
 		if (IN && isIterable(arg)) return `(${(Array.isArray(arg) ? arg : [...arg]).map((value) => addValue(ctx.values, value)).join(", ")})`;
 		if (isExpression(arg)) return arg.toSQL(ctx, quotedAs);
-		if ("toSQL" in arg) return `(${moveMutativeQueryToCte$1(ctx, arg)})`;
+		if (isQuery(arg)) return `(${moveMutativeQueryToCte$1(ctx, arg)})`;
 		if (!(arg instanceof Date) && !Array.isArray(arg)) arg = JSON.stringify(arg);
 	}
 	return addValue(ctx.values, arg);
@@ -2371,7 +2379,7 @@ const quoteLikeValue = (arg, ctx, quotedAs, jsonArray) => {
 	if (arg && typeof arg === "object") {
 		if (!jsonArray && Array.isArray(arg)) return `(${arg.map((value) => addValue(ctx.values, value)).join(", ")})`;
 		if (isExpression(arg)) return arg.toSQL(ctx, quotedAs);
-		if ("toSQL" in arg) return `replace(replace((${moveMutativeQueryToCte$1(ctx, arg)}), '%', '\\\\%'), '_', '\\\\_')`;
+		if (isQuery(arg)) return `replace(replace((${moveMutativeQueryToCte$1(ctx, arg)}), '%', '\\\\%'), '_', '\\\\_')`;
 	}
 	return addValue(ctx.values, arg.replace(/[%_]/g, "\\$&"));
 };
@@ -2411,20 +2419,21 @@ const ordinalText = {
 };
 const encodeJsonPath = (ctx, path) => addValue(ctx.values, `{${Array.isArray(path) ? path.join(", ") : path}}`);
 const jsonPathQueryOp = (key, [path, options], ctx) => `jsonb_path_query_first(${key}, ${addValue(ctx.values, path)}${options?.vars ? `, ${addValue(ctx.values, JSON.stringify(options.vars))}${options.silent ? ", true" : ""}` : options?.silent ? ", NULL, true" : ""})`;
-const shouldEncodeJson = (ctx) => ctx.q.adapter.driverAdapter.schemaConfig?.jsonEncodedByDriver === false;
+const encodeJsonIfNeeded = (ctx, value) => ctx.q.adapter.driverAdapter.schemaConfig?.jsonEncodedByDriver === false ? JSON.stringify(value) : value;
+const quoteJsonOperand = (arg, ctx, quotedAs) => isExpression(arg) || isQuery(arg) ? quoteValue(arg, ctx, quotedAs) : addValue(ctx.values, encodeJsonIfNeeded(ctx, arg));
 const quoteJsonValue = (arg, ctx, quotedAs, IN) => {
 	if (arg && typeof arg === "object") {
-		if (IN && Array.isArray(arg)) return `(${arg.map((value) => shouldEncodeJson(ctx) ? addValue(ctx.values, JSON.stringify(value)) : addValue(ctx.values, value)).join(", ")})`;
-		if (Array.isArray(arg)) return shouldEncodeJson(ctx) ? addValue(ctx.values, JSON.stringify(arg)) : addValue(ctx.values, arg);
+		if (IN && Array.isArray(arg)) return `(${arg.map((value) => addValue(ctx.values, encodeJsonIfNeeded(ctx, value))).join(", ")})`;
+		if (Array.isArray(arg)) return addValue(ctx.values, encodeJsonIfNeeded(ctx, arg));
 		if (isExpression(arg)) return "to_jsonb(" + arg.toSQL(ctx, quotedAs) + ")";
-		if ("toSQL" in arg) return `to_jsonb((${moveMutativeQueryToCte$1(ctx, arg)}))`;
+		if (isQuery(arg)) return `to_jsonb((${moveMutativeQueryToCte$1(ctx, arg)}))`;
 	}
-	return shouldEncodeJson(ctx) ? addValue(ctx.values, JSON.stringify(arg)) : addValue(ctx.values, arg);
+	return addValue(ctx.values, encodeJsonIfNeeded(ctx, arg));
 };
 const serializeJsonValue = (arg, ctx, quotedAs) => {
 	if (arg && typeof arg === "object") {
 		if (isExpression(arg)) return "to_jsonb(" + arg.toSQL(ctx, quotedAs) + ")";
-		if ("toSQL" in arg) return `to_jsonb((${moveMutativeQueryToCte$1(ctx, arg)}))`;
+		if (isQuery(arg)) return `to_jsonb((${moveMutativeQueryToCte$1(ctx, arg)}))`;
 	}
 	return addValue(ctx.values, JSON.stringify(arg));
 };
@@ -2461,8 +2470,8 @@ const Operators = {
 			}
 			return this;
 		}, { _op: jsonPathQueryOp }),
-		jsonSupersetOf: make((key, value, ctx, quotedAs) => `${key} @> ${quoteValue(value, ctx, quotedAs)}`),
-		jsonSubsetOf: make((key, value, ctx, quotedAs) => `${key} <@ ${quoteValue(value, ctx, quotedAs)}`),
+		jsonSupersetOf: make((key, value, ctx, quotedAs) => `${key} @> ${quoteJsonOperand(value, ctx, quotedAs)}`),
+		jsonSubsetOf: make((key, value, ctx, quotedAs) => `${key} <@ ${quoteJsonOperand(value, ctx, quotedAs)}`),
 		jsonSet: makeVarArg((key, [path, value], ctx, quotedAs) => `jsonb_set(${key}, ${encodeJsonPath(ctx, path)}, ${serializeJsonValue(value, ctx, quotedAs)})`),
 		jsonReplace: makeVarArg((key, [path, value], ctx, quotedAs) => `jsonb_set(${key}, ${encodeJsonPath(ctx, path)}, ${serializeJsonValue(value, ctx, quotedAs)}, false)`),
 		jsonInsert: makeVarArg((key, [path, value, options], ctx, quotedAs) => `jsonb_insert(${key}, ${encodeJsonPath(ctx, path)}, ${serializeJsonValue(value, ctx, quotedAs)}${options?.after ? ", true" : ""})`),
@@ -5668,14 +5677,6 @@ var QueryWrap = class {
 		return queryWrap(this, _clone(query), as);
 	}
 };
-const queryTypeWithLimitOne = {
-	one: true,
-	oneOrThrow: true,
-	value: true,
-	valueOrThrow: true
-};
-const isQueryReturnsAll = (q) => !q.q.returnType || q.q.returnType === "all";
-const isQuery = (q) => !!q && typeof q === "object" && "__isQuery" in q && q.__isQuery === true;
 const skipQueryKeysForSubQuery = {
 	adapter: true,
 	schema: true,