pqb 0.45.4 → 0.45.5

package/dist/index.js

@@ -1106,8 +1106,35 @@ const text = {
 };
 const encodeJsonPath = (ctx, path) => orchidCore.addValue(ctx.values, `{${Array.isArray(path) ? path.join(", ") : path}}`);
 const jsonPathQueryOp = (key, [path, options], ctx) => `jsonb_path_query_first(${key}, ${orchidCore.addValue(ctx.values, path)}${options?.vars ? `, ${orchidCore.addValue(ctx.values, JSON.stringify(options.vars))}${options.silent ? ", true" : ""}` : options?.silent ? ", NULL, true" : ""})`;
+const quoteJsonValue = (arg, ctx, quotedAs, IN) => {
+  if (arg && typeof arg === "object") {
+    if (IN && Array.isArray(arg)) {
+      return `(${arg.map((value) => orchidCore.addValue(ctx.values, JSON.stringify(value)) + "::jsonb").join(", ")})`;
+    }
+    if (orchidCore.isExpression(arg)) {
+      return "to_jsonb(" + arg.toSQL(ctx, quotedAs) + ")";
+    }
+    if ("toSQL" in arg) {
+      return `to_jsonb((${getSqlText(
+        arg.toSQL({ values: ctx.values })
+      )}))`;
+    }
+  }
+  return orchidCore.addValue(ctx.values, JSON.stringify(arg)) + "::jsonb";
+};
 const json = {
-  ...base,
+  equals: make(
+    (key, value, ctx, quotedAs) => value === null ? `nullif(${key}, 'null'::jsonb) IS NULL` : `${key} = ${quoteJsonValue(value, ctx, quotedAs)}`
+  ),
+  not: make(
+    (key, value, ctx, quotedAs) => value === null ? `nullif(${key}, 'null'::jsonb) IS NOT NULL` : `${key} != ${quoteJsonValue(value, ctx, quotedAs)}`
+  ),
+  in: make(
+    (key, value, ctx, quotedAs) => `${key} IN ${quoteJsonValue(value, ctx, quotedAs, true)}`
+  ),
+  notIn: make(
+    (key, value, ctx, quotedAs) => `NOT ${key} IN ${quoteJsonValue(value, ctx, quotedAs, true)}`
+  ),
   jsonPathQueryFirst: Object.assign(
     function(path, options) {
       const { q, columnTypes } = this;