pqb 0.37.0 → 0.38.1

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { ExpressionTypeMethod, Expression, RawSQLBase, emptyObject, isTemplateLiteralArgs, ColumnTypeBase, setColumnData, pushColumnData, quoteObjectKey, toArray, singleQuote, addCode, singleQuoteArray, objectHasValues, toSnakeCase, columnDefaultArgumentToCode, columnErrorMessagesToCode, getValueKey, addValue, isExpression, joinTruthy, numberDataToCode, stringDataToCode, getDefaultLanguage, dateDataToCode, pushOrNewArrayToObject, returnArg as returnArg$1, noop, arrayDataToCode, logColors, emptyArray, applyTransforms, callWithThis, setParserToQuery, isRawSQL, pushOrNewArray, setDefaultNowFn, setDefaultLanguage, makeTimestampsHelpers, setCurrentColumnName, setAdapterConnectRetry, isObjectEmpty, ValExpression, applyMixins, snakeCaseKey } from 'orchid-core';
+import { ExpressionTypeMethod, Expression, RawSQLBase, emptyObject, isTemplateLiteralArgs, ColumnTypeBase, setColumnData, pushColumnData, quoteObjectKey, toArray, singleQuote, addCode, singleQuoteArray, objectHasValues, toSnakeCase, columnDefaultArgumentToCode, columnErrorMessagesToCode, getValueKey, emptyArray, addValue, isExpression, joinTruthy, numberDataToCode, stringDataToCode, getDefaultLanguage, dateDataToCode, pushOrNewArrayToObject, returnArg as returnArg$1, noop, arrayDataToCode, logColors, applyTransforms, callWithThis, setParserToQuery, isRawSQL, pushOrNewArray, setDefaultNowFn, setDefaultLanguage, makeTimestampsHelpers, setCurrentColumnName, setAdapterConnectRetry, isObjectEmpty, ValExpression, applyMixins, snakeCaseKey } from 'orchid-core';
 import pg from 'pg';
 import { inspect } from 'node:util';
 import { AsyncLocalStorage } from 'node:async_hooks';
@@ -933,6 +933,22 @@ const quoteValue$1 = (arg, ctx, quotedAs, jsonArray) => {
   }
   return addValue(ctx.values, arg);
 };
+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((${getSqlText(
+        arg.toSQL({ values: ctx.values })
+      )}), '%', '\\\\%'), '_', '\\\\_')`;
+    }
+  }
+  return addValue(ctx.values, arg.replace(/[%_]/g, "\\$&"));
+};
 const base = {
   equals: make(
     (key, value, ctx, quotedAs) => value === null ? `${key} IS NULL` : `${key} = ${quoteValue$1(value, ctx, quotedAs)}`
@@ -978,22 +994,22 @@ const numeric = __spreadProps$9(__spreadValues$j({}, base), {
 });
 const text = __spreadProps$9(__spreadValues$j({}, base), {
   contains: make(
-    (key, value, ctx, quotedAs) => `${key} ILIKE '%' || ${quoteValue$1(value, ctx, quotedAs)} || '%'`
+    (key, value, ctx, quotedAs) => `${key} ILIKE '%' || ${quoteLikeValue(value, ctx, quotedAs)} || '%'`
   ),
   containsSensitive: make(
-    (key, value, ctx, quotedAs) => `${key} LIKE '%' || ${quoteValue$1(value, ctx, quotedAs)} || '%'`
+    (key, value, ctx, quotedAs) => `${key} LIKE '%' || ${quoteLikeValue(value, ctx, quotedAs)} || '%'`
   ),
   startsWith: make(
-    (key, value, ctx, quotedAs) => `${key} ILIKE ${quoteValue$1(value, ctx, quotedAs)} || '%'`
+    (key, value, ctx, quotedAs) => `${key} ILIKE ${quoteLikeValue(value, ctx, quotedAs)} || '%'`
   ),
   startsWithSensitive: make(
-    (key, value, ctx, quotedAs) => `${key} LIKE ${quoteValue$1(value, ctx, quotedAs)} || '%'`
+    (key, value, ctx, quotedAs) => `${key} LIKE ${quoteLikeValue(value, ctx, quotedAs)} || '%'`
   ),
   endsWith: make(
-    (key, value, ctx, quotedAs) => `${key} ILIKE '%' || ${quoteValue$1(value, ctx, quotedAs)}`
+    (key, value, ctx, quotedAs) => `${key} ILIKE '%' || ${quoteLikeValue(value, ctx, quotedAs)}`
   ),
   endsWithSensitive: make(
-    (key, value, ctx, quotedAs) => `${key} LIKE '%' || ${quoteValue$1(value, ctx, quotedAs)}`
+    (key, value, ctx, quotedAs) => `${key} LIKE '%' || ${quoteLikeValue(value, ctx, quotedAs)}`
   )
 });
 const encodeJsonPath = (ctx, path) => addValue(ctx.values, `{${Array.isArray(path) ? path.join(", ") : path}}`);
@@ -1002,14 +1018,21 @@ const json = __spreadProps$9(__spreadValues$j({}, base), {
   jsonPathQueryFirst: Object.assign(
     function(path, options) {
       var _a, _b, _c, _d, _e;
-      ((_b = (_a = this.q).chain) != null ? _b : _a.chain = []).push(jsonPathQueryOp, [path, options]);
+      const chain = (_b = (_a = this.q).chain) != null ? _b : _a.chain = [];
+      chain.push(jsonPathQueryOp, [path, options]);
       if ((_c = this.q.parsers) == null ? void 0 : _c[getValueKey]) {
         this.q.parsers[getValueKey] = void 0;
       }
       if (options == null ? void 0 : options.type) {
-        const parse = options.type(this.columnTypes).parseFn;
-        if (parse)
-          ((_e = (_d = this.q).parsers) != null ? _e : _d.parsers = {})[getValueKey] = parse;
+        const type = options.type(this.columnTypes);
+        if (type.parseFn)
+          ((_e = (_d = this.q).parsers) != null ? _e : _d.parsers = {})[getValueKey] = type.parseFn;
+        chain.push = (...args) => {
+          chain.push = Array.prototype.push;
+          chain.push((s) => `${s}::${type.dataType}`, emptyArray);
+          return chain.push(...args);
+        };
+        return setQueryOperators(this, type.operators);
       }
       return this;
     },