pqb 0.56.6 → 0.56.8

package/dist/index.js

@@ -970,7 +970,7 @@ class EnumColumn extends ColumnType {
     super(schema, schemaType);
     this.enumName = enumName;
     this.options = options;
-    this.operators = Operators.any;
+    this.operators = Operators.ordinalText;
     this.dataType = "enum";
     this.inputSchema = this.outputSchema = this.querySchema = schemaType;
   }
@@ -1071,8 +1071,8 @@ const makeVarArg = (_op) => {
 };
 const quoteValue = (arg, ctx, quotedAs, IN) => {
   if (arg && typeof arg === "object") {
-    if (IN && Array.isArray(arg)) {
-      return `(${arg.map((value) => orchidCore.addValue(ctx.values, value)).join(", ")})`;
+    if (IN && orchidCore.isIterable(arg)) {
+      return `(${(Array.isArray(arg) ? arg : [...arg]).map((value) => orchidCore.addValue(ctx.values, value)).join(", ")})`;
     }
     if (orchidCore.isExpression(arg)) {
       return arg.toSQL(ctx, quotedAs);
@@ -1113,16 +1113,7 @@ const base = {
     (key, value, ctx, quotedAs) => `NOT ${key} IN ${quoteValue(value, ctx, quotedAs, true)}`
   )
 };
-const boolean = {
-  ...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 = {
+const ord = {
   ...base,
   lt: make(
     (key, value, ctx, quotedAs) => `${key} < ${quoteValue(value, ctx, quotedAs)}`
@@ -1144,6 +1135,15 @@ const numeric = {
     )}`
   )
 };
+const boolean = {
+  ...ord,
+  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 text = {
   ...base,
   contains: make(
@@ -1165,6 +1165,10 @@ const text = {
     (key, value, ctx, quotedAs) => `${key} LIKE '%' || ${quoteLikeValue(value, ctx, quotedAs)}`
   )
 };
+const ordinalText = {
+  ...ord,
+  ...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) => {
@@ -1193,6 +1197,7 @@ const serializeJsonValue = (arg, ctx, quotedAs) => {
   return orchidCore.addValue(ctx.values, JSON.stringify(arg));
 };
 const json = {
+  ...ord,
   equals: make(
     (key, value, ctx, quotedAs) => value === null ? `nullif(${key}, 'null'::jsonb) IS NULL` : `${key} = ${quoteJsonValue(value, ctx, quotedAs)}`
   ),
@@ -1259,7 +1264,7 @@ const json = {
   )
 };
 const array = {
-  ...base,
+  ...ord,
   has: make(
     (key, value, ctx, quotedAs) => `${quoteValue(value, ctx, quotedAs)} = ANY(${key})`
   ),
@@ -1277,7 +1282,7 @@ const array = {
     return typeof value === "number" ? `${expr} = ${quoteValue(value, ctx, quotedAs)}` : Object.keys(value).map(
       (key2) => (
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        numeric[key2]._op(expr, value[key2], ctx, quotedAs)
+        ord[key2]._op(expr, value[key2], ctx, quotedAs)
       )
     ).join(" AND ");
   })
@@ -1285,9 +1290,10 @@ const array = {
 const Operators = {
   any: base,
   boolean,
-  number: numeric,
-  date: numeric,
-  time: numeric,
+  ordinalText,
+  number: ord,
+  date: ord,
+  time: ord,
   text,
   json,
   array
@@ -1757,6 +1763,9 @@ const defaultSchemaConfig = {
   asType() {
     return this;
   },
+  narrowType() {
+    return this;
+  },
   dateAsNumber() {
     return this.parse(Date.parse);
   },
@@ -1822,6 +1831,7 @@ class LimitedTextBaseColumn extends TextBaseColumn {
       schema,
       limit !== void 0 ? schema.stringMax(limit) : schema.stringSchema()
     );
+    this.operators = Operators.ordinalText;
     this.data.maxChars = limit;
   }
   toSQL() {
@@ -1888,6 +1898,7 @@ class TextColumn extends TextBaseColumn {
   constructor(schema) {
     super(schema, schema.stringSchema());
     this.dataType = "text";
+    this.operators = Operators.ordinalText;
   }
   static get instance() {
     return this._instance ?? (this._instance = new TextColumn(defaultSchemaConfig));
@@ -1901,7 +1912,7 @@ class ByteaColumn extends ColumnType {
   constructor(schema) {
     super(schema, schema.buffer());
     this.dataType = "bytea";
-    this.operators = Operators.text;
+    this.operators = Operators.ordinalText;
     setColumnDefaultParse(this, byteaParse);
   }
   toCode(ctx, key) {
@@ -2011,7 +2022,7 @@ class InetColumn extends ColumnType {
   constructor(schema) {
     super(schema, schema.stringSchema());
     this.dataType = "inet";
-    this.operators = Operators.text;
+    this.operators = Operators.ordinalText;
   }
   toCode(ctx, key) {
     return columnCode(this, ctx, key, `inet()`);
@@ -2021,7 +2032,7 @@ class MacAddrColumn extends ColumnType {
   constructor(schema) {
     super(schema, schema.stringSchema());
     this.dataType = "macaddr";
-    this.operators = Operators.text;
+    this.operators = Operators.ordinalText;
   }
   toCode(ctx, key) {
     return columnCode(this, ctx, key, `macaddr()`);
@@ -2031,7 +2042,7 @@ class MacAddr8Column extends ColumnType {
   constructor(schema) {
     super(schema, schema.stringSchema());
     this.dataType = "macaddr8";
-    this.operators = Operators.text;
+    this.operators = Operators.ordinalText;
   }
   toCode(ctx, key) {
     return columnCode(this, ctx, key, `macaddr8()`);
@@ -2041,7 +2052,7 @@ class BitColumn extends ColumnType {
   constructor(schema, length) {
     super(schema, schema.bit(length));
     this.dataType = "bit";
-    this.operators = Operators.text;
+    this.operators = Operators.ordinalText;
     this.data.length = length;
   }
   toCode(ctx, key) {
@@ -2059,7 +2070,7 @@ class BitVaryingColumn extends ColumnType {
   constructor(schema, length) {
     super(schema, schema.bit(length));
     this.dataType = "varbit";
-    this.operators = Operators.text;
+    this.operators = Operators.ordinalText;
     this.data.length = length;
     this.data.alias = "bitVarying";
   }
@@ -2079,7 +2090,7 @@ class TsVectorColumn extends ColumnType {
     super(schema, schema.stringSchema());
     this.defaultLanguage = defaultLanguage;
     this.dataType = "tsvector";
-    this.operators = Operators.text;
+    this.operators = Operators.ordinalText;
   }
   toCode(ctx, key) {
     return columnCode(this, ctx, key, `tsvector()`);
@@ -2171,7 +2182,7 @@ class TsQueryColumn extends ColumnType {
   constructor(schema) {
     super(schema, schema.stringSchema());
     this.dataType = "tsquery";
-    this.operators = Operators.text;
+    this.operators = Operators.ordinalText;
   }
   toCode(ctx, key) {
     return columnCode(this, ctx, key, `tsquery()`);
@@ -2183,7 +2194,7 @@ class UUIDColumn extends ColumnType {
   constructor(schema) {
     super(schema, schema.uuid());
     this.dataType = "uuid";
-    this.operators = Operators.text;
+    this.operators = Operators.ordinalText;
     this.data.defaultDefault = uuidDefault;
   }
   /**
@@ -2215,6 +2226,7 @@ class CitextColumn extends TextBaseColumn {
   constructor(schema) {
     super(schema, schema.stringSchema());
     this.dataType = "citext";
+    this.operators = Operators.ordinalText;
     this.data.extension = "citext";
   }
   toCode(ctx, key) {
@@ -3430,6 +3442,7 @@ const _queryOrNot = (q, args) => {
 const _queryWhereIn = (q, and, arg, values, not) => {
   let item;
   if (values) {
+    if (orchidCore.isIterable(values)) values = [...values];
     if ("length" in values && !values.length) {
       return _queryNone(q);
     }
@@ -3447,7 +3460,7 @@ const _queryWhereIn = (q, and, arg, values, not) => {
     item = {};
     for (const key in arg) {
       const values2 = arg[key];
-      if ("length" in values2 && !values2.length) {
+      if ("length" in values2 && !values2.length || "size" in values2 && !values2.size) {
         return _queryNone(q);
       }
       item[key] = { in: values2 };
@@ -3990,8 +4003,10 @@ class Where {
    *
    * ```ts
    * db.table.whereIn('column', [1, 2, 3]);
+   * db.table.whereIn('column', new Set([1, 2, 3]));
    * // the same as:
-   * db.table.where({ column: [1, 2, 3] });
+   * db.table.where({ column: { in: [1, 2, 3] } });
+   * db.table.where({ column: { in: new Set([1, 2, 3]) } });
    * ```
    *
    * `whereIn` can support a tuple of columns, that's what the `in` operator cannot support:
@@ -4022,9 +4037,9 @@ class Where {
    *
    * ```ts
    * // following queries resolves into `none`:
-   * db.table.where('id', [])
-   * db.table.where(['id', 'name'], [])
-   * db.table.where({ id: [] })
+   * db.table.whereIn('id', [])
+   * db.table.whereIn(['id', 'name'], [])
+   * db.table.whereIn({ id: [] })
    * ```
    */
   whereIn(...args) {
@@ -11783,7 +11798,7 @@ class QueryMap {
    *
    * ```ts
    * // add a `titleLength` to every post
-   * const posts = await db.post.limit(10).map((post) => ({
+   * const posts = await db.post.limit(10).map((post, i) => ({
    *   ...post,
    *   titleLength: post.title.length,
    * }));
@@ -11791,7 +11806,7 @@ class QueryMap {
    * posts[0].titleLength; // number
    *
    * // using the exact same `map` function to transform a single post
-   * const singlePost = await db.post.find(id).map((post) => ({
+   * const singlePost = await db.post.find(id).map((post, i) => ({
    *   ...post,
    *   titleLength: post.title.length,
    * }));
@@ -11801,7 +11816,7 @@ class QueryMap {
    * // can be used in sub-queries
    * const postsWithComments = await db.post.select('title', {
    *   comments: (q) =>
-   *     q.comments.map((comment) => ({
+   *     q.comments.map((comment, i) => ({
    *       ...comment,
    *       truncatedContent: comment.content.slice(0, 100),
    *     })),
@@ -11811,10 +11826,12 @@ class QueryMap {
    * ```
    *
    * @param fn - function to transform an individual record
+   * @param thisArg - same as in the native array map
    */
-  map(fn) {
+  map(fn, thisArg) {
     return orchidCore.pushQueryValueImmutable(_clone(this), "transform", {
-      map: fn
+      map: fn,
+      thisArg
     });
   }
 }