pqb 0.31.9 → 0.33.0

package/dist/index.js

@@ -881,6 +881,25 @@ const make = (_op) => {
       return setQueryOperators(this, boolean);
     },
     {
+      // function to turn the operator expression into SQL
+      _op
+    }
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  );
+};
+const makeVarArg = (_op) => {
+  return Object.assign(
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    function(...args) {
+      var _a, _b, _c;
+      ((_b = (_a = this.q).chain) != null ? _b : _a.chain = []).push(_op, args);
+      if ((_c = this.q.parsers) == null ? void 0 : _c[orchidCore.getValueKey]) {
+        this.q.parsers[orchidCore.getValueKey] = void 0;
+      }
+      return setQueryOperators(this, boolean);
+    },
+    {
+      // function to turn the operator expression into SQL
       _op
     }
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -963,15 +982,51 @@ const text = __spreadProps$7(__spreadValues$f({}, base), {
     (key, value, ctx, quotedAs) => `${key} LIKE '%' || ${quoteValue$1(value, ctx, quotedAs)}`
   )
 });
+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 == null ? void 0 : options.vars) ? `, ${orchidCore.addValue(ctx.values, JSON.stringify(options.vars))}${options.silent ? ", true" : ""}` : (options == null ? void 0 : options.silent) ? ", NULL, true" : ""})`;
 const json = __spreadProps$7(__spreadValues$f({}, base), {
-  jsonPath: make(
-    (key, [path, op, value], ctx, quotedAs) => `jsonb_path_query_first(${key}, '${path}') #>> '{}' ${op} ${value === null ? "null" : quoteValue$1(value, ctx, quotedAs, true)}`
+  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]);
+      if ((_c = this.q.parsers) == null ? void 0 : _c[orchidCore.getValueKey]) {
+        this.q.parsers[orchidCore.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 = {})[orchidCore.getValueKey] = parse;
+      }
+      return this;
+    },
+    { _op: jsonPathQueryOp }
   ),
   jsonSupersetOf: make(
     (key, value, ctx, quotedAs) => `${key} @> ${quoteValue$1(value, ctx, quotedAs, true)}`
   ),
   jsonSubsetOf: make(
     (key, value, ctx, quotedAs) => `${key} <@ ${quoteValue$1(value, ctx, quotedAs, true)}`
+  ),
+  jsonSet: makeVarArg(
+    (key, [path, value], ctx) => `jsonb_set(${key}, ${encodeJsonPath(ctx, path)}, ${orchidCore.addValue(
+      ctx.values,
+      JSON.stringify(value)
+    )})`
+  ),
+  jsonReplace: makeVarArg(
+    (key, [path, value], ctx) => `jsonb_set(${key}, ${encodeJsonPath(ctx, path)}, ${orchidCore.addValue(
+      ctx.values,
+      JSON.stringify(value)
+    )}, false)`
+  ),
+  jsonInsert: makeVarArg(
+    (key, [path, value, options], ctx) => `jsonb_insert(${key}, ${encodeJsonPath(ctx, path)}, ${orchidCore.addValue(
+      ctx.values,
+      JSON.stringify(value)
+    )}${(options == null ? void 0 : options.after) ? ", true" : ""})`
+  ),
+  jsonRemove: makeVarArg(
+    (key, [path], ctx) => `(${key} #- ${encodeJsonPath(ctx, path)})`
   )
 });
 const Operators = {
@@ -1740,7 +1795,8 @@ class BooleanColumn extends ColumnType {
   }
 }
 
