pqb 0.18.15 → 0.18.17

package/dist/index.mjs

@@ -2553,7 +2553,7 @@ const quoteValue = (arg, ctx, quotedAs, jsonArray) => {
   }
   return addValue(ctx.values, arg);
 };
-const ops = {
+const base = {
   equals: make(
     (key, value, ctx, quotedAs) => value === null ? `${key} IS NULL` : `${key} = ${quoteValue(value, ctx, quotedAs)}`
   ),
@@ -2565,7 +2565,17 @@ const ops = {
   ),
   notIn: make(
     (key, value, ctx, quotedAs) => `NOT ${key} IN ${quoteValue(value, ctx, quotedAs)}`
+  )
+};
+const boolean = __spreadProps$7(__spreadValues$b({}, base), {
+  and: make(
+    (key, value, ctx, quotedAs) => `${key} AND ${value.q.expr.toSQL(ctx, quotedAs)}`
   ),
+  or: make(
+    (key, value, ctx, quotedAs) => `(${key}) OR (${value.q.expr.toSQL(ctx, quotedAs)})`
+  )
+});
+const numeric = __spreadProps$7(__spreadValues$b({}, base), {
   lt: make(
     (key, value, ctx, quotedAs) => `${key} < ${quoteValue(value, ctx, quotedAs)}`
   ),
@@ -2578,6 +2588,15 @@ const ops = {
   gte: make(
     (key, value, ctx, quotedAs) => `${key} >= ${quoteValue(value, ctx, quotedAs)}`
   ),
+  between: make(
+    (key, [from, to], ctx, quotedAs) => `${key} BETWEEN ${quoteValue(from, ctx, quotedAs)} AND ${quoteValue(
+      to,
+      ctx,
+      quotedAs
+    )}`
+  )
+});
+const text = __spreadProps$7(__spreadValues$b({}, base), {
   contains: make(
     (key, value, ctx, quotedAs) => `${key} ILIKE '%' || ${quoteValue(value, ctx, quotedAs)} || '%'`
   ),
@@ -2595,14 +2614,9 @@ const ops = {
   ),
   endsWithSensitive: make(
     (key, value, ctx, quotedAs) => `${key} LIKE '%' || ${quoteValue(value, ctx, quotedAs)}`
-  ),
-  between: make(
-    (key, [from, to], ctx, quotedAs) => `${key} BETWEEN ${quoteValue(from, ctx, quotedAs)} AND ${quoteValue(
-      to,
-      ctx,
-      quotedAs
-    )}`
-  ),
+  )
+});
+const json = __spreadProps$7(__spreadValues$b({}, base), {
   jsonPath: make(
     (key, [path, op, value], ctx, quotedAs) => `jsonb_path_query_first(${key}, '${path}') #>> '{}' ${op} ${quoteValue(
       value,
@@ -2616,50 +2630,14 @@ const ops = {
   ),
   jsonSubsetOf: make(
     (key, value, ctx, quotedAs) => `${key} <@ ${quoteValue(value, ctx, quotedAs, true)}`
-  ),
-  and: make(
-    (key, value, ctx, quotedAs) => `${key} AND ${value.q.expr.toSQL(ctx, quotedAs)}`
-  ),
-  or: make(
-    (key, value, ctx, quotedAs) => `(${key}) OR (${value.q.expr.toSQL(ctx, quotedAs)})`
   )
-};
-const base = {
-  equals: ops.equals,
-  not: ops.not,
-  in: ops.in,
-  notIn: ops.notIn
-};
-const boolean = __spreadProps$7(__spreadValues$b({}, base), {
-  and: ops.and,
-  or: ops.or
-});
-const numeric = __spreadProps$7(__spreadValues$b({}, base), {
-  lt: ops.lt,
-  lte: ops.lte,
-  gt: ops.gt,
-  gte: ops.gte,
-  between: ops.between
-});
-const text = __spreadProps$7(__spreadValues$b({}, base), {
-  contains: ops.contains,
-  containsSensitive: ops.containsSensitive,
-  startsWith: ops.startsWith,
-  startsWithSensitive: ops.startsWithSensitive,
-  endsWith: ops.endsWith,
-  endsWithSensitive: ops.endsWithSensitive
-});
-const json = __spreadProps$7(__spreadValues$b({}, base), {
-  jsonPath: ops.jsonPath,
-  jsonSupersetOf: ops.jsonSupersetOf,
-  jsonSubsetOf: ops.jsonSubsetOf
 });
 const Operators = {
   any: base,
   boolean,
   number: numeric,
-  date: base,
-  time: base,
+  date: numeric,
+  time: numeric,
   text,
   json,
   array: base