-const toCodeSkip = { encodeFn: JSON.stringify };
+const encodeFn = (x) => x === null ? x : JSON.stringify(x);
+const toCodeSkip = { encodeFn };
 class JSONColumn extends ColumnType {
   constructor() {
     super(...arguments);
@@ -1751,7 +1807,7 @@ class JSONColumn extends ColumnType {
     return columnCode(this, t, `json()`, m, this.data, toCodeSkip);
   }
 }
-JSONColumn.prototype.encodeFn = JSON.stringify;
+JSONColumn.prototype.encodeFn = encodeFn;
 class JSONTextColumn extends ColumnType {
   constructor(schema) {
     super(schema, schema.stringSchema());
@@ -2076,9 +2132,13 @@ const processWhere = (ands, ctx, table, query, data, quotedAs) => {
   if ("prototype" in data || "baseQuery" in data) {
     const query2 = data;
     if (query2.q.expr) {
-      const q = joinSubQuery(table, query2);
-      q.q.select = [query2.q.expr];
-      ands.push(`(${getSqlText(makeSQL(q, ctx))})`);
+      if (query2.q.subQuery === 1) {
+        ands.push(selectToSql(ctx, table, query2.q, quotedAs));
+      } else {
+        const q = joinSubQuery(table, query2);
+        q.q.select = [query2.q.expr];
+        ands.push(`(${getSqlText(makeSQL(q, ctx))})`);
+      }
     } else {
       pushWhereToSql(
         ands,
@@ -3609,7 +3669,7 @@ const processSelectArg = (q, as, arg, columnAs) => {
           (q2) => q2,
           key
         );
-      } else if (((_d = value.q) == null ? void 0 : _d.isSubQuery) && value.q.expr) {
+      } else if (((_d = value.q) == null ? void 0 : _d.subQuery) && value.q.expr) {
         value = value.q.expr;
       }
     }
@@ -3784,7 +3844,7 @@ class SelectItemExpression extends orchidCore.Expression {
   // except that it will use non-aliasing `columnToSql` when `ctx.aliasValue` is true,
   // it is needed for relation sub-queries that returns a single column.
   makeSQL(ctx, quotedAs) {
-    return typeof this.item === "string" ? this.item === "*" ? selectAllSql(this.query, this.q, quotedAs) : ctx.aliasValue ? columnToSql(ctx, this.q, this.q.shape, this.item, quotedAs, true) : columnToSqlWithAs(ctx, this.q, this.item, quotedAs, true) : selectedObjectToSQL(ctx, this.query, quotedAs, this.item);
+    return typeof this.item === "string" ? this.item === "*" ? selectAllSql(this.query, this.q, quotedAs) : ctx.aliasValue ? columnToSql(ctx, this.q, this.q.shape, this.item, quotedAs, true) : columnToSqlWithAs(ctx, this.q, this.item, quotedAs, true) : selectedObjectToSQL(ctx, quotedAs, this.item);
   }
 }
 
@@ -3992,50 +4052,6 @@ function queryJson(self, coalesce) {
   return q;
 }
 
-const jsonColumnOrMethodToSql = (ctx, table, column, values, quotedAs) => {
-  return typeof column === "string" ? columnToSql(ctx, table.q, table.q.shape, column, quotedAs) : jsonToSql(ctx, table, column, values, quotedAs);
-};
-const jsonToSql = (ctx, table, item, values, quotedAs) => {
-  const json = item.__json;
-  if (json[0] === "pathQuery") {
-    const [, , , column, path, options] = json;
-    return `jsonb_path_query(${jsonColumnOrMethodToSql(
-      ctx,
-      table,
-      column,
-      values,
-      quotedAs
-    )}, ${orchidCore.addValue(values, path)}${(options == null ? void 0 : options.vars) ? `, ${orchidCore.addValue(values, options.vars)}` : ""}${(options == null ? void 0 : options.silent) ? ", true" : ""})`;
-  } else if (json[0] === "set") {
-    const [, , , column, path, value, options] = json;
-    return `jsonb_set(${jsonColumnOrMethodToSql(
-      ctx,
-      table,
-      column,
-      values,
-      quotedAs
-    )}, '{${path.join(", ")}}', ${orchidCore.addValue(values, JSON.stringify(value))}${(options == null ? void 0 : options.createIfMissing) ? ", true" : ""})`;
-  } else if (json[0] === "insert") {
-    const [, , , column, path, value, options] = json;
-    return `jsonb_insert(${jsonColumnOrMethodToSql(
-      ctx,
-      table,
-      column,
-      values,
-      quotedAs
-    )}, '{${path.join(", ")}}', ${orchidCore.addValue(values, JSON.stringify(value))}${(options == null ? void 0 : options.insertAfter) ? ", true" : ""})`;
-  } else if (json[0] === "remove") {
-    const [, , , column, path] = json;
-    return `${jsonColumnOrMethodToSql(
-      ctx,
-      table,
-      column,
-      values,
-      quotedAs
-    )} #- '{${path.join(", ")}}'`;
-  }
-  return "";
-};
 const pushSelectSql = (ctx, table, query, quotedAs) => {
   ctx.sql.push(selectToSql(ctx, table, query, quotedAs));
 };
@@ -4069,7 +4085,7 @@ const selectToSql = (ctx, table, query, quotedAs) => {
           }
         }
       } else {
-        list.push(selectedObjectToSQL(ctx, table, quotedAs, item));
+        list.push(selectedObjectToSQL(ctx, quotedAs, item));
       }
     }
     return list.join(", ");
@@ -4077,10 +4093,7 @@ const selectToSql = (ctx, table, query, quotedAs) => {
   return selectAllSql(table, query, quotedAs);
 };
 const selectedStringToSQL = (ctx, table, query, quotedAs, item) => item === "*" ? selectAllSql(table, query, quotedAs) : columnToSqlWithAs(ctx, table.q, item, quotedAs, true);
-function selectedObjectToSQL(ctx, table, quotedAs, item) {
-  if ("__json" in item) {
-    return `${jsonToSql(ctx, table, item, ctx.values, quotedAs)} "${item.__json[1]}"`;
-  }
+function selectedObjectToSQL(ctx, quotedAs, item) {
   const sql = item.toSQL(ctx, quotedAs);
   return ctx.aliasValue ? `${sql} r` : sql;
 }
@@ -4770,11 +4783,12 @@ const processData = (ctx, table, set, data, quotedAs) => {
 };
 const processValue = (ctx, table, QueryClass, key, value, quotedAs) => {
   if (value && typeof value === "object") {
-    if (value.__json) {
-      return jsonToSql(ctx, table, value, ctx.values, quotedAs);
-    } else if (orchidCore.isExpression(value)) {
+    if (orchidCore.isExpression(value)) {
       return value.toSQL(ctx, quotedAs);
     } else if (value instanceof QueryClass) {
+      if (value.q.subQuery === 1) {
+        return selectToSql(ctx, table, value.q, quotedAs);
+      }
       return `(${getSqlText(
         joinSubQuery(table, value).toSQL(ctx)
       )})`;
@@ -5200,11 +5214,11 @@ const makeRegexToFindInSql = (value) => {
   return new RegExp(`${value}(?=(?:[^']*'[^']*')*[^']*$)`, "g");
 };
 const resolveSubQueryCallback = (q, cb) => {
-  const { isSubQuery, relChain } = q.q;
-  q.q.isSubQuery = true;
+  const { subQuery, relChain } = q.q;
+  q.q.subQuery = 1;
   q.q.relChain = void 0;
   const result = cb(q);
-  q.q.isSubQuery = isSubQuery;
+  q.q.subQuery = subQuery;
   q.q.relChain = relChain;
   return result;
 };
@@ -6654,7 +6668,7 @@ class Create {
    * const createdCount = await db.table.insertMany([data, data, data]);
    * ```
    *
-   * Because of a limitation of Postgres protocol, queries having more than **65536** are going to fail in runtime.
+   * Because of a limitation of Postgres protocol, queries having more than **65535** of values are going to fail in runtime.
    * To solve this seamlessly, OrchidORM will automatically batch such queries, and wrap them into a transaction, unless they are already in a transaction.
    *
    * ```ts
@@ -8276,183 +8290,6 @@ class OnMethods {
   }
 }
 
-class JsonModifiers {
-  /**
-   * Return a JSON value/object/array where a given value is set at the given path.
-   * The path is an array of keys to access the value.
-   *
-   * Can be used in `update` callback.
-   *
-   * ```ts
-   * const result = await db.table.jsonSet('data', ['name'], 'new value').take();
-   *
-   * expect(result.data).toEqual({ name: 'new value' });
-   * ```
-   *
-   * Optionally takes parameters of type `{ as?: string, createIfMissing?: boolean }`
-   *
-   * ```ts
-   * await db.table.jsonSet('data', ['name'], 'new value', {
-   *   as: 'alias', // select data as `alias`
-   *   createIfMissing: true, // ignored if missing by default
-   * });
-   * ```
-   *
-   * @param column - name of JSON column, or a result of a nested json method
-   * @param path - path to value inside the json
-   * @param value - value to set into the json
-   * @param options - `as` to alias the json value when selecting, `createIfMissing: true` will create a new JSON property if it didn't exist before
-   */
-  jsonSet(column, path, value, options) {
-    var _a;
-    const q = this.clone();
-    const json = {
-      __json: [
-        "set",
-        (_a = options == null ? void 0 : options.as) != null ? _a : typeof column === "string" ? column : column.__json[1],
-        typeof column === "string" ? q.q.shape[column] : column.__json[2],
-        column,
-        path,
-        value,
-        options
-      ]
-    };
-    return Object.assign(pushQueryValue(q, "select", json), json);
-  }
-  /**
-   * Return a JSON value/object/array where a given value is inserted at the given JSON path. Value can be a single value or JSON object. If a value exists at the given path, the value is not replaced.
-   *
-   * Can be used in `update` callback.
-   *
-   * ```ts
-   * // imagine user has data = { tags: ['two'] }
-   * const result = await db.table.jsonInsert('data', ['tags', 0], 'one').take();
-   *
-   * // 'one' is inserted to 0 position
-   * expect(result.data).toEqual({ tags: ['one', 'two'] });
-   * ```
-   *
-   * Optionally takes parameters of type `{ as?: string, insertAfter?: boolean }`
-   *
-   * ```ts
-   * // imagine user has data = { tags: ['one'] }
-   * const result = await db.table
-   *   .jsonInsert('data', ['tags', 0], 'two', {
-   *     as: 'alias', // select as an alias
-   *     insertAfter: true, // insert after the specified position
-   *   })
-   *   .take();
-   *
-   * // 'one' is inserted to 0 position
-   * expect(result.alias).toEqual({ tags: ['one', 'two'] });
-   * ```
-   * @param column - name of JSON column, or a result of a nested json method
-   * @param path - path to the array inside the json, last path element is index to insert into
-   * @param value - value to insert into the json array
-   * @param options - `as` to alias the json value when selecting, `insertAfter: true` to insert after the specified position
-   */
-  jsonInsert(column, path, value, options) {
-    var _a;
-    const q = this.clone();
-    const json = {
-      __json: [
-        "insert",
-        (_a = options == null ? void 0 : options.as) != null ? _a : typeof column === "string" ? column : column.__json[1],
-        typeof column === "string" ? q.q.shape[column] : column.__json[2],
-        column,
-        path,
-        value,
-        options
-      ]
-    };
-    return Object.assign(pushQueryValue(q, "select", json), json);
-  }
-  /**
-   * Return a JSON value/object/array where a given value is removed at the given JSON path.
-   *
-   * Can be used in `update` callback.
-   *
-   * ```ts
-   * // imagine a user has data = { tags: ['one', 'two'] }
-   * const result = await db.table
-   *   .jsonRemove(
-   *     'data',
-   *     ['tags', 0],
-   *     // optional parameters:
-   *     {
-   *       as: 'alias', // select as an alias
-   *     },
-   *   )
-   *   .take();
-   *
-   * expect(result.alias).toEqual({ tags: ['two'] });
-   * ```
-   *
-   * @param column - name of JSON column, or a result of a nested json method
-   * @param path - path to the array inside the json, last path element is index to remove this element
-   * @param options - `as` to alias the json value when selecting
-   */
-  jsonRemove(column, path, options) {
-    var _a;
-    const q = this.clone();
-    const json = {
-      __json: [
-        "remove",
-        (_a = options == null ? void 0 : options.as) != null ? _a : typeof column === "string" ? column : column.__json[1],
-        typeof column === "string" ? q.q.shape[column] : column.__json[2],
-        column,
-        path
-      ]
-    };
-    return Object.assign(pushQueryValue(q, "select", json), json);
-  }
-  /**
-   * Selects a value from JSON data using a JSON path.
-   *
-   * ```ts
-   * import { columnTypes } from 'orchid-orm';
-   *
-   * db.table.jsonPathQuery(
-   *   columnTypes.text(3, 100), // type of the value
-   *   'data', // name of the JSON column
-   *   '$.name', // JSON path
-   *   'name', // select value as name
-   *
-   *   // Optionally supports `vars` and `silent` options
-   *   // check Postgres docs for jsonb_path_query for details
-   *   {
-   *     vars: 'vars',
-   *     silent: true,
-   *   },
-   * );
-   * ```
-   *
-   * Nested JSON operations can be used in place of JSON column name:
-   *
-   * ```ts
-   * db.table.jsonPathQuery(
-   *   columnTypes.text(3, 100),
-   *   // Available: .jsonSet, .jsonInsert, .jsonRemove
-   *   db.table.jsonSet('data', ['key'], 'value'),
-   *   '$.name',
-   *   'name',
-   * );
-   * ```
-   *
-   * @param type - provide a column type to have a correct result type
-   * @param column - name of JSON column, or a result of a nested json method
-   * @param path - special JSON path string to reference a JSON value
-   * @param as - optional alias for the selected value
-   * @param options - supports `vars` and `silent`, check Postgres docs of `json_path_query` for these
-   */
-  jsonPathQuery(type, column, path, as, options) {
-    const q = this.clone();
-    const json = {
-      __json: ["pathQuery", as, type, column, path, options]
-    };
-    return Object.assign(pushQueryValue(q, "select", json), json);
-  }
-}
 class JsonMethods {
   /**
    * Wraps the query in a way to select a single JSON string.
@@ -8828,7 +8665,7 @@ const resolveCallbacksInArgs = (q, args) => {
       const qb = Object.create(q);
       qb.q = getClonedQueryData(q.q);
       qb.q.and = qb.q.or = qb.q.scopes = void 0;
-      qb.q.isSubQuery = true;
+      qb.q.subQuery = 1;
       args[i] = resolveSubQueryCallback(qb, arg);
     }
   }
@@ -11541,7 +11378,6 @@ orchidCore.applyMixins(QueryMethods, [
   OnMethods,
   WithMethods,
   Union,
-  JsonModifiers,
   JsonMethods,
   Create,
   Update,
@@ -12180,7 +12016,6 @@ exports.JSONColumn = JSONColumn;
 exports.JSONTextColumn = JSONTextColumn;
 exports.Join = Join;
 exports.JsonMethods = JsonMethods;
-exports.JsonModifiers = JsonModifiers;
 exports.LimitedTextBaseColumn = LimitedTextBaseColumn;
 exports.LineColumn = LineColumn;
 exports.LsegColumn = LsegColumn;